homeconsole-cli 0.0.2__tar.gz → 0.0.4__tar.gz

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: homeconsole-cli
-Version: 0.0.2
+Version: 0.0.4
 Summary: HomeConsole CLI (hc) — управление платформой через HTTP API
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -18,13 +18,42 @@ Requires-Dist: pytest>=8; extra == "dev"
 
 CLI-утилита для управления платформой HomeConsole **исключительно через HTTP API** CoreRuntime.
 
-## Установка (локально)
+## Установка
+
+### Рекомендуется — `pipx` (Debian / Ubuntu / Raspbian / OrangePi OS)
+
+`pipx` создаёт изолированный venv автоматически и регистрирует `hc` глобально:
+
+```bash
+apt install pipx          # или: pip install pipx --user
+pipx ensurepath           # добавляет ~/.local/bin в PATH (один раз)
+pipx install homeconsole-cli
+```
+
+После `pipx ensurepath` перезапусти шелл или выполни `source ~/.bashrc`.
+
+Обновление:
+```bash
+pipx upgrade homeconsole-cli
+```
+
+### Альтернатива — `pip --user`
+
+```bash
+pip install --user homeconsole-cli
+```
+
+Убедись, что `~/.local/bin` в `PATH`:
+```bash
+echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc
+```
+
+### Локальная разработка (из исходников)
 
 ```bash
 cd home-console-cli
 python -m venv .venv
 source .venv/bin/activate
-pip install -U pip
 pip install -e .
 ```
 

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/README.md

@@ -2,13 +2,42 @@
 
 CLI-утилита для управления платформой HomeConsole **исключительно через HTTP API** CoreRuntime.
 
-## Установка (локально)
+## Установка
+
+### Рекомендуется — `pipx` (Debian / Ubuntu / Raspbian / OrangePi OS)
+
+`pipx` создаёт изолированный venv автоматически и регистрирует `hc` глобально:
+
+```bash
+apt install pipx          # или: pip install pipx --user
+pipx ensurepath           # добавляет ~/.local/bin в PATH (один раз)
+pipx install homeconsole-cli
+```
+
+После `pipx ensurepath` перезапусти шелл или выполни `source ~/.bashrc`.
+
+Обновление:
+```bash
+pipx upgrade homeconsole-cli
+```
+
+### Альтернатива — `pip --user`
+
+```bash
+pip install --user homeconsole-cli
+```
+
+Убедись, что `~/.local/bin` в `PATH`:
+```bash
+echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc
+```
+
+### Локальная разработка (из исходников)
 
 ```bash
 cd home-console-cli
 python -m venv .venv
 source .venv/bin/activate
-pip install -U pip
 pip install -e .
 ```
 

homeconsole_cli-0.0.4/hc/__init__.py

@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+__all__ = ["__version__"]
+
+try:
+    from importlib.metadata import version as _pkg_version
+    __version__ = _pkg_version("homeconsole-cli")
+except Exception:
+    __version__ = "0.0.2"
+

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/hc/client.py

@@ -20,6 +20,7 @@ class HCClient:
     auth: str = "auto"  # auto|bearer|api-key
     refresh_token: str = ""
     on_token_refreshed: Callable[[str], None] | None = field(default=None)
+    silent_connect: bool = False  # suppress "Core недоступен" during background probes
 
     def _auth_hint(self, status_code: int) -> None:
         console = Console()
@@ -59,11 +60,13 @@ class HCClient:
             ) as client:
                 return await client.request(method, path, headers=self._headers(), **kwargs)
         except httpx.ConnectError:
-            hostport = self.base_url.replace("http://", "").replace("https://", "")
-            console.print(f"[red]Ошибка: Core недоступен на {hostport}[/red]")
+            if not self.silent_connect:
+                hostport = self.base_url.replace("http://", "").replace("https://", "")
+                console.print(f"[red]Ошибка: Core недоступен на {hostport}[/red]")
             return None
         except httpx.RequestError as e:
-            console.print(f"[red]Ошибка: {e}[/red]")
+            if not self.silent_connect:
+                console.print(f"[red]Ошибка: {e}[/red]")
             return None
 
     async def _try_refresh(self) -> bool:

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/hc/commands/_client_helpers.py

@@ -11,9 +11,10 @@ from hc.config import Config
 
 
 def _mute_auth_hints(client: HCClient) -> HCClient:
-    # Capabilities probe / фоновые операции не должны спамить подсказками при 403.
+    # Фоновые проbes не должны спамить ни auth-подсказками, ни "Core недоступен".
     client._auth_hint = lambda *a, **kw: None  # type: ignore[attr-defined]
     client._expired_session_hint = lambda: None  # type: ignore[attr-defined]
+    client.silent_connect = True
     return client
 
 

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/hc/commands/deploy.py

@@ -52,11 +52,15 @@ _STACK_ENV_COMPOSE: dict[str, str] = {
 }
 
 
+_MONOREPO_SIBLINGS = frozenset({"home-console-cli", "packages", "platform-home-console"})
+
+
 def _find_repo_root() -> Path | None:
     here = Path(__file__).resolve()
     for p in [here, *here.parents]:
         if (p / "core-runtime-service").exists():
-            return p
+            if any((p / s).exists() for s in _MONOREPO_SIBLINGS):
+                return p
     return None
 
 
@@ -106,6 +110,28 @@ def _run_env(cmd: list[str], *, cwd: Path | None = None, env: dict[str, str] | N
         raise typer.Exit(code=p.returncode)
 
 
+def _run_pull(
+    cmd: list[str],
+    *,
+    cwd: Path | None = None,
+    env: dict[str, str] | None = None,
+    image: str,
+) -> None:
+    """docker compose pull с понятной подсказкой при ошибке авторизации."""
+    p = subprocess.run(cmd, cwd=str(cwd) if cwd else None, env=env, check=False)  # noqa: S603
+    if p.returncode != 0:
+        registry = image.split("/")[0] if "/" in image else "ghcr.io"
+        raise HcCliError(
+            message=f"Не удалось загрузить образ {image}",
+            hint=(
+                f"Образ недоступен (denied / unauthorized).\n"
+                f"  Авторизуйся в реестре:\n"
+                f"  docker login {registry} -u <github_username> -p <PAT_read:packages>"
+            ),
+            exit_code=p.returncode,
+        )
+
+
 def _copy_dir_contents(src: Path, dst: Path) -> None:
     if dst.exists():
         shutil.rmtree(dst)
@@ -707,10 +733,11 @@ def register(app: typer.Typer) -> None:
             env = {**os.environ, "PLATFORM_IMAGE": full_image}
             console.print(f"[cyan]→[/cyan] Deploy platform image [bold]{full_image}[/bold]")
             if start:
-                _run_env(
+                _run_pull(
                     ["docker", "compose", "-f", str(compose_file), "pull", "platform-web"],
                     cwd=platform_root,
                     env=env,
+                    image=full_image,
                 )
                 _run_env(
                     ["docker", "compose", "-f", str(compose_file), "up", "-d"],
@@ -1477,10 +1504,11 @@ def register(app: typer.Typer) -> None:
         console.print(f"Local rollout: [bold]{full}[/bold]")
         env = {**os.environ, "CORE_RUNTIME_IMAGE": full, **_compose_env_overrides(db=db, cache=cache)}
         if do_pull:
-            _run_env(
+            _run_pull(
                 ["docker", "compose", "-f", str(project.compose_file), "pull", "core-runtime"],
                 cwd=project.cwd,
                 env=env,
+                image=full,
             )
         _run_env(
             ["docker", "compose", "-f", str(project.compose_file), "up", "-d"],

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/hc/commands/env.py

@@ -11,7 +11,7 @@ from rich.console import Console
 from rich.table import Table
 
 from hc.core_ops import compose_project_from_source, require_docker
-from hc.core_source import CoreSource, get_core_source_from_repo, get_core_source_local
+from hc.core_source import CoreSource, get_core_source_from_repo, get_core_source_local, init_core_source
 from hc.errors import CoreSourcesNotFoundError, HcCliError
 
 
@@ -105,11 +105,17 @@ _DB_HELP = "sqlite | postgres  (без --db: интерактивный выбо
 
 # ─── Helpers ──────────────────────────────────────────────────────────────────
 
+# Known siblings of core-runtime-service that confirm we're in the monorepo root.
+# Without them, a standalone core-runtime-service clone in any parent dir would be mistaken for monorepo.
+_MONOREPO_SIBLINGS = frozenset({"home-console-cli", "packages", "platform-home-console"})
+
+
 def _find_repo_root() -> Path | None:
     here = Path(__file__).resolve()
     for p in [here, *here.parents]:
         if (p / "core-runtime-service").exists():
-            return p
+            if any((p / s).exists() for s in _MONOREPO_SIBLINGS):
+                return p
     return None
 
 
@@ -122,10 +128,36 @@ def _resolve_source(console: Console) -> CoreSource:
     src = get_core_source_local()
     if src:
         return src
+
+    # On a fresh machine: offer to auto-clone core-runtime-service.
+    from hc.constants import CORE_SRC_DIR, DEFAULT_CORE_REPO
+    console.print(f"[yellow]Исходники Core не найдены.[/yellow] ({CORE_SRC_DIR})")
+
+    if sys.stdin.isatty():
+        try:
+            import questionary
+            answer = questionary.confirm(
+                f"Скачать core-runtime-service в {CORE_SRC_DIR}?",
+                default=True,
+            ).ask()
+        except ImportError:
+            answer = None
+
+        if answer is None:
+            raise typer.Abort()
+        if not answer:
+            raise CoreSourcesNotFoundError(
+                message="Исходники Core не найдены.",
+                exit_code=1,
+                hint=f"Запусти: hc core init  (клонирует {DEFAULT_CORE_REPO})",
+            )
+
+        return init_core_source(console, None, None)
+
     raise CoreSourcesNotFoundError(
         message="Исходники Core не найдены.",
         exit_code=1,
-        hint="Сделай `hc core init` или запусти из монорепы HomeConsole.",
+        hint=f"Запусти: hc core init  (клонирует {DEFAULT_CORE_REPO})",
     )
 
 

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/hc/commands/update.py

@@ -23,11 +23,15 @@ from hc.errors import (
 )
 
 
+_MONOREPO_SIBLINGS = frozenset({"home-console-cli", "packages", "platform-home-console"})
+
+
 def _find_repo_root() -> Path | None:
     here = Path(__file__).resolve()
     for p in [here, *here.parents]:
         if (p / "core-runtime-service").exists():
-            return p
+            if any((p / s).exists() for s in _MONOREPO_SIBLINGS):
+                return p
     return None
 
 
@@ -81,6 +85,28 @@ def _run(cmd: list[str], *, cwd: Path | None = None, env: dict[str, str] | None
         raise typer.Exit(code=p.returncode)
 
 
+def _run_pull(
+    cmd: list[str],
+    *,
+    cwd: Path | None = None,
+    env: dict[str, str] | None = None,
+    image: str,
+) -> None:
+    """docker compose pull с понятной подсказкой при ошибке авторизации."""
+    p = subprocess.run(cmd, cwd=str(cwd) if cwd else None, env=env, check=False)  # noqa: S603
+    if p.returncode != 0:
+        registry = image.split("/")[0] if "/" in image else "ghcr.io"
+        raise HcCliError(
+            message=f"Не удалось загрузить образ {image}",
+            hint=(
+                f"Образ недоступен (denied / unauthorized).\n"
+                f"  Авторизуйся в реестре:\n"
+                f"  docker login {registry} -u <github_username> -p <PAT_read:packages>"
+            ),
+            exit_code=p.returncode,
+        )
+
+
 def _fmt_s(seconds: float) -> str:
     if seconds < 60:
         return f"{seconds:.1f}s"
@@ -307,10 +333,11 @@ def register(app: typer.Typer) -> None:
                 project = compose_project_from_source(console, src, mode=deploy_mode)
                 env = {**os.environ, "CORE_RUNTIME_IMAGE": full}
                 t0 = time.monotonic()
-                _run(
+                _run_pull(
                     ["docker", "compose", "-f", str(project.compose_file), "pull", "core-runtime"],
                     cwd=project.cwd,
                     env=env,
+                    image=full,
                 )
                 _run(["docker", "compose", "-f", str(project.compose_file), "up", "-d"], cwd=project.cwd, env=env)
                 dt = time.monotonic() - t0

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/hc/constants.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from pathlib import Path
 
 APP_NAME = "HomeConsole CLI"
-APP_VERSION = "1.0"
 ENV_TOKEN = "HC_TOKEN"
 
 CONFIG_DIR = Path.home() / ".config" / "hc"
@@ -24,7 +23,7 @@ DEFAULT_CORE_REPO = "https://github.com/home-console/core-runtime-service"
 DEFAULT_CORE_REF = "master"
 
 # Образ для prod / dev-image rollout (Ghcr). Локально собранный тег задаёт через --image.
-DEFAULT_CORE_IMAGE = "ghcr.io/home-console/core-runtime"
+DEFAULT_CORE_IMAGE = "ghcr.io/home-console/core-runtime-service"
 
 DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 8080

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/hc/core_ops.py

@@ -9,7 +9,7 @@ import typer
 from rich.console import Console
 
 from hc.config import Config
-from hc.core_source import VALID_MODES, CoreSource
+from hc.core_source import COMPOSE_MODES, VALID_MODES, CoreSource
 from hc.env_bootstrap import ensure_core_env
 from hc.errors import DockerNotFoundError, HcCliError
 
@@ -46,10 +46,17 @@ def compose_project_from_source(console: Console, src: CoreSource, mode: str | N
             hint=f"Допустимые режимы: {valid}",
         ) from exc
     if not compose.exists():
+        available = [m for m, rel in COMPOSE_MODES.items() if (src.path / rel).exists()]
+        hint = f"Режим {mode!r} → {src.compose_rel(mode)}. Файл не найден в {src.path}."
+        if available:
+            hint += f"\n  Доступные режимы: {' | '.join(available)}"
+            hint += f"\n  Попробуй: hc env up --mode {available[0]}"
+        else:
+            hint += "\n  Сделай `hc core init` для загрузки исходников Core."
         raise HcCliError(
             message=f"Не найден compose-файл: {compose}",
             exit_code=1,
-            hint=f"Режим {mode!r} → {src.compose_rel(mode)}. Проверь наличие файла в core-runtime-service.",
+            hint=hint,
         )
     return ComposeProject(compose_file=compose)
 

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/hc/repl.py

@@ -14,6 +14,7 @@ from rich.console import Console
 
 from typer.main import get_command as _typer_get_command
 
+from hc import __version__
 from hc.config import Config
 from hc.constants import APP_NAME, HISTORY_PATH
 from hc.commands._client_helpers import require_client
@@ -229,32 +230,30 @@ def run_repl(app: typer.Typer) -> None:
     console = Console()
     cfg = Config.load()
     token = os.getenv("HC_TOKEN") or cfg.core.token
-    connected = bool(cfg.core.host.strip()) and bool(token.strip())
+    cfg_ok = bool(cfg.core.host.strip()) and bool(token.strip())
     hostport = f"{cfg.core.host}:{cfg.core.port}"
 
     plugins: list[str] = []
-    if connected:
-        client = require_client(console)
+    connected = False
+    if cfg_ok:
+        client = require_client(console, silent=True)
 
-        async def _get_names() -> list[str]:
+        async def _get_names() -> tuple[bool, list[str]]:
             # Пытаемся получить имена плагинов из inspector (админский источник истины).
             insp = await client.inspector_plugins()
             if isinstance(insp, dict):
                 arr = insp.get("plugins") or []
                 if isinstance(arr, list):
-                    names = []
-                    for p in arr:
-                        if isinstance(p, dict) and p.get("name"):
-                            names.append(str(p["name"]))
+                    names = [str(p["name"]) for p in arr if isinstance(p, dict) and p.get("name")]
                     if names:
-                        return names
+                        return True, names
             # Fallback на старый эндпоинт (если он есть).
             items = await client.get_plugins()
-            if not items:
-                return []
-            return [str(p.get("name", "")) for p in items if p.get("name")]
+            if items is not None:
+                return True, [str(p.get("name", "")) for p in items if p.get("name")]
+            return False, []
 
-        plugins = anyio.run(_get_names)
+        connected, plugins = anyio.run(_get_names)
 
     commands = [
         "connect",
@@ -290,7 +289,13 @@ def run_repl(app: typer.Typer) -> None:
 
     completer = _HCCompleter(app=app, commands=commands, plugins=plugins, get_group_ctx=_get_ctx)
 
-    console.print(f"{APP_NAME} 0.0.1 | " + (f"connected to {hostport}" if connected else "not connected"))
+    if connected:
+        status = f"connected to {hostport}"
+    elif cfg_ok:
+        status = f"offline • configured for {hostport}"
+    else:
+        status = "not connected"
+    console.print(f"{APP_NAME} {__version__} | {status}")
     console.print("Type 'help' or '?' for commands, 'exit' to quit")
 
     HISTORY_PATH.parent.mkdir(parents=True, exist_ok=True)

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/homeconsole_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: homeconsole-cli
-Version: 0.0.2
+Version: 0.0.4
 Summary: HomeConsole CLI (hc) — управление платформой через HTTP API
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -18,13 +18,42 @@ Requires-Dist: pytest>=8; extra == "dev"
 
 CLI-утилита для управления платформой HomeConsole **исключительно через HTTP API** CoreRuntime.
 
-## Установка (локально)
+## Установка
+
+### Рекомендуется — `pipx` (Debian / Ubuntu / Raspbian / OrangePi OS)
+
+`pipx` создаёт изолированный venv автоматически и регистрирует `hc` глобально:
+
+```bash
+apt install pipx          # или: pip install pipx --user
+pipx ensurepath           # добавляет ~/.local/bin в PATH (один раз)
+pipx install homeconsole-cli
+```
+
+После `pipx ensurepath` перезапусти шелл или выполни `source ~/.bashrc`.
+
+Обновление:
+```bash
+pipx upgrade homeconsole-cli
+```
+
+### Альтернатива — `pip --user`
+
+```bash
+pip install --user homeconsole-cli
+```
+
+Убедись, что `~/.local/bin` в `PATH`:
+```bash
+echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc
+```
+
+### Локальная разработка (из исходников)
 
 ```bash
 cd home-console-cli
 python -m venv .venv
 source .venv/bin/activate
-pip install -U pip
 pip install -e .
 ```
 

{homeconsole_cli-0.0.2 → homeconsole_cli-0.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "homeconsole-cli"
-version = "0.0.2"
+version = "0.0.4"
 description = "HomeConsole CLI (hc) — управление платформой через HTTP API"
 readme = "README.md"
 requires-python = ">=3.11"

homeconsole_cli-0.0.2/hc/__init__.py

@@ -1,6 +0,0 @@
-from __future__ import annotations
-
-__all__ = ["__version__"]
-
-__version__ = "0.0.1"
-