cyclo-manager 0.2.0.dev11__tar.gz → 0.2.0.dev13__tar.gz

cyclo_manager-0.2.0.dev13/PKG-INFO

@@ -0,0 +1,275 @@
+Metadata-Version: 2.4
+Name: cyclo-manager
+Version: 0.2.0.dev13
+Summary: cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack.
+License-Expression: Apache-2.0
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+Requires-Dist: fastapi>=0.100.0
+Requires-Dist: uvicorn[standard]>=0.23.0
+Requires-Dist: psutil>=5.9.0
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+
+# cyclo_manager CLI
+
+**PyPI package:** `cyclo-manager`  
+**Console commands:** `cyclo_manager` (underscore), `cyclo-manager` (hyphen)  
+**Host agent:** `cyclo_host_agent` (installed by the package, run via systemd)
+
+This package is the **pip-installable launcher** for the cyclo_manager stack on a robot host. It:
+
+1. Runs **`docker compose`** against a **bundled** [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/docker/docker-compose.yml) to start the **API** and **web UI** containers.
+2. Installs and maintains **`cyclo_host_agent`** as a **systemd** service for host-level operations (git repo updates, `cyclo_manager` package update from the UI).
+3. Can **`pip install -U`** itself and bring the Docker stack back up.
+
+Implementation: [`cyclo_manager_cli/cli.py`](cyclo_manager_cli/cli.py), [`cyclo_host_agent/`](cyclo_host_agent/).
+
+For the full monorepo (API source, UI source, dev compose), see the [repository root README](../README.md).
+
+---
+
+## Table of contents
+
+- [Prerequisites](#prerequisites)
+- [Install](#install)
+- [Commands](#commands)
+- [What `cyclo_manager up` does](#what-cyclo_manager-up-does)
+- [Host agent (`cyclo_host_agent`)](#host-agent-cyclo_host_agent)
+- [Compose services](#compose-services)
+- [Configuration](#configuration)
+- [Agent sockets on the host](#agent-sockets-on-the-host)
+- [Environment variables](#environment-variables)
+- [URLs (packaged stack)](#urls-packaged-stack)
+- [Custom config and development](#custom-config-and-development)
+- [Dependencies](#dependencies)
+- [License](#license)
+
+---
+
+## Prerequisites
+
+- **Docker** with **Compose v2** (`docker compose` — the legacy `docker-compose` binary alone is not enough)
+- **Python 3.10+**
+- **`sudo`** — required to install the host agent systemd unit, socket directory permissions, and sudoers rules
+- For **`cyclo_manager update`:** **`pip`** or **`pip3`** on `PATH`
+- **Do not run as root** — the host agent runs as the invoking user (or `SUDO_USER` when using `sudo cyclo_manager up`). Running as root is rejected.
+- **Agent sockets** on the host under `/var/run/robotis/agent_sockets/` (robot containers and host agent). The bundled Compose file bind-mounts this tree into the API container as `/agents/`.
+
+---
+
+## Install
+
+From **PyPI**:
+
+```bash
+pip install cyclo-manager
+```
+
+Pre-release versions:
+
+```bash
+pip install --pre cyclo-manager==0.2.0.dev0
+```
+
+If `cyclo_manager` is not on `PATH`, add the user script directory:
+
+```bash
+export PATH="$HOME/.local/bin:$PATH"
+cyclo_manager up
+```
+
+If the entry point is missing:
+
+```bash
+python3 -m cyclo_manager_cli.cli --help
+python3 -m cyclo_manager_cli.cli up
+```
+
+---
+
+## Commands
+
+| Command | Behavior |
+|--------|----------|
+| `cyclo_manager up` | Install/refresh **cyclo_host_agent** (systemd unit, socket dir, sudoers), then `docker compose up -d` for **API + UI**, then `docker compose create --no-recreate` for **Zenoh** and **noVNC** (created but **not started**). Sets **`CYCLO_MANAGER_CONFIG_FILE`** to the bundled config. |
+| `cyclo_manager up --pull` | `docker compose pull` first, then the same as `up`. |
+| `cyclo_manager down` | **Tear down host agent** (stop/disable service, remove unit, sudoers, socket dir), then `docker compose down` for all services in the bundled compose file. |
+| `cyclo_manager update` | `docker compose down` (containers only — **host agent stays installed**), `pip install -U cyclo-manager`, `docker compose up` + create optional services, then **refresh host agent** (unit, socket, sudoers). Optional `--pull` pulls images before the final `up`. |
+| `cyclo_manager --help` | Subcommand overview |
+
+**`down` vs `update`:** `down` removes the host agent entirely. `update` only stops Docker containers, upgrades the pip package, restarts the stack, and refreshes the host agent — it does **not** call `cyclo_manager down`.
+
+---
+
+## What `cyclo_manager up` does
+
+Three phases:
+
+```text
+[1/3] Setting up host agent     → systemd unit, socket ownership, sudoers
+[2/3] Starting containers       → cyclo_manager (API) + ui
+[3/3] Creating (not starting)   → zenoh_daemon + novnc-server
+```
+
+Open **http://127.0.0.1:3000** (UI) and **http://127.0.0.1:8081/docs** (API).
+
+---
+
+## Host agent (`cyclo_host_agent`)
+
+The pip package installs a small **FastAPI** server that listens on a **Unix domain socket** on the host:
+
+| Item | Path |
+|------|------|
+| Socket | `/var/run/robotis/agent_sockets/host/host_agent.sock` |
+| systemd unit | `cyclo_host_agent.service` |
+| sudoers | `/etc/sudoers.d/cyclo_manager` (`cp`, `udevadm` for container setup scripts) |
+
+The API container reaches it at `/agents/host/host_agent.sock` (see bundled `config.yml`).
+
+**Responsibilities:**
+
+- List and update **`~/ROBOTIS-GIT/*`** git repositories (Version Management in the UI)
+- Run **`cyclo_manager update`** when triggered from the UI (`POST /host/update`)
+
+`cyclo_manager up` and `cyclo_manager update` both call `_ensure_host_agent()`, which is idempotent — safe to run after upgrades or user changes.
+
+---
+
+## Compose services
+
+Defined in [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/docker/docker-compose.yml). All services use **`network_mode: host`**.
+
+| Compose service | Container name | `cyclo_manager up` | Image (example) |
+|-----------------|----------------|--------------------|-----------------|
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:0.2.0` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:0.2.0` |
+| `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
+| `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
+
+Start optional containers from the UI or manually, e.g. `docker start zenoh_daemon`.
+
+---
+
+## Configuration
+
+The CLI always mounts the **bundled** config into the API container. There is **no** `-c` / `--config` flag on the pip CLI.
+
+**Bundled path:** [`cyclo_manager_cli/config/config.yml`](cyclo_manager_cli/config/config.yml)
+
+The API reads it as `CONFIG_FILE=/app/config.yml` inside the container.
+
+### Schema
+
+| Key | Description |
+|-----|-------------|
+| **`robot_container`** | Primary robot Docker container name (e.g. `ai_worker`). Used by the UI System page and service bringup. Must be a key in `sockets` and cannot be `host_agent`. |
+| **`sockets`** | Map of logical name → agent **Unix socket path as seen inside the API container** (under `/agents/...`). Include robot/service containers and `host_agent`. |
+
+s6 **service names** are not listed in config; each in-container agent reports them at runtime.
+
+### Example (bundled default)
+
+```yaml
+robot_container: ai_worker
+
+sockets:
+  ai_worker: "/agents/ai_worker/s6_agent.sock"
+  physical_ai_server: "/agents/physical_ai_server/s6_agent.sock"
+  host_agent: "/agents/host/host_agent.sock"
+```
+
+### Validation (API startup)
+
+- At least one socket entry besides `host_agent`
+- `robot_container` must exist in `sockets`
+- All socket paths must be non-empty strings
+
+To use a different config layout, mounts, or local source builds, use the repository’s **`docker-compose.dev.yml`** — see [Custom config and development](#custom-config-and-development).
+
+---
+
+## Agent sockets on the host
+
+On the host, sockets typically live under:
+
+```text
+/var/run/robotis/agent_sockets/
+├── ai_worker/s6_agent.sock
+├── physical_ai_server/s6_agent.sock
+└── host/host_agent.sock          ← created by cyclo_manager up
+```
+
+The bundled compose file mounts the parent directory:
+
+```yaml
+- /var/run/robotis/agent_sockets:/agents
+```
+
+So `/agents/ai_worker/s6_agent.sock` in config corresponds to the host path above.
+
+---
+
+## Environment variables
+
+| Variable | Set by | Purpose |
+|----------|--------|---------|
+| **`CYCLO_MANAGER_CONFIG_FILE`** | CLI (`up`, `down`, `update`) | Absolute path to bundled `config.yml` on the host; mounted into the API container |
+| **`HOSTNAME`** | CLI (default: machine hostname) | Passed to API as `HOST_HOSTNAME` |
+| **`CONFIG_FILE`** | Compose (`/app/config.yml`) | Path inside the API container |
+| **`ROS_DOMAIN_ID`** | **Not** set by CLI | Set inside robot containers (e.g. `~/.bashrc`) so DDS matches your fleet |
+
+---
+
+## URLs (packaged stack)
+
+With `network_mode: host` and default ports:
+
+| What | URL |
+|------|-----|
+| Web UI | http://127.0.0.1:3000 |
+| cyclo_manager API | http://127.0.0.1:8081 |
+| OpenAPI (Swagger) | http://127.0.0.1:8081/docs |
+
+---
+
+## Custom config and development
+
+The pip workflow is intended for **production robots** with pre-built images.
+
+For development (local API/UI source, custom `config.yml`, hot reload):
+
+```bash
+# From repository root
+docker compose -f docker-compose.dev.yml up
+```
+
+See the [root README](../README.md#development).
+
+---
+
+## Dependencies
+
+Python dependencies declared in [`pyproject.toml`](pyproject.toml):
+
+| Package | Used by |
+|---------|---------|
+| **fastapi** | `cyclo_host_agent` HTTP API |
+| **uvicorn** | `cyclo_host_agent` server |
+| **psutil** | Host agent / system utilities |
+
+The **`cyclo_manager`** CLI itself uses only the Python standard library plus **`subprocess`** calls to **`docker compose`**, **`pip`**, **`systemctl`**, and **`sudo`**.
+
+Runtime **outside** Python:
+
+- **Docker** + **Compose v2**
+- **systemd** (host agent service)
+- Pre-built **Docker images** referenced in the bundled compose file
+
+---
+
+## License
+
+SPDX: **Apache-2.0** (see [pyproject.toml](pyproject.toml) and the repository [LICENSE](../LICENSE)).

cyclo_manager-0.2.0.dev13/README.md

@@ -0,0 +1,261 @@
+# cyclo_manager CLI
+
+**PyPI package:** `cyclo-manager`  
+**Console commands:** `cyclo_manager` (underscore), `cyclo-manager` (hyphen)  
+**Host agent:** `cyclo_host_agent` (installed by the package, run via systemd)
+
+This package is the **pip-installable launcher** for the cyclo_manager stack on a robot host. It:
+
+1. Runs **`docker compose`** against a **bundled** [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/docker/docker-compose.yml) to start the **API** and **web UI** containers.
+2. Installs and maintains **`cyclo_host_agent`** as a **systemd** service for host-level operations (git repo updates, `cyclo_manager` package update from the UI).
+3. Can **`pip install -U`** itself and bring the Docker stack back up.
+
+Implementation: [`cyclo_manager_cli/cli.py`](cyclo_manager_cli/cli.py), [`cyclo_host_agent/`](cyclo_host_agent/).
+
+For the full monorepo (API source, UI source, dev compose), see the [repository root README](../README.md).
+
+---
+
+## Table of contents
+
+- [Prerequisites](#prerequisites)
+- [Install](#install)
+- [Commands](#commands)
+- [What `cyclo_manager up` does](#what-cyclo_manager-up-does)
+- [Host agent (`cyclo_host_agent`)](#host-agent-cyclo_host_agent)
+- [Compose services](#compose-services)
+- [Configuration](#configuration)
+- [Agent sockets on the host](#agent-sockets-on-the-host)
+- [Environment variables](#environment-variables)
+- [URLs (packaged stack)](#urls-packaged-stack)
+- [Custom config and development](#custom-config-and-development)
+- [Dependencies](#dependencies)
+- [License](#license)
+
+---
+
+## Prerequisites
+
+- **Docker** with **Compose v2** (`docker compose` — the legacy `docker-compose` binary alone is not enough)
+- **Python 3.10+**
+- **`sudo`** — required to install the host agent systemd unit, socket directory permissions, and sudoers rules
+- For **`cyclo_manager update`:** **`pip`** or **`pip3`** on `PATH`
+- **Do not run as root** — the host agent runs as the invoking user (or `SUDO_USER` when using `sudo cyclo_manager up`). Running as root is rejected.
+- **Agent sockets** on the host under `/var/run/robotis/agent_sockets/` (robot containers and host agent). The bundled Compose file bind-mounts this tree into the API container as `/agents/`.
+
+---
+
+## Install
+
+From **PyPI**:
+
+```bash
+pip install cyclo-manager
+```
+
+Pre-release versions:
+
+```bash
+pip install --pre cyclo-manager==0.2.0.dev0
+```
+
+If `cyclo_manager` is not on `PATH`, add the user script directory:
+
+```bash
+export PATH="$HOME/.local/bin:$PATH"
+cyclo_manager up
+```
+
+If the entry point is missing:
+
+```bash
+python3 -m cyclo_manager_cli.cli --help
+python3 -m cyclo_manager_cli.cli up
+```
+
+---
+
+## Commands
+
+| Command | Behavior |
+|--------|----------|
+| `cyclo_manager up` | Install/refresh **cyclo_host_agent** (systemd unit, socket dir, sudoers), then `docker compose up -d` for **API + UI**, then `docker compose create --no-recreate` for **Zenoh** and **noVNC** (created but **not started**). Sets **`CYCLO_MANAGER_CONFIG_FILE`** to the bundled config. |
+| `cyclo_manager up --pull` | `docker compose pull` first, then the same as `up`. |
+| `cyclo_manager down` | **Tear down host agent** (stop/disable service, remove unit, sudoers, socket dir), then `docker compose down` for all services in the bundled compose file. |
+| `cyclo_manager update` | `docker compose down` (containers only — **host agent stays installed**), `pip install -U cyclo-manager`, `docker compose up` + create optional services, then **refresh host agent** (unit, socket, sudoers). Optional `--pull` pulls images before the final `up`. |
+| `cyclo_manager --help` | Subcommand overview |
+
+**`down` vs `update`:** `down` removes the host agent entirely. `update` only stops Docker containers, upgrades the pip package, restarts the stack, and refreshes the host agent — it does **not** call `cyclo_manager down`.
+
+---
+
+## What `cyclo_manager up` does
+
+Three phases:
+
+```text
+[1/3] Setting up host agent     → systemd unit, socket ownership, sudoers
+[2/3] Starting containers       → cyclo_manager (API) + ui
+[3/3] Creating (not starting)   → zenoh_daemon + novnc-server
+```
+
+Open **http://127.0.0.1:3000** (UI) and **http://127.0.0.1:8081/docs** (API).
+
+---
+
+## Host agent (`cyclo_host_agent`)
+
+The pip package installs a small **FastAPI** server that listens on a **Unix domain socket** on the host:
+
+| Item | Path |
+|------|------|
+| Socket | `/var/run/robotis/agent_sockets/host/host_agent.sock` |
+| systemd unit | `cyclo_host_agent.service` |
+| sudoers | `/etc/sudoers.d/cyclo_manager` (`cp`, `udevadm` for container setup scripts) |
+
+The API container reaches it at `/agents/host/host_agent.sock` (see bundled `config.yml`).
+
+**Responsibilities:**
+
+- List and update **`~/ROBOTIS-GIT/*`** git repositories (Version Management in the UI)
+- Run **`cyclo_manager update`** when triggered from the UI (`POST /host/update`)
+
+`cyclo_manager up` and `cyclo_manager update` both call `_ensure_host_agent()`, which is idempotent — safe to run after upgrades or user changes.
+
+---
+
+## Compose services
+
+Defined in [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/docker/docker-compose.yml). All services use **`network_mode: host`**.
+
+| Compose service | Container name | `cyclo_manager up` | Image (example) |
+|-----------------|----------------|--------------------|-----------------|
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:0.2.0` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:0.2.0` |
+| `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
+| `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
+
+Start optional containers from the UI or manually, e.g. `docker start zenoh_daemon`.
+
+---
+
+## Configuration
+
+The CLI always mounts the **bundled** config into the API container. There is **no** `-c` / `--config` flag on the pip CLI.
+
+**Bundled path:** [`cyclo_manager_cli/config/config.yml`](cyclo_manager_cli/config/config.yml)
+
+The API reads it as `CONFIG_FILE=/app/config.yml` inside the container.
+
+### Schema
+
+| Key | Description |
+|-----|-------------|
+| **`robot_container`** | Primary robot Docker container name (e.g. `ai_worker`). Used by the UI System page and service bringup. Must be a key in `sockets` and cannot be `host_agent`. |
+| **`sockets`** | Map of logical name → agent **Unix socket path as seen inside the API container** (under `/agents/...`). Include robot/service containers and `host_agent`. |
+
+s6 **service names** are not listed in config; each in-container agent reports them at runtime.
+
+### Example (bundled default)
+
+```yaml
+robot_container: ai_worker
+
+sockets:
+  ai_worker: "/agents/ai_worker/s6_agent.sock"
+  physical_ai_server: "/agents/physical_ai_server/s6_agent.sock"
+  host_agent: "/agents/host/host_agent.sock"
+```
+
+### Validation (API startup)
+
+- At least one socket entry besides `host_agent`
+- `robot_container` must exist in `sockets`
+- All socket paths must be non-empty strings
+
+To use a different config layout, mounts, or local source builds, use the repository’s **`docker-compose.dev.yml`** — see [Custom config and development](#custom-config-and-development).
+
+---
+
+## Agent sockets on the host
+
+On the host, sockets typically live under:
+
+```text
+/var/run/robotis/agent_sockets/
+├── ai_worker/s6_agent.sock
+├── physical_ai_server/s6_agent.sock
+└── host/host_agent.sock          ← created by cyclo_manager up
+```
+
+The bundled compose file mounts the parent directory:
+
+```yaml
+- /var/run/robotis/agent_sockets:/agents
+```
+
+So `/agents/ai_worker/s6_agent.sock` in config corresponds to the host path above.
+
+---
+
+## Environment variables
+
+| Variable | Set by | Purpose |
+|----------|--------|---------|
+| **`CYCLO_MANAGER_CONFIG_FILE`** | CLI (`up`, `down`, `update`) | Absolute path to bundled `config.yml` on the host; mounted into the API container |
+| **`HOSTNAME`** | CLI (default: machine hostname) | Passed to API as `HOST_HOSTNAME` |
+| **`CONFIG_FILE`** | Compose (`/app/config.yml`) | Path inside the API container |
+| **`ROS_DOMAIN_ID`** | **Not** set by CLI | Set inside robot containers (e.g. `~/.bashrc`) so DDS matches your fleet |
+
+---
+
+## URLs (packaged stack)
+
+With `network_mode: host` and default ports:
+
+| What | URL |
+|------|-----|
+| Web UI | http://127.0.0.1:3000 |
+| cyclo_manager API | http://127.0.0.1:8081 |
+| OpenAPI (Swagger) | http://127.0.0.1:8081/docs |
+
+---
+
+## Custom config and development
+
+The pip workflow is intended for **production robots** with pre-built images.
+
+For development (local API/UI source, custom `config.yml`, hot reload):
+
+```bash
+# From repository root
+docker compose -f docker-compose.dev.yml up
+```
+
+See the [root README](../README.md#development).
+
+---
+
+## Dependencies
+
+Python dependencies declared in [`pyproject.toml`](pyproject.toml):
+
+| Package | Used by |
+|---------|---------|
+| **fastapi** | `cyclo_host_agent` HTTP API |
+| **uvicorn** | `cyclo_host_agent` server |
+| **psutil** | Host agent / system utilities |
+
+The **`cyclo_manager`** CLI itself uses only the Python standard library plus **`subprocess`** calls to **`docker compose`**, **`pip`**, **`systemctl`**, and **`sudo`**.
+
+Runtime **outside** Python:
+
+- **Docker** + **Compose v2**
+- **systemd** (host agent service)
+- Pre-built **Docker images** referenced in the bundled compose file
+
+---
+
+## License
+
+SPDX: **Apache-2.0** (see [pyproject.toml](pyproject.toml) and the repository [LICENSE](../LICENSE)).

{cyclo_manager-0.2.0.dev11 → cyclo_manager-0.2.0.dev13}/cyclo_host_agent/models.py

@@ -71,6 +71,14 @@ class RepoStatusResponse(BaseModel):
     has_changes: bool
 
 
+class RepoBranchCheckResponse(BaseModel):
+    """Response for GET /repos/{name}/branch."""
+
+    name: str
+    branch: Optional[str] = None
+    allowed: bool
+
+
 class UpdateRequest(BaseModel):
     """Request body for POST /repos/{name}/update."""
 

{cyclo_manager-0.2.0.dev11 → cyclo_manager-0.2.0.dev13}/cyclo_host_agent/routers/repos.py

@@ -29,6 +29,7 @@ from fastapi import APIRouter, HTTPException, status
 from cyclo_host_agent.models import (
     ContainerScriptResponse,
     FileChange,
+    RepoBranchCheckResponse,
     RepoInfo,
     RepoListResponse,
     RepoStatusResponse,
@@ -52,6 +53,7 @@ def _resolve_home() -> Path:
 
 WORKSPACE_PATH = _resolve_home()
 MANAGED_GITHUB_ORG = 'ROBOTIS-GIT'
+ALLOWED_UPDATE_BRANCHES = frozenset({'main', 'jazzy'})
 
 
 # ── shared helpers ─────────────────────────────────────────────────────────────
@@ -84,6 +86,41 @@ def _fmt_cmd(cmd: str, output: str) -> str:
 
 # ── git helpers ────────────────────────────────────────────────────────────────
 
+async def _stash_count(cwd: Path) -> int:
+    rc, out, _ = await _git(['stash', 'list'], cwd=cwd)
+    if rc != 0:
+        return 0
+    return sum(1 for line in out.splitlines() if line.strip())
+
+
+async def _current_branch(repo_path: Path) -> Optional[str]:
+    rc, out, _ = await _git(['rev-parse', '--abbrev-ref', 'HEAD'], cwd=repo_path)
+    if rc != 0:
+        return None
+    branch = out.strip()
+    if not branch or branch == 'HEAD':
+        return None
+    return branch
+
+
+async def _ensure_allowed_branch(repo_path: Path) -> None:
+    branch = await _current_branch(repo_path)
+    if branch in ALLOWED_UPDATE_BRANCHES:
+        return
+    allowed = ', '.join(sorted(ALLOWED_UPDATE_BRANCHES))
+    if branch:
+        detail = (
+            f"Updates are only allowed on branches: {allowed}. "
+            f"Current branch is '{branch}'."
+        )
+    else:
+        detail = (
+            f"Updates are only allowed on branches: {allowed}. "
+            'Could not determine the current branch (detached HEAD?).'
+        )
+    raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=detail)
+
+
 async def _git(args: list[str], cwd: Optional[Path] = None) -> tuple[int, str, str]:
     proc = await asyncio.create_subprocess_exec(
         'git', *args,
@@ -202,17 +239,23 @@ async def _update_stash(repo_path: Path) -> UpdateResponse:
     name = repo_path.name
     lines: list[str] = []
 
+    stash_before = await _stash_count(repo_path)
     rc, out, err = await _git(['stash', '-u'], cwd=repo_path)
     lines.append(_fmt_cmd('git stash -u', out + err))
     if rc != 0:
         return UpdateResponse(name=name, success=False, output='\n'.join(lines))
+    stashed = await _stash_count(repo_path) > stash_before
 
     rc, out, err = await _git(['pull'], cwd=repo_path)
     lines.append(_fmt_cmd('git pull', out + err))
     if rc != 0:
-        await _git(['stash', 'pop'], cwd=repo_path)
+        if stashed:
+            await _git(['stash', 'pop'], cwd=repo_path)
         return UpdateResponse(name=name, success=False, output='\n'.join(lines))
 
+    if not stashed:
+        return UpdateResponse(name=name, success=True, output='\n'.join(lines))
+
     rc, out, err = await _git(['stash', 'pop'], cwd=repo_path)
     lines.append(_fmt_cmd('git stash pop', out + err))
 
@@ -314,6 +357,17 @@ async def list_repos() -> RepoListResponse:
     return RepoListResponse(repos=repos, workspace_path=str(WORKSPACE_PATH))
 
 
+@router.get('/{name}/branch', response_model=RepoBranchCheckResponse)
+async def get_repo_branch(name: str) -> RepoBranchCheckResponse:
+    repo_path = _get_repo(name)
+    branch = await _current_branch(repo_path)
+    return RepoBranchCheckResponse(
+        name=name,
+        branch=branch,
+        allowed=branch in ALLOWED_UPDATE_BRANCHES,
+    )
+
+
 @router.get('/{name}/status', response_model=RepoStatusResponse)
 async def get_repo_status(name: str) -> RepoStatusResponse:
     repo_path = _get_repo(name)
@@ -347,6 +401,7 @@ async def start_repo_container(name: str) -> ContainerScriptResponse:
 @router.post('/{name}/update', response_model=UpdateResponse)
 async def update_repo(name: str, req: UpdateRequest) -> UpdateResponse:
     repo_path = _get_repo(name)
+    await _ensure_allowed_branch(repo_path)
     try:
         if req.strategy == 'reset':
             return await _update_reset(repo_path, req.preserve_files)

{cyclo_manager-0.2.0.dev11 → cyclo_manager-0.2.0.dev13}/cyclo_host_agent/routers/update.py

@@ -62,6 +62,10 @@ async def start_update() -> dict:
         raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
                             detail='cyclo_manager command not found')
 
+    if _update_status.get('phase') == 'updating':
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT,
+                            detail='Update already in progress')
+
     _update_status = {'phase': 'updating', 'output': '', 'error': ''}
     asyncio.create_task(_run_update(cyclo_exe))
     return {'status': 'update started'}