release: v0.23.3 [skip ci]

.env.example

@@ -1,6 +1,6 @@
 # Gitea API token (required for CI scripts that interact with Gitea)
 # Create at: https://git.oblachno.oblachno.fyi/user/settings/applications
-REPO_TOKEN=
+CI_GITEA_TOKEN=
 
 # Vikunja API token (required for post-merge task updates)
 # Create at: https://work.oblachno.oblachno.fyi/settings/tokens

.gitea/workflows/build-images.yml

@@ -23,6 +23,10 @@ on:
       - src/devx/**
   workflow_dispatch:
 
+concurrency:
+  group: build-images
+  cancel-in-progress: false
+
 jobs:
   detect-type:
     runs-on: docker
@@ -54,19 +58,19 @@ jobs:
           fetch-depth: 0
       - name: Set up environment
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
         run: make setup-release
       - name: Docker registry login
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
-          REGISTRY_USERNAME: ${{ vars.REGISTRY_USERNAME }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
+          CI_GITEA_USERNAME: ${{ vars.CI_GITEA_USERNAME }}
         run: |
           . .venv/bin/activate
-          echo "$REPO_TOKEN" | docker login git.oblachno.oblachno.fyi -u "$REGISTRY_USERNAME" --password-stdin
+          echo "$CI_GITEA_TOKEN" | docker login git.oblachno.oblachno.fyi -u "$CI_GITEA_USERNAME" --password-stdin
       - name: Build and push tier images
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
-          REGISTRY_USERNAME: ${{ vars.REGISTRY_USERNAME }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
+          CI_GITEA_USERNAME: ${{ vars.CI_GITEA_USERNAME }}
           PYTHONPATH: src
         run: |
           . .venv/bin/activate
@@ -95,7 +99,7 @@ jobs:
       - name: Notify on failure
         if: failure()
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           . .venv/bin/activate 2>/dev/null || true
@@ -119,7 +123,7 @@ jobs:
         run: make setup-ci
       - name: Clean up old image versions
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           . .venv/bin/activate

.gitea/workflows/ci.yml

@@ -102,6 +102,8 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up environment
+        env:
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
         run: make setup-image
       - name: Release dry-run validation
         env:
@@ -109,7 +111,7 @@ jobs:
         run: |
           . .venv/bin/activate
           export PATH="$HOME/.local/bin:$PATH"
-          python3 -m devx.ci.release --dry-run || true
+          python3 -m devx.ci.release --dry-run
 
   pr-review:
     if: github.event_name == 'pull_request'
@@ -125,7 +127,7 @@ jobs:
         run: make setup-image
       - name: Run automated PR review
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           set -euo pipefail
@@ -138,12 +140,13 @@ jobs:
     # Auto-merge runs after all CI checks pass. It reads the task ID
     # from the branch name, validates the PR title, and squash-merges.
     # Uses always() so it runs even when detect-changes skips (no user-facing changes).
-    needs: [quality, detect-changes, pr-review]
+    needs: [quality, detect-changes, pr-review, release-dry-run]
     if: >-
       always() &&
       github.event_name == 'pull_request' &&
       needs.quality.result == 'success' &&
-      needs.pr-review.result == 'success'
+      needs.pr-review.result == 'success' &&
+      (needs.release-dry-run.result == 'success' || needs.release-dry-run.result == 'skipped')
     runs-on: docker
     container: git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-base:latest
     timeout-minutes: 10
@@ -154,12 +157,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.REPO_TOKEN }}
+          token: ${{ secrets.CI_GITEA_TOKEN }}
       - name: Set up environment
         run: make setup-image
       - name: Squash merge with task ID
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           VIKUNJA_TOKEN: ${{ secrets.VIKUNJA_TOKEN }}
           DEVX_VIKUNJA_PROJECT_ID: "8"
           PYTHONPATH: src

.gitea/workflows/post-merge.yml

@@ -93,10 +93,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.REPO_TOKEN }}
+          token: ${{ secrets.CI_GITEA_TOKEN }}
       - name: Set up environment
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
         run: make setup-image
       - name: Configure git
         run: |
@@ -110,17 +110,10 @@ jobs:
           . .venv/bin/activate
           export PATH="$HOME/.local/bin:$PATH"
           python3 -m devx.ci.release
-      - name: Extract tag (fallback if GITHUB_OUTPUT not set)
-        if: steps.release-tag.outputs.tag == ''
-        run: |
-          tag=$(git describe --tags --abbrev=0 2>/dev/null || true)
-          if [ -n "$tag" ]; then
-            echo "tag=$tag" >> "$GITHUB_OUTPUT"
-          fi
       - name: Notify on failure
         if: failure()
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           . .venv/bin/activate 2>/dev/null || true
@@ -144,22 +137,21 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ needs.release.outputs.tag }}
       - name: Set up environment
-        env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
-        run: make setup-image
+        run: make setup-image EXTRAS=release
       - name: Build and publish release
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           . .venv/bin/activate
           export PATH="$HOME/.local/bin:$PATH"
-          python3 -m devx.ci.publish "${{ needs.release.outputs.tag }}" "${{ github.repository }}"
+          python3 -m devx.ci.publish "${{ needs.release.outputs.tag }}" "${{ github.repository }}" --auto-login
       - name: Notify on failure
         if: failure()
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           . .venv/bin/activate 2>/dev/null || true
@@ -187,7 +179,7 @@ jobs:
         run: make setup-image
       - name: Sync documentation to wiki
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           . .venv/bin/activate
@@ -195,7 +187,7 @@ jobs:
       - name: Notify on failure
         if: failure()
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           export PATH="$HOME/.local/bin:$PATH"
@@ -219,7 +211,7 @@ jobs:
         with:
           fetch-depth: 0
           ref: master
-          token: ${{ secrets.REPO_TOKEN }}
+          token: ${{ secrets.CI_GITEA_TOKEN }}
       - name: Fetch latest master
         run: |
           git fetch origin master
@@ -235,7 +227,7 @@ jobs:
       - name: Notify on failure
         if: failure()
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           export PATH="$HOME/.local/bin:$PATH"
@@ -271,7 +263,7 @@ jobs:
       - name: Notify on failure
         if: failure()
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           export PATH="$HOME/.local/bin:$PATH"
@@ -296,7 +288,7 @@ jobs:
         run: make setup-image
       - name: Ensure branch protection and labels
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           . .venv/bin/activate
@@ -304,7 +296,7 @@ jobs:
       - name: Notify on failure
         if: failure()
         env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
           PYTHONPATH: src
         run: |
           export PATH="$HOME/.local/bin:$PATH"

AGENTS.md

@@ -4,8 +4,8 @@
 
 ```bash
 make setup           # Create venv, install deps, set up hooks, install CI tools
-make install-tools   # Install actionlint, git-cliff, act_runner to ~/.local/bin
-make lint-all        # ruff + pyright + bandit + actionlint
+make install-tools   # Install actionlint, git-cliff, act_runner, tea, hadolint to ~/.local/bin
+make lint-all        # ruff + pyright + bandit + actionlint + lint-dockerfiles
 make pytest-cov      # Unit tests with 100% coverage enforcement
 make test-unit       # Unit tests without coverage
 make workflow-lint   # Static lint of .gitea/workflows/*.yml (actionlint)
@@ -16,8 +16,8 @@ make clean           # Remove caches, build artifacts, coverage data
 
 `make setup` automatically installs all development tools:
 - **Python deps** via `python -m devx.tools.setup` (pip install -e .[dev], pre-commit hooks)
-- **actionlint, git-cliff, act_runner, tea** via `python -m devx.tools.install_tools` (CI/CD tools to ~/.local/bin)
-- **tea CLI login** via `python -m devx.tools.setup` (configures `tea login` from `.env` `REPO_TOKEN`)
+- **actionlint, git-cliff, act_runner, tea, hadolint** via `python -m devx.tools.install_tools` (CI/CD tools to ~/.local/bin)
+- **tea CLI login** via `python -m devx.tools.setup` (configures `tea login` from `.env` `CI_GITEA_TOKEN`)
 
 ## Workflow Verification (Before Push)
 
@@ -73,7 +73,7 @@ src/devx/
 │   └── doc_coverage.py  # Documentation coverage check
 ├── tools/               # Developer tooling modules (run locally or by CI)
 │   ├── setup.py         # Environment setup (venv, deps, hooks)
-│   ├── install_tools.py # Install actionlint, git-cliff, act_runner, tea
+│   ├── install_tools.py # Install actionlint, git-cliff, act_runner, tea, hadolint
 │   ├── install_checkmake.py  # Install checkmake (Makefile linter)
 │   ├── build_image.py   # Build and push Docker images to Gitea registry
 │   ├── clean_images.py  # Clean up old Docker image versions from Gitea registry
@@ -263,7 +263,7 @@ so `.:src` is not needed. The `src` directory is the sole import root.
 
 The `tea` Gitea CLI tool is used for Gitea API interactions. It is installed
 by `python -m devx.tools.install_tools` and configured by
-`python -m devx.tools.setup` (login profile from `.env` `REPO_TOKEN`).
+`python -m devx.tools.setup` (login profile from `.env` `CI_GITEA_TOKEN`).
 
 **`devx.gitea_cli.TeaCLI`** — Python wrapper around `tea` CLI with JSON output parsing:
 - `create_issue()` — Create issues with labels
@@ -358,7 +358,7 @@ devx uses environment variables with `.env` file fallback for configuration.
 | `DEVX_TASK_PREFIX` | `DEVX` | Task ID prefix (GRM, OBL-INFRA, etc.) |
 | `DEVX_VIKUNJA_PROJECT_ID` | `6` | Vikunja project ID |
 | `DEVX_LANG` | `en` | Language for i18n (en, bg) |
-| `REPO_TOKEN` | (from .env) | Gitea API token |
+| `CI_GITEA_TOKEN` | (from .env) | Gitea API token |
 | `VIKUNJA_TOKEN` | (from .env) | Vikunja API token |
 
 ### Per-Project Overrides
@@ -404,7 +404,7 @@ projects.
 | `devx-venv` | Create Python venv with version check |
 | `devx-activate-scripts` | Create shell/fish/zsh activate scripts |
 | `devx-install-hooks` | Set git hooks path to hooks/ |
-| `devx-install-tools` | Install actionlint, git-cliff, act_runner, tea |
+| `devx-install-tools` | Install actionlint, git-cliff, act_runner, tea, hadolint |
 | `devx-install-checkmake` | Install checkmake (Makefile linter) |
 | `devx-checkmake` | Lint Makefiles with checkmake |
 | `devx-workflow-lint` | Static lint of Gitea Actions YAML (actionlint) |
@@ -428,6 +428,7 @@ projects.
 | `devx-pre-push` | Run lint + tests before push |
 | `devx-clean` | Remove caches, build artifacts, coverage data |
 | `devx-setup-image` | Link /opt/venv + install project (for pre-built image CI jobs) |
+| `devx-lint-dockerfiles` | Lint Dockerfiles with hadolint (fail-fast, parameterized by `DEVX_DOCKERFILE_PATHS`) |
 | `devx-build-images` | Build Docker images from manifest (no push) |
 | `devx-push-images` | Build and push Docker images to Gitea registry |
 | `devx-build-images-dry-run` | Show what would be built/pushed |
@@ -441,6 +442,7 @@ projects.
 - `DEVX_COV_PKG` — coverage package (default: `src/devx`)
 - `DEVX_TEST_PATHS` — pytest paths (default: `tests/`)
 - `DEVX_PR_BASE` — PR base branch (default: `master`)
+- `DEVX_DOCKERFILE_PATHS` — directory to search for Dockerfiles (default: `docker`)
 - `DEVX_GITEA_REGISTRY` — registry URL (default: `git.oblachno.oblachno.fyi`)
 - `DEVX_IMAGE_MANIFEST` — path to JSON manifest (default: `docker/images.json`)
 - `DEVX_IMAGE_OWNER` — package owner for cleanup (default: `oblachno-oss`)
@@ -453,7 +455,7 @@ to eliminate the 40-120s setup tax on every CI job:
 | Image | Contains | Used by jobs |
 |-------|----------|-------------|
 | `ci-base-latest` | Python 3.12 + devx[ci] + tea | detect-changes, detect-type, validate-commit-msg, pr-review, auto-merge, sync-wiki, vikunja, configure-repo |
-| `ci-quality-latest` | ci-base + devx[lint] + actionlint + checkmake | quality, badges |
+| `ci-quality-latest` | ci-base + devx[lint] + actionlint + checkmake + hadolint | quality, badges |
 | `ci-full-latest` | ci-quality + devx[release,molecule,deploy] + git-cliff + OpenTofu | release, publish, release-dry-run, molecule-tests, deploy jobs |
 
 **Build process** (in `build-images.yml` workflow):

CHANGELOG.md

@@ -2,6 +2,70 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.23.3] - 2026-06-27
+
+### Bug Fixes
+
+- Correct clean_images delete URL and add retry with error handling
+
+## [0.23.2] - 2026-06-27
+
+### Bug Fixes
+
+- Add skip-ci flag to release commits and concurrency to build-images
+
+## [0.23.1] - 2026-06-27
+
+### Bug Fixes
+
+- Add rsync to ci-full image for molecule_docker
+
+## [0.23.0] - 2026-06-27
+
+### Features
+
+- Add devx-lint-dockerfiles to devx.mak, alias setup-image
+
+### Refactor
+
+- Remove hadolint on-the-fly install from setup-image
+
+## [0.22.1] - 2026-06-27
+
+### Bug Fixes
+
+- Checkout release tag in publish job
+- Fail lint-dockerfiles when hadolint is missing
+
+## [0.22.0] - 2026-06-27
+
+### Features
+
+- Document CI_GITEA_TOKEN scopes and add CI_GITEA_USERNAME to env var table
+
+## [0.21.2] - 2026-06-27
+
+### Bug Fixes
+
+- Gate auto-merge on release-dry-run and unmask failures
+
+## [0.21.1] - 2026-06-27
+
+### Bug Fixes
+
+- Devx-setup-image configures Gitea PyPI registry and shows pip errors
+
+## [0.21.0] - 2026-06-27
+
+### Features
+
+- Add --auto-login to publish, extract configure_tea_login to gitea_cli
+
+### Bug Fixes
+
+- Publish job uses setup-release for build + tea login
+- Remove tag fallback step from release workflow
+
 ## [0.20.3] - 2026-06-27
 
 ### Bug Fixes

Makefile

@@ -31,6 +31,9 @@ setup-release: $(VENV)/bin/activate .env
 	$(BIN)/python -m devx.tools.setup --bin "$(BIN)" --extras "ci,lint,release" --no-pre-commit
 
 # Setup for pre-built image jobs (deps already in image, just link venv + install project)
+# Note: Not aliased to devx-setup-image because devx's own CI images may have
+# an older devx.mak that doesn't yet define devx-setup-image. Consumer repos
+# (grm, infra) can safely alias to devx-setup-image since they install devx from PyPI.
 setup-image:
 	@if [ -d /opt/venv ]; then ln -sf /opt/venv .venv; . .venv/bin/activate && pip install -e . --no-deps 2>/dev/null; \
 	else echo "[setup-image] /opt/venv not found — falling back to setup-ci"; $(MAKE) setup-ci; fi
@@ -99,14 +102,16 @@ git-push: devx-push
 lint-all: lint workflow-lint lint-dockerfiles
 	@echo "[lint-all] All linting checks passed."
 
+# Note: Not aliased to devx-lint-dockerfiles for the same reason as setup-image —
+# devx's own CI images may have an older devx.mak. Consumer repos can safely alias.
 lint-dockerfiles:
 	@echo "[lint-dockerfiles] Linting Dockerfiles with hadolint..."
-	@if command -v hadolint >/dev/null 2>&1; then \
-		find docker -name 'Dockerfile*' -exec hadolint {} +; \
-		echo "[lint-dockerfiles] All Dockerfiles passed."; \
-	else \
-		echo "[lint-dockerfiles] hadolint not found — skipping (install with: pip install hadolint or download from GitHub)"; \
+	@if ! command -v hadolint >/dev/null 2>&1; then \
+		echo "[lint-dockerfiles] ERROR: hadolint not found. Install from https://github.com/hadolint/hadolint/releases" >&2; \
+		exit 1; \
 	fi
+	@find docker -name 'Dockerfile*' -exec hadolint {} +
+	@echo "[lint-dockerfiles] All Dockerfiles passed."
 
 test-unit: devx-test-unit
 

README.md

@@ -16,12 +16,12 @@ quality badges.
 
 [![CI](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions/workflows/ci.yml/badge.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
 [![License: GPL-3.0](https://img.shields.io/badge/license-GPL--3.0-blue)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/LICENSE)
-[![Coverage](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/coverage.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
-[![Tests](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/tests.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
-[![Docs](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/docs.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
-[![Code Quality](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/quality.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
-[![Version](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/version.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
-[![Python](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/python.svg)](https://www.python.org/downloads/)
+[![Coverage](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/coverage.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
+[![Tests](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/tests.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
+[![Docs](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/docs.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
+[![Code Quality](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/quality.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
+[![Version](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/version.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
+[![Python](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/python.svg)](https://www.python.org/downloads/)
 
 ## Why devx?
 
@@ -326,10 +326,24 @@ The config system loads `.env` automatically via `python-dotenv`.
 | `DEVX_DOCS_DIR` | `docs` | Documentation directory (used by sync_wiki) |
 | `DEVX_STATUS_CHECKS` | `CI / quality (pull_request)` | Comma-separated status check contexts |
 | `DEVX_PYPI_REGISTRY_URL` | — | Gitea PyPI registry URL (used by publish) |
-| `REPO_TOKEN` | — | Gitea API token |
+| `CI_GITEA_TOKEN` | — | Gitea API token (see scopes below) |
+| `CI_GITEA_USERNAME` | — | Gitea username for registry authentication |
 | `VIKUNJA_TOKEN` | — | Vikunja API token |
 | `PYPI_TOKEN` | — | Standard PyPI token (takes precedence over Gitea registry) |
 
+#### CI_GITEA_TOKEN scopes
+
+The `CI_GITEA_TOKEN` is a single Gitea Personal Access Token used across all
+workflows. It requires these scopes:
+
+| Scope | Purpose |
+|-------|---------|
+| `read:repository` | Read repos, PRs, issues, branches |
+| `write:repository` | Push commits, merge PRs, create tags/releases, create issues, set branch protection, push wiki |
+| `read:package` | Pull packages from Gitea PyPI registry, pull Docker images |
+| `write:package` | Publish packages to Gitea PyPI registry, push Docker images |
+| `read:organization` | Query org-level runners for molecule test distribution |
+
 ### Per-project overrides
 
 Projects using devx can override the default API URLs and language by setting

docker/ci-full/Dockerfile

@@ -11,6 +11,10 @@ FROM git.oblachno.oblachno.fyi/oblachno-oss/runner-images/ci-quality:latest
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+# Install rsync (required by molecule_docker for file sync between host and test containers)
+RUN apt-get update && apt-get install -y --no-install-recommends rsync \
+    && rm -rf /var/lib/apt/lists/*
+
 # Install devx[release,molecule,deploy] from local source
 COPY . /tmp/devx
 RUN pip install --no-cache-dir /tmp/devx[release,molecule,deploy] \

docs/index.md

@@ -12,12 +12,12 @@ project to be reusable across all oblachno-oss repositories.
 
 [![CI](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions/workflows/ci.yml/badge.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
 [![License: GPL-3.0](https://img.shields.io/badge/license-GPL--3.0-blue)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/LICENSE)
-[![Coverage](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/coverage.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
-[![Tests](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/tests.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
-[![Docs](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/docs.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
-[![Code Quality](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/quality.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
-[![Version](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/version.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
-[![Python](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/bc706211123c7f520e8aaf36b7c71fac4ce8d149/python.svg)](https://www.python.org/downloads/)
+[![Coverage](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/coverage.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
+[![Tests](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/tests.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
+[![Docs](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/docs.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
+[![Code Quality](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/quality.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
+[![Version](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/version.svg)](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
+[![Python](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/raw/commit/dd2ca2f7c67b539173bf3c3be45f42917bde6c48/python.svg)](https://www.python.org/downloads/)
 
 ## Overview
 
@@ -149,7 +149,7 @@ fallback. Key variables:
 | `DEVX_REPO_NAME` | **(must be set)** | Repository name |
 | `DEVX_TASK_PREFIX` | `DEVX` | Task ID prefix (GRM, OBL-INFRA, etc.) |
 | `DEVX_LANG` | `en` | Language for i18n (en, bg, de, ru, zh, pl) |
-| `REPO_TOKEN` | — | Gitea API token |
+| `CI_GITEA_TOKEN` | — | Gitea API token |
 | `VIKUNJA_TOKEN` | — | Vikunja API token |
 
 See [AGENTS.md](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/AGENTS.md)

docs/tech/architecture.md

@@ -245,7 +245,7 @@ for retrying on git push failures.
 
 Creates a Gitea issue when a CI workflow fails. Uses the `tea` CLI for issue
 creation with failure labels. Supports `--auto-login` to configure the tea
-CLI login profile from `REPO_TOKEN` and `DEVX_GITEA_API_URL` before creating
+CLI login profile from `CI_GITEA_TOKEN` and `DEVX_GITEA_API_URL` before creating
 the issue.
 
 ### `post_merge.py`
@@ -569,7 +569,7 @@ push_badges.py:
 The `tea` Gitea CLI tool is used for Gitea API interactions where tea provides
 reliable, official support. It is installed by
 `python -m devx.tools.install_tools` and configured by
-`python -m devx.tools.setup` (login profile from `.env` `REPO_TOKEN`).
+`python -m devx.tools.setup` (login profile from `.env` `CI_GITEA_TOKEN`).
 
 `devx.gitea_cli.TeaCLI` wraps tea with JSON output parsing. Operations that
 tea does not support (wiki management, commit status, runner discovery,

docs/tech/ci-cd-workflow.md

@@ -305,7 +305,7 @@ post-merge workflow when it creates and pushes a new version tag.
    and the project itself
 2. **Install CI tools** — git-cliff and tea via
    `python -m devx.tools.install_tools`
-3. **Configure tea login** — `tea login add` using `REPO_TOKEN`
+3. **Configure tea login** — `tea login add` using `CI_GITEA_TOKEN`
 4. **Build and publish** — `python -m devx.ci.publish <tag> <owner/repo>`:
    - Build the package with `python -m build`
    - Publish to the Gitea PyPI registry (default) using `twine upload
@@ -377,7 +377,7 @@ python -m devx.ci.pr_review <pr_number> <owner/repo>
 
 Creates a Gitea issue when a CI workflow fails. Uses the tea CLI for issue
 creation with failure labels. Supports `--auto-login` to configure the tea
-CLI login profile from `REPO_TOKEN`.
+CLI login profile from `CI_GITEA_TOKEN`.
 
 ```bash
 python -m devx.ci.notify_failure --repo <owner/repo> --run-id <id> \

docs/user/cli-commands.md

@@ -148,7 +148,7 @@ devx ci integration-guard -- -x -v --tb=short test_a.py
 
 Environment variables:
 - `GITEA_URL` — base URL of the Gitea instance
-- `REPO_TOKEN` — API token with repo access
+- `CI_GITEA_TOKEN` — API token with repo access
 - `RUN_ID` — workflow run ID (`GITHUB_RUN_ID`)
 - `JOB_NAME` — base job name (`GITHUB_JOB`)
 - `MATRIX_INDEX` — current matrix index (runner-index)
@@ -171,7 +171,7 @@ Options:
 - `--run-id <id>` — CI run ID (required)
 - `--workflow <name>` — workflow name (required)
 - `--commit <sha>` — commit SHA (required)
-- `--auto-login` — configure tea CLI login from `REPO_TOKEN` before creating
+- `--auto-login` — configure tea CLI login from `CI_GITEA_TOKEN` before creating
   the issue
 
 ### `devx ci post-merge`
@@ -462,7 +462,7 @@ Options:
 
 Environment variables:
 - `GITEA_URL` — base URL of the Gitea instance
-- `REPO_TOKEN` — API token with repo access
+- `CI_GITEA_TOKEN` — API token with repo access
 - `RUN_ID` — workflow run ID (`GITHUB_RUN_ID`)
 - `JOB_NAME` — base job name (`GITHUB_JOB`)
 - `MATRIX_INDEX` — current matrix index (runner-index)

src/devx/__init__.py

@@ -1,3 +1,3 @@
 """devx — reusable development and CI/CD tools for oblachno-oss projects."""
 
-__version__ = "0.20.3"
+__version__ = "0.23.3"

src/devx/ci/auto_merge.py

@@ -17,7 +17,7 @@ This allows the PR title to be a human-friendly Vikunja task title
 while the squashed commit follows conventional commits.
 
 Usage:
-  REPO_TOKEN=<token> python3 -m devx.ci.auto_merge <branch> <pr_title> <repo> <pr_number>
+  CI_GITEA_TOKEN=<token> python3 -m devx.ci.auto_merge <branch> <pr_title> <repo> <pr_number>
 """
 
 import os
@@ -196,9 +196,9 @@ def extract_conventional_msg(commits: list[dict[str, Any]]) -> str:
 @click.argument("repo")
 @click.argument("pr_number")
 def main(branch: str, pr_title: str, repo: str, pr_number: str) -> None:
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     if not token:
-        raise click.ClickException(_("ERROR: REPO_TOKEN is not set."))
+        raise click.ClickException(_("ERROR: CI_GITEA_TOKEN is not set."))
 
     # Validate PR number is an integer
     try:

src/devx/ci/check_auto_merge_ready.py

@@ -15,7 +15,7 @@ Exit code 1 = NOT ready — fix issues before pushing.
 
 Usage::
 
-  # CI (with VIKUNJA_TOKEN and REPO_TOKEN):
+  # CI (with VIKUNJA_TOKEN and CI_GITEA_TOKEN):
   python3 -m devx.ci.check_auto_merge_ready \\
       --branch "$HEAD_REF" \\
       --pr-title "$PR_TITLE" \\
@@ -34,7 +34,7 @@ skipped (with a warning) — this allows local pre-push hooks to run
 without CI secrets.  In CI, the token is always set and the check is
 mandatory.
 
-If ``REPO_TOKEN`` is not set and ``--pr-number`` is not provided, only
+If ``CI_GITEA_TOKEN`` is not set and ``--pr-number`` is not provided, only
 branch-name and PR-title-format checks run (local mode).
 """
 
@@ -98,9 +98,9 @@ def is_branch_behind_master(branch: str) -> bool:
 def get_pr_title_from_gitea(repo: str, pr_number: int) -> str | None:
     """Fetch the PR title from the Gitea API.
 
-    Returns ``None`` if ``REPO_TOKEN`` is not set or the PR cannot be fetched.
+    Returns ``None`` if ``CI_GITEA_TOKEN`` is not set or the PR cannot be fetched.
     """
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     if not token or "/" not in repo:
         return None
     owner, repo_name = repo.split("/", 1)
@@ -189,7 +189,9 @@ def cli(
     if pr_title is None:
         # Local mode without PR — only validate branch name
         if pr_number is not None:
-            raise click.ClickException(_("Could not fetch PR title from Gitea (REPO_TOKEN not set or PR not found)."))
+            raise click.ClickException(
+                _("Could not fetch PR title from Gitea (CI_GITEA_TOKEN not set or PR not found).")
+            )
         click.echo("[pre-merge-check] No PR title provided — running branch-name-only check (local mode).")
         click.echo("[pre-merge-check] Branch name OK. Push to create PR, then CI will validate the title.")
         return

src/devx/ci/discover_runners.py

@@ -148,7 +148,7 @@ def main(
     output_indices: bool,
     github_output: bool,
 ) -> None:
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
 
     if owner is None:
         owner = os.environ.get("DEVX_REPO_OWNER", "oblachno-oss")

src/devx/ci/integration_guard.py

@@ -17,7 +17,7 @@ Usage::
 
 Environment variables:
     GITEA_URL           Base URL of the Gitea instance.
-    REPO_TOKEN          API token with repo access.
+    CI_GITEA_TOKEN      API token with repo access.
     RUN_ID              Workflow run ID (GITHUB_RUN_ID).
     JOB_NAME            Base job name (GITHUB_JOB), e.g. "integration-tests".
     MATRIX_INDEX        Current matrix index (runner-index).
@@ -49,7 +49,7 @@ POLL_INTERVAL = 10
 def cli(pytest_args: tuple[str, ...]) -> None:
     """Run pytest with cross-runner failure detection."""
     gitea_url = os.environ.get("GITEA_URL", "")
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     run_id = int(os.environ.get("RUN_ID", "0"))
     job_name = os.environ.get("JOB_NAME", "integration-tests")
     current_index = int(os.environ.get("MATRIX_INDEX", "0"))
@@ -59,7 +59,7 @@ def cli(pytest_args: tuple[str, ...]) -> None:
         owner, repo = "oblachno-oss", "devx"
 
     if not all([gitea_url, token, run_id]):
-        click.echo(_("GITEA_URL/REPO_TOKEN/RUN_ID not set; running without cross-runner cancellation."))
+        click.echo(_("GITEA_URL/CI_GITEA_TOKEN/RUN_ID not set; running without cross-runner cancellation."))
 
     stop_event = threading.Event()
     failed_event = threading.Event()

src/devx/ci/notify_failure.py

@@ -6,7 +6,7 @@ otherwise go unnoticed in the Actions tab. Uses the ``tea`` Gitea CLI
 for issue creation — tea must be installed and configured.
 
 Usage:
-  REPO_TOKEN=<token> python3 -m devx.ci.notify_failure \
+  CI_GITEA_TOKEN=<token> python3 -m devx.ci.notify_failure \
     --repo <owner/repo> \
     --run-id <run_id> \
     --workflow <workflow_name> \
@@ -14,7 +14,7 @@ Usage:
     --auto-login
 
 With ``--auto-login``, the script configures the tea CLI login profile
-from ``REPO_TOKEN`` and ``DEVX_GITEA_API_URL`` before creating the issue,
+from ``CI_GITEA_TOKEN`` and ``DEVX_GITEA_API_URL`` before creating the issue,
 eliminating the need for a separate ``tea login add`` step in the workflow.
 """
 
@@ -22,14 +22,12 @@ from __future__ import annotations
 
 import logging
 import os
-import shutil
-import subprocess  # nosec B404
 
 import click
 from dotenv import load_dotenv  # pyright: ignore[reportMissingImports,reportUnknownVariableType]
 
 from devx.config import GITEA_API_URL
-from devx.gitea_cli import TeaCLI, TeaCLIError
+from devx.gitea_cli import TeaCLI, TeaCLIError, configure_tea_login
 from devx.i18n import _
 
 load_dotenv()
@@ -37,49 +35,6 @@ load_dotenv()
 logger = logging.getLogger("devx")
 
 
-def _configure_tea_login(login_name: str = "devx") -> None:
-    """Configure tea CLI login from REPO_TOKEN and DEVX_GITEA_API_URL.
-
-    Idempotent: if a login with the same name already exists, it is not re-added.
-    Skips silently if tea is not installed or REPO_TOKEN is not set.
-    """
-    tea_bin = shutil.which("tea")
-    if tea_bin is None:
-        click.echo("notify_failure: tea not installed — skipping login configuration.")
-        return
-
-    token = os.environ.get("REPO_TOKEN", "")
-    if not token:
-        click.echo("notify_failure: REPO_TOKEN not set — skipping login configuration.")
-        return
-
-    gitea_url = GITEA_API_URL.replace("/api/v1", "")
-
-    result = subprocess.run(  # nosec B603
-        [tea_bin, "login", "list", "--output", "simple"],
-        capture_output=True,
-        text=True,
-        check=False,
-    )
-    if result.returncode == 0 and login_name in result.stdout:
-        click.echo(f"notify_failure: tea login '{login_name}' already configured.")
-        return
-
-    click.echo(f"notify_failure: configuring tea login '{login_name}' for {gitea_url}...")
-    subprocess.run(  # nosec B603
-        [tea_bin, "login", "add", "--name", login_name, "--url", gitea_url, "--token", token],
-        capture_output=True,
-        text=True,
-        check=False,
-    )
-    subprocess.run(  # nosec B603
-        [tea_bin, "login", "default", login_name],
-        capture_output=True,
-        text=True,
-        check=False,
-    )
-
-
 def _create_issue_via_tea(repo: str, title: str, body: str) -> int:
     """Create issue via tea CLI. Returns issue index.
 
@@ -116,15 +71,15 @@ def _create_issue_via_tea(repo: str, title: str, body: str) -> int:
     "--auto-login",
     is_flag=True,
     default=False,
-    help="Configure tea CLI login from REPO_TOKEN before creating the issue.",
+    help="Configure tea CLI login from CI_GITEA_TOKEN before creating the issue.",
 )
 def main(repo: str, run_id: str, workflow: str, commit: str, auto_login: bool) -> None:
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     if not token:
-        raise click.ClickException(_("ERROR: REPO_TOKEN is not set."))
+        raise click.ClickException(_("ERROR: CI_GITEA_TOKEN is not set."))
 
     if auto_login:
-        _configure_tea_login()
+        configure_tea_login()
 
     title = f"[CI] {workflow} workflow failed (run #{run_id})"
     body = (

src/devx/ci/pr_review.py

@@ -17,7 +17,7 @@ Checks performed:
   8. Commit conventions — conventional commit format on branch commits
 
 Usage:
-  REPO_TOKEN=<token> python3 -m devx.ci.pr_review <pr_number> <owner/repo>
+  CI_GITEA_TOKEN=<token> python3 -m devx.ci.pr_review <pr_number> <owner/repo>
 """
 
 from __future__ import annotations
@@ -526,9 +526,9 @@ def post_review(client: GiteaClient, pr_number: str, result: ReviewResult) -> di
 @click.option("--dry-run", is_flag=True, default=False, help="Print review without posting.")
 def main(pr_number: str, repo: str, dry_run: bool) -> None:
     """Run automated PR review and post results to Gitea."""
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     if not token:
-        raise click.ClickException(_("ERROR: REPO_TOKEN is not set."))
+        raise click.ClickException(_("ERROR: CI_GITEA_TOKEN is not set."))
 
     owner, repo_name = repo.split("/")
     client = GiteaClient(GITEA_API_URL, token, owner, repo_name)

src/devx/ci/publish.py

@@ -9,14 +9,14 @@ Publishing destinations (checked in order):
      ``DEVX_PYPI_REGISTRY_URL`` env var is set, or ``GITEA_API_URL``
      is converted to a packages URL). Uses ``twine upload
      --repository-url <url> -u <token> -p <token>`` with the
-     ``REPO_TOKEN`` as both username and password.
+     ``CI_GITEA_TOKEN`` as both username and password.
   2. **Standard PyPI** — if ``PYPI_TOKEN`` is set. Uses the standard
      ``twine upload -u __token__ -p <token>`` flow.
   3. **Skip** — if neither is configured, only the Gitea release is created.
 
 Usage:
-  REPO_TOKEN=<token> [PYPI_TOKEN=<token>] python3 -m devx.ci.publish <tag> <repo>
-  REPO_TOKEN=<token> python3 -m devx.ci.publish <tag> <repo> --registry-url https://git.example.com/api/packages/owner/pypi
+  CI_GITEA_TOKEN=<token> [PYPI_TOKEN=<token>] python3 -m devx.ci.publish <tag> <repo>
+  CI_GITEA_TOKEN=<token> python3 -m devx.ci.publish <tag> <repo> --registry-url https://git.example.com/api/packages/owner/pypi
 """
 
 import os
@@ -29,7 +29,7 @@ import click
 from dotenv import load_dotenv  # pyright: ignore[reportMissingImports,reportUnknownVariableType]
 
 from devx.config import GITEA_API_URL
-from devx.gitea_cli import TeaCLI, TeaCLIError
+from devx.gitea_cli import TeaCLI, TeaCLIError, configure_tea_login
 from devx.i18n import _
 
 load_dotenv()
@@ -221,12 +221,20 @@ def is_release_commit(tag: str) -> bool:
     help="Auto-detect latest tag and check if HEAD is a release commit. "
     "Skips publish if no tag or HEAD is not a release commit for that tag.",
 )
+@click.option(
+    "--auto-login",
+    is_flag=True,
+    default=False,
+    help="Configure tea CLI login from CI_GITEA_TOKEN before creating the Gitea release. "
+    "Eliminates the need for a separate tea login step in containerized CI jobs.",
+)
 def main(
     tag: str | None,
     repo: str | None,
     registry_url: str | None,
     skip_build: bool,
     from_tag: bool,
+    auto_login: bool,
 ) -> None:
     if repo is None:
         repo = os.environ.get("GITHUB_REPOSITORY", "")
@@ -245,9 +253,9 @@ def main(
 
     if not tag:
         raise click.ClickException(_("Tag is required (or use --from-tag)."))
-    gitea_token = os.environ.get("REPO_TOKEN", "")
+    gitea_token = os.environ.get("CI_GITEA_TOKEN", "")
     if not gitea_token:
-        raise click.ClickException(_("ERROR: REPO_TOKEN is not set."))
+        raise click.ClickException(_("ERROR: CI_GITEA_TOKEN is not set."))
 
     pypi_token = os.environ.get("PYPI_TOKEN", "")
 
@@ -287,6 +295,9 @@ def main(
 
     tea = TeaCLI(repo=repo)
 
+    if auto_login:
+        configure_tea_login()
+
     # Check if release already exists (idempotent — avoids failure when
     # called multiple times, e.g. by both post-merge and publish workflows)
     try:

src/devx/ci/release.py

@@ -29,7 +29,7 @@ version.  This prevents duplicate release commits (a common issue when CI
 checkouts don't fetch tags) and ensures tag/version/commit alignment.
 
 Usage:
-  REPO_TOKEN=<token> python3 -m devx.ci.release [--dry-run] [--skip-tests]
+  CI_GITEA_TOKEN=<token> python3 -m devx.ci.release [--dry-run] [--skip-tests]
   python3 -m devx.ci.release --verify   # Check tag/version/release alignment
 """
 
@@ -279,7 +279,7 @@ def commit_release_changes(new_version: str) -> bool:
     if status.returncode == 0:
         click.echo(_("No staged changes — version and changelog already up to date."))
         return False
-    run_cmd(["git", "commit", "--no-verify", "-m", f"release: v{new_version}"])
+    run_cmd(["git", "commit", "--no-verify", "-m", f"release: v{new_version} [skip ci]"])
     return True
 
 
@@ -705,7 +705,7 @@ def main(dry_run: bool, skip_tests: bool, verify: bool) -> None:
         click.echo(_("\n[dry-run] Changelog:\n{changelog}", changelog=changelog))
         click.echo(_("[dry-run] Would update {init}", init=INIT_FILE))
         click.echo(_("[dry-run] Would update {changelog_file}", changelog_file=CHANGELOG_FILE))
-        click.echo(_("[dry-run] Would commit: release: v{version}", version=new_version))
+        click.echo(_("[dry-run] Would commit: release: v{version} [skip ci]", version=new_version))
         click.echo(_("[dry-run] Would push commit to master"))
         click.echo(_("[dry-run] Would create tag: v{version}", version=new_version))
         return

src/devx/ci/sync_wiki.py

@@ -14,7 +14,7 @@ Gitea 1.26 wiki API endpoints (all use content_base64, NOT content):
   - Delete: DELETE /repos/{owner}/{repo}/wiki/page/{sub_url}
 
 Usage:
-  REPO_TOKEN=<token> python3 -m devx.ci.sync_wiki [--dry-run] [--repo owner/repo]
+  CI_GITEA_TOKEN=<token> python3 -m devx.ci.sync_wiki [--dry-run] [--repo owner/repo]
 """
 
 from __future__ import annotations
@@ -225,9 +225,9 @@ def verify_wiki_integrity(
     help="Full integrity check: verify page count, missing pages, stale pages, and content. Implies --verify.",
 )
 def main(dry_run: bool, repo: str | None, verify: bool, strict: bool) -> None:
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     if not token:
-        raise click.ClickException(_("ERROR: REPO_TOKEN is not set."))
+        raise click.ClickException(_("ERROR: CI_GITEA_TOKEN is not set."))
 
     if repo is None:
         owner = os.environ.get("DEVX_REPO_OWNER", "oblachno-oss")

src/devx/gitea_cli.py

@@ -40,15 +40,67 @@ Usage::
 from __future__ import annotations
 
 import json
+import os
 import shutil
 import subprocess  # nosec B404
 from typing import Any
 
+import click
+
+from devx.config import GITEA_API_URL
+from devx.i18n import _
+
 
 class TeaCLIError(Exception):
     """Raised when a tea CLI command fails."""
 
 
+def configure_tea_login(login_name: str = "devx") -> None:
+    """Configure tea CLI login from CI_GITEA_TOKEN and DEVX_GITEA_API_URL.
+
+    Idempotent: if a login with the same name already exists, it is not re-added.
+    Skips silently if tea is not installed or CI_GITEA_TOKEN is not set.
+
+    Used by CI scripts (publish, notify_failure) that need tea login but
+    run in containerized environments where ``make setup`` was not called.
+    """
+    tea_bin = shutil.which("tea")
+    if tea_bin is None:
+        click.echo(_("tea not installed — skipping login configuration."))
+        return
+
+    token = os.environ.get("CI_GITEA_TOKEN", "")
+    if not token:
+        click.echo(_("CI_GITEA_TOKEN not set — skipping login configuration."))
+        return
+
+    gitea_url = GITEA_API_URL.replace("/api/v1", "")
+
+    result = subprocess.run(  # nosec B603
+        [tea_bin, "login", "list", "--output", "simple"],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    if result.returncode == 0 and login_name in result.stdout:
+        click.echo(_("tea login '{name}' already configured.", name=login_name))
+        return
+
+    click.echo(_("Configuring tea login '{name}' for {url}...", name=login_name, url=gitea_url))
+    subprocess.run(  # nosec B603
+        [tea_bin, "login", "add", "--name", login_name, "--url", gitea_url, "--token", token],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    subprocess.run(  # nosec B603
+        [tea_bin, "login", "default", login_name],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+
+
 class TeaCLI:
     """Wrapper around the ``tea`` Gitea CLI tool.
 

src/devx/make/devx.mak

@@ -51,14 +51,15 @@ DEVX_GITEA_PYPI_HOST ?= git.oblachno.oblachno.fyi
 DEVX_GITEA_PYPI_ORG ?= oblachno-oss
 DEVX_ACTIONLINT_CFG ?= .gitea/actionlint.yaml
 DEVX_WORKFLOW_DIR ?= .gitea/workflows
+DEVX_DOCKERFILE_PATHS ?= docker
 
 # PIP_INSTALL — helper to run pip with Gitea private PyPI registry configured.
 # Usage: $(DEVX_PIP_INSTALL) install -e '.[ci,lint]'
-# GITEA_PYPI_USER can be set in .env, as an env var, or as a Make variable.
-DEVX_PIP_INSTALL := if [ -z "$$REPO_TOKEN" ]; then . ./.env 2>/dev/null; fi; \
-	REPO_TOKEN="$${REPO_TOKEN:-$$GITEA_REGISTRY_TOKEN}"; \
-	_PYPI_USER="$${DEVX_GITEA_PYPI_USER:-$${GITEA_PYPI_USER}}"; \
-	if [ -n "$$REPO_TOKEN" ] && [ -n "$$_PYPI_USER" ]; then export PIP_EXTRA_INDEX_URL="https://$$_PYPI_USER:$$REPO_TOKEN@$(DEVX_GITEA_PYPI_HOST)/api/packages/$(DEVX_GITEA_PYPI_ORG)/pypi/simple/"; fi; \
+# CI_GITEA_USERNAME can be set in .env, as an env var, or as a Make variable.
+DEVX_PIP_INSTALL := if [ -z "$$CI_GITEA_TOKEN" ]; then . ./.env 2>/dev/null; fi; \
+	CI_GITEA_TOKEN="$$CI_GITEA_TOKEN"; \
+	_PYPI_USER="$${CI_GITEA_USERNAME:-emil}"; \
+	if [ -n "$$CI_GITEA_TOKEN" ] && [ -n "$$_PYPI_USER" ]; then export PIP_EXTRA_INDEX_URL="https://$$_PYPI_USER:$$CI_GITEA_TOKEN@$(DEVX_GITEA_PYPI_HOST)/api/packages/$(DEVX_GITEA_PYPI_ORG)/pypi/simple/"; fi; \
 	$(DEVX_BIN)/pip
 
 .PHONY: devx-create-task devx-create-pr devx-push devx-push-with-pr devx-check-config
@@ -69,6 +70,7 @@ DEVX_PIP_INSTALL := if [ -z "$$REPO_TOKEN" ]; then . ./.env 2>/dev/null; fi; \
 .PHONY: devx-clean devx-pre-push
 .PHONY: devx-check-mutable-globals devx-check-dep-docs devx-check-test-coverage devx-check-docs devx-check-test-speed
 .PHONY: devx-test-unit devx-pytest-cov
+.PHONY: devx-setup-image devx-lint-dockerfiles
 
 # ── Vikunja task and PR management ────────────────────────────────────────────
 
@@ -95,12 +97,12 @@ devx-push-with-pr: devx-push devx-create-pr
 # ── Environment setup ─────────────────────────────────────────────────────────
 
 # Configure Gitea private PyPI registry so pip can find devx and other
-# private packages. In CI, REPO_TOKEN is set as a secret. Locally, it's in .env.
+# private packages. In CI, CI_GITEA_TOKEN is set as a secret. Locally, it's in .env.
 devx-configure-gitea-pypi:
-	@if [ -z "$$REPO_TOKEN" ]; then . ./.env 2>/dev/null; fi; \
-	REPO_TOKEN="$${REPO_TOKEN:-$$GITEA_REGISTRY_TOKEN}"; \
-	if [ -z "$$REPO_TOKEN" ]; then echo "[configure-gitea-pypi] REPO_TOKEN not set — skipping (devx must be on public PyPI)"; exit 0; fi; \
-	echo "[configure-gitea-pypi] Gitea PyPI registry configured (REPO_TOKEN present)."
+	@if [ -z "$$CI_GITEA_TOKEN" ]; then . ./.env 2>/dev/null; fi; \
+	CI_GITEA_TOKEN="$$CI_GITEA_TOKEN"; \
+	if [ -z "$$CI_GITEA_TOKEN" ]; then echo "[configure-gitea-pypi] CI_GITEA_TOKEN not set — skipping (devx must be on public PyPI)"; exit 0; fi; \
+	echo "[configure-gitea-pypi] Gitea PyPI registry configured (CI_GITEA_TOKEN present)."
 
 # Create .env from .env.example if it doesn't exist
 devx-env:
@@ -173,7 +175,7 @@ devx-workflow-check: devx-workflow-lint devx-workflow-dryrun
 
 # Notify on CI failure — creates a Gitea issue via devx.ci.notify_failure.
 # Usage: make devx-notify-failure WORKFLOW=post-merge/release
-# Requires: REPO_TOKEN, GITHUB_REPOSITORY, GITHUB_RUN_ID, GITHUB_SHA
+# Requires: CI_GITEA_TOKEN, GITHUB_REPOSITORY, GITHUB_RUN_ID, GITHUB_SHA
 devx-notify-failure:
 	@. $(DEVX_VENV)/bin/activate 2>/dev/null || true; \
 	export PATH="$(HOME)/.local/bin:$$PATH"; \
@@ -250,22 +252,47 @@ devx-clean:
 	@find . -type f -name "*.pyc" -delete 2>/dev/null || true
 	@rm -rf .coverage htmlcov/ dist/ build/ *.egg-info/ .molecule/ 2>/dev/null || true
 
+# ── Dockerfile linting ────────────────────────────────────────────────────────
+#
+# Lint Dockerfiles with hadolint. Fails fast if hadolint is not installed
+# (no silent skip). Set DEVX_DOCKERFILE_PATHS to the directory containing
+# your Dockerfiles (default: docker).
+#
+# Usage:
+#   make devx-lint-dockerfiles                          (lints docker/ directory)
+#   make devx-lint-dockerfiles DEVX_DOCKERFILE_PATHS=ansible  (lints ansible/)
+
+devx-lint-dockerfiles:
+	@echo "[devx-lint-dockerfiles] Linting Dockerfiles with hadolint..."
+	@if ! command -v hadolint >/dev/null 2>&1; then \
+		echo "[devx-lint-dockerfiles] ERROR: hadolint not found. Install from https://github.com/hadolint/hadolint/releases" >&2; \
+		exit 1; \
+	fi
+	@find $(DEVX_DOCKERFILE_PATHS) -name 'Dockerfile*' -exec hadolint {} +
+	@echo "[devx-lint-dockerfiles] All Dockerfiles passed."
+
 # ── Pre-built image setup ─────────────────────────────────────────────────────
 #
 # When running inside a pre-built Docker runner image (ci-base, ci-quality,
 # ci-full), all deps are already installed in /opt/venv. This target links
-# the venv and installs the project itself (no-deps, fast).
-# Falls back to devx-setup-ci if /opt/venv is not present (local dev).
+# the venv and installs the project itself (with optional extras).
+#
+# Usage:
+#   make devx-setup-image              (runtime deps only)
+#   make devx-setup-image EXTRAS=lint  (runtime + lint deps)
+#   make devx-setup-image EXTRAS=ci,lint (runtime + ci + lint deps)
+#
+# Falls back to setup-ci if /opt/venv is not present (local dev).
+# Note: the fallback target name is project-specific (setup-ci, not
+# devx-setup-ci) — each project defines its own setup-ci target.
 
 devx-setup-image:
-	@if [ -d /opt/venv ]; then \
-		ln -sf /opt/venv $(DEVX_VENV); \
-		. $(DEVX_BIN)/activate && pip install -e . --no-deps 2>/dev/null; \
-		echo "[devx-setup-image] Linked /opt/venv and installed project (no-deps)."; \
-	else \
-		echo "[devx-setup-image] /opt/venv not found — falling back to devx-setup-ci"; \
-		$(MAKE) devx-setup-ci; \
-	fi
+	@if [ -d /opt/venv ]; then ln -sf /opt/venv $(DEVX_VENV); . $(DEVX_BIN)/activate; \
+		_U="$${CI_GITEA_USERNAME:-emil}"; \
+		if [ -n "$$CI_GITEA_TOKEN" ]; then export PIP_EXTRA_INDEX_URL="https://$$_U:$$CI_GITEA_TOKEN@$(DEVX_GITEA_PYPI_HOST)/api/packages/$(DEVX_GITEA_PYPI_ORG)/pypi/simple/"; fi; \
+		pip install -e .$(if $(EXTRAS),[$(EXTRAS)],); \
+		echo "[devx-setup-image] Linked /opt/venv$(if $(EXTRAS), with [$(EXTRAS)],)."; \
+	else echo "[devx-setup-image] /opt/venv not found — falling back to setup-ci"; $(MAKE) setup-ci; fi
 
 # ── Docker image build / push / cleanup ───────────────────────────────────────
 #

src/devx/molecule/discover_runners.py

@@ -142,7 +142,7 @@ def main(
     output_indices: bool,
     github_output: bool,
 ) -> None:
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
 
     if owner is None:
         owner = os.environ.get("DEVX_REPO_OWNER", "oblachno-oss")

src/devx/molecule/molecule_ci_guard.py

@@ -22,7 +22,7 @@ Usage::
 
 Environment variables:
     GITEA_URL           Base URL of the Gitea instance.
-    REPO_TOKEN          API token with repo access.
+    CI_GITEA_TOKEN      API token with repo access.
     RUN_ID              Workflow run ID (GITHUB_RUN_ID).
     JOB_NAME            Base job name (GITHUB_JOB), e.g. "molecule-tests".
     MATRIX_INDEX        Current matrix index (runner-index).
@@ -163,7 +163,7 @@ def resolve_role_dir(role: str, roles_root: Path | None, repo_root: Path) -> Pat
 def cli(pairs: tuple[str, ...], roles_root: Path | None) -> None:
     """Run molecule pairs sequentially, stop if another CI runner fails."""
     gitea_url = os.environ.get("GITEA_URL", "")
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     run_id = int(os.environ.get("RUN_ID", "0"))
     job_name = os.environ.get("JOB_NAME", "molecule-tests")
     current_index = int(os.environ.get("MATRIX_INDEX", "0"))
@@ -173,7 +173,7 @@ def cli(pairs: tuple[str, ...], roles_root: Path | None) -> None:
         owner, repo = "oblachno-oss", "devx"
 
     if not all([gitea_url, token, run_id]):
-        click.echo(_("GITEA_URL/REPO_TOKEN/RUN_ID not set; running without cross-runner cancellation."))
+        click.echo(_("GITEA_URL/CI_GITEA_TOKEN/RUN_ID not set; running without cross-runner cancellation."))
 
     # When devx is installed as a pip package, __file__ resolves to the
     # site-packages directory, not the repo root. Use GITHUB_WORKSPACE

src/devx/tools/build_image.py

@@ -34,9 +34,8 @@ The manifest file is a JSON list of dicts, each with:
     - ``context``: build context directory (optional, defaults to repo root)
     - ``tags``: list of tags (optional, defaults to ``["latest"]``)
 
-Registry authentication uses ``REPO_TOKEN`` (or ``GITEA_REGISTRY_TOKEN``)
-and ``REGISTRY_USERNAME`` (or ``GITEA_REGISTRY_USERNAME``) environment
-variables, matching the existing CI workflow patterns.
+Registry authentication uses ``CI_GITEA_TOKEN`` and ``CI_GITEA_USERNAME``
+environment variables, matching the existing CI workflow patterns.
 """
 
 from __future__ import annotations
@@ -221,13 +220,9 @@ def push_image(
 
 
 def _get_registry_creds() -> tuple[str, str]:
-    """Get registry credentials from environment variables.
-
-    Supports both REPO_TOKEN/GITEA_REGISTRY_TOKEN and
-    REGISTRY_USERNAME/GITEA_REGISTRY_USERNAME patterns.
-    """
-    token = os.environ.get("REPO_TOKEN") or os.environ.get("GITEA_REGISTRY_TOKEN", "")
-    username = os.environ.get("REGISTRY_USERNAME") or os.environ.get("GITEA_REGISTRY_USERNAME", "")
+    """Get registry credentials from environment variables."""
+    token = os.environ.get("CI_GITEA_TOKEN", "")
+    username = os.environ.get("CI_GITEA_USERNAME", "")
     return username, token
 
 
@@ -312,7 +307,7 @@ def main(
         username, token = _get_registry_creds()
         if not token or not username:
             raise click.ClickException(
-                _("Registry credentials required: set REPO_TOKEN and REGISTRY_USERNAME env vars")
+                _("Registry credentials required: set CI_GITEA_TOKEN and CI_GITEA_USERNAME env vars")
             )
         if not registry_login(registry, username, token, dry_run=dry_run):
             raise click.ClickException(_("Registry login failed"))

src/devx/tools/clean_images.py

@@ -28,12 +28,13 @@ Usage::
         --keep 2 \\
         --dry-run
 
-Authentication uses ``REPO_TOKEN`` environment variable.
+Authentication uses ``CI_GITEA_TOKEN`` environment variable.
 """
 
 from __future__ import annotations
 
 import os
+import time
 from typing import Any
 
 import click
@@ -85,15 +86,37 @@ def delete_package_version(
     token: str,
     *,
     timeout: int = 30,
+    package_type: str = "container",
+    max_retries: int = 3,
 ) -> bool:
     """Delete a specific version of a container package.
 
+    Uses the Gitea API endpoint ``DELETE /packages/{owner}/{type}/{name}/{version}``.
+    Retries on transient failures (5xx, timeouts) up to ``max_retries`` times.
+
     Returns True on success, False on failure.
     """
-    url = f"{api_url}/packages/{owner}/{name}/{version}"
+    url = f"{api_url}/packages/{owner}/{package_type}/{name}/{version}"
     headers = {"Authorization": f"token {token}"}
-    resp = requests.delete(url, headers=headers, timeout=timeout)
-    return resp.status_code in (204, 200)
+    for attempt in range(max_retries):
+        try:
+            resp = requests.delete(url, headers=headers, timeout=timeout)
+        except requests.RequestException:
+            if attempt < max_retries - 1:
+                time.sleep(2**attempt)
+                continue
+            return False
+        if resp.status_code in (204, 200):
+            return True
+        # 404 means already deleted — treat as success
+        if resp.status_code == 404:
+            return True
+        # 5xx is transient — retry
+        if 500 <= resp.status_code < 600 and attempt < max_retries - 1:
+            time.sleep(2**attempt)
+            continue
+        return False
+    return False
 
 
 def sort_versions_by_date(
@@ -164,13 +187,14 @@ def main(
     api_url: str | None,
 ) -> None:
     """Clean up old Docker image versions from a Gitea registry."""
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     if not token:
-        raise click.ClickException(_("REPO_TOKEN environment variable required"))
+        raise click.ClickException(_("CI_GITEA_TOKEN environment variable required"))
     base_url = api_url or GITEA_API_URL
 
     total_deleted = 0
     total_kept = 0
+    total_failed = 0
     for name in names:
         click.echo(f"\n{'=' * 60}")
         click.echo(f"Package: {owner}/{name}")
@@ -182,6 +206,7 @@ def main(
                 _("Failed to list versions for {name}: {error}", name=name, error=exc),
                 err=True,
             )
+            total_failed += 1
             continue
 
         if not versions:
@@ -203,6 +228,7 @@ def main(
             continue
 
         deleted_count = 0
+        failed_count = 0
         for v in to_delete:
             version = str(v.get("version", ""))
             if delete_package_version(base_url, owner, name, version, token):
@@ -210,11 +236,15 @@ def main(
                 deleted_count += 1
             else:
                 click.echo(f"  FAILED to delete: {version}", err=True)
+                failed_count += 1
 
         total_deleted += deleted_count
         total_kept += kept_count
+        total_failed += failed_count
 
-    click.echo(f"\nDone. Deleted {total_deleted}, kept {total_kept}.")
+    click.echo(f"\nDone. Deleted {total_deleted}, kept {total_kept}, failed {total_failed}.")
+    if total_failed > 0:
+        raise click.ClickException(_("Failed to delete {count} image version(s)", count=total_failed))
 
 
 if __name__ == "__main__":  # pragma: no cover

src/devx/tools/configure_repo.py

@@ -6,8 +6,8 @@ The ``tea`` CLI is used for label creation if available, with a
 fallback to ``GiteaClient`` if tea is not installed.
 
 Usage:
-  REPO_TOKEN=<token> python3 -m devx.tools.configure_repo --repo my-repo
-  REPO_TOKEN=<token> python3 -m devx.tools.configure_repo --repo my-repo --owner my-org
+  CI_GITEA_TOKEN=<token> python3 -m devx.tools.configure_repo --repo my-repo
+  CI_GITEA_TOKEN=<token> python3 -m devx.tools.configure_repo --repo my-repo --owner my-org
 """
 
 from __future__ import annotations
@@ -102,7 +102,7 @@ def configure_repo(
         api_url: Gitea API base URL. If None, uses ``GITEA_API_URL`` from config.
     """
     if not token:
-        raise click.ClickException(_("ERROR: REPO_TOKEN is not set."))
+        raise click.ClickException(_("ERROR: CI_GITEA_TOKEN is not set."))
 
     url = api_url or GITEA_API_URL
     client = GiteaClient(url, token, owner, repo)
@@ -148,7 +148,7 @@ def configure_repo(
 )
 def main(repo: str | None, owner: str | None, branch: str, api_url: str | None) -> None:
     """Configure branch protection and repository settings via the Gitea API."""
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
 
     if repo is None:
         repo = os.environ.get("DEVX_REPO_NAME", "")

src/devx/tools/create_pr.py

@@ -123,9 +123,9 @@ def create_pr(
             ),
         )
 
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     if not token:
-        raise click.ClickException(_("REPO_TOKEN is not set. Required to create a PR."))
+        raise click.ClickException(_("CI_GITEA_TOKEN is not set. Required to create a PR."))
 
     vikunja_title = get_vikunja_task_title(task_id)
     pr_title = f"{task_id}: {vikunja_title}"

src/devx/tools/install_tools.py

@@ -6,6 +6,7 @@ Handles installation of:
 - git-cliff (changelog generator)
 - act_runner (Gitea Actions local runner, optional)
 - tea (Gitea CLI — official command-line tool for Gitea API operations)
+- hadolint (Dockerfile linter)
 
 Each tool is installed to ``~/.local/bin`` if not already on PATH.
 Idempotent: skips tools that are already available.
@@ -39,6 +40,8 @@ ACT_RUNNER_VERSION = "0.2.11"
 
 TEA_VERSION = "0.14.1"
 
+HADOLINT_VERSION = "2.12.0"
+
 
 def _arch() -> str:
     """Return the architecture string used by release assets."""
@@ -161,7 +164,20 @@ def install_tea() -> bool:
     return True
 
 
-TOOL_NAMES = ["actionlint", "git-cliff", "act_runner", "tea"]
+def install_hadolint() -> bool:
+    """Install hadolint if not already present. Returns True if installed/skipped."""
+    if _is_installed("hadolint"):
+        click.echo("hadolint: already installed")
+        return True
+    machine = platform.machine().lower()
+    arch = "x86_64" if machine in {"x86_64", "amd64"} else "arm64"
+    url = f"https://github.com/hadolint/hadolint/releases/download/v{HADOLINT_VERSION}/hadolint-Linux-{arch}"
+    dest = _download_binary(url, "hadolint")
+    click.echo(f"hadolint: installed to {dest}")
+    return True
+
+
+TOOL_NAMES = ["actionlint", "git-cliff", "act_runner", "tea", "hadolint"]
 
 
 def _install_tool(name: str) -> bool:
@@ -174,6 +190,8 @@ def _install_tool(name: str) -> bool:
         return install_act_runner()
     if name == "tea":
         return install_tea()
+    if name == "hadolint":
+        return install_hadolint()
     raise click.ClickException(f"Unknown tool: {name}")
 
 

src/devx/tools/setup.py

@@ -64,19 +64,19 @@ def _install_ansible_collections(bin_dir: str) -> None:
 
 
 def _configure_tea_login() -> None:
-    """Configure tea CLI login from .env if REPO_TOKEN is set.
+    """Configure tea CLI login from .env if CI_GITEA_TOKEN is set.
 
     Idempotent: if a login with the same name already exists, it is not re-added.
-    Skips if tea is not installed or REPO_TOKEN is not set.
+    Skips if tea is not installed or CI_GITEA_TOKEN is not set.
     """
     tea_bin = shutil.which("tea")
     if tea_bin is None:
         click.echo("tea: not installed — run 'make install-tools' to install it.")
         return
 
-    token = os.environ.get("REPO_TOKEN", "")
+    token = os.environ.get("CI_GITEA_TOKEN", "")
     if not token:
-        click.echo("tea: REPO_TOKEN not set — skipping login configuration.")
+        click.echo("tea: CI_GITEA_TOKEN not set — skipping login configuration.")
         return
 
     api_url = os.environ.get("DEVX_GITEA_API_URL", "https://git.oblachno.oblachno.fyi/api/v1")

src/devx/translations.json

@@ -535,13 +535,13 @@
     "ru": "Could not extract conventional commit message from PR commits.",
     "zh": "Could not extract conventional commit message from PR commits."
   },
-  "Could not fetch PR title from Gitea (REPO_TOKEN not set or PR not found).": {
-    "bg": "Could not fetch PR title from Gitea (REPO_TOKEN not set or PR not found).",
-    "de": "Could not fetch PR title from Gitea (REPO_TOKEN not set or PR not found).",
-    "en": "Could not fetch PR title from Gitea (REPO_TOKEN not set or PR not found).",
-    "pl": "Could not fetch PR title from Gitea (REPO_TOKEN not set or PR not found).",
-    "ru": "Could not fetch PR title from Gitea (REPO_TOKEN not set or PR not found).",
-    "zh": "Could not fetch PR title from Gitea (REPO_TOKEN not set or PR not found)."
+  "Could not fetch PR title from Gitea (CI_GITEA_TOKEN not set or PR not found).": {
+    "bg": "Could not fetch PR title from Gitea (CI_GITEA_TOKEN not set or PR not found).",
+    "de": "Could not fetch PR title from Gitea (CI_GITEA_TOKEN not set or PR not found).",
+    "en": "Could not fetch PR title from Gitea (CI_GITEA_TOKEN not set or PR not found).",
+    "pl": "Could not fetch PR title from Gitea (CI_GITEA_TOKEN not set or PR not found).",
+    "ru": "Could not fetch PR title from Gitea (CI_GITEA_TOKEN not set or PR not found).",
+    "zh": "Could not fetch PR title from Gitea (CI_GITEA_TOKEN not set or PR not found)."
   },
   "Could not find Vikunja task {task_id} in project {project_id}.": {
     "bg": "Не е намерена Vikunja задача {task_id} в проект {project_id}.",
@@ -655,13 +655,13 @@
     "ru": "Dry-run mode: on branch '{branch}' (not master). Some checks may behave differently.",
     "zh": "Dry-run mode: on branch '{branch}' (not master). Some checks may behave differently."
   },
-  "ERROR: REPO_TOKEN is not set.": {
-    "bg": "ГРЕШКА: REPO_TOKEN не е зададен.",
-    "de": "FEHLER: REPO_TOKEN ist nicht gesetzt.",
-    "en": "ERROR: REPO_TOKEN is not set.",
-    "pl": "BŁĄD: REPO_TOKEN nie jest ustawiony.",
-    "ru": "ОШИБКА: REPO_TOKEN не задан.",
-    "zh": "错误：未设置 REPO_TOKEN。"
+  "ERROR: CI_GITEA_TOKEN is not set.": {
+    "bg": "ГРЕШКА: CI_GITEA_TOKEN не е зададен.",
+    "de": "FEHLER: CI_GITEA_TOKEN ist nicht gesetzt.",
+    "en": "ERROR: CI_GITEA_TOKEN is not set.",
+    "pl": "BŁĄD: CI_GITEA_TOKEN nie jest ustawiony.",
+    "ru": "ОШИБКА: CI_GITEA_TOKEN не задан.",
+    "zh": "错误：未设置 CI_GITEA_TOKEN。"
   },
   "ERROR: Repository name not specified. Use --repo or set DEVX_REPO_NAME.": {
     "bg": "ГРЕШКА: Името на хранилището не е указано. Използвайте --repo или задайте DEVX_REPO_NAME.",
@@ -759,13 +759,13 @@
     "ru": "Found {count} stale documentation reference(s)",
     "zh": "Found {count} stale documentation reference(s)"
   },
-  "GITEA_URL/REPO_TOKEN/RUN_ID not set; running without cross-runner cancellation.": {
-    "bg": "GITEA_URL/REPO_TOKEN/RUN_ID not set; running without cross-runner cancellation.",
-    "de": "GITEA_URL/REPO_TOKEN/RUN_ID not set; running without cross-runner cancellation.",
-    "en": "GITEA_URL/REPO_TOKEN/RUN_ID not set; running without cross-runner cancellation.",
-    "pl": "GITEA_URL/REPO_TOKEN/RUN_ID nie ustawione; uruchamianie bez anulowania między runnerami.",
-    "ru": "GITEA_URL/REPO_TOKEN/RUN_ID not set; running without cross-runner cancellation.",
-    "zh": "GITEA_URL/REPO_TOKEN/RUN_ID not set; running without cross-runner cancellation."
+  "GITEA_URL/CI_GITEA_TOKEN/RUN_ID not set; running without cross-runner cancellation.": {
+    "bg": "GITEA_URL/CI_GITEA_TOKEN/RUN_ID not set; running without cross-runner cancellation.",
+    "de": "GITEA_URL/CI_GITEA_TOKEN/RUN_ID not set; running without cross-runner cancellation.",
+    "en": "GITEA_URL/CI_GITEA_TOKEN/RUN_ID not set; running without cross-runner cancellation.",
+    "pl": "GITEA_URL/CI_GITEA_TOKEN/RUN_ID nie ustawione; uruchamianie bez anulowania między runnerami.",
+    "ru": "GITEA_URL/CI_GITEA_TOKEN/RUN_ID not set; running without cross-runner cancellation.",
+    "zh": "GITEA_URL/CI_GITEA_TOKEN/RUN_ID not set; running without cross-runner cancellation."
   },
   "Generated {file} with prefix '{prefix}'.": {
     "bg": "Generated {file} with prefix '{prefix}'.",
@@ -1383,29 +1383,37 @@
     "ru": "REPO argument is required (or set GITHUB_REPOSITORY env var).",
     "zh": "REPO argument is required (or set GITHUB_REPOSITORY env var)."
   },
-  "REPO_TOKEN environment variable required": {
-    "bg": "REPO_TOKEN environment variable required",
-    "de": "REPO_TOKEN environment variable required",
-    "en": "REPO_TOKEN environment variable required",
-    "pl": "REPO_TOKEN environment variable required",
-    "ru": "REPO_TOKEN environment variable required",
-    "zh": "REPO_TOKEN environment variable required"
+  "CI_GITEA_TOKEN environment variable required": {
+    "bg": "CI_GITEA_TOKEN environment variable required",
+    "de": "CI_GITEA_TOKEN environment variable required",
+    "en": "CI_GITEA_TOKEN environment variable required",
+    "pl": "CI_GITEA_TOKEN environment variable required",
+    "ru": "CI_GITEA_TOKEN environment variable required",
+    "zh": "CI_GITEA_TOKEN environment variable required"
   },
-  "REPO_TOKEN is not set. Required to create a PR.": {
-    "bg": "REPO_TOKEN не е зададен. Необходим за създаване на PR.",
-    "de": "REPO_TOKEN nicht gesetzt. Erforderlich zum Erstellen eines PR.",
-    "en": "REPO_TOKEN is not set. Required to create a PR.",
-    "pl": "REPO_TOKEN nie jest ustawiony. Wymagany do utworzenia PR.",
-    "ru": "REPO_TOKEN не установлен. Требуется для создания PR.",
-    "zh": "REPO_TOKEN 未设置。创建 PR 所需。"
+  "Failed to delete {count} image version(s)": {
+    "bg": "Failed to delete {count} image version(s)",
+    "de": "Failed to delete {count} image version(s)",
+    "en": "Failed to delete {count} image version(s)",
+    "pl": "Failed to delete {count} image version(s)",
+    "ru": "Failed to delete {count} image version(s)",
+    "zh": "Failed to delete {count} image version(s)"
   },
-  "Registry credentials required: set REPO_TOKEN and REGISTRY_USERNAME env vars": {
-    "bg": "Registry credentials required: set REPO_TOKEN and REGISTRY_USERNAME env vars",
-    "de": "Registry credentials required: set REPO_TOKEN and REGISTRY_USERNAME env vars",
-    "en": "Registry credentials required: set REPO_TOKEN and REGISTRY_USERNAME env vars",
-    "pl": "Registry credentials required: set REPO_TOKEN and REGISTRY_USERNAME env vars",
-    "ru": "Registry credentials required: set REPO_TOKEN and REGISTRY_USERNAME env vars",
-    "zh": "Registry credentials required: set REPO_TOKEN and REGISTRY_USERNAME env vars"
+  "CI_GITEA_TOKEN is not set. Required to create a PR.": {
+    "bg": "CI_GITEA_TOKEN не е зададен. Необходим за създаване на PR.",
+    "de": "CI_GITEA_TOKEN nicht gesetzt. Erforderlich zum Erstellen eines PR.",
+    "en": "CI_GITEA_TOKEN is not set. Required to create a PR.",
+    "pl": "CI_GITEA_TOKEN nie jest ustawiony. Wymagany do utworzenia PR.",
+    "ru": "CI_GITEA_TOKEN не установлен. Требуется для создания PR.",
+    "zh": "CI_GITEA_TOKEN 未设置。创建 PR 所需。"
+  },
+  "Registry credentials required: set CI_GITEA_TOKEN and CI_GITEA_USERNAME env vars": {
+    "bg": "Registry credentials required: set CI_GITEA_TOKEN and CI_GITEA_USERNAME env vars",
+    "de": "Registry credentials required: set CI_GITEA_TOKEN and CI_GITEA_USERNAME env vars",
+    "en": "Registry credentials required: set CI_GITEA_TOKEN and CI_GITEA_USERNAME env vars",
+    "pl": "Registry credentials required: set CI_GITEA_TOKEN and CI_GITEA_USERNAME env vars",
+    "ru": "Registry credentials required: set CI_GITEA_TOKEN and CI_GITEA_USERNAME env vars",
+    "zh": "Registry credentials required: set CI_GITEA_TOKEN and CI_GITEA_USERNAME env vars"
   },
   "Registry login failed": {
     "bg": "Registry login failed",
@@ -1799,13 +1807,13 @@
     "ru": "[check_test_coverage] No changed files to check.",
     "zh": "[check_test_coverage] No changed files to check."
   },
-  "[dry-run] Would commit: release: v{version}": {
-    "bg": "[dry-run] Would commit: release: v{version}",
-    "de": "[dry-run] Would commit: release: v{version}",
-    "en": "[dry-run] Would commit: release: v{version}",
-    "pl": "[dry-run] Utworzono by commit: release: v{version}",
-    "ru": "[dry-run] Would commit: release: v{version}",
-    "zh": "[dry-run] Would commit: release: v{version}"
+  "[dry-run] Would commit: release: v{version} [skip ci]": {
+    "bg": "[dry-run] Would commit: release: v{version} [skip ci]",
+    "de": "[dry-run] Would commit: release: v{version} [skip ci]",
+    "en": "[dry-run] Would commit: release: v{version} [skip ci]",
+    "pl": "[dry-run] Utworzono by commit: release: v{version} [skip ci]",
+    "ru": "[dry-run] Would commit: release: v{version} [skip ci]",
+    "zh": "[dry-run] Would commit: release: v{version} [skip ci]"
   },
   "[dry-run] Would create tag: v{version}": {
     "bg": "[dry-run] Would create tag: v{version}",
@@ -1998,5 +2006,37 @@
     "pl": "",
     "ru": "",
     "zh": ""
+  },
+  "tea not installed — skipping login configuration.": {
+    "bg": "tea not installed — skipping login configuration.",
+    "de": "tea not installed — skipping login configuration.",
+    "en": "tea not installed — skipping login configuration.",
+    "pl": "tea not installed — skipping login configuration.",
+    "ru": "tea not installed — skipping login configuration.",
+    "zh": "tea not installed — skipping login configuration."
+  },
+  "CI_GITEA_TOKEN not set — skipping login configuration.": {
+    "bg": "CI_GITEA_TOKEN not set — skipping login configuration.",
+    "de": "CI_GITEA_TOKEN not set — skipping login configuration.",
+    "en": "CI_GITEA_TOKEN not set — skipping login configuration.",
+    "pl": "CI_GITEA_TOKEN not set — skipping login configuration.",
+    "ru": "CI_GITEA_TOKEN not set — skipping login configuration.",
+    "zh": "CI_GITEA_TOKEN not set — skipping login configuration."
+  },
+  "tea login '{name}' already configured.": {
+    "bg": "tea login '{name}' already configured.",
+    "de": "tea login '{name}' already configured.",
+    "en": "tea login '{name}' already configured.",
+    "pl": "tea login '{name}' already configured.",
+    "ru": "tea login '{name}' already configured.",
+    "zh": "tea login '{name}' already configured."
+  },
+  "Configuring tea login '{name}' for {url}...": {
+    "bg": "Configuring tea login '{name}' for {url}...",
+    "de": "Configuring tea login '{name}' for {url}...",
+    "en": "Configuring tea login '{name}' for {url}...",
+    "pl": "Configuring tea login '{name}' for {url}...",
+    "ru": "Configuring tea login '{name}' for {url}...",
+    "zh": "Configuring tea login '{name}' for {url}..."
   }
-}
+}

tests/unit/test_auto_merge.py

@@ -217,7 +217,7 @@ class TestRunCmd:
 
 
 class TestMain:
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.auto_merge.validate_pr_title_matches_vikunja")
     @patch("devx.ci.auto_merge.GiteaClient")
     def test_full_merge_flow(
@@ -239,14 +239,14 @@ class TestMain:
         assert result.exit_code == 0, result.output
         mock_client.merge_pr.assert_called_once_with(7, "DEVX-19: fix: resolve timeout")
 
-    @patch.dict("os.environ", {"REPO_TOKEN": ""}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": ""}, clear=True)
     def test_no_token_raises(self) -> None:
         runner = CliRunner()
         result = runner.invoke(main, ["DEVX-19-fix", "DEVX-19: test", "owner/repo", "7"])
         assert result.exit_code != 0
-        assert "REPO_TOKEN" in result.output
+        assert "CI_GITEA_TOKEN" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.auto_merge.GiteaClient")
     def test_no_task_id_raises(self, mock_client_cls: MagicMock, tmp_path, monkeypatch) -> None:  # type: ignore[no-untyped-def]
         monkeypatch.chdir(tmp_path)
@@ -256,7 +256,7 @@ class TestMain:
         assert result.exit_code != 0
         assert "No task ID" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.auto_merge.GiteaClient")
     def test_invalid_pr_title_raises(self, mock_client_cls: MagicMock, tmp_path, monkeypatch) -> None:  # type: ignore[no-untyped-def]
         monkeypatch.chdir(tmp_path)
@@ -266,7 +266,7 @@ class TestMain:
         assert result.exit_code != 0
         assert "format" in result.output.lower()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.auto_merge.validate_pr_title_matches_vikunja")
     @patch("devx.ci.auto_merge.GiteaClient")
     def test_merge_behind_master_raises_no_rebase(
@@ -298,7 +298,7 @@ class TestMain:
         # Must NOT have called merge_pr twice (no retry after rebase)
         assert mock_client.merge_pr.call_count == 1
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.auto_merge.validate_pr_title_matches_vikunja")
     @patch("devx.ci.auto_merge.GiteaClient")
     def test_merge_failure_raises(
@@ -321,7 +321,7 @@ class TestMain:
         assert result.exit_code != 0
         assert "Merge failed" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.auto_merge.validate_pr_title_matches_vikunja")
     @patch("devx.ci.auto_merge.GiteaClient")
     def test_no_conventional_msg_raises(
@@ -342,7 +342,7 @@ class TestMain:
         assert result.exit_code != 0
         assert "conventional commit" in result.output.lower()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     def test_invalid_pr_number_raises(self, tmp_path, monkeypatch) -> None:
         """Non-integer PR number should raise."""
         monkeypatch.chdir(tmp_path)
@@ -351,7 +351,7 @@ class TestMain:
         assert result.exit_code != 0
         assert "PR number must be an integer" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     def test_invalid_repo_format_raises(self, tmp_path, monkeypatch) -> None:
         """Repo without owner/name should raise."""
         monkeypatch.chdir(tmp_path)
@@ -360,7 +360,7 @@ class TestMain:
         assert result.exit_code != 0
         assert "owner/name" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok", "VIKUNJA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.auto_merge.validate_pr_title_matches_vikunja")
     @patch("devx.ci.auto_merge.GiteaClient")
     def test_merge_behind_master_does_not_force_push(

tests/unit/test_build_image.py

@@ -321,6 +321,25 @@ class TestCleanImagesAPI:
         from devx.tools.clean_images import delete_package_version
 
         mock_resp = MagicMock(status_code=204)
+        with patch("devx.tools.clean_images.requests.delete", return_value=mock_resp) as mock_del:
+            assert (
+                delete_package_version(
+                    "https://git.example.com/api/v1",
+                    "oblachno-oss",
+                    "ci-base",
+                    "0.1.0",
+                    "token",
+                )
+                is True
+            )
+            # Verify URL includes container type
+            url = mock_del.call_args.args[0]
+            assert "/container/" in url
+
+    def test_delete_package_version_404_treated_as_success(self) -> None:
+        from devx.tools.clean_images import delete_package_version
+
+        mock_resp = MagicMock(status_code=404)
         with patch("devx.tools.clean_images.requests.delete", return_value=mock_resp):
             assert (
                 delete_package_version(
@@ -336,7 +355,7 @@ class TestCleanImagesAPI:
     def test_delete_package_version_failure(self) -> None:
         from devx.tools.clean_images import delete_package_version
 
-        mock_resp = MagicMock(status_code=404)
+        mock_resp = MagicMock(status_code=403)
         with patch("devx.tools.clean_images.requests.delete", return_value=mock_resp):
             assert (
                 delete_package_version(
@@ -349,6 +368,110 @@ class TestCleanImagesAPI:
                 is False
             )
 
+    def test_delete_package_version_retries_on_5xx(self) -> None:
+        from devx.tools.clean_images import delete_package_version
+
+        responses = [
+            MagicMock(status_code=500),
+            MagicMock(status_code=502),
+            MagicMock(status_code=204),
+        ]
+        with patch("devx.tools.clean_images.requests.delete", side_effect=responses):
+            with patch("devx.tools.clean_images.time.sleep"):
+                assert (
+                    delete_package_version(
+                        "https://git.example.com/api/v1",
+                        "oblachno-oss",
+                        "ci-base",
+                        "0.1.0",
+                        "token",
+                        max_retries=3,
+                    )
+                    is True
+                )
+
+    def test_delete_package_version_retries_on_exception(self) -> None:
+        import requests as req
+
+        from devx.tools.clean_images import delete_package_version
+
+        responses = [
+            req.ConnectionError("network down"),
+            MagicMock(status_code=204),
+        ]
+        with patch("devx.tools.clean_images.requests.delete", side_effect=responses):
+            with patch("devx.tools.clean_images.time.sleep"):
+                assert (
+                    delete_package_version(
+                        "https://git.example.com/api/v1",
+                        "oblachno-oss",
+                        "ci-base",
+                        "0.1.0",
+                        "token",
+                        max_retries=3,
+                    )
+                    is True
+                )
+
+    def test_delete_package_version_exhausts_retries_on_exception(self) -> None:
+        import requests as req
+
+        from devx.tools.clean_images import delete_package_version
+
+        with patch(
+            "devx.tools.clean_images.requests.delete",
+            side_effect=req.ConnectionError("network down"),
+        ):
+            with patch("devx.tools.clean_images.time.sleep"):
+                assert (
+                    delete_package_version(
+                        "https://git.example.com/api/v1",
+                        "oblachno-oss",
+                        "ci-base",
+                        "0.1.0",
+                        "token",
+                        max_retries=2,
+                    )
+                    is False
+                )
+
+    def test_delete_package_version_exhausts_retries_on_5xx(self) -> None:
+        from devx.tools.clean_images import delete_package_version
+
+        with patch(
+            "devx.tools.clean_images.requests.delete",
+            return_value=MagicMock(status_code=500),
+        ):
+            with patch("devx.tools.clean_images.time.sleep"):
+                assert (
+                    delete_package_version(
+                        "https://git.example.com/api/v1",
+                        "oblachno-oss",
+                        "ci-base",
+                        "0.1.0",
+                        "token",
+                        max_retries=2,
+                    )
+                    is False
+                )
+
+    def test_delete_package_version_zero_retries(self) -> None:
+        from devx.tools.clean_images import delete_package_version
+
+        with patch("devx.tools.clean_images.requests.delete") as mock_del:
+            assert (
+                delete_package_version(
+                    "https://git.example.com/api/v1",
+                    "oblachno-oss",
+                    "ci-base",
+                    "0.1.0",
+                    "token",
+                    max_retries=0,
+                )
+                is False
+            )
+            mock_del.assert_not_called()
+
 
 class TestCLIBuildImage:
     def test_single_image_build(self, tmp_path: Path) -> None:
@@ -442,7 +565,7 @@ class TestCLIBuildImage:
         dockerfile.touch()
         runner = CliRunner()
         login_result = MagicMock(returncode=1, stderr="auth failed", stdout="")
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake", "REGISTRY_USERNAME": "user"}):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake", "CI_GITEA_USERNAME": "user"}):
             with patch("devx.tools.build_image.subprocess.run", return_value=login_result):
                 result = runner.invoke(
                     build_image.main,
@@ -458,7 +581,7 @@ class TestCLIBuildImage:
         build_result = MagicMock(returncode=0)
         login_result = MagicMock(returncode=0, stderr="", stdout="")
         push_result = MagicMock(returncode=1, stderr="push failed", stdout="")
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake", "REGISTRY_USERNAME": "user"}):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake", "CI_GITEA_USERNAME": "user"}):
             with patch(
                 "devx.tools.build_image.subprocess.run",
                 side_effect=[login_result, build_result, push_result],
@@ -482,7 +605,7 @@ class TestCLICleanImages:
             {"version": "0.3.0", "created_at": "2025-03-01"},
         ]
         mock_resp.raise_for_status = MagicMock()
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake"}):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake"}):
             with patch("devx.tools.clean_images.requests.get", return_value=mock_resp):
                 result = runner.invoke(
                     clean_main,
@@ -511,7 +634,7 @@ class TestCLICleanImages:
         mock_resp = MagicMock()
         mock_resp.json.return_value = []
         mock_resp.raise_for_status = MagicMock()
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake"}):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake"}):
             with patch("devx.tools.clean_images.requests.get", return_value=mock_resp):
                 result = runner.invoke(
                     clean_main,
@@ -532,7 +655,7 @@ class TestCLICleanImages:
         ]
         list_resp.raise_for_status = MagicMock()
         delete_resp = MagicMock(status_code=204)
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake"}):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake"}):
             with patch("devx.tools.clean_images.requests.get", return_value=list_resp):
                 with patch("devx.tools.clean_images.requests.delete", return_value=delete_resp):
                     result = runner.invoke(
@@ -548,7 +671,7 @@ class TestCLICleanImages:
         from devx.tools.clean_images import main as clean_main
 
         runner = CliRunner()
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake"}):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake"}):
             with patch(
                 "devx.tools.clean_images.requests.get",
                 side_effect=req.ConnectionError("network down"),
@@ -557,7 +680,7 @@ class TestCLICleanImages:
                     clean_main,
                     ["--owner", "oblachno-oss", "--name", "ci-base", "--dry-run"],
                 )
-                assert result.exit_code == 0
+                assert result.exit_code != 0
                 assert "Failed to list" in result.output
 
     def test_delete_failure_in_cli(self) -> None:
@@ -571,13 +694,15 @@ class TestCLICleanImages:
             {"version": "0.3.0", "created_at": "2025-03-01"},
         ]
         list_resp.raise_for_status = MagicMock()
-        delete_resp = MagicMock(status_code=500)
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake"}):
+        delete_resp = MagicMock(status_code=403)
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake"}):
             with patch("devx.tools.clean_images.requests.get", return_value=list_resp):
                 with patch("devx.tools.clean_images.requests.delete", return_value=delete_resp):
-                    result = runner.invoke(
-                        clean_main,
-                        ["--owner", "oblachno-oss", "--name", "ci-base", "--keep", "2"],
-                    )
-                    assert result.exit_code == 0
-                    assert "FAILED" in result.output
+                    with patch("devx.tools.clean_images.time.sleep"):
+                        result = runner.invoke(
+                            clean_main,
+                            ["--owner", "oblachno-oss", "--name", "ci-base", "--keep", "2"],
+                        )
+                        assert result.exit_code != 0
+                        assert "FAILED" in result.output
+                        assert "failed" in result.output.lower()

tests/unit/test_check_auto_merge_ready.py

@@ -78,7 +78,7 @@ class TestGetPrTitleFromGitea:
             assert get_pr_title_from_gitea("owner/repo", 1) is None
 
     def test_returns_none_with_invalid_repo(self) -> None:
-        with patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True):
             assert get_pr_title_from_gitea("invalid", 1) is None
 
     @patch("devx.ci.check_auto_merge_ready.GiteaClient")
@@ -86,7 +86,7 @@ class TestGetPrTitleFromGitea:
         mock_client = MagicMock()
         mock_client.get_pr.return_value = {"title": "DEVX-1: Fix bug"}
         mock_client_cls.return_value = mock_client
-        with patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True):
             result = get_pr_title_from_gitea("owner/repo", 1)
         assert result == "DEVX-1: Fix bug"
 
@@ -95,7 +95,7 @@ class TestGetPrTitleFromGitea:
         mock_client = MagicMock()
         mock_client.get_pr.side_effect = Exception("API error")
         mock_client_cls.return_value = mock_client
-        with patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True):
             result = get_pr_title_from_gitea("owner/repo", 1)
         assert result is None
 

tests/unit/test_check_translations.py

@@ -248,8 +248,8 @@ class TestDevxI18n:
         import devx.i18n
 
         importlib.reload(devx.i18n)
-        # "ERROR: REPO_TOKEN is not set." has a German translation
-        result = devx.i18n._("ERROR: REPO_TOKEN is not set.")
+        # "ERROR: CI_GITEA_TOKEN is not set." has a German translation
+        result = devx.i18n._("ERROR: CI_GITEA_TOKEN is not set.")
         assert "FEHLER" in result
 
         # Restore

tests/unit/test_configure_repo.py

@@ -47,7 +47,7 @@ class TestDefaultConfigs:
 
 
 class TestConfigureRepo:
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.tools.configure_repo.GiteaClient")
     def test_configure_repo_success(self, mock_client_cls: MagicMock) -> None:
         mock_client = MagicMock()
@@ -58,7 +58,7 @@ class TestConfigureRepo:
         mock_client.ensure_branch_protection.assert_called_once()
         mock_client.update_repo_settings.assert_called_once()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.tools.configure_repo.GiteaClient")
     def test_configure_repo_api_error(self, mock_client_cls: MagicMock) -> None:
         mock_client = MagicMock()
@@ -69,10 +69,10 @@ class TestConfigureRepo:
             configure_repo(token="tok", owner="owner", repo="repo")
 
     def test_configure_repo_no_token(self) -> None:
-        with pytest.raises(click.ClickException, match="REPO_TOKEN"):
+        with pytest.raises(click.ClickException, match="CI_GITEA_TOKEN"):
             configure_repo(token="", owner="owner", repo="repo")
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.tools.configure_repo.GiteaClient")
     def test_configure_repo_custom_configs(self, mock_client_cls: MagicMock) -> None:
         mock_client = MagicMock()
@@ -102,7 +102,7 @@ class TestConfigureRepo:
 
 
 class TestMain:
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok", "DEVX_REPO_NAME": "myrepo"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok", "DEVX_REPO_NAME": "myrepo"}, clear=True)
     @patch("devx.tools.configure_repo.GiteaClient")
     def test_main_success_with_env_repo(self, mock_client_cls: MagicMock) -> None:
         mock_client = MagicMock()
@@ -114,7 +114,7 @@ class TestMain:
         mock_client.ensure_branch_protection.assert_called_once()
         mock_client.update_repo_settings.assert_called_once()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.tools.configure_repo.GiteaClient")
     def test_main_success_with_cli_repo(self, mock_client_cls: MagicMock) -> None:
         mock_client = MagicMock()
@@ -125,7 +125,7 @@ class TestMain:
         assert result.exit_code == 0
         mock_client.ensure_branch_protection.assert_called_once()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.tools.configure_repo.GiteaClient")
     def test_main_api_error(self, mock_client_cls: MagicMock) -> None:
         mock_client = MagicMock()
@@ -142,16 +142,16 @@ class TestMain:
         runner = CliRunner()
         result = runner.invoke(main, ["--repo", "myrepo"])
         assert result.exit_code != 0
-        assert "REPO_TOKEN" in result.output
+        assert "CI_GITEA_TOKEN" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     def test_main_no_repo(self) -> None:
         runner = CliRunner()
         result = runner.invoke(main, [])
         assert result.exit_code != 0
         assert "Repository name not specified" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.tools.configure_repo.GiteaClient")
     def test_main_custom_branch(self, mock_client_cls: MagicMock) -> None:
         mock_client = MagicMock()
@@ -164,7 +164,7 @@ class TestMain:
         args = mock_client.ensure_branch_protection.call_args
         assert args[0][0] == "develop"
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok", "DEVX_REPO_NAME": "oblachno/infra"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok", "DEVX_REPO_NAME": "oblachno/infra"}, clear=True)
     @patch("devx.tools.configure_repo.GiteaClient")
     def test_main_parses_owner_repo_from_env(self, mock_client_cls: MagicMock) -> None:
         """DEVX_REPO_NAME with 'owner/repo' format should be split."""
@@ -181,7 +181,7 @@ class TestMain:
 
     @patch.dict(
         "os.environ",
-        {"REPO_TOKEN": "tok", "DEVX_REPO_NAME": "infra", "DEVX_REPO_OWNER": "oblachno"},
+        {"CI_GITEA_TOKEN": "tok", "DEVX_REPO_NAME": "infra", "DEVX_REPO_OWNER": "oblachno"},
         clear=True,
     )
     @patch("devx.tools.configure_repo.REPO_OWNER", "oblachno")

tests/unit/test_create_pr.py

@@ -95,7 +95,7 @@ class TestCreatePr:
     @patch("devx.tools.create_pr.GiteaClient")
     @patch("devx.tools.create_pr.get_vikunja_task_title", return_value="Add feature")
     @patch("devx.tools.create_pr.find_existing_pr", return_value=None)
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     def test_creates_new_pr(self, mock_find: MagicMock, mock_title: MagicMock, mock_gitea: MagicMock) -> None:
         mock_client = MagicMock()
         mock_client.create_pr.return_value = {"number": 15, "html_url": "https://git.example.com/pr/15"}
@@ -112,7 +112,7 @@ class TestCreatePr:
     @patch("devx.tools.create_pr.GiteaClient")
     @patch("devx.tools.create_pr.get_vikunja_task_title", return_value="Add feature")
     @patch("devx.tools.create_pr.find_existing_pr")
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     def test_existing_pr_idempotent(self, mock_find: MagicMock, mock_title: MagicMock, mock_gitea: MagicMock) -> None:
         mock_find.return_value = {"number": 10, "html_url": "https://git.example.com/pr/10"}
         mock_client = MagicMock()
@@ -123,10 +123,10 @@ class TestCreatePr:
 
     @patch.dict("os.environ", {}, clear=True)
     def test_no_repo_token(self) -> None:
-        with pytest.raises(click.ClickException, match="REPO_TOKEN"):
+        with pytest.raises(click.ClickException, match="CI_GITEA_TOKEN"):
             create_pr("DEVX-42-fix", "master", "", "owner", "repo")
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     def test_no_task_id_in_branch(self) -> None:
         with pytest.raises(click.ClickException, match="does not contain a task ID"):
             create_pr("feature-branch", "master", "", "owner", "repo")

tests/unit/test_gitea_cli.py

@@ -7,7 +7,7 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from devx.gitea_cli import TeaCLI, TeaCLIError, _extract_issue_number, _extract_pr_number
+from devx.gitea_cli import TeaCLI, TeaCLIError, _extract_issue_number, _extract_pr_number, configure_tea_login
 
 
 class TestExtractIssueNumber:
@@ -359,3 +359,37 @@ class TestWhoami:
         mock_result = MagicMock(returncode=0, stdout="testuser", stderr="")
         with patch("subprocess.run", return_value=mock_result):
             assert cli.whoami() == "testuser"
+
+
+class TestConfigureTeaLogin:
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": ""}, clear=True)
+    @patch("devx.gitea_cli.shutil.which", return_value="/usr/bin/tea")
+    def test_no_token_skips(self, mock_which: MagicMock) -> None:
+        """configure_tea_login with no token prints skip message and returns."""
+        configure_tea_login()
+
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.gitea_cli.shutil.which", return_value=None)
+    def test_no_tea_skips(self, mock_which: MagicMock) -> None:
+        """configure_tea_login with no tea binary prints skip message and returns."""
+        configure_tea_login()
+
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.gitea_cli.shutil.which", return_value="/usr/bin/tea")
+    @patch("devx.gitea_cli.subprocess.run")
+    def test_configures_login_when_not_present(self, mock_subprocess: MagicMock, mock_which: MagicMock) -> None:
+        """configure_tea_login adds login when not already configured."""
+        mock_list = MagicMock(returncode=0, stdout="")
+        mock_subprocess.return_value = mock_list
+        configure_tea_login()
+        assert mock_subprocess.call_count >= 2  # login list + login add + login default
+
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.gitea_cli.shutil.which", return_value="/usr/bin/tea")
+    @patch("devx.gitea_cli.subprocess.run")
+    def test_skips_when_already_configured(self, mock_subprocess: MagicMock, mock_which: MagicMock) -> None:
+        """configure_tea_login skips if login already exists."""
+        mock_list = MagicMock(returncode=0, stdout="devx  https://git.example.com")
+        mock_subprocess.return_value = mock_list
+        configure_tea_login()
+        assert mock_subprocess.call_count == 1  # only login list, no add

tests/unit/test_install_tools.py

@@ -222,6 +222,24 @@ class TestInstallTea:
         assert (tmp_path / "tea").exists()
 
 
+class TestInstallHadolint:
+    def test_already_installed(self) -> None:
+        with patch.object(install_tools, "_is_installed", return_value=True):
+            assert install_tools.install_hadolint() is True
+
+    def test_install(self, tmp_path: Path) -> None:
+        def _write_file(url: str, path: Path) -> tuple[str, None]:
+            Path(path).write_bytes(b"binary")
+            return str(path), None
+
+        with patch.object(install_tools, "_is_installed", return_value=False):
+            with patch.object(install_tools, "TARGET_DIR", tmp_path):
+                with patch.object(platform, "machine", return_value="x86_64"):
+                    with patch.object(install_tools, "_download", side_effect=_write_file):
+                        assert install_tools.install_hadolint() is True
+        assert (tmp_path / "hadolint").exists()
+
+
 class TestListTools:
     def test_list(self, tmp_path: Path) -> None:
         with patch.object(install_tools, "TARGET_DIR", tmp_path):
@@ -251,6 +269,11 @@ class TestInstallTool:
             assert install_tools._install_tool("tea") is True
         mock.assert_called_once()
 
+    def test_hadolint(self) -> None:
+        with patch.object(install_tools, "install_hadolint", return_value=True) as mock:
+            assert install_tools._install_tool("hadolint") is True
+        mock.assert_called_once()
+
     def test_unknown_tool(self) -> None:
         with pytest.raises(ClickException, match="Unknown tool"):
             install_tools._install_tool("unknown")
@@ -269,7 +292,7 @@ class TestMain:
         with patch.object(install_tools, "_install_tool", return_value=True) as mock_install:
             result = runner.invoke(install_tools.main, [])
         assert result.exit_code == 0
-        assert mock_install.call_count == 4
+        assert mock_install.call_count == 5
 
     def test_install_specific_tool(self) -> None:
         runner = CliRunner()

tests/unit/test_integration_guard.py

@@ -101,7 +101,7 @@ class TestCli:
                 os.environ,
                 {
                     "GITEA_URL": "https://gitea.example",
-                    "REPO_TOKEN": "token",
+                    "CI_GITEA_TOKEN": "token",
                     "RUN_ID": "123",
                     "JOB_NAME": "integration-tests",
                     "MATRIX_INDEX": "0",
@@ -148,7 +148,7 @@ class TestCli:
                 os.environ,
                 {
                     "GITEA_URL": "https://gitea.example",
-                    "REPO_TOKEN": "token",
+                    "CI_GITEA_TOKEN": "token",
                     "RUN_ID": "123",
                     "JOB_NAME": "integration-tests",
                     "MATRIX_INDEX": "0",
@@ -193,7 +193,7 @@ class TestCli:
                 os.environ,
                 {
                     "GITEA_URL": "https://gitea.example",
-                    "REPO_TOKEN": "token",
+                    "CI_GITEA_TOKEN": "token",
                     "RUN_ID": "123",
                     "JOB_NAME": "integration-tests",
                     "MATRIX_INDEX": "0",
@@ -239,7 +239,7 @@ class TestCli:
             assert "without cross-runner cancellation" in result.output
 
     def test_partial_env_vars_runs_without_polling(self) -> None:
-        """Only GITEA_URL set (missing REPO_TOKEN and RUN_ID) — should skip polling."""
+        """Only GITEA_URL set (missing CI_GITEA_TOKEN and RUN_ID) — should skip polling."""
         with (
             patch.dict(
                 os.environ,

tests/unit/test_molecule_ci_guard.py

@@ -220,7 +220,7 @@ class TestCli:
                 os.environ,
                 {
                     "GITEA_URL": "https://gitea.example",
-                    "REPO_TOKEN": "token",
+                    "CI_GITEA_TOKEN": "token",
                     "RUN_ID": "123",
                     "JOB_NAME": "molecule-tests",
                     "MATRIX_INDEX": "0",
@@ -288,7 +288,7 @@ class TestCli:
                 os.environ,
                 {
                     "GITEA_URL": "https://gitea.example",
-                    "REPO_TOKEN": "token",
+                    "CI_GITEA_TOKEN": "token",
                     "RUN_ID": "123",
                     "JOB_NAME": "molecule-tests",
                     "MATRIX_INDEX": "0",
@@ -325,7 +325,7 @@ class TestCli:
                 os.environ,
                 {
                     "GITEA_URL": "https://gitea.example",
-                    "REPO_TOKEN": "token",
+                    "CI_GITEA_TOKEN": "token",
                     "RUN_ID": "123",
                     "JOB_NAME": "molecule-tests",
                     "MATRIX_INDEX": "0",
@@ -371,7 +371,7 @@ class TestCli:
                 os.environ,
                 {
                     "GITEA_URL": "https://gitea.example",
-                    "REPO_TOKEN": "token",
+                    "CI_GITEA_TOKEN": "token",
                     "RUN_ID": "123",
                     "JOB_NAME": "molecule-tests",
                     "MATRIX_INDEX": "0",
@@ -418,7 +418,7 @@ class TestCli:
                 os.environ,
                 {
                     "GITEA_URL": "https://gitea.example",
-                    "REPO_TOKEN": "token",
+                    "CI_GITEA_TOKEN": "token",
                     "RUN_ID": "123",
                     "JOB_NAME": "molecule-tests",
                     "MATRIX_INDEX": "0",

tests/unit/test_notify_failure.py

@@ -4,12 +4,12 @@ from unittest.mock import MagicMock, patch
 
 from click.testing import CliRunner
 
-from devx.ci.notify_failure import _configure_tea_login, main
-from devx.gitea_cli import TeaCLIError
+from devx.ci.notify_failure import main
+from devx.gitea_cli import TeaCLIError, configure_tea_login
 
 
 class TestNotifyFailure:
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_creates_issue_with_tea(self, mock_tea_cls: MagicMock) -> None:
         mock_tea = MagicMock()
@@ -36,7 +36,7 @@ class TestNotifyFailure:
         mock_tea.create_issue.assert_called_once()
         mock_tea.add_label.assert_called_once_with("owner/repo", 42, ["bug"])
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_tea_creates_issue_without_bug_label(self, mock_tea_cls: MagicMock) -> None:
         mock_tea = MagicMock()
@@ -53,7 +53,7 @@ class TestNotifyFailure:
         assert "issue #43" in result.output
         mock_tea.add_label.assert_not_called()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_tea_error_raises(self, mock_tea_cls: MagicMock) -> None:
         """When tea fails, the workflow fails — no fallback."""
@@ -70,7 +70,7 @@ class TestNotifyFailure:
         assert result.exit_code != 0
         assert "tea" in result.output.lower()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_tea_list_labels_error_continues_without_labels(self, mock_tea_cls: MagicMock) -> None:
         """If listing labels fails via tea, issue is still created without labels."""
@@ -87,7 +87,7 @@ class TestNotifyFailure:
         assert result.exit_code == 0
         assert "issue #50" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_tea_add_label_error_is_ignored(self, mock_tea_cls: MagicMock) -> None:
         """If adding label fails via tea, issue is still reported as created."""
@@ -105,7 +105,7 @@ class TestNotifyFailure:
         assert result.exit_code == 0
         assert "issue #51" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": ""}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": ""}, clear=True)
     def test_missing_token_exits(self) -> None:
         runner = CliRunner()
         result = runner.invoke(
@@ -113,10 +113,10 @@ class TestNotifyFailure:
             ["--repo", "owner/repo", "--run-id", "1", "--workflow", "release", "--commit", "abc"],
         )
         assert result.exit_code != 0
-        assert "REPO_TOKEN" in result.output
+        assert "CI_GITEA_TOKEN" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
-    @patch("devx.ci.notify_failure.shutil.which", return_value=None)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.gitea_cli.shutil.which", return_value=None)
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_auto_login_no_tea_skips(self, mock_tea_cls: MagicMock, mock_which: MagicMock) -> None:
         """--auto-login with tea not installed skips login and still creates issue."""
@@ -133,11 +133,11 @@ class TestNotifyFailure:
         assert result.exit_code == 0
         assert "issue #60" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": ""}, clear=True)
-    @patch("devx.ci.notify_failure.shutil.which", return_value="/usr/bin/tea")
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": ""}, clear=True)
+    @patch("devx.gitea_cli.shutil.which", return_value="/usr/bin/tea")
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_auto_login_no_token_skips_login(self, mock_tea_cls: MagicMock, mock_which: MagicMock) -> None:
-        """--auto-login with no REPO_TOKEN skips login but raises before creating issue."""
+        """--auto-login with no CI_GITEA_TOKEN skips login but raises before creating issue."""
         mock_tea = MagicMock()
         mock_tea_cls.return_value = mock_tea
 
@@ -147,25 +147,25 @@ class TestNotifyFailure:
             ["--repo", "owner/repo", "--run-id", "1", "--workflow", "release", "--commit", "abc", "--auto-login"],
         )
         assert result.exit_code != 0
-        assert "REPO_TOKEN" in result.output
+        assert "CI_GITEA_TOKEN" in result.output
 
 
 class TestConfigureTeaLogin:
-    @patch.dict("os.environ", {"REPO_TOKEN": ""}, clear=True)
-    @patch("devx.ci.notify_failure.shutil.which", return_value="/usr/bin/tea")
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": ""}, clear=True)
+    @patch("devx.gitea_cli.shutil.which", return_value="/usr/bin/tea")
     def test_no_token_skips(self, mock_which: MagicMock) -> None:
-        """_configure_tea_login with no token prints skip message and returns."""
-        _configure_tea_login()
+        """configure_tea_login with no token prints skip message and returns."""
+        configure_tea_login()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
-    @patch("devx.ci.notify_failure.shutil.which", return_value=None)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.gitea_cli.shutil.which", return_value=None)
     def test_no_tea_skips(self, mock_which: MagicMock) -> None:
-        """_configure_tea_login with no tea binary prints skip message and returns."""
-        _configure_tea_login()
+        """configure_tea_login with no tea binary prints skip message and returns."""
+        configure_tea_login()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
-    @patch("devx.ci.notify_failure.shutil.which", return_value="/usr/bin/tea")
-    @patch("devx.ci.notify_failure.subprocess.run")
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.gitea_cli.shutil.which", return_value="/usr/bin/tea")
+    @patch("devx.gitea_cli.subprocess.run")
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_auto_login_configures_tea(
         self, mock_tea_cls: MagicMock, mock_subprocess: MagicMock, mock_which: MagicMock
@@ -191,9 +191,9 @@ class TestConfigureTeaLogin:
         # tea login add was called
         assert mock_subprocess.call_count >= 2
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
-    @patch("devx.ci.notify_failure.shutil.which", return_value="/usr/bin/tea")
-    @patch("devx.ci.notify_failure.subprocess.run")
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.gitea_cli.shutil.which", return_value="/usr/bin/tea")
+    @patch("devx.gitea_cli.subprocess.run")
     @patch("devx.ci.notify_failure.TeaCLI")
     def test_auto_login_skips_if_already_configured(
         self, mock_tea_cls: MagicMock, mock_subprocess: MagicMock, mock_which: MagicMock

tests/unit/test_pr_review.py

@@ -683,7 +683,7 @@ class TestMain:
     def test_dry_run_does_not_post(self, mock_client_class: MagicMock, mock_run: MagicMock) -> None:
         mock_run.return_value = ReviewResult()
         runner = CliRunner()
-        result = runner.invoke(main, ["42", "oblachno-oss/grm", "--dry-run"], env={"REPO_TOKEN": "fake"})
+        result = runner.invoke(main, ["42", "oblachno-oss/grm", "--dry-run"], env={"CI_GITEA_TOKEN": "fake"})
         assert result.exit_code == 0
         assert "[dry-run]" in result.output
         mock_client_class.return_value.create_review.assert_not_called()
@@ -694,7 +694,7 @@ class TestMain:
         mock_run.return_value = ReviewResult()
         mock_client_class.return_value.create_review.return_value = {"id": 123}
         runner = CliRunner()
-        result = runner.invoke(main, ["42", "oblachno-oss/grm"], env={"REPO_TOKEN": "fake"})
+        result = runner.invoke(main, ["42", "oblachno-oss/grm"], env={"CI_GITEA_TOKEN": "fake"})
         assert result.exit_code == 0
         assert "Review #123" in result.output
         mock_client_class.return_value.create_review.assert_called_once()
@@ -710,7 +710,7 @@ class TestMain:
             {"id": 124},
         ]
         runner = CliRunner()
-        result = runner.invoke(main, ["42", "oblachno-oss/grm"], env={"REPO_TOKEN": "fake"})
+        result = runner.invoke(main, ["42", "oblachno-oss/grm"], env={"CI_GITEA_TOKEN": "fake"})
         assert result.exit_code == 0
         assert "Review #124" in result.output
         assert client.create_review.call_count == 2
@@ -723,14 +723,14 @@ class TestMain:
         client = mock_client_class.return_value
         client.create_review.side_effect = APIError(500, "Internal server error")
         runner = CliRunner()
-        result = runner.invoke(main, ["42", "oblachno-oss/grm"], env={"REPO_TOKEN": "fake"})
+        result = runner.invoke(main, ["42", "oblachno-oss/grm"], env={"CI_GITEA_TOKEN": "fake"})
         assert result.exit_code != 0
 
     def test_no_token_raises(self) -> None:
         runner = CliRunner()
-        result = runner.invoke(main, ["42", "oblachno-oss/grm"], env={"REPO_TOKEN": ""})
+        result = runner.invoke(main, ["42", "oblachno-oss/grm"], env={"CI_GITEA_TOKEN": ""})
         assert result.exit_code != 0
-        assert "REPO_TOKEN" in result.output
+        assert "CI_GITEA_TOKEN" in result.output
 
 
 def test_main_module_block() -> None:

tests/unit/test_publish.py

@@ -165,7 +165,7 @@ class TestDefaultGiteaRegistryUrl:
 
 
 class TestMain:
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_pypi")
@@ -190,7 +190,7 @@ class TestMain:
             "owner/repo", tag="v1.0.0", title="v1.0.0", body="Release notes"
         )
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok"}, clear=True)
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_gitea_registry")
@@ -213,7 +213,7 @@ class TestMain:
         mock_gitea_publish.assert_called_once()
         mock_tea.create_release.assert_called_once()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok"}, clear=True)
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_gitea_registry")
@@ -239,7 +239,7 @@ class TestMain:
 
     @patch.dict(
         "os.environ",
-        {"REPO_TOKEN": "gitea-tok", "DEVX_PYPI_REGISTRY_URL": "https://env.registry.com/pypi"},
+        {"CI_GITEA_TOKEN": "gitea-tok", "DEVX_PYPI_REGISTRY_URL": "https://env.registry.com/pypi"},
         clear=True,
     )
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
@@ -262,7 +262,7 @@ class TestMain:
         assert result.exit_code == 0
         mock_gitea_publish.assert_called_once_with("https://env.registry.com/pypi", "gitea-tok")
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok"}, clear=True)
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.build_package")
@@ -284,14 +284,14 @@ class TestMain:
         assert "PYPI_TOKEN not set" in result.output
         mock_tea.create_release.assert_called_once()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": ""}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": ""}, clear=True)
     def test_missing_repo_token_exits(self) -> None:
         runner = CliRunner()
         result = runner.invoke(main, ["v1.0.0", "owner/repo"])
         assert result.exit_code == 1
-        assert "REPO_TOKEN" in result.output
+        assert "CI_GITEA_TOKEN" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_pypi")
@@ -305,7 +305,7 @@ class TestMain:
         assert result.exit_code == 1
         assert "build" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_pypi")
@@ -326,7 +326,7 @@ class TestMain:
             "owner/repo", tag="v1.0.0", title="v1.0.0", body="Release notes"
         )
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_pypi")
@@ -343,7 +343,7 @@ class TestMain:
         assert result.exit_code == 1
         assert "Release creation failed" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.build_package")
@@ -361,7 +361,7 @@ class TestMain:
         mock_build.assert_not_called()
         mock_tea.create_release.assert_called_once()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_pypi")
@@ -379,7 +379,7 @@ class TestMain:
         assert "already exists" in result.output
         mock_tea.create_release.assert_not_called()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok", "PYPI_TOKEN": "pypi-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_pypi")
@@ -395,7 +395,7 @@ class TestMain:
         result = runner.invoke(main, ["v1.0.0", "owner/repo"])
         assert result.exit_code == 0
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_gitea_registry")
@@ -419,7 +419,7 @@ class TestMain:
         assert result.exit_code == 0
         assert "already exists" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "gitea-tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "gitea-tok"})
     @patch("devx.ci.publish.generate_release_notes", return_value="Release notes")
     @patch("devx.ci.publish.TeaCLI")
     @patch("devx.ci.publish.publish_to_gitea_registry")
@@ -521,7 +521,7 @@ class TestFromTag:
     @patch("devx.ci.publish.is_release_commit", return_value=True)
     @patch("devx.ci.publish.get_latest_tag", return_value="v1.0.0")
     def test_from_tag_publishes(self, _mock_tag: MagicMock, _mock_rel: MagicMock) -> None:
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake"}):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake"}):
             with patch("devx.ci.publish.TeaCLI") as mock_tea_cls:
                 mock_tea = MagicMock()
                 mock_tea.list_releases.return_value = []
@@ -535,7 +535,7 @@ class TestFromTag:
     @patch("devx.ci.publish.is_release_commit", return_value=True)
     @patch("devx.ci.publish.get_latest_tag", return_value="v1.0.0")
     def test_from_tag_publishes_no_repo_arg(self, _mock_tag: MagicMock, _mock_rel: MagicMock) -> None:
-        with patch.dict("os.environ", {"REPO_TOKEN": "fake", "GITHUB_REPOSITORY": "owner/repo"}):
+        with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake", "GITHUB_REPOSITORY": "owner/repo"}):
             with patch("devx.ci.publish.TeaCLI") as mock_tea_cls:
                 mock_tea = MagicMock()
                 mock_tea.list_releases.return_value = []
@@ -551,3 +551,37 @@ class TestFromTag:
         result = runner.invoke(main, ["", "owner/repo", "--skip-build"])
         assert result.exit_code != 0
         assert "Tag is required" in result.output
+
+
+class TestPublishAutoLogin:
+    """Tests for --auto-login flag in publish."""
+
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.ci.publish.configure_tea_login")
+    @patch("devx.ci.publish.TeaCLI")
+    def test_auto_login_calls_configure(self, mock_tea_cls: MagicMock, mock_login: MagicMock) -> None:
+        """--auto-login calls configure_tea_login before creating release."""
+        mock_tea = MagicMock()
+        mock_tea.list_releases.return_value = []
+        mock_tea.create_release.return_value = {"tag_name": "v1.0.0"}
+        mock_tea_cls.return_value = mock_tea
+        with patch("devx.ci.publish.generate_release_notes", return_value="notes"):
+            runner = CliRunner()
+            result = runner.invoke(main, ["v1.0.0", "owner/repo", "--skip-build", "--auto-login"])
+        assert result.exit_code == 0
+        mock_login.assert_called_once()
+
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
+    @patch("devx.ci.publish.configure_tea_login")
+    @patch("devx.ci.publish.TeaCLI")
+    def test_no_auto_login_skips_configure(self, mock_tea_cls: MagicMock, mock_login: MagicMock) -> None:
+        """Without --auto-login, configure_tea_login is not called."""
+        mock_tea = MagicMock()
+        mock_tea.list_releases.return_value = []
+        mock_tea.create_release.return_value = {"tag_name": "v1.0.0"}
+        mock_tea_cls.return_value = mock_tea
+        with patch("devx.ci.publish.generate_release_notes", return_value="notes"):
+            runner = CliRunner()
+            result = runner.invoke(main, ["v1.0.0", "owner/repo", "--skip-build"])
+        assert result.exit_code == 0
+        mock_login.assert_not_called()

tests/unit/test_release.py

@@ -802,7 +802,7 @@ class TestCommitReleaseChanges:
         assert result is True
         calls = [c.args[0] for c in mock_run_cmd.call_args_list]
         assert ["git", "add", "src/devx/__init__.py", "CHANGELOG.md"] in calls
-        assert ["git", "commit", "--no-verify", "-m", "release: v0.2.0"] in calls
+        assert ["git", "commit", "--no-verify", "-m", "release: v0.2.0 [skip ci]"] in calls
 
     @patch("devx.ci.release.run_cmd")
     def test_skips_when_no_changes(self, mock_run_cmd: MagicMock) -> None:
@@ -811,7 +811,7 @@ class TestCommitReleaseChanges:
         result = commit_release_changes("0.1.0")
         assert result is False
         calls = [c.args[0] for c in mock_run_cmd.call_args_list]
-        assert ["git", "commit", "--no-verify", "-m", "release: v0.1.0"] not in calls
+        assert ["git", "commit", "--no-verify", "-m", "release: v0.1.0 [skip ci]"] not in calls
 
 
 class TestCreateAndPushTag:

tests/unit/test_setup.py

@@ -120,7 +120,7 @@ class TestConfigureTeaLogin:
 
     @patch("devx.tools.setup.subprocess.run")
     @patch("devx.tools.setup.shutil.which", return_value="/usr/local/bin/tea")
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok123"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok123"}, clear=True)
     def test_login_already_exists(self, mock_which: MagicMock, mock_run: MagicMock) -> None:
         mock_run.return_value = MagicMock(returncode=0, stdout="devx\ngrm\n", stderr="")
         _configure_tea_login()
@@ -130,7 +130,7 @@ class TestConfigureTeaLogin:
 
     @patch("devx.tools.setup.subprocess.run")
     @patch("devx.tools.setup.shutil.which", return_value="/usr/local/bin/tea")
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok123"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok123"}, clear=True)
     def test_login_add_success(self, mock_which: MagicMock, mock_run: MagicMock) -> None:
         list_result = MagicMock(returncode=0, stdout="", stderr="")
         add_result = MagicMock(returncode=0, stdout="", stderr="")
@@ -143,7 +143,7 @@ class TestConfigureTeaLogin:
 
     @patch("devx.tools.setup.subprocess.run")
     @patch("devx.tools.setup.shutil.which", return_value="/usr/local/bin/tea")
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok123"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok123"}, clear=True)
     def test_login_add_failure(self, mock_which: MagicMock, mock_run: MagicMock) -> None:
         list_result = MagicMock(returncode=0, stdout="", stderr="")
         add_result = MagicMock(returncode=1, stdout="", stderr="auth failed")
@@ -155,7 +155,7 @@ class TestConfigureTeaLogin:
     @patch("devx.tools.setup.shutil.which", return_value="/usr/local/bin/tea")
     @patch.dict(
         "os.environ",
-        {"REPO_TOKEN": "tok123", "DEVX_GITEA_API_URL": "https://custom.example.com/api/v1"},
+        {"CI_GITEA_TOKEN": "tok123", "DEVX_GITEA_API_URL": "https://custom.example.com/api/v1"},
         clear=True,
     )
     def test_custom_gitea_url(self, mock_which: MagicMock, mock_run: MagicMock) -> None:

tests/unit/test_sync_wiki.py

@@ -286,7 +286,7 @@ class TestVerifyWikiIntegrity:
 
 
 class TestMain:
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"})
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"})
     @patch("devx.ci.sync_wiki.MAPPING_FILE")
     @patch("devx.ci.sync_wiki.DOCS_DIR")
     @patch("devx.ci.sync_wiki.GiteaClient")
@@ -301,14 +301,16 @@ class TestMain:
         assert result.exit_code == 0
         assert "dry-run" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": ""}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": ""}, clear=True)
     def test_missing_token_exits(self) -> None:
         runner = CliRunner()
         result = runner.invoke(main, ["--repo", "owner/repo"])
         assert result.exit_code == 1
-        assert "REPO_TOKEN" in result.output
+        assert "CI_GITEA_TOKEN" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok", "DEVX_REPO_OWNER": "me", "DEVX_REPO_NAME": "myrepo"}, clear=True)
+    @patch.dict(
+        "os.environ", {"CI_GITEA_TOKEN": "tok", "DEVX_REPO_OWNER": "me", "DEVX_REPO_NAME": "myrepo"}, clear=True
+    )
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_auto_detect_repo(self, mock_client_cls: MagicMock) -> None:
         """Test that repo is auto-detected from env vars when --repo is not passed."""
@@ -322,7 +324,7 @@ class TestMain:
         assert result.exit_code == 0
         mock_client_cls.assert_called_once()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_missing_mapping_file(self, mock_client_cls: MagicMock) -> None:
         """Test that missing mapping.json exits with error."""
@@ -333,7 +335,7 @@ class TestMain:
         assert result.exit_code == 1
         assert "mapping.json" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_existing_pages_message(self, mock_client_cls: MagicMock) -> None:
         """Test that existing wiki pages are reported."""
@@ -347,7 +349,7 @@ class TestMain:
         assert result.exit_code == 0
         assert "existing wiki pages" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_file_not_found_fails(self, mock_client_cls: MagicMock) -> None:
         """Test that missing doc files cause an error, not a warning."""
@@ -361,7 +363,7 @@ class TestMain:
         assert result.exit_code != 0
         assert "not found" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_empty_doc_file_fails(self, mock_client_cls: MagicMock) -> None:
         """Test that empty doc files cause an error, not a warning."""
@@ -375,7 +377,7 @@ class TestMain:
         assert result.exit_code != 0
         assert "empty" in result.output.lower()
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_create_and_update(self, mock_client_cls: MagicMock) -> None:
         """Test that pages are created and updated correctly (non-dry-run)."""
@@ -393,7 +395,7 @@ class TestMain:
         assert "Created: 1" in result.output
         assert "Updated: 1" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_verify_passes(self, mock_client_cls: MagicMock) -> None:
         """Test that --verify passes when content matches."""
@@ -413,7 +415,7 @@ class TestMain:
         assert result.exit_code == 0
         assert "Verification passed" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_verify_fails_on_empty_content(self, mock_client_cls: MagicMock) -> None:
         """Test that --verify fails when wiki pages have empty content."""
@@ -430,7 +432,7 @@ class TestMain:
         assert result.exit_code == 1
         assert "FAIL" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_verify_skipped_in_dry_run(self, mock_client_cls: MagicMock) -> None:
         """Test that --verify is skipped during dry-run."""
@@ -444,7 +446,7 @@ class TestMain:
         assert result.exit_code == 0
         assert "Verification" not in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_strict_passes(self, mock_client_cls: MagicMock) -> None:
         """Test that --strict passes when integrity check succeeds."""
@@ -461,7 +463,7 @@ class TestMain:
         assert result.exit_code == 0
         assert "Integrity check passed" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_strict_fails_on_integrity_issues(self, mock_client_cls: MagicMock) -> None:
         """Test that --strict fails when integrity check finds issues."""
@@ -483,7 +485,7 @@ class TestMain:
         assert "Missing page: FAQ" in result.output
         assert "Stale page: Old-Page" in result.output
 
-    @patch.dict("os.environ", {"REPO_TOKEN": "tok"}, clear=True)
+    @patch.dict("os.environ", {"CI_GITEA_TOKEN": "tok"}, clear=True)
     @patch("devx.ci.sync_wiki.GiteaClient")
     def test_strict_skipped_in_dry_run(self, mock_client_cls: MagicMock) -> None:
         """Test that --strict verification is skipped during dry-run."""