install missing pacakge

zz
fix typo
2026-08-20 15:27:26 +00:00 · 2026-05-04 16:10:35 +03:00 · 2026-04-27 13:01:56 +03:00 · 2026-04-27 13:01:56 +03:00 · 2026-04-27 13:01:56 +03:00 · 2026-04-27 13:01:56 +03:00
834 changed files with 2332 additions and 2968 deletions
@@ -1,5 +0,0 @@
-[tool.bandit]
-skips = [
-    "B404",
-    "B603",
-]
@@ -0,0 +1,3 @@
+skips:
+  - B404
+  - B603
@@ -26,10 +26,6 @@ jobs:

      - uses: docker/setup-buildx-action@v3

-      - name: Set image date
-        id: args
-        run: echo "date=$(date -d yesterday +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
-
      - name: Login to docker hub
        uses: docker/login-action@v3
        with:
@@ -57,8 +53,6 @@ jobs:
      - name: Build an image and push
        uses: docker/build-push-action@v6
        with:
-          build-args: |
-            BUILD_DATE=${{ steps.args.outputs.date }}
          file: docker/Dockerfile
          push: true
          tags: ${{ steps.meta.outputs.tags }}
@@ -26,7 +26,7 @@ jobs:

      - name: Extract version
        id: version
-        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}

      - name: Create changelog
        id: changelog
@@ -38,7 +38,7 @@ jobs:
      - name: Create archive
        run: tox -e archive
        env:
-          VERSION: ${{ steps.version.outputs.version }}
+          VERSION: ${{ steps.version.outputs.VERSION }}

      - name: Publish release
        uses: softprops/action-gh-release@v2
@@ -12,7 +12,7 @@ pacman -Syyu --noconfirm
 # main dependencies
 pacman -S --noconfirm devtools git npm pyalpm python-bcrypt python-filelock python-inflection python-pyelftools python-requests python-systemd sudo
 # make dependencies
-pacman -S --noconfirm --asdeps base-devel python-build python-hatchling python-installer python-tox python-wheel
+pacman -S --noconfirm --asdeps base-devel python-build python-flit python-installer python-tox python-wheel
 # optional dependencies
 if [[ -z $MINIMAL_INSTALL ]]; then
    # web server
@@ -26,10 +26,10 @@ cp "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 # create fresh tarball
 tox -e archive
 # run makepkg
-PKGVER=$(PYTHONPATH=ahriman-core/src python -c "from ahriman import __version__; print(__version__)")
-mv "dist/ahriman-$PKGVER.tar.gz" archlinux
-chmod +777 archlinux  # because fuck you that's why
-cd archlinux
+PKGVER=$(python -c "from src.ahriman import __version__; print(__version__)")
+mv "dist/ahriman-$PKGVER.tar.gz" package/archlinux
+chmod +777 package/archlinux  # because fuck you that's why
+cd package/archlinux
 sudo -u nobody -- makepkg -cf --skipchecksums --noconfirm
 sudo -u nobody -- makepkg --packagelist | grep "ahriman-core-$PKGVER" | pacman -U --noconfirm --nodeps -
 if [[ -z $MINIMAL_INSTALL ]]; then
@@ -27,7 +27,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Setup the minimal service in arch linux container
-        run: .github/scripts/setup.sh minimal
+        run: .github/workflows/setup.sh minimal

  run-setup:

@@ -43,4 +43,4 @@ jobs:
      - uses: actions/checkout@v4

      - name: Setup the service in arch linux container
-        run: .github/scripts/setup.sh
+        run: .github/workflows/setup.sh
@@ -103,8 +103,5 @@ docs/html/
 # Frontend
 node_modules/
 package-lock.json
-ahriman-web/package/share/ahriman/templates/static/index.js
-ahriman-web/package/share/ahriman/templates/static/index.css
-
-# local configs
-/*.ini
+package/share/ahriman/templates/static/index.js
+package/share/ahriman/templates/static/index.css
@@ -0,0 +1,5 @@
+[pytest]
+addopts = --cov=ahriman --cov-report=term-missing:skip-covered --no-cov-on-fail --cov-fail-under=100 --spec
+asyncio_default_fixture_loop_scope = function
+asyncio_mode = auto
+spec_test_format = {result} {docstring_summary}
@@ -1,8 +0,0 @@
-[pytest]
-addopts = [
-    "--spec",
-]
-asyncio_default_fixture_loop_scope = "function"
-asyncio_mode = "auto"
-"resource-path.directory-name-test-resources" = "../../tests/testresources"
-spec_test_format = "{result} {docstring_summary}"
@@ -3,16 +3,13 @@ version: 2
 build:
  os: ubuntu-lts-latest
  tools:
-    python: "3.14"
+    python: "3.12"
  apt_packages:
    - graphviz

 python:
  install:
    - requirements: docs/requirements.txt
-    - path: ahriman-core
-    - path: ahriman-triggers
-    - path: ahriman-web

 formats:
  - pdf
@@ -1,64 +0,0 @@
-[build-system]
-requires = [
-    "hatchling",
-]
-build-backend = "hatchling.build"
-
-[project]
-name = "ahriman-core"
-dependencies = [
-    "bcrypt",
-    "filelock",
-    "inflection",
-    "pyelftools",
-    "requests",
-]
-description = "ArcH linux ReposItory MANager, core package"
-dynamic = [
-    "version",
-]
-requires-python = ">=3.14"
-
-[project.optional-dependencies]
-journald = [
-    "systemd-python",
-]
-# FIXME technically this dependency is required, but in some cases we do not have access to
-# the libalpm which is required in order to install the package. Thus in case if we do not
-# really need to run the application we can move it to "optional" dependencies
-pacman = [
-    "pyalpm",
-]
-reports = [
-    "Jinja2",
-]
-s3 = [
-    "boto3",
-]
-shell = [
-    "IPython",
-]
-stats = [
-    "matplotlib",
-]
-unixsocket = [
-    "requests-unixsocket2",  # required by unix socket support
-]
-validator = [
-    "cerberus",
-]
-
-[project.scripts]
-ahriman = "ahriman.application.ahriman:run"
-
-[tool.hatch.build.targets.wheel]
-packages = [
-    "src/ahriman",
-]
-
-[tool.hatch.build.targets.wheel.shared-data]
-"package/lib" = "lib"
-"package/share" = "share"
-
-[tool.hatch.version]
-path = "src/ahriman/__init__.py"
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2021-2026 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-__version__ = "2.21.1"
@@ -1,162 +0,0 @@
-import datetime
-import pytest
-
-from unittest.mock import MagicMock, PropertyMock
-
-from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote import AUR
-from ahriman.core.configuration import Configuration
-from ahriman.models.aur_package import AURPackage
-from ahriman.models.package import Package
-from ahriman.models.package_description import PackageDescription
-from ahriman.models.package_source import PackageSource
-from ahriman.models.pacman_synchronization import PacmanSynchronization
-from ahriman.models.remote_source import RemoteSource
-from ahriman.models.scan_paths import ScanPaths
-
-
-@pytest.fixture
-def aur_package_akonadi() -> AURPackage:
-    """
-    fixture for AUR package
-
-    Returns:
-        AURPackage: AUR package test instance
-    """
-    return AURPackage(
-        id=0,
-        name="akonadi",
-        package_base_id=0,
-        package_base="akonadi",
-        version="21.12.3-2",
-        description="PIM layer, which provides an asynchronous API to access all kind of PIM data",
-        num_votes=0,
-        popularity=0.0,
-        first_submitted=datetime.datetime.fromtimestamp(0, datetime.UTC),
-        last_modified=datetime.datetime.fromtimestamp(1646555990.610, datetime.UTC),
-        url_path="",
-        url="https://kontact.kde.org",
-        out_of_date=None,
-        maintainer="felixonmars",
-        repository="extra",
-        depends=[
-            "libakonadi",
-            "mariadb",
-        ],
-        make_depends=[
-            "boost",
-            "doxygen",
-            "extra-cmake-modules",
-            "kaccounts-integration",
-            "kitemmodels",
-            "postgresql",
-            "qt5-tools",
-        ],
-        opt_depends=[
-            "postgresql: PostgreSQL backend",
-        ],
-        conflicts=[],
-        provides=[],
-        license=["LGPL"],
-        keywords=[],
-        groups=[],
-    )
-
-
-@pytest.fixture
-def package_tpacpi_bat_git() -> Package:
-    """
-    git package fixture
-
-    Returns:
-        Package: git package test instance
-    """
-    return Package(
-        base="tpacpi-bat-git",
-        version="3.1.r12.g4959b52-1",
-        remote=RemoteSource(
-            source=PackageSource.AUR,
-            git_url=AUR.remote_git_url("tpacpi-bat-git", "aur"),
-            web_url=AUR.remote_web_url("tpacpi-bat-git"),
-            path=".",
-            branch="master",
-        ),
-        packages={"tpacpi-bat-git": PackageDescription()})
-
-
-@pytest.fixture
-def pacman(configuration: Configuration) -> Pacman:
-    """
-    fixture for pacman wrapper
-
-    Args:
-        configuration(Configuration): configuration fixture
-
-    Returns:
-        Pacman: pacman wrapper test instance
-    """
-    _, repository_id = configuration.check_loaded()
-    return Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.Disabled)
-
-
-@pytest.fixture
-def passwd() -> MagicMock:
-    """
-    get passwd structure for the user
-
-    Returns:
-        MagicMock: passwd structure test instance
-    """
-    passwd = MagicMock()
-    passwd.pw_dir = "home"
-    passwd.pw_name = "ahriman"
-    return passwd
-
-
-@pytest.fixture
-def pyalpm_package_ahriman(aur_package_ahriman: AURPackage) -> MagicMock:
-    """
-    mock object for pyalpm package
-
-    Args:
-        aur_package_ahriman(AURPackage): package fixture
-
-    Returns:
-        MagicMock: pyalpm package mock
-    """
-    mock = MagicMock()
-    db = type(mock).db = MagicMock()
-
-    type(mock).base = PropertyMock(return_value=aur_package_ahriman.package_base)
-    type(mock).builddate = PropertyMock(
-        return_value=aur_package_ahriman.last_modified.replace(tzinfo=datetime.timezone.utc).timestamp())
-    type(mock).conflicts = PropertyMock(return_value=aur_package_ahriman.conflicts)
-    type(db).name = PropertyMock(return_value="aur")
-    type(mock).depends = PropertyMock(return_value=aur_package_ahriman.depends)
-    type(mock).desc = PropertyMock(return_value=aur_package_ahriman.description)
-    type(mock).licenses = PropertyMock(return_value=aur_package_ahriman.license)
-    type(mock).makedepends = PropertyMock(return_value=aur_package_ahriman.make_depends)
-    type(mock).name = PropertyMock(return_value=aur_package_ahriman.name)
-    type(mock).optdepends = PropertyMock(return_value=aur_package_ahriman.opt_depends)
-    type(mock).checkdepends = PropertyMock(return_value=aur_package_ahriman.check_depends)
-    type(mock).packager = PropertyMock(return_value="packager")
-    type(mock).provides = PropertyMock(return_value=aur_package_ahriman.provides)
-    type(mock).version = PropertyMock(return_value=aur_package_ahriman.version)
-    type(mock).url = PropertyMock(return_value=aur_package_ahriman.url)
-    type(mock).groups = PropertyMock(return_value=aur_package_ahriman.groups)
-
-    return mock
-
-
-@pytest.fixture
-def scan_paths(configuration: Configuration) -> ScanPaths:
-    """
-    scan paths fixture
-
-    Args:
-        configuration(Configuration): configuration test instance
-
-    Returns:
-        ScanPaths: scan paths test instance
-    """
-    return ScanPaths(configuration.getlist("build", "scan_paths", fallback=[]))
@@ -1,27 +0,0 @@
-[build-system]
-requires = [
-    "hatchling",
-]
-build-backend = "hatchling.build"
-
-[project]
-name = "ahriman-triggers"
-dependencies = [
-    "ahriman-core",
-]
-description = "ArcH linux ReposItory MANager, additional extensions"
-dynamic = [
-    "version",
-]
-requires-python = ">=3.14"
-
-[tool.hatch.build.targets.wheel]
-packages = [
-    "src/ahriman",
-]
-
-[tool.hatch.build.targets.wheel.shared-data]
-"package/share" = "share"
-
-[tool.hatch.version]
-path = "../ahriman-core/src/ahriman/__init__.py"
@@ -1,50 +0,0 @@
-[build-system]
-requires = [
-    "hatchling",
-]
-build-backend = "hatchling.build"
-
-[project]
-name = "ahriman-web"
-dependencies = [
-    "ahriman-core",
-    "aiohttp",
-    "aiohttp_cors",
-    "aiohttp_jinja2",
-    "aiohttp_sse",
-]
-description = "ArcH linux ReposItory MANager, web server"
-dynamic = [
-    "version",
-]
-requires-python = ">=3.14"
-
-[project.optional-dependencies]
-auth = [
-    "aiohttp_session",
-    "aiohttp_security",
-    "cryptography",
-]
-docs = [
-    "aiohttp-apispec",
-    "setuptools",  # required by aiohttp-apispec
-]
-metrics = [
-    "aiohttp-openmetrics",
-]
-oauth2 = [
-    "ahriman-web[auth]",
-    "aioauth-client",
-]
-
-[tool.hatch.build.targets.wheel]
-packages = [
-    "src/ahriman",
-]
-
-[tool.hatch.build.targets.wheel.shared-data]
-"package/lib" = "lib"
-"package/share" = "share"
-
-[tool.hatch.version]
-path = "../ahriman-core/src/ahriman/__init__.py"
@@ -1,19 +0,0 @@
-#
-# Copyright (c) 2021-2026 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
@@ -1,18 +0,0 @@
-import pytest
-
-from ahriman.core.auth import Auth
-from ahriman.core.configuration import Configuration
-
-
-@pytest.fixture
-def auth(configuration: Configuration) -> Auth:
-    """
-    auth provider fixture
-
-    Args:
-        configuration(Configuration): configuration fixture
-
-    Returns:
-        Auth: auth service instance
-    """
-    return Auth(configuration)
@@ -1,15 +1,13 @@
 # build image
 FROM archlinux:base AS build

-ARG BUILD_DATE
-
 # install environment
 ## create build user
 RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build

 ## extract container creation date and set mirror for this timestamp, set PKGEXT and refresh database next
-RUN echo "Server = https://archive.archlinux.org/repos/${BUILD_DATE//-/\/}/\$repo/os/\$arch" > "/etc/pacman.d/mirrorlist" && \
-    pacman -Syyuu --noconfirm
+RUN echo "Server = https://archive.archlinux.org/repos/$(stat -c "%y" "/var/lib/pacman" | cut -d " " -f 1 | sed "s,-,/,g")/\$repo/os/\$arch" > "/etc/pacman.d/mirrorlist" && \
+    pacman -Sy
 ## setup package cache
 RUN runuser -u build -- mkdir "/tmp/pkg" && \
    echo "PKGDEST=/tmp/pkg" >> "/etc/makepkg.conf" && \
@@ -35,7 +33,7 @@ RUN pacman -S --noconfirm --asdeps \
 RUN pacman -S --noconfirm --asdeps \
        base-devel \
        python-build \
-        python-hatchling \
+        python-flit \
        python-installer \
        python-setuptools \
        python-tox \
@@ -68,8 +66,8 @@ COPY --chown=build . "/home/build/ahriman"
 ## create package archive and install it
 RUN cd "/home/build/ahriman" && \
    tox -e archive && \
-    cp ./dist/*.tar.gz "archlinux" && \
-    cd "archlinux" && \
+    cp ./dist/*.tar.gz "package/archlinux" && \
+    cd "package/archlinux" && \
    runuser -u build -- makepkg --noconfirm --skipchecksums && \
    cd / && rm -r "/home/build/ahriman"

@@ -110,7 +108,7 @@ RUN cp "/etc/pacman.d/mirrorlist" "/etc/pacman.d/mirrorlist.orig" && \
    echo "Server = file:///var/cache/pacman/pkg" > "/etc/pacman.d/mirrorlist" && \
    cp "/etc/pacman.conf" "/etc/pacman.conf.orig" && \
    sed -i "s/SigLevel *=.*/SigLevel = Optional/g" "/etc/pacman.conf" && \
-    pacman -Syyuu --noconfirm
+    pacman -Sy
 ## install package and its optional dependencies
 RUN pacman -S --noconfirm ahriman
 RUN pacman -S --noconfirm --asdeps \
@@ -7,10 +7,8 @@ for PACKAGE in "$@"; do
    # clone the remote source
    git clone https://aur.archlinux.org/"$PACKAGE".git "$BUILD_DIR"
    cd "$BUILD_DIR"
-    # FIXME monkey patch PKGBUILD for python
-    sed -i 's/python -m build/python -m build --skip-dependency-check/g' "PKGBUILD"
    # checkout to the image date
-    git checkout "$(git rev-list -1 --before="$BUILD_DATE" master)"
+    git checkout "$(git rev-list -1 --before="$(stat -c "%y" "/var/lib/pacman" | cut -d " " -f 1)" master)"
    # build and install the package
    makepkg --nocheck --noconfirm --install --rmdeps --syncdeps
    cd /
@@ -1,15 +1,6 @@
 ahriman.application.handlers package
 ====================================

-Subpackages
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   ahriman.application.handlers.triggers_support
-   ahriman.application.handlers.web
-
 Submodules
 ----------

@@ -277,6 +268,14 @@ ahriman.application.handlers.triggers module
   :no-undoc-members:
   :show-inheritance:

+ahriman.application.handlers.triggers\_support module
+-----------------------------------------------------
+
+.. automodule:: ahriman.application.handlers.triggers_support
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.unsafe\_commands module
 ----------------------------------------------------

@@ -317,6 +316,14 @@ ahriman.application.handlers.versions module
   :no-undoc-members:
   :show-inheritance:

+ahriman.application.handlers.web module
+---------------------------------------
+
+.. automodule:: ahriman.application.handlers.web
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------

@@ -1,21 +0,0 @@
-ahriman.application.handlers.triggers\_support package
-======================================================
-
-Submodules
----------
-
-ahriman.application.handlers.triggers\_support.triggers\_support module
-----------------------------------------------------------------------
-
-.. automodule:: ahriman.application.handlers.triggers_support.triggers_support
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
---------------
-
-.. automodule:: ahriman.application.handlers.triggers_support
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
@@ -1,21 +0,0 @@
-ahriman.application.handlers.web package
-========================================
-
-Submodules
----------
-
-ahriman.application.handlers.web.web module
-------------------------------------------
-
-.. automodule:: ahriman.application.handlers.web.web
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
---------------
-
-.. automodule:: ahriman.application.handlers.web
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
@@ -11,6 +11,14 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import datetime
+import sys
+
+from pathlib import Path
+
+
+# support package imports
+basedir = Path(__file__).resolve().parent.parent / "src"
+sys.path.insert(0, str(basedir))


 # -- Project information -----------------------------------------------------
@@ -136,7 +136,6 @@ Build related configuration. Group name can refer to architecture, e.g. ``build:
 * ``include_debug_packages`` - distribute debug packages, boolean, optional, default ``yes``.
 * ``makepkg_flags`` - additional flags passed to ``makepkg`` command, space separated list of strings, optional.
 * ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
-* ``min_age`` - minimal age in seconds since the latest AUR package modification before automatic updates are allowed, integer, optional, default ``0``.
 * ``scan_paths`` - paths to be used for implicit dependencies scan, space separated list of strings, optional. If any of those paths is matched against the path, it will be added to the allowed list.
 * ``triggers`` - list of ``ahriman.core.triggers.Trigger`` class implementation (e.g. ``ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger``) which will be loaded and run at the end of processing, space separated list of strings, optional. You can also specify triggers by their paths, e.g. ``/usr/lib/python3.10/site-packages/ahriman/core/report/report.py.ReportTrigger``. Triggers are run in the order of definition.
 * ``triggers_known`` - optional list of ``ahriman.core.triggers.Trigger`` class implementations which are not run automatically and used only for trigger discovery and configuration validation.
@@ -1,19 +1,19 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --group pyproject.toml:docs --no-emit-package ahriman-core --no-emit-package ahriman-triggers --no-emit-package ahriman-web --output-file docs/requirements.txt pyproject.toml
+#    uv pip compile --group pyproject.toml:docs --extra s3 --extra validator --extra web --output-file docs/requirements.txt pyproject.toml
 aiohappyeyeballs==2.6.1
    # via aiohttp
 aiohttp==3.11.18
    # via
-    #   ahriman-web
+    #   ahriman (pyproject.toml)
    #   aiohttp-cors
    #   aiohttp-jinja2
    #   aiohttp-sse
 aiohttp-cors==0.8.1
-    # via ahriman-web
+    # via ahriman (pyproject.toml)
 aiohttp-jinja2==1.6
-    # via ahriman-web
+    # via ahriman (pyproject.toml)
 aiohttp-sse==2.2.0
-    # via ahriman-web
+    # via ahriman (pyproject.toml)
 aiosignal==1.3.2
    # via aiohttp
 alabaster==1.0.0
@@ -25,15 +25,15 @@ attrs==25.3.0
 babel==2.17.0
    # via sphinx
 bcrypt==4.3.0
-    # via ahriman-core
-boto3==1.43.47
-    # via ahriman-core
-botocore==1.43.47
+    # via ahriman (pyproject.toml)
+boto3==1.38.11
+    # via ahriman (pyproject.toml)
+botocore==1.38.11
    # via
    #   boto3
    #   s3transfer
-cerberus==1.3.8
-    # via ahriman-core
+cerberus==1.3.7
+    # via ahriman (pyproject.toml)
 certifi==2025.4.26
    # via requests
 charset-normalizer==3.4.2
@@ -44,7 +44,7 @@ docutils==0.21.2
    #   sphinx-argparse
    #   sphinx-rtd-theme
 filelock==3.24.0
-    # via ahriman-core
+    # via ahriman (pyproject.toml)
 frozenlist==1.6.0
    # via
    #   aiohttp
@@ -56,12 +56,12 @@ idna==3.10
 imagesize==1.4.1
    # via sphinx
 inflection==0.5.1
-    # via ahriman-core
+    # via ahriman (pyproject.toml)
 jinja2==3.1.6
    # via
    #   aiohttp-jinja2
    #   sphinx
-jmespath==1.1.0
+jmespath==1.0.1
    # via
    #   boto3
    #   botocore
@@ -80,18 +80,18 @@ propcache==0.3.1
 pydeps==3.0.1
    # via ahriman (pyproject.toml:docs)
 pyelftools==0.32
-    # via ahriman-core
+    # via ahriman (pyproject.toml)
 pygments==2.19.1
    # via sphinx
 python-dateutil==2.9.0.post0
    # via botocore
 requests==2.32.3
    # via
-    #   ahriman-core
+    #   ahriman (pyproject.toml)
    #   sphinx
 roman-numerals-py==3.1.0
    # via sphinx
-s3transfer==0.19.1
+s3transfer==0.12.0
    # via boto3
 shtab==1.7.2
    # via ahriman (pyproject.toml:docs)
@@ -131,8 +131,3 @@ urllib3==2.4.0
    #   requests
 yarl==1.20.0
    # via aiohttp
-
-# The following packages were excluded from the output:
-# ahriman-core
-# ahriman-triggers
-# ahriman-web
@@ -2,10 +2,10 @@
    "dependencies": {
        "@emotion/react": ">=11.14.0 <11.15.0",
        "@emotion/styled": ">=11.14.0 <11.15.0",
-        "@mui/icons-material": ">=9.2.0 <9.3.0",
-        "@mui/material": ">=9.2.0 <9.3.0",
-        "@mui/x-data-grid": ">=9.10.0 <9.11.0",
-        "@tanstack/react-query": ">=5.101.0 <5.102.0",
+        "@mui/icons-material": ">=7.3.0 <7.4.0",
+        "@mui/material": ">=7.3.0 <7.4.0",
+        "@mui/x-data-grid": ">=8.28.0 <8.29.0",
+        "@tanstack/react-query": ">=5.94.0 <5.95.0",
        "chart.js": ">=4.5.0 <4.6.0",
        "react": ">=19.2.0 <19.3.0",
        "react-chartjs-2": ">=5.3.0 <5.4.0",
@@ -22,14 +22,14 @@
        "@vitejs/plugin-react": ">=6.0.0 <6.1.0",
        "eslint": ">=9.39.0 <9.40.0",
        "eslint-plugin-react": ">=7.37.0 <7.38.0",
-        "eslint-plugin-react-hooks": ">=7.1.0 <7.2.0",
+        "eslint-plugin-react-hooks": ">=7.0.0 <7.1.0",
        "eslint-plugin-react-refresh": ">=0.5.0 <0.6.0",
-        "eslint-plugin-simple-import-sort": ">=14.0.0 <14.1.0",
-        "typescript": ">=6.0.0 <6.1.0",
-        "typescript-eslint": ">=8.64.0 <8.65.0",
-        "vite": ">=8.1.0 <8.2.0"
+        "eslint-plugin-simple-import-sort": ">=12.1.0 <12.2.0",
+        "typescript": ">=5.9.0 <5.10.0",
+        "typescript-eslint": ">=8.57.0 <8.58.0",
+        "vite": ">=8.0.0 <8.1.0"
    },
-    "name": "ahriman",
+    "name": "ahriman-frontend",
    "private": true,
    "scripts": {
        "build": "tsc && vite build",
@@ -39,5 +39,5 @@
        "preview": "vite preview"
    },
    "type": "module",
-    "version": "2.21.1"
+    "version": "2.20.0"
 }
@@ -31,6 +31,7 @@ const queryClient = new QueryClient({
    defaultOptions: {
        queries: {
            retry: 1,
+            staleTime: 30_000,
        },
    },
 });
@@ -58,7 +58,11 @@ export default function PackageInfoDialog({
    const { showSuccess, showError } = useNotification();
    const queryClient = useQueryClient();

-    const localPackageBase = packageBase;
+    const [localPackageBase, setLocalPackageBase] = useState(packageBase);
+    if (packageBase !== null && packageBase !== localPackageBase) {
+        setLocalPackageBase(packageBase);
+    }
+
    const [activeTab, setActiveTab] = useState<TabKey>("logs");
    const [refreshDatabase, setRefreshDatabase] = useState(true);

@@ -153,42 +157,38 @@ export default function PackageInfoDialog({

        <DialogContent>
            {pkg &&
-                <PackageDetailsGrid dependencies={dependencies} pkg={pkg} />
-            }
-            {localPackageBase &&
-                <PackagePatchesList
-                    editable={isAuthorized}
-                    onDelete={key => void handleDeletePatch(key)}
-                    patches={patches}
-                />
-            }
-
-            {localPackageBase && currentRepository &&
                <>
+                    <PackageDetailsGrid dependencies={dependencies} pkg={pkg} />
+                    <PackagePatchesList
+                        editable={isAuthorized}
+                        onDelete={key => void handleDeletePatch(key)}
+                        patches={patches}
+                    />
+
                    <Box sx={{ borderBottom: 1, borderColor: "divider", mt: 2 }}>
                        <Tabs onChange={(_, tab: TabKey) => setActiveTab(tab)} value={activeTab}>
                            {tabs.map(({ key, label }) => <Tab key={key} label={label} value={key} />)}
                        </Tabs>
                    </Box>

-                    {activeTab === "logs" &&
+                    {activeTab === "logs" && localPackageBase && currentRepository &&
                        <BuildLogsTab
                            packageBase={localPackageBase}
                            repository={currentRepository}
                        />
                    }
-                    {activeTab === "changes" &&
+                    {activeTab === "changes" && localPackageBase && currentRepository &&
                        <ChangesTab packageBase={localPackageBase} repository={currentRepository} />
                    }
-                    {activeTab === "pkgbuild" &&
+                    {activeTab === "pkgbuild" && localPackageBase && currentRepository &&
                        <PkgbuildTab packageBase={localPackageBase} repository={currentRepository} />
                    }
-                    {activeTab === "events" &&
+                    {activeTab === "events" && localPackageBase && currentRepository &&
                        <EventsTab packageBase={localPackageBase} repository={currentRepository} />
                    }
-                    {activeTab === "artifacts" &&
+                    {activeTab === "artifacts" && localPackageBase && currentRepository &&
                        <ArtifactsTab
-                            currentVersion={pkg?.version}
+                            currentVersion={pkg.version}
                            packageBase={localPackageBase}
                            repository={currentRepository}
                        />
@@ -32,7 +32,7 @@ import { useCallback, useMemo } from "react";
 import { DETAIL_TABLE_PROPS } from "utils";

 interface ArtifactsTabProps {
-    currentVersion?: string;
+    currentVersion: string;
    packageBase: string;
    repository: RepositoryId;
 }
@@ -78,7 +78,6 @@ export default function ArtifactsTab({
            })).reverse();
        },
        queryKey: QueryKeys.artifacts(packageBase, repository),
-        refetchOnMount: "always",
    });

    const handleRollback = useCallback(async (version: string): Promise<void> => {
@@ -102,7 +101,7 @@ export default function ArtifactsTab({
                <Tooltip title={params.row.version === currentVersion ? "Current version" : "Rollback to this version"}>
                    <span>
                        <IconButton
-                            disabled={currentVersion === params.row.version}
+                            disabled={params.row.version === currentVersion}
                            onClick={() => void handleRollback(params.row.version)}
                            size="small"
                        >
@@ -61,7 +61,6 @@ export default function BuildLogsTab({
        enabled: !!packageBase,
        queryFn: () => client.fetch.fetchPackageLogs(packageBase, repository),
        queryKey: QueryKeys.logs(packageBase, repository),
-        refetchOnMount: "always",
    });

    // Build version selectors from all logs
@@ -117,7 +116,6 @@ export default function BuildLogsTab({
            )
            : skipToken,
        queryKey: QueryKeys.logsVersion(packageBase, repository, activeVersion?.version ?? "", activeVersion?.processId ?? ""),
-        refetchOnMount: "always",
    });

    // Derive displayed logs: prefer fresh polled data when available
@@ -54,7 +54,6 @@ export default function EventsTab({ packageBase, repository }: EventsTabProps):
        enabled: !!packageBase,
        queryFn: () => client.fetch.fetchPackageEvents(repository, packageBase, 30),
        queryKey: QueryKeys.events(repository, packageBase),
-        refetchOnMount: "always",
    });

    const rows = useMemo<EventRow[]>(() => events.map((event, index) => ({
@@ -89,7 +89,7 @@ export default function PackageDetailsGrid({ dependencies, pkg }: PackageDetails
            <Grid size={{ md: 1, xs: 4 }}><Typography align="right" color="text.secondary" variant="body2">upstream</Typography></Grid>
            <Grid size={{ md: 5, xs: 8 }}>
                {upstreamUrls.map(url =>
-                    <Link href={url} key={url} rel="noopener noreferrer" sx={{ display: "block" }} target="_blank" underline="hover" variant="body2">
+                    <Link display="block" href={url} key={url} rel="noopener noreferrer" target="_blank" underline="hover" variant="body2">
                        {url}
                    </Link>,
                )}
@@ -17,10 +17,8 @@
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-import type { QueryClient } from "@tanstack/react-query";
 import { useQueryClient } from "@tanstack/react-query";
 import { buildEventStreamUrl } from "hooks/useEventStream";
-import { useNotification } from "hooks/useNotification";
 import type { LogRecord } from "models/LogRecord";
 import type { RepositoryId } from "models/RepositoryId";
 import { useEffect } from "react";
@@ -36,38 +34,14 @@ function appendLogRecord(existing: LogRecord[] | undefined, record: LogRecord):
    return [...existing ?? [], record];
 }

-function invalidateLogs(queryClient: QueryClient, repository: RepositoryId, packageBase: string): void {
-    void queryClient.invalidateQueries({ queryKey: ["logs", repository.key, packageBase] });
-}
-
 export function useBuildLogStream(packageBase: string, repository: RepositoryId): void {
    const queryClient = useQueryClient();
-    const { showError } = useNotification();

    useEffect(() => {
        const source = new EventSource(buildEventStreamUrl(repository, ["build-log"], packageBase));
-        let needsRefresh = false;
-
-        source.addEventListener("error", () => {
-            needsRefresh = true;
-        });
-
-        source.addEventListener("open", () => {
-            if (needsRefresh) {
-                invalidateLogs(queryClient, repository, packageBase);
-                needsRefresh = false;
-            }
-        });

        source.addEventListener("build-log", (event: MessageEvent<string>) => {
-            let data: BuildLogEvent;
-            try {
-                data = JSON.parse(event.data) as BuildLogEvent;
-            } catch {
-                showError("Live updates failed", "Could not parse build log event; refreshing logs.");
-                invalidateLogs(queryClient, repository, packageBase);
-                return;
-            }
+            const data = JSON.parse(event.data) as BuildLogEvent;

            const record: LogRecord = {
                created: data.created,
@@ -92,5 +66,5 @@ export function useBuildLogStream(packageBase: string, repository: RepositoryId)
        return () => {
            source.close();
        };
-    }, [queryClient, packageBase, repository, showError]);
+    }, [queryClient, packageBase, repository]);
 }
@@ -18,7 +18,6 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 import type { QueryClient } from "@tanstack/react-query";
-import { useNotification } from "hooks/useNotification";
 import type { RepositoryId } from "models/RepositoryId";
 import { useEffect } from "react";

@@ -63,12 +62,6 @@ function invalidateForEvent(
    }
 }

-function invalidateRepository(queryClient: QueryClient, repositoryKey: string): void {
-    void queryClient.invalidateQueries({ queryKey: ["packages", repositoryKey] });
-    void queryClient.invalidateQueries({ queryKey: ["status", repositoryKey] });
-    void queryClient.invalidateQueries({ queryKey: ["events", repositoryKey] });
-}
-
 export function buildEventStreamUrl(
    repository: RepositoryId,
    events?: readonly string[],
@@ -87,41 +80,22 @@ export function buildEventStreamUrl(
 }

 export function useEventStream(queryClient: QueryClient, repository: RepositoryId | null): void {
-    const { showError } = useNotification();
-
    useEffect(() => {
        if (!repository) {
            return;
        }

        const source = new EventSource(buildEventStreamUrl(repository, GLOBAL_EVENT_TYPES));
-        let needsRefresh = false;
-
-        source.addEventListener("error", () => {
-            needsRefresh = true;
-        });
-
-        source.addEventListener("open", () => {
-            if (needsRefresh) {
-                invalidateRepository(queryClient, repository.key);
-                needsRefresh = false;
-            }
-        });

        for (const eventType of GLOBAL_EVENT_TYPES) {
            source.addEventListener(eventType, (event: MessageEvent<string>) => {
-                try {
-                    const data = JSON.parse(event.data) as { object_id?: string };
-                    invalidateForEvent(queryClient, repository.key, eventType, data.object_id ?? undefined);
-                } catch {
-                    showError("Live updates failed", "Could not parse server event; refreshing data.");
-                    invalidateRepository(queryClient, repository.key);
-                }
+                const data = JSON.parse(event.data) as { object_id?: string };
+                invalidateForEvent(queryClient, repository.key, eventType, data.object_id ?? undefined);
            });
        }

        return () => {
            source.close();
        };
-    }, [queryClient, repository, showError]);
+    }, [queryClient, repository]);
 }
@@ -30,7 +30,6 @@ export function usePackageChanges(packageBase: string, repository: RepositoryId)
        enabled: !!packageBase,
        queryFn: () => client.fetch.fetchPackageChanges(packageBase, repository),
        queryKey: QueryKeys.changes(packageBase, repository),
-        refetchOnMount: "always",
    });

    return data;
@@ -1,6 +1,7 @@
 {
    "compilerOptions": {
        "allowImportingTsExtensions": true,
+        "baseUrl": "src",
        "isolatedModules": true,
        "jsx": "react-jsx",
        "lib": ["ESNext", "DOM", "DOM.Iterable"],
@@ -11,17 +12,6 @@
        "noImplicitOverride": true,
        "noUnusedLocals": true,
        "noUnusedParameters": true,
-        "paths": {
-            "App": ["./src/App.tsx"],
-            "api/*": ["./src/api/*"],
-            "chartSetup": ["./src/chartSetup.ts"],
-            "components/*": ["./src/components/*"],
-            "contexts/*": ["./src/contexts/*"],
-            "hooks/*": ["./src/hooks/*"],
-            "models/*": ["./src/models/*"],
-            "theme/*": ["./src/theme/*"],
-            "utils": ["./src/utils.ts"]
-        },
        "resolveJsonModule": true,
        "skipLibCheck": true,
        "strict": true,
@@ -19,7 +19,7 @@ export default defineConfig({
    build: {
        chunkSizeWarningLimit: 10000,
        emptyOutDir: false,
-        outDir: path.resolve(__dirname, "../ahriman-web/package/share/ahriman/templates"),
+        outDir: path.resolve(__dirname, "../package/share/ahriman/templates"),
        rolldownOptions: {
            output: {
                assetFileNames: "static/[name].[ext]",
@@ -2,14 +2,14 @@

 pkgbase='ahriman'
 pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.21.1
+pkgver=2.20.0
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')
 url="https://ahriman.readthedocs.io/"
 license=('GPL-3.0-or-later')
 depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-bcrypt' 'python-filelock' 'python-inflection' 'python-pyelftools' 'python-requests')
-makedepends=('npm' 'python-build' 'python-hatchling' 'python-installer' 'python-wheel')
+makedepends=('npm' 'python-build' 'python-flit' 'python-installer' 'python-wheel')
 source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgbase-$pkgver.tar.gz"
        "$pkgbase.sysusers"
        "$pkgbase.tmpfiles")
@@ -20,9 +20,7 @@ build() {
    npm --prefix "frontend" install --cache "$srcdir/npm-cache"
    npm --prefix "frontend" run build

-    python -m build --wheel --no-isolation "ahriman-core"
-    python -m build --wheel --no-isolation "ahriman-triggers"
-    python -m build --wheel --no-isolation "ahriman-web"
+    python -m build --wheel --no-isolation
 }

 package_ahriman() {
@@ -50,7 +48,8 @@ package_ahriman-core() {

    cd "$pkgbase-$pkgver"

-    python -m installer --destdir="$pkgdir" "$pkgname/dist/ahriman_core-$pkgver-py3-none-any.whl"
+    python -m installer --destdir="$pkgdir" "dist/$pkgbase-$pkgver-py3-none-any.whl"
+    python subpackages.py "$pkgdir" "$pkgname"

    # keep usr/share configs as reference and copy them to /etc
    install -Dm644 "$pkgdir/usr/share/$pkgbase/settings/ahriman.ini" "$pkgdir/etc/ahriman.ini"
@@ -69,7 +68,8 @@ package_ahriman-triggers() {

    cd "$pkgbase-$pkgver"

-    python -m installer --destdir="$pkgdir" "$pkgname/dist/ahriman_triggers-$pkgver-py3-none-any.whl"
+    python -m installer --destdir="$pkgdir" "dist/$pkgbase-$pkgver-py3-none-any.whl"
+    python subpackages.py "$pkgdir" "$pkgname"

    install -Dm644 "$pkgdir/usr/share/$pkgbase/settings/ahriman.ini.d/00-triggers.ini" "$pkgdir/etc/ahriman.ini.d/00-triggers.ini"
 }
@@ -88,7 +88,8 @@ package_ahriman-web() {

    cd "$pkgbase-$pkgver"

-    python -m installer --destdir="$pkgdir" "$pkgname/dist/ahriman_web-$pkgver-py3-none-any.whl"
+    python -m installer --destdir="$pkgdir" "dist/$pkgbase-$pkgver-py3-none-any.whl"
+    python subpackages.py "$pkgdir" "$pkgname"

    install -Dm644 "$pkgdir/usr/share/$pkgbase/settings/ahriman.ini.d/00-web.ini" "$pkgdir/etc/ahriman.ini.d/00-web.ini"
 }
@@ -42,8 +42,6 @@ retry_backoff = 1.0
 ;include_debug_packages = yes
 ; List of additional flags passed to makechrootpkg command.
 ;makechrootpkg_flags =
-; Minimal age in seconds since the latest AUR package modification before automatic updates are allowed.
-;min_age = 0
 ; List of additional flags passed to makepkg command.
 makepkg_flags = --nocolor --ignorearch
 ; List of paths to be used for implicit dependency scan. Regular expressions are supported.
@@ -1,9 +1,9 @@
 # AUTOMATICALLY GENERATED by `shtab`

-_shtab_ahriman_subparsers=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-archives' 'package-changes' 'package-changes-remove' 'package-copy' 'package-hold' 'package-pkgbuild' 'package-pkgbuild-remove' 'package-remove' 'package-rollback' 'package-status' 'package-status-remove' 'package-status-update' 'package-unhold' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web' 'web-reload')
+_shtab_ahriman_subparsers=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-changes' 'package-changes-remove' 'package-copy' 'package-remove' 'package-status' 'package-status-remove' 'package-status-update' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web' 'web-reload')

 _shtab_ahriman_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--log-handler' '-q' '--quiet' '--report' '--no-report' '-r' '--repository' '--unsafe' '-V' '--version' '--wait-timeout')
-_shtab_ahriman_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-s' '--source' '-u' '--username' '-v' '--variable' '-y' '--refresh')
+_shtab_ahriman_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
 _shtab_ahriman_aur_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
 _shtab_ahriman_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
 _shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
@@ -17,21 +17,15 @@ _shtab_ahriman_help_updates_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_help_version_option_strings=('-h' '--help')
 _shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
 _shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server')
-_shtab_ahriman_package_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-s' '--source' '-u' '--username' '-v' '--variable' '-y' '--refresh')
-_shtab_ahriman_package_archives_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info')
+_shtab_ahriman_package_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
 _shtab_ahriman_package_changes_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_package_changes_remove_option_strings=('-h' '--help')
 _shtab_ahriman_package_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
-_shtab_ahriman_package_hold_option_strings=('-h' '--help')
-_shtab_ahriman_package_pkgbuild_option_strings=('-h' '--help' '-e' '--exit-code')
-_shtab_ahriman_package_pkgbuild_remove_option_strings=('-h' '--help')
 _shtab_ahriman_package_remove_option_strings=('-h' '--help')
-_shtab_ahriman_package_rollback_option_strings=('-h' '--help' '--hold' '--no-hold' '-u' '--username')
 _shtab_ahriman_package_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
 _shtab_ahriman_package_status_remove_option_strings=('-h' '--help')
 _shtab_ahriman_package_status_update_option_strings=('-h' '--help' '-s' '--status')
-_shtab_ahriman_package_unhold_option_strings=('-h' '--help')
-_shtab_ahriman_package_update_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-s' '--source' '-u' '--username' '-v' '--variable' '-y' '--refresh')
+_shtab_ahriman_package_update_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
 _shtab_ahriman_patch_add_option_strings=('-h' '--help')
 _shtab_ahriman_patch_list_option_strings=('-h' '--help' '-e' '--exit-code' '-v' '--variable')
 _shtab_ahriman_patch_remove_option_strings=('-h' '--help' '-v' '--variable')
@@ -88,7 +82,7 @@ _shtab_ahriman_web_reload_option_strings=('-h' '--help')



-_shtab_ahriman_pos_0_choices=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-archives' 'package-changes' 'package-changes-remove' 'package-copy' 'package-hold' 'package-pkgbuild' 'package-pkgbuild-remove' 'package-remove' 'package-rollback' 'package-status' 'package-status-remove' 'package-status-update' 'package-unhold' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web' 'web-reload')
+_shtab_ahriman_pos_0_choices=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-changes' 'package-changes-remove' 'package-copy' 'package-remove' 'package-status' 'package-status-remove' 'package-status-update' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web' 'web-reload')
 _shtab_ahriman___log_handler_choices=('console' 'syslog' 'journald')
 _shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
 _shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
@@ -108,8 +102,8 @@ _shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repositor
 _shtab_ahriman_repo_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_setup___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_repo_statistics__e_choices=('build-log' 'package-held' 'package-outdated' 'package-removed' 'package-status-changed' 'package-update-failed' 'package-updated' 'service-status-changed')
-_shtab_ahriman_repo_statistics___event_choices=('build-log' 'package-held' 'package-outdated' 'package-removed' 'package-status-changed' 'package-update-failed' 'package-updated' 'service-status-changed')
+_shtab_ahriman_repo_statistics__e_choices=('package-outdated' 'package-removed' 'package-update-failed' 'package-updated')
+_shtab_ahriman_repo_statistics___event_choices=('package-outdated' 'package-removed' 'package-update-failed' 'package-updated')
 _shtab_ahriman_repo_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
@@ -257,12 +251,6 @@ _shtab_ahriman_package_add__n_nargs=0
 _shtab_ahriman_package_add___now_nargs=0
 _shtab_ahriman_package_add__y_nargs=0
 _shtab_ahriman_package_add___refresh_nargs=0
-_shtab_ahriman_package_archives__h_nargs=0
-_shtab_ahriman_package_archives___help_nargs=0
-_shtab_ahriman_package_archives__e_nargs=0
-_shtab_ahriman_package_archives___exit_code_nargs=0
-_shtab_ahriman_package_archives___info_nargs=0
-_shtab_ahriman_package_archives___no_info_nargs=0
 _shtab_ahriman_package_changes__h_nargs=0
 _shtab_ahriman_package_changes___help_nargs=0
 _shtab_ahriman_package_changes__e_nargs=0
@@ -275,22 +263,9 @@ _shtab_ahriman_package_copy___help_nargs=0
 _shtab_ahriman_package_copy__e_nargs=0
 _shtab_ahriman_package_copy___exit_code_nargs=0
 _shtab_ahriman_package_copy___remove_nargs=0
-_shtab_ahriman_package_hold_pos_0_nargs=+
-_shtab_ahriman_package_hold__h_nargs=0
-_shtab_ahriman_package_hold___help_nargs=0
-_shtab_ahriman_package_pkgbuild__h_nargs=0
-_shtab_ahriman_package_pkgbuild___help_nargs=0
-_shtab_ahriman_package_pkgbuild__e_nargs=0
-_shtab_ahriman_package_pkgbuild___exit_code_nargs=0
-_shtab_ahriman_package_pkgbuild_remove__h_nargs=0
-_shtab_ahriman_package_pkgbuild_remove___help_nargs=0
 _shtab_ahriman_package_remove_pos_0_nargs=+
 _shtab_ahriman_package_remove__h_nargs=0
 _shtab_ahriman_package_remove___help_nargs=0
-_shtab_ahriman_package_rollback__h_nargs=0
-_shtab_ahriman_package_rollback___help_nargs=0
-_shtab_ahriman_package_rollback___hold_nargs=0
-_shtab_ahriman_package_rollback___no_hold_nargs=0
 _shtab_ahriman_package_status_pos_0_nargs=*
 _shtab_ahriman_package_status__h_nargs=0
 _shtab_ahriman_package_status___help_nargs=0
@@ -305,9 +280,6 @@ _shtab_ahriman_package_status_remove___help_nargs=0
 _shtab_ahriman_package_status_update_pos_0_nargs=*
 _shtab_ahriman_package_status_update__h_nargs=0
 _shtab_ahriman_package_status_update___help_nargs=0
-_shtab_ahriman_package_unhold_pos_0_nargs=+
-_shtab_ahriman_package_unhold__h_nargs=0
-_shtab_ahriman_package_unhold___help_nargs=0
 _shtab_ahriman_package_update_pos_0_nargs=+
 _shtab_ahriman_package_update__h_nargs=0
 _shtab_ahriman_package_update___help_nargs=0
@@ -1,9 +1,9 @@
-.TH AHRIMAN "1" "2026\-07\-21" "ahriman 2.21.1" "ArcH linux ReposItory MANager"
+.TH AHRIMAN "1" "2026\-03\-08" "ahriman 2.20.0" "ArcH linux ReposItory MANager"
 .SH NAME
 ahriman \- ArcH linux ReposItory MANager
 .SH SYNOPSIS
-.B ahriman
-[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--log-handler {console,syslog,journald}] [-q] [--report | --no-report] [-r REPOSITORY] [--unsafe] [-V] [--wait-timeout WAIT_TIMEOUT] {add,aur-search,check,clean,config,config-validate,copy,daemon,help,help-commands-unsafe,help-updates,help-version,init,key-import,package-add,package-archives,package-changes,package-changes-remove,package-copy,package-hold,package-pkgbuild,package-pkgbuild-remove,package-remove,package-rollback,package-status,package-status-remove,package-status-update,package-unhold,package-update,patch-add,patch-list,patch-remove,patch-set-add,rebuild,remove,remove-unknown,repo-backup,repo-check,repo-clean,repo-config,repo-config-validate,repo-create-keyring,repo-create-mirrorlist,repo-daemon,repo-init,repo-rebuild,repo-remove-unknown,repo-report,repo-restore,repo-setup,repo-sign,repo-statistics,repo-status-update,repo-sync,repo-tree,repo-triggers,repo-update,report,run,search,service-clean,service-config,service-config-validate,service-key-import,service-repositories,service-run,service-setup,service-shell,service-tree-migrate,setup,shell,sign,status,status-update,sync,update,user-add,user-list,user-remove,version,web,web-reload} ...
+.B [0m[1;35mahriman[0m
+[[32m-h[0m] [[32m-a [33mARCHITECTURE[0m] [[32m-c [33mCONFIGURATION[0m] [[36m--force[0m] [[32m-l [33mLOCK[0m] [[36m--log-handler [33m{console,syslog,journald}[0m] [[32m-q[0m] [[36m--report | --no-report[0m] [[32m-r [33mREPOSITORY[0m] [[36m--unsafe[0m] [[32m-V[0m] [[36m--wait-timeout [33mWAIT_TIMEOUT[0m] [32m{add,aur-search,check,clean,config,config-validate,copy,daemon,help,help-commands-unsafe,help-updates,help-version,init,key-import,package-add,package-changes,package-changes-remove,package-copy,package-remove,package-status,package-status-remove,package-status-update,package-update,patch-add,patch-list,patch-remove,patch-set-add,rebuild,remove,remove-unknown,repo-backup,repo-check,repo-clean,repo-config,repo-config-validate,repo-create-keyring,repo-create-mirrorlist,repo-daemon,repo-init,repo-rebuild,repo-remove-unknown,repo-report,repo-restore,repo-setup,repo-sign,repo-statistics,repo-status-update,repo-sync,repo-tree,repo-triggers,repo-update,report,run,search,service-clean,service-config,service-config-validate,service-key-import,service-repositories,service-run,service-setup,service-shell,service-tree-migrate,setup,shell,sign,status,status-update,sync,update,user-add,user-list,user-remove,version,web,web-reload} ...[0m
 .SH DESCRIPTION
 ArcH linux ReposItory MANager

@@ -74,9 +74,6 @@ application version
 \fBahriman\fR \fI\,package\-add\/\fR
 add package
 .TP
-\fBahriman\fR \fI\,package\-archives\/\fR
-list package archive versions
-.TP
 \fBahriman\fR \fI\,package\-changes\/\fR
 get package changes
 .TP
@@ -86,21 +83,9 @@ remove package changes
 \fBahriman\fR \fI\,package\-copy\/\fR
 copy package from another repository
 .TP
-\fBahriman\fR \fI\,package\-hold\/\fR
-hold package
-.TP
-\fBahriman\fR \fI\,package\-pkgbuild\/\fR
-get package pkgbuild
-.TP
-\fBahriman\fR \fI\,package\-pkgbuild\-remove\/\fR
-remove package pkgbuild
-.TP
 \fBahriman\fR \fI\,package\-remove\/\fR
 remove package
 .TP
-\fBahriman\fR \fI\,package\-rollback\/\fR
-rollback package
-.TP
 \fBahriman\fR \fI\,package\-status\/\fR
 get package status
 .TP
@@ -110,9 +95,6 @@ remove package status
 \fBahriman\fR \fI\,package\-status\-update\/\fR
 update package status
 .TP
-\fBahriman\fR \fI\,package\-unhold\/\fR
-unhold package
-.TP
 \fBahriman\fR \fI\,patch\-add\/\fR
 add patch for PKGBUILD function
 .TP
@@ -216,9 +198,9 @@ web server
 reload configuration

 .SH COMMAND \fI\,'ahriman aur\-search'\/\fR
-usage: ahriman aur\-search [\-h] [\-e] [\-\-info | \-\-no\-info]
-                          [\-\-sort\-by {description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,submitter,url,url_path,version}]
-                          search [search ...]
+[1;34musage: [0m[1;35mahriman aur\-search[0m [[32m\-h[0m] [[32m\-e[0m] [[36m\-\-info | \-\-no\-info[0m]
+                          [[36m\-\-sort\-by [33m{description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,submitter,url,url_path,version}[0m]
+                          [32msearch [search ...][0m

 search for package in AUR using API

@@ -241,7 +223,7 @@ sort field by this field. In case if two packages have the same value of the spe
 by name

 .SH COMMAND \fI\,'ahriman help'\/\fR
-usage: ahriman help [\-h] [subcommand]
+[1;34musage: [0m[1;35mahriman help[0m [[32m\-h[0m] [32m[subcommand][0m

 show help message for application or command and exit

@@ -250,7 +232,7 @@ show help message for application or command and exit
 show help message for specific command

 .SH COMMAND \fI\,'ahriman help\-commands\-unsafe'\/\fR
-usage: ahriman help\-commands\-unsafe [\-h] [subcommand ...]
+[1;34musage: [0m[1;35mahriman help\-commands\-unsafe[0m [[32m\-h[0m] [32m[subcommand ...][0m

 list unsafe commands as defined in default args

@@ -260,7 +242,7 @@ instead of showing commands, just test command line for unsafe subcommand and re
 otherwise

 .SH COMMAND \fI\,'ahriman help\-updates'\/\fR
-usage: ahriman help\-updates [\-h] [\-e]
+[1;34musage: [0m[1;35mahriman help\-updates[0m [[32m\-h[0m] [[32m\-e[0m]

 request AUR for current version and compare with current service version

@@ -270,15 +252,15 @@ request AUR for current version and compare with current service version
 return non\-zero exit code if updates available

 .SH COMMAND \fI\,'ahriman help\-version'\/\fR
-usage: ahriman help\-version [\-h]
+[1;34musage: [0m[1;35mahriman help\-version[0m [[32m\-h[0m]

 print application and its dependencies versions

 .SH COMMAND \fI\,'ahriman package\-add'\/\fR
-usage: ahriman package\-add [\-h] [\-\-changes | \-\-no\-changes] [\-\-dependencies | \-\-no\-dependencies] [\-e]
-                           [\-\-increment | \-\-no\-increment] [\-n] [\-s {auto,archive,aur,directory,local,remote,repository}]
-                           [\-u USERNAME] [\-v VARIABLE] [\-y]
-                           package [package ...]
+[1;34musage: [0m[1;35mahriman package\-add[0m [[32m\-h[0m] [[36m\-\-changes | \-\-no\-changes[0m] [[36m\-\-dependencies | \-\-no\-dependencies[0m] [[32m\-e[0m]
+                           [[36m\-\-increment | \-\-no\-increment[0m] [[32m\-n[0m] [[32m\-y[0m]
+                           [[32m\-s [33m{auto,archive,aur,directory,local,remote,repository}[0m] [[32m\-u [33mUSERNAME[0m] [[32m\-v [33mVARIABLE[0m]
+                           [32mpackage [package ...][0m

 add existing or new package to the build queue

@@ -307,6 +289,10 @@ increment package release (pkgrel) version on duplicate
 \fB\-n\fR, \fB\-\-now\fR
 run update function after

+.TP
+\fB\-y\fR, \fB\-\-refresh\fR
+download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
+
 .TP
 \fB\-s\fR \fI\,{auto,archive,aur,directory,local,remote,repository}\/\fR, \fB\-\-source\fR \fI\,{auto,archive,aur,directory,local,remote,repository}\/\fR
 explicitly specify the package source for this command
@@ -319,30 +305,8 @@ build as user
 \fB\-v\fR \fI\,VARIABLE\/\fR, \fB\-\-variable\fR \fI\,VARIABLE\/\fR
 apply specified makepkg variables to the next build

-.TP
-\fB\-y\fR, \fB\-\-refresh\fR
-download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
-
-.SH COMMAND \fI\,'ahriman package\-archives'\/\fR
-usage: ahriman package\-archives [\-h] [\-e] [\-\-info | \-\-no\-info] package
-
-list available archive versions for the package
-
-.TP
-\fBpackage\fR
-package base
-
-.SH OPTIONS \fI\,'ahriman package\-archives'\/\fR
-.TP
-\fB\-e\fR, \fB\-\-exit\-code\fR
-return non\-zero exit status if result is empty
-
-.TP
-\fB\-\-info\fR, \fB\-\-no\-info\fR
-show additional package information
-
 .SH COMMAND \fI\,'ahriman package\-changes'\/\fR
-usage: ahriman package\-changes [\-h] [\-e] package
+[1;34musage: [0m[1;35mahriman package\-changes[0m [[32m\-h[0m] [[32m\-e[0m] [32mpackage[0m

 retrieve package changes stored in database

@@ -356,7 +320,7 @@ package base
 return non\-zero exit status if result is empty

 .SH COMMAND \fI\,'ahriman package\-changes\-remove'\/\fR
-usage: ahriman package\-changes\-remove [\-h] package
+[1;34musage: [0m[1;35mahriman package\-changes\-remove[0m [[32m\-h[0m] [32mpackage[0m

 remove the package changes stored remotely

@@ -365,7 +329,7 @@ remove the package changes stored remotely
 package base

 .SH COMMAND \fI\,'ahriman package\-copy'\/\fR
-usage: ahriman package\-copy [\-h] [\-e] [\-\-remove] source package [package ...]
+[1;34musage: [0m[1;35mahriman package\-copy[0m [[32m\-h[0m] [[32m\-e[0m] [[36m\-\-remove[0m] [32msource[0m [32mpackage [package ...][0m

 copy package and its metadata from another repository

@@ -386,40 +350,8 @@ return non\-zero exit status if result is empty
 \fB\-\-remove\fR
 remove package from the source repository after

-.SH COMMAND \fI\,'ahriman package\-hold'\/\fR
-usage: ahriman package\-hold [\-h] package [package ...]
-
-hold package from automatic updates
-
-.TP
-\fBpackage\fR
-package base
-
-.SH COMMAND \fI\,'ahriman package\-pkgbuild'\/\fR
-usage: ahriman package\-pkgbuild [\-h] [\-e] package
-
-retrieve package PKGBUILD stored in database
-
-.TP
-\fBpackage\fR
-package base
-
-.SH OPTIONS \fI\,'ahriman package\-pkgbuild'\/\fR
-.TP
-\fB\-e\fR, \fB\-\-exit\-code\fR
-return non\-zero exit status if result is empty
-
-.SH COMMAND \fI\,'ahriman package\-pkgbuild\-remove'\/\fR
-usage: ahriman package\-pkgbuild\-remove [\-h] package
-
-remove the package PKGBUILD stored remotely
-
-.TP
-\fBpackage\fR
-package base
-
 .SH COMMAND \fI\,'ahriman package\-remove'\/\fR
-usage: ahriman package\-remove [\-h] package [package ...]
+[1;34musage: [0m[1;35mahriman package\-remove[0m [[32m\-h[0m] [32mpackage [package ...][0m

 remove package from the repository

@@ -427,31 +359,9 @@ remove package from the repository
 \fBpackage\fR
 package name or base

-.SH COMMAND \fI\,'ahriman package\-rollback'\/\fR
-usage: ahriman package\-rollback [\-h] [\-\-hold | \-\-no\-hold] [\-u USERNAME] package version
-
-rollback package to specified version from archives
-
-.TP
-\fBpackage\fR
-package base
-
-.TP
-\fBversion\fR
-package version
-
-.SH OPTIONS \fI\,'ahriman package\-rollback'\/\fR
-.TP
-\fB\-\-hold\fR, \fB\-\-no\-hold\fR
-hold package afterwards
-
-.TP
-\fB\-u\fR \fI\,USERNAME\/\fR, \fB\-\-username\fR \fI\,USERNAME\/\fR
-build as user
-
 .SH COMMAND \fI\,'ahriman package\-status'\/\fR
-usage: ahriman package\-status [\-h] [\-\-ahriman] [\-e] [\-\-info | \-\-no\-info] [\-s {unknown,pending,building,failed,success}]
-                              [package ...]
+[1;34musage: [0m[1;35mahriman package\-status[0m [[32m\-h[0m] [[36m\-\-ahriman[0m] [[32m\-e[0m] [[36m\-\-info | \-\-no\-info[0m] [[32m\-s [33m{unknown,pending,building,failed,success}[0m]
+                              [32m[package ...][0m

 request status of the package

@@ -477,7 +387,7 @@ show additional package information
 filter packages by status

 .SH COMMAND \fI\,'ahriman package\-status\-remove'\/\fR
-usage: ahriman package\-status\-remove [\-h] package [package ...]
+[1;34musage: [0m[1;35mahriman package\-status\-remove[0m [[32m\-h[0m] [32mpackage [package ...][0m

 remove the package from the status page

@@ -486,7 +396,7 @@ remove the package from the status page
 remove specified packages from status page

 .SH COMMAND \fI\,'ahriman package\-status\-update'\/\fR
-usage: ahriman package\-status\-update [\-h] [\-s {unknown,pending,building,failed,success}] [package ...]
+[1;34musage: [0m[1;35mahriman package\-status\-update[0m [[32m\-h[0m] [[32m\-s [33m{unknown,pending,building,failed,success}[0m] [32m[package ...][0m

 update package status on the status page

@@ -499,17 +409,8 @@ set status for specified packages. If no packages supplied, service status will
 \fB\-s\fR \fI\,{unknown,pending,building,failed,success}\/\fR, \fB\-\-status\fR \fI\,{unknown,pending,building,failed,success}\/\fR
 new package build status

-.SH COMMAND \fI\,'ahriman package\-unhold'\/\fR
-usage: ahriman package\-unhold [\-h] package [package ...]
-
-remove package hold, allowing automatic updates
-
-.TP
-\fBpackage\fR
-package base
-
 .SH COMMAND \fI\,'ahriman patch\-add'\/\fR
-usage: ahriman patch\-add [\-h] package variable [patch]
+[1;34musage: [0m[1;35mahriman patch\-add[0m [[32m\-h[0m] [32mpackage[0m [32mvariable[0m [32m[patch][0m

 create or update patched PKGBUILD function or variable

@@ -526,7 +427,7 @@ PKGBUILD variable or function name. If variable is a function, it must end with
 path to file which contains function or variable value. If not set, the value will be read from stdin

 .SH COMMAND \fI\,'ahriman patch\-list'\/\fR
-usage: ahriman patch\-list [\-h] [\-e] [\-v VARIABLE] package
+[1;34musage: [0m[1;35mahriman patch\-list[0m [[32m\-h[0m] [[32m\-e[0m] [[32m\-v [33mVARIABLE[0m] [32mpackage[0m

 list available patches for the package

@@ -544,7 +445,7 @@ return non\-zero exit status if result is empty
 if set, show only patches for specified PKGBUILD variables

 .SH COMMAND \fI\,'ahriman patch\-remove'\/\fR
-usage: ahriman patch\-remove [\-h] [\-v VARIABLE] package
+[1;34musage: [0m[1;35mahriman patch\-remove[0m [[32m\-h[0m] [[32m\-v [33mVARIABLE[0m] [32mpackage[0m

 remove patches for the package

@@ -559,7 +460,7 @@ should be used for single\-function patches in case if you wold like to remove o
 if not set, it will remove all patches related to the package

 .SH COMMAND \fI\,'ahriman patch\-set\-add'\/\fR
-usage: ahriman patch\-set\-add [\-h] [\-t TRACK] package
+[1;34musage: [0m[1;35mahriman patch\-set\-add[0m [[32m\-h[0m] [[32m\-t [33mTRACK[0m] [32mpackage[0m

 create or update source patches

@@ -573,7 +474,7 @@ path to directory with changed files for patch addition/update
 files which has to be tracked

 .SH COMMAND \fI\,'ahriman repo\-backup'\/\fR
-usage: ahriman repo\-backup [\-h] path
+[1;34musage: [0m[1;35mahriman repo\-backup[0m [[32m\-h[0m] [32mpath[0m

 backup repository settings and database

@@ -582,9 +483,9 @@ backup repository settings and database
 path of the output archive

 .SH COMMAND \fI\,'ahriman repo\-check'\/\fR
-usage: ahriman repo\-check [\-h] [\-\-changes | \-\-no\-changes] [\-\-check\-files | \-\-no\-check\-files] [\-e] [\-\-vcs | \-\-no\-vcs]
-                          [\-y]
-                          [package ...]
+[1;34musage: [0m[1;35mahriman repo\-check[0m [[32m\-h[0m] [[36m\-\-changes | \-\-no\-changes[0m] [[36m\-\-check\-files | \-\-no\-check\-files[0m] [[32m\-e[0m] [[36m\-\-vcs | \-\-no\-vcs[0m]
+                          [[32m\-y[0m]
+                          [32m[package ...][0m

 check for packages updates. Same as repo\-update \-\-dry\-run \-\-no\-manual

@@ -614,20 +515,20 @@ fetch actual version of VCS packages
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date

 .SH COMMAND \fI\,'ahriman repo\-create\-keyring'\/\fR
-usage: ahriman repo\-create\-keyring [\-h]
+[1;34musage: [0m[1;35mahriman repo\-create\-keyring[0m [[32m\-h[0m]

 create package which contains list of trusted keys as set by configuration. Note, that this action will only create package, the package itself has to be built manually

 .SH COMMAND \fI\,'ahriman repo\-create\-mirrorlist'\/\fR
-usage: ahriman repo\-create\-mirrorlist [\-h]
+[1;34musage: [0m[1;35mahriman repo\-create\-mirrorlist[0m [[32m\-h[0m]

 create package which contains list of available mirrors as set by configuration. Note, that this action will only create package, the package itself has to be built manually

 .SH COMMAND \fI\,'ahriman repo\-daemon'\/\fR
-usage: ahriman repo\-daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes]
-                           [\-\-check\-files | \-\-no\-check\-files] [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run]
-                           [\-\-increment | \-\-no\-increment] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual]
-                           [\-\-partitions | \-\-no\-partitions] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
+[1;34musage: [0m[1;35mahriman repo\-daemon[0m [[32m\-h[0m] [[32m\-i [33mINTERVAL[0m] [[36m\-\-aur | \-\-no\-aur[0m] [[36m\-\-changes | \-\-no\-changes[0m]
+                           [[36m\-\-check\-files | \-\-no\-check\-files[0m] [[36m\-\-dependencies | \-\-no\-dependencies[0m] [[36m\-\-dry\-run[0m]
+                           [[36m\-\-increment | \-\-no\-increment[0m] [[36m\-\-local | \-\-no\-local[0m] [[36m\-\-manual | \-\-no\-manual[0m]
+                           [[36m\-\-partitions | \-\-no\-partitions[0m] [[32m\-u [33mUSERNAME[0m] [[36m\-\-vcs | \-\-no\-vcs[0m] [[32m\-y[0m]

 start process which periodically will run update process

@@ -685,8 +586,8 @@ fetch actual version of VCS packages
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date

 .SH COMMAND \fI\,'ahriman repo\-rebuild'\/\fR
-usage: ahriman repo\-rebuild [\-h] [\-\-depends\-on DEPENDS_ON] [\-\-dry\-run] [\-\-from\-database] [\-\-increment | \-\-no\-increment]
-                            [\-e] [\-s {unknown,pending,building,failed,success}] [\-u USERNAME]
+[1;34musage: [0m[1;35mahriman repo\-rebuild[0m [[32m\-h[0m] [[36m\-\-depends\-on [33mDEPENDS_ON[0m] [[36m\-\-dry\-run[0m] [[36m\-\-from\-database[0m] [[36m\-\-increment | \-\-no\-increment[0m]
+                            [[32m\-e[0m] [[32m\-s [33m{unknown,pending,building,failed,success}[0m] [[32m\-u [33mUSERNAME[0m]

 force rebuild whole repository

@@ -722,7 +623,7 @@ filter packages by status. Requires \-\-from\-database to be set
 build as user

 .SH COMMAND \fI\,'ahriman repo\-remove\-unknown'\/\fR
-usage: ahriman repo\-remove\-unknown [\-h] [\-\-dry\-run]
+[1;34musage: [0m[1;35mahriman repo\-remove\-unknown[0m [[32m\-h[0m] [[36m\-\-dry\-run[0m]

 remove packages which are missing in AUR and do not have local PKGBUILDs

@@ -732,12 +633,12 @@ remove packages which are missing in AUR and do not have local PKGBUILDs
 just perform check for packages without removal

 .SH COMMAND \fI\,'ahriman repo\-report'\/\fR
-usage: ahriman repo\-report [\-h]
+[1;34musage: [0m[1;35mahriman repo\-report[0m [[32m\-h[0m]

 generate repository report according to current settings

 .SH COMMAND \fI\,'ahriman repo\-restore'\/\fR
-usage: ahriman repo\-restore [\-h] [\-o OUTPUT] path
+[1;34musage: [0m[1;35mahriman repo\-restore[0m [[32m\-h[0m] [[32m\-o [33mOUTPUT[0m] [32mpath[0m

 restore settings and database

@@ -751,7 +652,7 @@ path of the input archive
 root path of the extracted files

 .SH COMMAND \fI\,'ahriman repo\-sign'\/\fR
-usage: ahriman repo\-sign [\-h] [package ...]
+[1;34musage: [0m[1;35mahriman repo\-sign[0m [[32m\-h[0m] [32m[package ...][0m

 (re\-)sign packages and repository database according to current settings

@@ -760,10 +661,10 @@ usage: ahriman repo\-sign [\-h] [package ...]
 sign only specified packages

 .SH COMMAND \fI\,'ahriman repo\-statistics'\/\fR
-usage: ahriman repo\-statistics [\-h] [\-\-chart CHART]
-                               [\-e {build\-log,package\-held,package\-outdated,package\-removed,package\-status\-changed,package\-update\-failed,package\-updated,service\-status\-changed}]
-                               [\-\-from\-date FROM_DATE] [\-\-limit LIMIT] [\-\-offset OFFSET] [\-\-to\-date TO_DATE]
-                               [package]
+[1;34musage: [0m[1;35mahriman repo\-statistics[0m [[32m\-h[0m] [[36m\-\-chart [33mCHART[0m]
+                               [[32m\-e [33m{package\-outdated,package\-removed,package\-update\-failed,package\-updated}[0m]
+                               [[36m\-\-from\-date [33mFROM_DATE[0m] [[36m\-\-limit [33mLIMIT[0m] [[36m\-\-offset [33mOFFSET[0m] [[36m\-\-to\-date [33mTO_DATE[0m]
+                               [32m[package][0m

 fetch repository statistics

@@ -777,7 +678,7 @@ fetch only events for the specified package
 create updates chart and save it to the specified path

 .TP
-\fB\-e\fR \fI\,{build\-log,package\-held,package\-outdated,package\-removed,package\-status\-changed,package\-update\-failed,package\-updated,service\-status\-changed}\/\fR, \fB\-\-event\fR \fI\,{build\-log,package\-held,package\-outdated,package\-removed,package\-status\-changed,package\-update\-failed,package\-updated,service\-status\-changed}\/\fR
+\fB\-e\fR \fI\,{package\-outdated,package\-removed,package\-update\-failed,package\-updated}\/\fR, \fB\-\-event\fR \fI\,{package\-outdated,package\-removed,package\-update\-failed,package\-updated}\/\fR
 event type filter

 .TP
@@ -797,7 +698,7 @@ skip specified amount of events
 only fetch events which are older than the date

 .SH COMMAND \fI\,'ahriman repo\-status\-update'\/\fR
-usage: ahriman repo\-status\-update [\-h] [\-s {unknown,pending,building,failed,success}]
+[1;34musage: [0m[1;35mahriman repo\-status\-update[0m [[32m\-h[0m] [[32m\-s [33m{unknown,pending,building,failed,success}[0m]

 update repository status on the status page

@@ -807,12 +708,12 @@ update repository status on the status page
 new status

 .SH COMMAND \fI\,'ahriman repo\-sync'\/\fR
-usage: ahriman repo\-sync [\-h]
+[1;34musage: [0m[1;35mahriman repo\-sync[0m [[32m\-h[0m]

 sync repository files to remote server according to current settings

 .SH COMMAND \fI\,'ahriman repo\-tree'\/\fR
-usage: ahriman repo\-tree [\-h] [\-p PARTITIONS]
+[1;34musage: [0m[1;35mahriman repo\-tree[0m [[32m\-h[0m] [[32m\-p [33mPARTITIONS[0m]

 dump repository tree based on packages dependencies

@@ -822,7 +723,7 @@ dump repository tree based on packages dependencies
 also divide packages by independent partitions

 .SH COMMAND \fI\,'ahriman repo\-triggers'\/\fR
-usage: ahriman repo\-triggers [\-h] [trigger ...]
+[1;34musage: [0m[1;35mahriman repo\-triggers[0m [[32m\-h[0m] [32m[trigger ...][0m

 run triggers on empty build result as configured by settings

@@ -831,10 +732,10 @@ run triggers on empty build result as configured by settings
 instead of running all triggers as set by configuration, just process specified ones in order of mention

 .SH COMMAND \fI\,'ahriman repo\-update'\/\fR
-usage: ahriman repo\-update [\-h] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes] [\-\-check\-files | \-\-no\-check\-files]
-                           [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run] [\-e] [\-\-increment | \-\-no\-increment]
-                           [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
-                           [package ...]
+[1;34musage: [0m[1;35mahriman repo\-update[0m [[32m\-h[0m] [[36m\-\-aur | \-\-no\-aur[0m] [[36m\-\-changes | \-\-no\-changes[0m] [[36m\-\-check\-files | \-\-no\-check\-files[0m]
+                           [[36m\-\-dependencies | \-\-no\-dependencies[0m] [[36m\-\-dry\-run[0m] [[32m\-e[0m] [[36m\-\-increment | \-\-no\-increment[0m]
+                           [[36m\-\-local | \-\-no\-local[0m] [[36m\-\-manual | \-\-no\-manual[0m] [[32m\-u [33mUSERNAME[0m] [[36m\-\-vcs | \-\-no\-vcs[0m] [[32m\-y[0m]
+                           [32m[package ...][0m

 check for packages updates and run build process if requested

@@ -892,8 +793,8 @@ fetch actual version of VCS packages
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date

 .SH COMMAND \fI\,'ahriman service\-clean'\/\fR
-usage: ahriman service\-clean [\-h] [\-\-cache | \-\-no\-cache] [\-\-chroot | \-\-no\-chroot] [\-\-manual | \-\-no\-manual]
-                             [\-\-packages | \-\-no\-packages] [\-\-pacman | \-\-no\-pacman]
+[1;34musage: [0m[1;35mahriman service\-clean[0m [[32m\-h[0m] [[36m\-\-cache | \-\-no\-cache[0m] [[36m\-\-chroot | \-\-no\-chroot[0m] [[36m\-\-manual | \-\-no\-manual[0m]
+                             [[36m\-\-packages | \-\-no\-packages[0m] [[36m\-\-pacman | \-\-no\-pacman[0m]

 remove local caches

@@ -919,7 +820,7 @@ clear directory with built packages
 clear directory with pacman local database cache

 .SH COMMAND \fI\,'ahriman service\-config'\/\fR
-usage: ahriman service\-config [\-h] [\-\-info | \-\-no\-info] [\-\-secure | \-\-no\-secure] [section] [key]
+[1;34musage: [0m[1;35mahriman service\-config[0m [[32m\-h[0m] [[36m\-\-info | \-\-no\-info[0m] [[36m\-\-secure | \-\-no\-secure[0m] [32m[section][0m [32m[key][0m

 dump configuration for the specified architecture

@@ -941,7 +842,7 @@ show additional information, e.g. configuration files
 hide passwords and secrets from output

 .SH COMMAND \fI\,'ahriman service\-config\-validate'\/\fR
-usage: ahriman service\-config\-validate [\-h] [\-e]
+[1;34musage: [0m[1;35mahriman service\-config\-validate[0m [[32m\-h[0m] [[32m\-e[0m]

 validate configuration and print found errors

@@ -951,7 +852,7 @@ validate configuration and print found errors
 return non\-zero exit status if configuration is invalid

 .SH COMMAND \fI\,'ahriman service\-key\-import'\/\fR
-usage: ahriman service\-key\-import [\-h] [\-\-key\-server KEY_SERVER] key
+[1;34musage: [0m[1;35mahriman service\-key\-import[0m [[32m\-h[0m] [[36m\-\-key\-server [33mKEY_SERVER[0m] [32mkey[0m

 import PGP key from public sources to the repository user

@@ -965,7 +866,7 @@ PGP key to import from public server
 key server for key import

 .SH COMMAND \fI\,'ahriman service\-repositories'\/\fR
-usage: ahriman service\-repositories [\-h] [\-\-id\-only | \-\-no\-id\-only]
+[1;34musage: [0m[1;35mahriman service\-repositories[0m [[32m\-h[0m] [[36m\-\-id\-only | \-\-no\-id\-only[0m]

 list all available repositories

@@ -975,7 +876,7 @@ list all available repositories
 show machine readable identifier instead

 .SH COMMAND \fI\,'ahriman service\-run'\/\fR
-usage: ahriman service\-run [\-h] command [command ...]
+[1;34musage: [0m[1;35mahriman service\-run[0m [[32m\-h[0m] [32mcommand [command ...][0m

 run multiple commands on success run of the previous command

@@ -984,11 +885,11 @@ run multiple commands on success run of the previous command
 command to be run (quoted) without ``ahriman``

 .SH COMMAND \fI\,'ahriman service\-setup'\/\fR
-usage: ahriman service\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-from\-configuration FROM_CONFIGURATION]
-                             [\-\-generate\-salt | \-\-no\-generate\-salt] [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs]
-                             [\-\-mirror MIRROR] [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER [\-\-server SERVER]
-                             [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT]
-                             [\-\-web\-unix\-socket WEB_UNIX_SOCKET]
+[1;34musage: [0m[1;35mahriman service\-setup[0m [[32m\-h[0m] [[36m\-\-build\-as\-user [33mBUILD_AS_USER[0m] [[36m\-\-from\-configuration [33mFROM_CONFIGURATION[0m]
+                             [[36m\-\-generate\-salt | \-\-no\-generate\-salt[0m] [[36m\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs[0m]
+                             [[36m\-\-mirror [33mMIRROR[0m] [[36m\-\-multilib | \-\-no\-multilib[0m] [36m\-\-packager [33mPACKAGER[0m [[36m\-\-server [33mSERVER[0m]
+                             [[36m\-\-sign\-key [33mSIGN_KEY[0m] [[36m\-\-sign\-target [33m{disabled,packages,repository}[0m] [[36m\-\-web\-port [33mWEB_PORT[0m]
+                             [[36m\-\-web\-unix\-socket [33mWEB_UNIX_SOCKET[0m]

 create initial service configuration, requires root

@@ -1042,7 +943,7 @@ port of the web service
 path to unix socket used for interprocess communications

 .SH COMMAND \fI\,'ahriman service\-shell'\/\fR
-usage: ahriman service\-shell [\-h] [\-o OUTPUT] [code]
+[1;34musage: [0m[1;35mahriman service\-shell[0m [[32m\-h[0m] [[32m\-o [33mOUTPUT[0m] [32m[code][0m

 drop into python shell

@@ -1056,13 +957,13 @@ instead of dropping into shell, just execute the specified code
 output commands and result to the file

 .SH COMMAND \fI\,'ahriman service\-tree\-migrate'\/\fR
-usage: ahriman service\-tree\-migrate [\-h]
+[1;34musage: [0m[1;35mahriman service\-tree\-migrate[0m [[32m\-h[0m]

 migrate repository tree between versions

 .SH COMMAND \fI\,'ahriman user\-add'\/\fR
-usage: ahriman user\-add [\-h] [\-\-key KEY] [\-\-packager PACKAGER] [\-p PASSWORD] [\-R {unauthorized,read,reporter,full}]
-                        username
+[1;34musage: [0m[1;35mahriman user\-add[0m [[32m\-h[0m] [[36m\-\-key [33mKEY[0m] [[36m\-\-packager [33mPACKAGER[0m] [[32m\-p [33mPASSWORD[0m] [[32m\-R [33m{unauthorized,read,reporter,full}[0m]
+                        [32musername[0m

 update user for web services with the given password and role. In case if password was not entered it will be asked interactively

@@ -1089,7 +990,7 @@ authorization type.
 user access level

 .SH COMMAND \fI\,'ahriman user\-list'\/\fR
-usage: ahriman user\-list [\-h] [\-e] [\-R {unauthorized,read,reporter,full}] [username]
+[1;34musage: [0m[1;35mahriman user\-list[0m [[32m\-h[0m] [[32m\-e[0m] [[32m\-R [33m{unauthorized,read,reporter,full}[0m] [32m[username][0m

 list users from the user mapping and their roles

@@ -1107,7 +1008,7 @@ return non\-zero exit status if result is empty
 filter users by role

 .SH COMMAND \fI\,'ahriman user\-remove'\/\fR
-usage: ahriman user\-remove [\-h] username
+[1;34musage: [0m[1;35mahriman user\-remove[0m [[32m\-h[0m] [32musername[0m

 remove user from the user mapping and update the configuration

@@ -1116,12 +1017,12 @@ remove user from the user mapping and update the configuration
 username for web service

 .SH COMMAND \fI\,'ahriman web'\/\fR
-usage: ahriman web [\-h]
+[1;34musage: [0m[1;35mahriman web[0m [[32m\-h[0m]

 start web server

 .SH COMMAND \fI\,'ahriman web\-reload'\/\fR
-usage: ahriman web\-reload [\-h]
+[1;34musage: [0m[1;35mahriman web\-reload[0m [[32m\-h[0m]

 reload web server configuration

@@ -20,19 +20,13 @@ _shtab_ahriman_commands() {
    "init:create initial service configuration, requires root"
    "key-import:import PGP key from public sources to the repository user"
    "package-add:add existing or new package to the build queue"
-    "package-archives:list available archive versions for the package"
    "package-changes:retrieve package changes stored in database"
    "package-changes-remove:remove the package changes stored remotely"
    "package-copy:copy package and its metadata from another repository"
-    "package-hold:hold package from automatic updates"
-    "package-pkgbuild:retrieve package PKGBUILD stored in database"
-    "package-pkgbuild-remove:remove the package PKGBUILD stored remotely"
    "package-remove:remove package from the repository"
-    "package-rollback:rollback package to specified version from archives"
    "package-status:request status of the package"
    "package-status-remove:remove the package from the status page"
    "package-status-update:update package status on the status page"
-    "package-unhold:remove package hold, allowing automatic updates"
    "package-update:add existing or new package to the build queue"
    "patch-add:create or update patched PKGBUILD function or variable"
    "patch-list:list available patches for the package"
@@ -116,10 +110,10 @@ _shtab_ahriman_add_options=(
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
  {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
  {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
  {-u,--username}"[build as user (default\: None)]:username:"
  "*"{-v,--variable}"[apply specified makepkg variables to the next build (default\: None)]:variable:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
  "(*):package source (base name, path to local files, remote URL):"
 )

@@ -278,26 +272,16 @@ _shtab_ahriman_package_add_options=(
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
  {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
  {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
  {-u,--username}"[build as user (default\: None)]:username:"
  "*"{-v,--variable}"[apply specified makepkg variables to the next build (default\: None)]:variable:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
  "(*):package source (base name, path to local files, remote URL):"
 )

 # guard to ensure default positional specs are added only once per session
 _shtab_ahriman_package_add_defaults_added=0

-_shtab_ahriman_package_archives_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]:info:"
-  ":package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_archives_defaults_added=0
-
 _shtab_ahriman_package_changes_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
@@ -326,31 +310,6 @@ _shtab_ahriman_package_copy_options=(
 # guard to ensure default positional specs are added only once per session
 _shtab_ahriman_package_copy_defaults_added=0

-_shtab_ahriman_package_hold_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*):package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_hold_defaults_added=0
-
-_shtab_ahriman_package_pkgbuild_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  ":package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_pkgbuild_defaults_added=0
-
-_shtab_ahriman_package_pkgbuild_remove_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  ":package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_pkgbuild_remove_defaults_added=0
-
 _shtab_ahriman_package_remove_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*):package name or base:"
@@ -359,17 +318,6 @@ _shtab_ahriman_package_remove_options=(
 # guard to ensure default positional specs are added only once per session
 _shtab_ahriman_package_remove_defaults_added=0

-_shtab_ahriman_package_rollback_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--hold,--no-hold}"[hold package afterwards (default\: True)]:hold:"
-  {-u,--username}"[build as user (default\: None)]:username:"
-  ":package base:"
-  ":package version:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_rollback_defaults_added=0
-
 _shtab_ahriman_package_status_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--ahriman[get service status itself (default\: False)]"
@@ -399,14 +347,6 @@ _shtab_ahriman_package_status_update_options=(
 # guard to ensure default positional specs are added only once per session
 _shtab_ahriman_package_status_update_defaults_added=0

-_shtab_ahriman_package_unhold_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  "(*):package base:"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_unhold_defaults_added=0
-
 _shtab_ahriman_package_update_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
@@ -414,10 +354,10 @@ _shtab_ahriman_package_update_options=(
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
  {-n,--now}"[run update function after (default\: False)]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
  {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
  {-u,--username}"[build as user (default\: None)]:username:"
  "*"{-v,--variable}"[apply specified makepkg variables to the next build (default\: None)]:variable:"
-  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
  "(*):package source (base name, path to local files, remote URL):"
 )

@@ -665,7 +605,7 @@ _shtab_ahriman_repo_sign_defaults_added=0
 _shtab_ahriman_repo_statistics_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--chart[create updates chart and save it to the specified path (default\: None)]:chart:"
-  {-e,--event}"[event type filter (default\: package-updated)]:event:(build-log package-held package-outdated package-removed package-status-changed package-update-failed package-updated service-status-changed)"
+  {-e,--event}"[event type filter (default\: package-updated)]:event:(package-outdated package-removed package-update-failed package-updated)"
  "--from-date[only fetch events which are newer than the date (default\: None)]:from_date:"
  "--limit[limit response by specified amount of events (default\: -1)]:limit:"
  "--offset[skip specified amount of events (default\: 0)]:offset:"
@@ -1013,19 +953,13 @@ _shtab_ahriman() {
        init) _arguments -C -s $_shtab_ahriman_init_options ;;
        key-import) _arguments -C -s $_shtab_ahriman_key_import_options ;;
        package-add) _arguments -C -s $_shtab_ahriman_package_add_options ;;
-        package-archives) _arguments -C -s $_shtab_ahriman_package_archives_options ;;
        package-changes) _arguments -C -s $_shtab_ahriman_package_changes_options ;;
        package-changes-remove) _arguments -C -s $_shtab_ahriman_package_changes_remove_options ;;
        package-copy) _arguments -C -s $_shtab_ahriman_package_copy_options ;;
-        package-hold) _arguments -C -s $_shtab_ahriman_package_hold_options ;;
-        package-pkgbuild) _arguments -C -s $_shtab_ahriman_package_pkgbuild_options ;;
-        package-pkgbuild-remove) _arguments -C -s $_shtab_ahriman_package_pkgbuild_remove_options ;;
        package-remove) _arguments -C -s $_shtab_ahriman_package_remove_options ;;
-        package-rollback) _arguments -C -s $_shtab_ahriman_package_rollback_options ;;
        package-status) _arguments -C -s $_shtab_ahriman_package_status_options ;;
        package-status-remove) _arguments -C -s $_shtab_ahriman_package_status_remove_options ;;
        package-status-update) _arguments -C -s $_shtab_ahriman_package_status_update_options ;;
-        package-unhold) _arguments -C -s $_shtab_ahriman_package_unhold_options ;;
        package-update) _arguments -C -s $_shtab_ahriman_package_update_options ;;
        patch-add) _arguments -C -s $_shtab_ahriman_patch_add_options ;;
        patch-list) _arguments -C -s $_shtab_ahriman_patch_list_options ;;
@@ -1,31 +1,92 @@
 [build-system]
-requires = [
-    "hatchling",
-]
-build-backend = "hatchling.build"
+requires = ["flit_core"]
+build-backend = "flit_core.buildapi"

 [project]
 name = "ahriman"
-authors = [
-    { name = "ahriman team" },
-]
-dependencies = [
-    "ahriman-core",
-    "ahriman-triggers",
-    "ahriman-web",
-]
+
 description = "ArcH linux ReposItory MANager"
-dynamic = [
-    "version",
-]
-license = { file = "COPYING" }
 readme = "README.md"
-requires-python = ">=3.14"
+
+# Actually we are using features from the latest python, however, ubuntu, which is used for CI doesn't have it
+requires-python = ">=3"
+
+license = {file = "COPYING"}
+authors = [
+    {name = "ahriman team"},
+]
+
+dependencies = [
+    "bcrypt",
+    "filelock",
+    "inflection",
+    "pyelftools",
+    "requests",
+]
+
+dynamic = ["version"]
+
+[project.optional-dependencies]
+journald = [
+    "systemd-python",
+]
+# FIXME technically this dependency is required, but in some cases we do not have access to
+# the libalpm which is required in order to install the package. Thus in case if we do not
+# really need to run the application we can move it to "optional" dependencies
+pacman = [
+    "pyalpm",
+]
+reports = [
+    "Jinja2",
+]
+s3 = [
+    "boto3",
+]
+shell = [
+    "IPython"
+]
+stats = [
+    "matplotlib",
+]
+unixsocket = [
+    "requests-unixsocket2",  # required by unix socket support
+]
+validator = [
+    "cerberus",
+]
+web = [
+    "aiohttp",
+    "aiohttp_cors",
+    "aiohttp_jinja2",
+    "aiohttp_sse",
+]
+web-auth = [
+    "ahriman[web]",
+    "aiohttp_session",
+    "aiohttp_security",
+    "cryptography",
+]
+web-docs = [
+    "ahriman[web]",
+    "aiohttp-apispec",
+    "setuptools",  # required by aiohttp-apispec
+]
+web-metrics = [
+    "ahriman[web]",
+    "aiohttp-openmetrics",
+]
+web-oauth2 = [
+    "ahriman[web-auth]",
+    "aioauth-client",
+]
+
+[project.scripts]
+ahriman = "ahriman.application.ahriman:run"

 [project.urls]
-Changelog = "https://github.com/arcan1s/ahriman/releases"
 Documentation = "https://ahriman.readthedocs.io/"
 Repository = "https://github.com/arcan1s/ahriman"
+Changelog = "https://github.com/arcan1s/ahriman/releases"

 [dependency-groups]
 check = [
@@ -35,67 +96,38 @@ check = [
    "pylint",
 ]
 docs = [
-    "ahriman-core[s3,validator]",
-    "Sphinx",
-    "argparse-manpage",
-    "pydeps",
-    "shtab",
-    "sphinx-argparse",
-    "sphinx-rtd-theme>=1.1.1",  # https://stackoverflow.com/a/74355734
+     "Sphinx",
+     "argparse-manpage",
+     "pydeps",
+     "shtab",
+     "sphinx-argparse",
+     "sphinx-rtd-theme>=1.1.1",  # https://stackoverflow.com/a/74355734
 ]
 tests = [
-    "coverage",
    "pytest",
    "pytest-aiohttp",
+    "pytest-cov",
    "pytest-helpers-namespace",
    "pytest-mock",
    "pytest-resource-path",
    "pytest-spec",
 ]

-[tool.hatch.build.targets.sdist]
+[tool.flit.sdist]
+include = [
+    "AUTHORS",
+    "CONTRIBUTING.md",
+    "SECURITY.md",
+    "package",
+    "frontend",
+    "subpackages.py",
+    "web.png",
+]
 exclude = [
-    "/.github",
-    "/archlinux",
-    "/docker",
-    "/docs",
-    "/recipes",
-    "/tools",
-    "tests",
-    "/.bandit.toml",
-    "/.dockerignore",
-    "/.pylint.toml",
-    "/.pytest.toml",
-    "/.readthedocs.yml",
-    "/conftest.py",
-    "/github-logo.png",
-    "/tox.toml",
-    "/toxfile.py",
-    "/web.png",
+    "package/archlinux",
+    "frontend/node_modules",
+    "frontend/package-lock.json",
 ]

-[tool.hatch.build.targets.wheel]
-bypass-selection = true
-
-[tool.hatch.envs.default]
-workspace.members = [
-    { path = "ahriman-core" },
-    { path = "ahriman-triggers" },
-    { path = "ahriman-web" },
-]
-
-[tool.hatch.version]
-path = "ahriman-core/src/ahriman/__init__.py"
-
-[tool.uv.sources]
-ahriman-core = { workspace = true, editable = false }
-ahriman-pytest-plugins = { path = "tools/pytest_plugins", editable = true }
-ahriman-triggers = { workspace = true, editable = false }
-ahriman-web = { workspace = true, editable = false }
-
-[tool.uv.workspace]
-members = [
-    "ahriman-core",
-    "ahriman-triggers",
-    "ahriman-web",
-]
+[tool.flit.external-data]
+directory = "package"
@@ -17,3 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+__version__ = "2.20.0"
@@ -19,7 +19,6 @@
 #
 import argparse

-from functools import partial
 from pathlib import Path

 import ahriman.application.handlers
@@ -35,13 +34,10 @@ from ahriman.models.log_handler import LogHandler
 __all__: list[str] = []


-def _parser(*, color: bool = False) -> argparse.ArgumentParser:
+def _parser() -> argparse.ArgumentParser:
    """
    command line parser generator

-    Args:
-        color(bool, optional): enable colors in help messages (Default value = False)
-
    Returns:
        argparse.ArgumentParser: command line parser for the application
    """
@@ -67,7 +63,7 @@ Start web service (requires additional configuration):

 >>> ahriman web
 """,
-                                     fromfile_prefix_chars="@", formatter_class=_HelpFormatter, color=color)
+                                     fromfile_prefix_chars="@", formatter_class=_HelpFormatter)
    parser.add_argument("-a", "--architecture", help="filter by target architecture")
    parser.add_argument("-c", "--configuration", help="configuration path", type=Path,
                        default=Path("/") / "etc" / "ahriman.ini")
@@ -96,9 +92,8 @@ Start web service (requires additional configuration):
    for handler in implementations(ahriman.application.handlers, Handler):
        for subparser_parser in handler.arguments:
            subparser = subparser_parser(subparsers)
-            subparser.color = color
            subparser.formatter_class = _HelpFormatter
-            subparser.set_defaults(handler=handler, parser=partial(_parser, color=color))
+            subparser.set_defaults(handler=handler, parser=_parser)

    # sort actions alphabetically in both choices and help message
    # pylint: disable=protected-access
@@ -115,7 +110,7 @@ def run() -> int:
    Returns:
        int: application status code
    """
-    parser = _parser(color=True)
+    parser = _parser()
    args = parser.parse_args()

    if args.command is None:  # in case of empty command we would like to print help message
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
arcanis	b8a75c110d	install missing pacakge	2026-05-04 16:10:35 +03:00
arcanis	a713c67948	zz	2026-04-27 13:01:56 +03:00
arcanis	4934205b9e	fix typo	2026-04-27 13:01:56 +03:00
arcanis	97c121731b	update configs	2026-04-27 13:01:56 +03:00
arcanis	578bb797ef	review fixes	2026-04-27 13:01:56 +03:00
arcanis	8623b26a04	docs update	2026-04-27 13:01:56 +03:00
arcanis	0903378a64	update tests	2026-04-27 13:01:56 +03:00
arcanis	47cc99292f	event bus implementation	2026-04-27 13:01:56 +03:00