review fixes

.bandit.toml

@@ -1,5 +0,0 @@
-[tool.bandit]
-skips = [
-    "B404",
-    "B603",
-]

.bandit.yml

@@ -0,0 +1,3 @@
+skips:
+  - B404
+  - B603

.github/workflows/docker.yml

@@ -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 }}

.github/workflows/regress.yml

@@ -18,8 +18,8 @@ jobs:
         image: arcan1s/ahriman:edge
         env:
           AHRIMAN_PORT: 8080
-          AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman-web.sock
+          AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
-        options: --privileged --user root --entrypoint entrypoint-web
+        options: --privileged --entrypoint entrypoint-web
         ports:
           - 8080
         volumes:
@@ -31,8 +31,8 @@ jobs:
         AHRIMAN_DEBUG: y
         AHRIMAN_OUTPUT: console
         AHRIMAN_PORT: 8080
-        AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman-web.sock
+        AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
-      options: --privileged --user root
+      options: --privileged
       volumes:
         - repo:/var/lib/ahriman
 
@@ -40,9 +40,7 @@ jobs:
       - run: pacman -Sy
 
       - name: Init repository
-        run: |
+        run: entrypoint help
-          chown ahriman:ahriman /var/lib/ahriman
-          sudo -E -u ahriman -- entrypoint help
 
       - name: Print configuration
         run: |

.github/workflows/release.yml

@@ -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

.github/workflows/setup.sh

@@ -12,11 +12,11 @@ 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
-    pacman -S --noconfirm python-aioauth-client python-aiohttp python-aiohttp-apispec-git python-aiohttp-cors python-aiohttp-jinja2 python-aiohttp-security python-aiohttp-session python-aiohttp-sse-git python-cryptography python-jinja
+    pacman -S --noconfirm python-aioauth-client python-aiohttp python-aiohttp-apispec-git python-aiohttp-cors python-aiohttp-jinja2 python-aiohttp-security python-aiohttp-session python-cryptography python-jinja
     # additional features
     pacman -S --noconfirm gnupg ipython python-boto3 python-cerberus python-matplotlib rsync
 fi
@@ -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__)")
+PKGVER=$(python -c "from src.ahriman import __version__; print(__version__)")
-mv "dist/ahriman-$PKGVER.tar.gz" archlinux
+mv "dist/ahriman-$PKGVER.tar.gz" package/archlinux
-chmod +777 archlinux  # because fuck you that's why
+chmod +777 package/archlinux  # because fuck you that's why
-cd archlinux
+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
@@ -44,7 +44,7 @@ pacman -Qdtq | pacman -Rscn --noconfirm -
 
 # initial setup command as root
 [[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
-sudo -u ahriman -- ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
+ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
 # enable services
 systemctl enable ahriman@x86_64-github.timer
 if [[ -z $MINIMAL_INSTALL ]]; then

.github/workflows/setup.yml

@@ -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

.gitignore

@@ -103,8 +103,5 @@ docs/html/
 # Frontend
 node_modules/
 package-lock.json
-ahriman-web/package/share/ahriman/templates/static/index.js
+package/share/ahriman/templates/static/index.js
-ahriman-web/package/share/ahriman/templates/static/index.css
+package/share/ahriman/templates/static/index.css
-
-# local configs
-/*.ini

.pytest.ini

@@ -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}

.pytest.toml

@@ -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}"

.readthedocs.yml

@@ -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

CONTRIBUTING.md

@@ -247,19 +247,13 @@ tox -e docs
 
 Must be usually done if there are changes in modules structure.
 
-### Before making a new release
-
-1. Make sure that all pipelines are green.
-2. Make sure that documentation is up-to-date.
-3. Run [regress job](https://github.com/arcan1s/ahriman/actions/workflows/regress.yml). The successful link must be attached to release.
-
 ### Create release
 
 ```shell
 tox -m release -- major.minor.patch
 ```
 
-The command above will generate documentation, tags, etc., and will push them to GitHub. Other things will be handled by GitHub workflows automatically. As soon as related github action completes, there will be a new release created. Edit it to add additional information if needed.
+The command above will generate documentation, tags, etc., and will push them to GitHub. Other things will be handled by GitHub workflows automatically.
 
 ### Hotfixes policy
 

README.md

@@ -31,7 +31,7 @@ For installation details kindly refer to the [documentation](https://ahriman.rea
 
 Every available option is described in the [documentation](https://ahriman.readthedocs.io/en/stable/configuration.html).
 
-The application provides reasonable defaults which allow to use it out-of-box; however additional steps (like configuring build toolchain) are recommended and can be easily achieved by following install instructions.
+The application provides reasonable defaults which allow to use it out-of-box; however additional steps (like configuring build toolchain and sudoers) are recommended and can be easily achieved by following install instructions.
 
 ## [FAQ](https://ahriman.readthedocs.io/en/stable/faq/index.html)
 

ahriman-core/package/bin/ahriman-archbuild

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-usage() {
-    local cmd="${0##*/}"
-    echo "Usage: $cmd [options] -- [archbuild args]"
-    echo "    -r <repository>    Repository name"
-    echo "    -a <architecture>  Repository architecture"
-    echo "    -c <directory>     Read devtools pacman configurations from this directory"
-}
-
-repository=
-architecture=
-pacman_config_dir=
-
-while getopts ":r:a:c:" arg; do
-    case "$arg" in
-        r) repository="$OPTARG" ;;
-        a) architecture="$OPTARG" ;;
-        c) pacman_config_dir="$OPTARG" ;;
-        *) usage >&2; exit 1 ;;
-    esac
-done
-
-if [[ -z $repository || -z $architecture ]]; then
-    usage >&2
-    exit 1
-fi
-
-if [[ -n $pacman_config_dir && ! -d $pacman_config_dir ]]; then
-    echo "devtools configuration directory does not exist: $pacman_config_dir" >&2
-    exit 1
-fi
-
-source "/usr/share/devtools/lib/archroot.sh"
-check_root "SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,NPROC,MAKEFLAGS,PACKAGER,GNUPGHOME" "${BASH_SOURCE[0]}" "$@"
-
-# because devtools doesn't allow to read configuration from custom path
-# here is a workaround, which uses unshare to bind-mount directory with configuration files
-# for specific process
-if [[ -n $pacman_config_dir && -z ${AHRIMAN_ARCHBUILD_MOUNTED:-} ]]; then
-    pacman_config_dir="$(readlink -e -- "$pacman_config_dir")"
-    export AHRIMAN_ARCHBUILD_MOUNTED=1
-
-    exec unshare --mount --propagation private \
-        bash -c 'mount --bind -- "$0" /usr/share/devtools/pacman.conf.d && exec "$@"' \
-        "$pacman_config_dir" "${BASH_SOURCE[0]}" "$@"
-fi
-
-exec bash -c 'source "/usr/bin/archbuild" "$@"' \
-    "${repository}-${architecture}-build" "${@:$OPTIND}"

ahriman-core/pyproject.toml

@@ -1,65 +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/bin" = "bin"
-"package/lib" = "lib"
-"package/share" = "share"
-
-[tool.hatch.version]
-path = "src/ahriman/__init__.py"

ahriman-core/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.22.1"

ahriman-core/tests/ahriman/conftest.py

@@ -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=[]))

ahriman-triggers/pyproject.toml

@@ -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"

ahriman-web/pyproject.toml

@@ -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"

ahriman-web/src/ahriman/web/views/v2/packages/__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/>.
-#

ahriman-web/tests/ahriman/conftest.py

@@ -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)

ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_event_bus.py

@@ -1,254 +0,0 @@
-import asyncio
-import pytest
-
-from aiohttp.test_utils import TestClient
-from aiohttp.web import HTTPBadRequest
-from asyncio import Queue
-from multidict import MultiDict
-from pytest_mock import MockerFixture
-from unittest.mock import AsyncMock
-
-from ahriman.core.status.watcher import Watcher
-from ahriman.models.event import EventType
-from ahriman.models.package import Package
-from ahriman.models.user_access import UserAccess
-from ahriman.web.keys import WatcherKey
-from ahriman.web.views.base import BaseView
-from ahriman.web.views.v1.auditlog.event_bus import EventBusView
-
-
-async def _producer(watcher: Watcher, package_ahriman: Package) -> None:
-    """
-    create producer
-
-    Args:
-        watcher(Watcher): watcher test instance
-        package_ahriman(Package): package test instance
-    """
-    await asyncio.sleep(0.1)
-    await watcher.event_bus.broadcast(EventType.PackageRemoved, package_ahriman.base)
-    await watcher.event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base, status="success")
-    await asyncio.sleep(0.1)
-    await watcher.event_bus.shutdown()
-
-
-async def test_get_permission() -> None:
-    """
-    must return correct permission for the request
-    """
-    for method in ("GET",):
-        request = pytest.helpers.request("", "", method)
-        assert await EventBusView.get_permission(request) == UserAccess.Full
-
-
-async def test_get_permission_build_log() -> None:
-    """
-    must return full permission for build log stream
-    """
-    request = pytest.helpers.request("", "", "GET", params=MultiDict(event=EventType.BuildLog))
-    assert await EventBusView.get_permission(request) == UserAccess.Full
-
-
-async def test_get_permission_build_log_with_read_events() -> None:
-    """
-    must return full permission for mixed build log and read event stream
-    """
-    request = pytest.helpers.request("", "", "GET", params=MultiDict([
-        ("event", EventType.BuildLog),
-        ("event", EventType.PackageUpdated),
-    ]))
-    assert await EventBusView.get_permission(request) == UserAccess.Full
-
-
-async def test_get_permission_invalid_event() -> None:
-    """
-    must return full permission for invalid event type
-    """
-    request = pytest.helpers.request("", "", "GET", params=MultiDict(event="invalid"))
-    assert await EventBusView.get_permission(request) == UserAccess.Full
-
-
-async def test_get_permission_post() -> None:
-    """
-    must use default permission for non-get requests
-    """
-    request = pytest.helpers.request("", "", "POST", params=MultiDict(event=EventType.PackageUpdated))
-    assert await EventBusView.get_permission(request) == await BaseView.get_permission(request)
-
-
-async def test_get_permission_read_events() -> None:
-    """
-    must return read permission for package and status streams
-    """
-    request = pytest.helpers.request("", "", "GET", params=MultiDict(
-        ("event", event_type) for event_type in EventBusView.READ_EVENTS
-    ))
-    assert await EventBusView.get_permission(request) == UserAccess.Read
-
-
-def test_routes() -> None:
-    """
-    must return correct routes
-    """
-    assert EventBusView.ROUTES == ["/api/v1/events/stream"]
-
-
-async def test_run_timeout() -> None:
-    """
-    must handle timeout and continue loop
-    """
-    queue = Queue()
-
-    async def _shutdown() -> None:
-        await asyncio.sleep(0.05)
-        queue.shutdown()
-
-    response = AsyncMock()
-    response.is_connected = lambda: True
-    response.ping_interval = 0.01
-
-    asyncio.create_task(_shutdown())
-    await EventBusView._run(response, queue)
-
-
-def test_topics() -> None:
-    """
-    must parse event filters
-    """
-    request = pytest.helpers.request("", "", "GET", params=MultiDict([
-        ("event", EventType.PackageUpdated),
-        ("event", EventType.PackageRemoved),
-    ]))
-
-    assert EventBusView(request)._topics() == [EventType.PackageUpdated, EventType.PackageRemoved]
-
-
-def test_topics_empty() -> None:
-    """
-    must return None for missing event filters
-    """
-    request = pytest.helpers.request("", "", "GET", params=MultiDict())
-
-    assert EventBusView(request)._topics() is None
-
-
-def test_topics_invalid() -> None:
-    """
-    must raise bad request for invalid event filters
-    """
-    request = pytest.helpers.request("", "", "GET", params=MultiDict(event="invalid"))
-
-    with pytest.raises(HTTPBadRequest):
-        EventBusView(request)._topics()
-
-
-async def test_get(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must stream events via SSE
-    """
-    watcher = next(iter(client.app[WatcherKey].values()))
-    asyncio.create_task(_producer(watcher, package_ahriman))
-    request_schema = pytest.helpers.schema_request(EventBusView.get, location="querystring")
-    # no content validation here because it is a streaming response
-
-    assert not request_schema.validate({})
-    response = await client.get("/api/v1/events/stream")
-    assert response.status == 200
-
-    body = await response.text()
-    assert EventType.PackageUpdated in body
-    assert "ahriman" in body
-
-
-async def test_get_with_topic_filter(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must filter events by topic
-    """
-    watcher = next(iter(client.app[WatcherKey].values()))
-    asyncio.create_task(_producer(watcher, package_ahriman))
-    request_schema = pytest.helpers.schema_request(EventBusView.get, location="querystring")
-
-    payload = {"event": [EventType.PackageUpdated]}
-    assert not request_schema.validate(payload)
-    response = await client.get("/api/v1/events/stream", params=payload)
-    assert response.status == 200
-
-    body = await response.text()
-    assert EventType.PackageUpdated in body
-    assert EventType.PackageRemoved not in body
-
-
-async def test_get_with_object_id_filter(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must filter events by object_id
-    """
-    watcher = next(iter(client.app[WatcherKey].values()))
-    asyncio.create_task(_producer(watcher, package_ahriman))
-    request_schema = pytest.helpers.schema_request(EventBusView.get, location="querystring")
-
-    payload = {"object_id": "non-existent-package"}
-    assert not request_schema.validate(payload)
-    response = await client.get("/api/v1/events/stream", params=payload)
-    assert response.status == 200
-
-    body = await response.text()
-    assert "ahriman" not in body
-
-
-async def test_get_bad_request(client: TestClient) -> None:
-    """
-    must return bad request for invalid event type
-    """
-    response_schema = pytest.helpers.schema_response(EventBusView.get, code=400)
-
-    response = await client.get("/api/v1/events/stream", params={"event": "invalid"})
-    assert response.status == 400
-    assert not response_schema.validate(await response.json())
-
-
-async def test_get_not_found(client: TestClient) -> None:
-    """
-    must return not found for unknown repository
-    """
-    response_schema = pytest.helpers.schema_response(EventBusView.get, code=404)
-
-    response = await client.get("/api/v1/events/stream", params={"architecture": "unknown", "repository": "unknown"})
-    assert response.status == 404
-    assert not response_schema.validate(await response.json())
-
-
-async def test_get_connection_reset(client: TestClient, mocker: MockerFixture) -> None:
-    """
-    must handle connection reset
-    """
-    mocker.patch.object(EventBusView, "_run", side_effect=ConnectionResetError)
-    response = await client.get("/api/v1/events/stream")
-    assert response.status == 200
-
-
-async def test_head(client: TestClient) -> None:
-    """
-    must check stream availability without opening SSE stream
-    """
-    response = await client.head("/api/v1/events/stream", params={"event": EventType.PackageUpdated})
-    assert response.status == 200
-    assert response.headers["Content-Type"] == "text/event-stream"
-    assert not await response.text()
-
-
-async def test_head_bad_request(client: TestClient) -> None:
-    """
-    must return bad request for invalid event type
-    """
-    response = await client.head("/api/v1/events/stream", params={"event": "invalid"})
-    assert response.status == 400
-    assert not await response.text()
-
-
-async def test_head_not_found(client: TestClient) -> None:
-    """
-    must return not found for unknown repository
-    """
-    response = await client.head("/api/v1/events/stream", params={"architecture": "unknown", "repository": "unknown"})
-    assert response.status == 404
-    assert not await response.text()

archlinux/sudoers.conf

@@ -1,2 +0,0 @@
-Defaults!/usr/bin/ahriman-archbuild env_keep += "SOURCE_DATE_EPOCH SRCDEST SRCPKGDEST PKGDEST LOGDEST NPROC MAKEFLAGS PACKAGER GNUPGHOME"
-ahriman ALL= NOPASSWD:NOSETENV: /usr/bin/ahriman-archbuild *

docker/01-docker.ini

@@ -1,2 +0,0 @@
-[web]
-host = $AHRIMAN_HOST

docker/Dockerfile

@@ -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" && \
+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 -Syyuu --noconfirm
+    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" && \
+    cp ./dist/*.tar.gz "package/archlinux" && \
-    cd "archlinux" && \
+    cd "package/archlinux" && \
     runuser -u build -- makepkg --noconfirm --skipchecksums && \
     cd / && rm -r "/home/build/ahriman"
 
@@ -80,6 +78,7 @@ FROM archlinux:base AS ahriman
 # image configuration
 ENV AHRIMAN_ARCHITECTURE="x86_64"
 ENV AHRIMAN_DEBUG=""
+ENV AHRIMAN_FORCE_ROOT=""
 ENV AHRIMAN_HOST="0.0.0.0"
 ENV AHRIMAN_MULTILIB="yes"
 ENV AHRIMAN_OUTPUT=""
@@ -90,6 +89,7 @@ ENV AHRIMAN_POSTSETUP_COMMAND=""
 ENV AHRIMAN_PRESETUP_COMMAND=""
 ENV AHRIMAN_REPOSITORY="aur"
 ENV AHRIMAN_REPOSITORY_SERVER=""
+ENV AHRIMAN_REPOSITORY_ROOT="/var/lib/ahriman/ahriman"
 ENV AHRIMAN_UNIX_SOCKET=""
 ENV AHRIMAN_USER="ahriman"
 ENV AHRIMAN_VALIDATE_CONFIGURATION="yes"
@@ -108,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 \
@@ -133,15 +133,11 @@ RUN find "/var/cache/pacman/pkg" "/var/lib/pacman/sync" -type "f,l" -delete && \
 VOLUME ["/var/lib/ahriman"]
 
 # minimal runtime ahriman setup
-RUN systemd-machine-id-setup
-COPY "docker/01-docker.ini" "/etc/ahriman.ini.d/01-docker.ini"
 ## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
 COPY "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 ## entrypoint setup
 COPY "docker/entrypoint.sh" "/usr/local/bin/entrypoint"
 COPY "docker/entrypoint-web.sh" "/usr/local/bin/entrypoint-web"
-
-USER ahriman
 ENTRYPOINT ["entrypoint"]
 # default command
 CMD ["repo-update", "--refresh"]

docker/entrypoint-web.sh

@@ -2,9 +2,4 @@
 # Special workaround for running web service in github actions, must not be usually used in real environment,
 # consider running web command explicitly instead
 
-if (( EUID == 0 )); then
+exec entrypoint web "$@"
-    chown ahriman:ahriman /var/lib/ahriman
-    exec sudo -E -u ahriman -- entrypoint web "$@"
-fi
-
-exec entrypoint web "$@"

docker/entrypoint.sh

@@ -3,15 +3,30 @@
 set -e
 [ -n "$AHRIMAN_DEBUG" ] && set -x
 
+# configuration tune
+cat <<EOF > "/etc/ahriman.ini.d/01-docker.ini"
+[repository]
+root = $AHRIMAN_REPOSITORY_ROOT
+
+[web]
+host = $AHRIMAN_HOST
+
+EOF
+
 AHRIMAN_DEFAULT_ARGS=("--architecture" "$AHRIMAN_ARCHITECTURE")
 AHRIMAN_DEFAULT_ARGS+=("--repository" "$AHRIMAN_REPOSITORY")
 if [ -n "$AHRIMAN_OUTPUT" ]; then
     AHRIMAN_DEFAULT_ARGS+=("--log-handler" "$AHRIMAN_OUTPUT")
 fi
 
+# create repository root inside the [[mounted]] directory and set correct ownership
+[ -d "$AHRIMAN_REPOSITORY_ROOT" ] || mkdir "$AHRIMAN_REPOSITORY_ROOT"
+chown "$AHRIMAN_USER":"$AHRIMAN_USER" "$AHRIMAN_REPOSITORY_ROOT"
+
 # create .gnupg directory which is required for keys
 AHRIMAN_GNUPG_HOME="$(getent passwd "$AHRIMAN_USER" | cut -d : -f 6)/.gnupg"
 [ -d "$AHRIMAN_GNUPG_HOME" ] || mkdir -m700 "$AHRIMAN_GNUPG_HOME"
+chown "$AHRIMAN_USER":"$AHRIMAN_USER" "$AHRIMAN_GNUPG_HOME"
 
 # run built-in setup command
 AHRIMAN_SETUP_ARGS=("--build-as-user" "$AHRIMAN_USER")
@@ -39,7 +54,19 @@ ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}"
 # validate configuration if set
 [ -n "$AHRIMAN_VALIDATE_CONFIGURATION" ] && ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-config-validate --exit-code
 
+# create machine-id which is required by build tools
+systemd-machine-id-setup &> /dev/null
+
 # special workaround to emulate /bin/bash entrypoint if first argument starts with /
 [[ "$1" =~ ^/.* ]] && exec "$@"
 
-exec ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" "$@"
+# if AHRIMAN_FORCE_ROOT is set or command is unsafe we can run without sudo
+# otherwise we prepend executable by sudo command
+if [ -n "$AHRIMAN_FORCE_ROOT" ]; then
+    AHRIMAN_EXECUTABLE=("ahriman")
+elif ahriman help-commands-unsafe -- "$@" &> /dev/null; then
+    AHRIMAN_EXECUTABLE=("sudo" "-E" "-u" "$AHRIMAN_USER" "--" "ahriman")
+else
+    AHRIMAN_EXECUTABLE=("ahriman")
+fi
+exec "${AHRIMAN_EXECUTABLE[@]}" "${AHRIMAN_DEFAULT_ARGS[@]}" "$@"

docker/install-aur-package.sh

@@ -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 /

docs/ahriman.application.handlers.rst

@@ -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
 ---------------
 

docs/ahriman.application.handlers.triggers_support.rst

@@ -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:

docs/ahriman.application.handlers.web.rst

@@ -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:

docs/architecture.rst

@@ -116,7 +116,7 @@ Filesystem tree
 
 The application supports two types of trees, one is for the legacy configuration (when there were no explicit repository name configuration available) and another one is the new-style tree. This document describes only new-style tree in order to avoid deprecated structures.
 
-Having default root as ``/var/lib/ahriman``, the directory structure is the following:
+Having default root as ``/var/lib/ahriman`` (differs from container though), the directory structure is the following:
 
 .. code-block::
 

docs/conf.py

@@ -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 -----------------------------------------------------

docs/configuration.rst

@@ -82,7 +82,7 @@ Base configuration settings.
 
 * ``apply_migrations`` - perform database migrations on the application start, boolean, optional, default ``yes``. Useful if you are using git version. Note, however, that this option must be changed only if you know what to do and going to handle migrations manually.
 * ``database`` - path to the application SQLite database, string, required.
-* ``include`` - path to directories with configuration files overrides, space separated list of strings, optional. Files will be read in alphabetical order.
+* ``include`` - path to directory with configuration files overrides, string, optional. Files will be read in alphabetical order.
 * ``logging`` - path to logging configuration, string, required. Check ``logging.ini`` for reference.
 
 ``alpm:*`` groups
@@ -131,15 +131,11 @@ Authorized users are stored inside internal database, if any of external provide
 Build related configuration. Group name can refer to architecture, e.g. ``build:x86_64`` can be used for x86_64 architecture specific settings.
 
 * ``archbuild_flags`` - additional flags passed to ``archbuild`` command, space separated list of strings, optional.
-* ``devtools_configs`` - path to devtools configuration directory, string, required.
+* ``build_command`` - default build command, string, required.
-* ``devtools_wrapper`` - path to devtools wrapper, space separated list of strings, required.
 * ``ignore_packages`` - list packages to ignore during a regular update (manual update will still work), space separated list of strings, optional.
 * ``include_debug_packages`` - distribute debug packages, boolean, optional, default ``yes``.
-* ``make_flags`` - additional flags passed to ``make`` command via environment variable, space separated list of strings, optional.
-* ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
 * ``makepkg_flags`` - additional flags passed to ``makepkg`` 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``.
+* ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
-* ``packager`` - default packager identifier in form ``Name Surname <mail@example.com>``, string, optional.
 * ``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.
@@ -192,7 +188,6 @@ Web server settings. This feature requires ``aiohttp`` libraries to be installed
 * ``host`` - host to bind, string, optional.
 * ``index_url`` - full URL of the repository index page, string, optional.
 * ``max_body_size`` - max body size in bytes to be validated for archive upload, integer, optional. If not set, validation will be disabled.
-* ``max_queue_size`` - max queue size for server sent event streams, integer, optional, default ``0``. If set to ``0``, queue is unlimited.
 * ``port`` - port to bind, integer, optional.
 * ``service_only`` - disable status routes (including logs), boolean, optional, default ``no``.
 * ``static_path`` - path to directory with static files, string, required.
@@ -200,7 +195,7 @@ Web server settings. This feature requires ``aiohttp`` libraries to be installed
 * ``templates`` - path to templates directories, space separated list of paths, required.
 * ``unix_socket`` - path to the listening unix socket, string, optional. If set, server will create the socket on the specified address which can (and will) be used by application. Note, that unlike usual host/port configuration, unix socket allows to perform requests without authorization.
 * ``unix_socket_unsafe`` - set unsafe (o+w) permissions to unix socket, boolean, optional, default ``yes``. This option is enabled by default, because it is supposed that unix socket is created in safe environment (only web service is supposed to be used in unsafe), but it can be disabled by configuration.
-* ``wait_timeout`` - wait timeout in seconds, maximum amount of time to be waited before lock will be free, integer, optional. If set to ``0``, wait infinitely.
+* ``wait_timeout`` - wait timeout in seconds, maximum amount of time to be waited before lock will be free, integer, optional.
 
 ``archive`` group
 -----------------

docs/faq/docker.rst

@@ -22,12 +22,6 @@ In order to make data available outside of container, you would need to mount lo
 
    docker run --privileged -v /path/to/local/repo:/var/lib/ahriman -v /path/to/overrides/overrides.ini:/etc/ahriman.ini.d/10-overrides.ini arcan1s/ahriman:latest
 
-The volume must have correct rights, e.g.:
-
-.. code-block:: shell
-
-   chown 643:643 /path/to/local/repo
-
 The action can be specified during run, e.g.:
 
 .. code-block:: shell
@@ -65,17 +59,19 @@ The following environment variables are supported:
 
 * ``AHRIMAN_ARCHITECTURE`` - architecture of the repository, default is ``x86_64``.
 * ``AHRIMAN_DEBUG`` - if set all commands will be logged to console.
+* ``AHRIMAN_FORCE_ROOT`` - force run ahriman as root instead of guessing by subcommand.
 * ``AHRIMAN_HOST`` - host for the web interface, default is ``0.0.0.0``.
 * ``AHRIMAN_MULTILIB`` - if set (default) multilib repository will be used, disabled otherwise.
 * ``AHRIMAN_OUTPUT`` - controls logging handler, e.g. ``syslog``, ``console``. The name must be found in logging configuration. Note that if ``syslog`` handler is used you will need to mount ``/dev/log`` inside container because it is not available there.
 * ``AHRIMAN_PACKAGER`` - packager name from which packages will be built, default is ``ahriman bot <ahriman@example.com>``.
 * ``AHRIMAN_PACMAN_MIRROR`` - override pacman mirror server if set.
 * ``AHRIMAN_PORT`` - HTTP server port if any, default is empty.
-* ``AHRIMAN_POSTSETUP_COMMAND`` - if set, the command which will be called after the setup command, but before any other actions.
+* ``AHRIMAN_POSTSETUP_COMMAND`` - if set, the command which will be called (as root) after the setup command, but before any other actions.
-* ``AHRIMAN_PRESETUP_COMMAND`` - if set, the command which will be called right before the setup command.
+* ``AHRIMAN_PRESETUP_COMMAND`` - if set, the command which will be called (as root) right before the setup command.
 * ``AHRIMAN_REPOSITORY`` - repository name, default is ``aur``.
 * ``AHRIMAN_REPOSITORY_SERVER`` - optional override for the repository URL. Useful if you would like to download packages from remote instead of local filesystem.
-* ``AHRIMAN_UNIX_SOCKET`` - full path to unix socket which is used by web server, default is empty. Note that more likely you would like to put it inside repository root directory (e.g. ``/var/lib/ahriman/ahriman-web.sock``) or to ``/run/ahriman``.
+* ``AHRIMAN_REPOSITORY_ROOT`` - repository root. Because of filesystem rights it is required to override default repository root. By default, it uses ``ahriman`` directory inside ahriman's home, which can be passed as mount volume.
+* ``AHRIMAN_UNIX_SOCKET`` - full path to unix socket which is used by web server, default is empty. Note that more likely you would like to put it inside ``AHRIMAN_REPOSITORY_ROOT`` directory (e.g. ``/var/lib/ahriman/ahriman/ahriman-web.sock``) or to ``/run/ahriman``.
 * ``AHRIMAN_USER`` - ahriman user, usually must not be overwritten, default is ``ahriman``.
 * ``AHRIMAN_VALIDATE_CONFIGURATION`` - if set (default) validate service configuration.
 
@@ -103,7 +99,7 @@ For that you would need to have web container instance running forever; it can b
 
 .. code-block:: shell
 
-   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
 Note about ``AHRIMAN_PORT`` environment variable which is required in order to enable web service. An additional port bind by ``-p 8080:8080`` is required to pass docker port outside of container.
 
@@ -113,7 +109,7 @@ If you are using ``AHRIMAN_UNIX_SOCKET`` variable, for every next container run
 
 .. code-block:: shell
 
-   docker run --privileged -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+   docker run --privileged -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
 Otherwise, you would need to pass ``AHRIMAN_PORT`` and mount container network to the host system (``--net=host``), e.g.:
 
@@ -132,7 +128,7 @@ In order to create configuration for additional repositories, the ``AHRIMAN_POST
 
 .. code-block:: shell
 
-   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman-web.sock -e AHRIMAN_POSTSETUP_COMMAND="ahriman --architecture x86_64 --repository aur-v2 service-setup --build-as-user ahriman --packager 'ahriman bot <ahriman@example.com>'" -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -e AHRIMAN_POSTSETUP_COMMAND="ahriman --architecture x86_64 --repository aur-v2 service-setup --build-as-user ahriman --packager 'ahriman bot <ahriman@example.com>'" -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
 The command above will also create configuration for the repository named ``aur-v2``.
 

docs/faq/non-x86_64-setup.rst

@@ -55,13 +55,6 @@ There are two possible ways to achieve same setup, by using docker container. Th
 
       FROM arcan1s/ahriman:latest
 
-#.
-   Switch to ``root`` user:
-
-   .. code-block:: dockerfile
-
-      USER root
-
 #.
    Init pacman keys. This command is required in order to populate distribution keys:
 
@@ -85,16 +78,12 @@ There are two possible ways to achieve same setup, by using docker container. Th
 
       FROM arcan1s/ahriman:latest
 
-      USER root
-
       RUN pacman-key --init
 
       RUN pacman --noconfirm -Sy wget
       RUN wget https://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.2-any.pkg.tar.zst && pacman --noconfirm -U devtools-20221208-1.2-any.pkg.tar.zst
       RUN wget https://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20230705-1.0-any.pkg.tar.zst && pacman --noconfirm -U archlinux32-keyring-20230705-1.0-any.pkg.tar.zst
 
-      USER ahriman
-
 #.
    After that you can build you own container, e.g.:
 

docs/migrations/2.22.0.rst

@@ -1,56 +0,0 @@
-To 2.22.0
----------
-
-This release stores newly generated configuration files in the repository root and changes the docker image to run as the ``ahriman`` user. Existing system-wide configuration files remain supported, so regular installations do not require manual intervention. Docker installations require data migration.
-
-Regular installation
-^^^^^^^^^^^^^^^^^^^^
-
-Newly generated ahriman and devtools configuration files are stored below ``/var/lib/ahriman/.config/ahriman`` instead of system-wide configuration directories. Existing configurations continue to work without any changes.
-
-However, it is recommended to migrate to the new configuration schema by doing the following steps:
-
-#.
-   Stop all ahriman services.
-
-#.
-   Remove the old generated configuration files. For example, for repository ``aur`` and architecture ``x86_64``:
-
-   .. code-block:: shell
-
-      sudo rm /etc/ahriman.ini.d/00-setup-overrides-x86_64-aur.ini
-      sudo rm /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
-
-   Repeat this step for every configured repository. Do not remove manually maintained configuration overrides.
-
-#.
-   Run setup command (i.e. ``ahriman service-setup``) again with the same arguments as used before as the ``ahriman`` user.
-
-#.
-   Start the services again.
-
-Docker installation
-^^^^^^^^^^^^^^^^^^^
-
-The repository root inside the Docker image has changed from ``/var/lib/ahriman/ahriman`` to ``/var/lib/ahriman``. Existing repository contents must therefore be moved one directory level up, and the volume must be owned by the ``ahriman`` user.
-
-#.
-   Stop all containers using the repository volume and create a backup.
-
-#.
-   Run a one-off container which mounts the existing volume. Replace ``VOLUME`` with the named volume or bind mount used by the installation:
-
-   .. code-block:: shell
-
-      docker run --rm --user root --entrypoint bash \
-          --volume VOLUME:/var/lib/ahriman \
-          arcan1s/ahriman:latest \
-          -c 'find /var/lib/ahriman/ahriman -mindepth 1 -maxdepth 1 -exec mv -t /var/lib/ahriman -- {} + && rmdir /var/lib/ahriman/ahriman && chown ahriman:ahriman /var/lib/ahriman'
-
-#.
-   Update custom configuration and container arguments which refer to ``/var/lib/ahriman/ahriman``. The new path is ``/var/lib/ahriman``.
-
-#.
-   Start the containers again.
-
-Please note, that some environment variables - ``AHRIMAN_FORCE_ROOT`` and ``AHRIMAN_REPOSITORY_ROOT`` - have been also removed and not supported anymore. ``AHRIMAN_POSTSETUP_COMMAND`` and ``AHRIMAN_PRESETUP_COMMAND`` are now executed as non-root user.

docs/migrations/index.rst

@@ -12,4 +12,3 @@ Upgrades to breakpoints
    2.9.0
    2.12.0
    2.16.0
-   2.22.0

docs/requirements.txt

@@ -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
+    # via ahriman (pyproject.toml)
-boto3==1.43.47
+boto3==1.38.11
-    # via ahriman-core
+    # via ahriman (pyproject.toml)
-botocore==1.43.47
+botocore==1.38.11
     # via
     #   boto3
     #   s3transfer
-cerberus==1.3.8
+cerberus==1.3.7
-    # via ahriman-core
+    # 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

docs/setup.rst

@@ -10,32 +10,65 @@ Initial setup
 
    .. code-block:: shell
 
-      sudo -u ahriman -- ahriman -a x86_64 -r aur service-setup \
+      sudo ahriman -a x86_64 -r aur service-setup ...
-          --packager "ahriman bot <ahriman@example.com>" ...
 
    .. admonition:: Details
       :collapsible: closed
 
-      ``service-setup`` does the following steps:
+      ``service-setup`` literally does the following steps:
 
       #.
-         Create a repository-specific ahriman configuration below
+         Create ``/var/lib/ahriman/.makepkg.conf`` with ``makepkg.conf`` overrides if required (at least you might want to set ``PACKAGER``):
-         ``/var/lib/ahriman/.config/ahriman/ahriman.ini.d``. This configuration stores the
+
-         packager identity, ``MAKEFLAGS`` and other options supplied on the command line.
+         .. code-block:: shell
+
+            echo 'PACKAGER="ahriman bot <ahriman@example.com>"' | sudo -u ahriman tee -a /var/lib/ahriman/.makepkg.conf
 
       #.
-         Generate the devtools pacman configuration in
+         Configure build tools (it is required for correct dependency management system):
-         ``/var/lib/ahriman/.config/ahriman/pacman.conf.d``. The file is based on the
-         configuration selected by ``--from-configuration`` and contains the requested mirror,
-         multilib settings and the ahriman repository path.
 
       #.
-         Create the repository directories, initialize the package repository and synchronize
+         Create build command (you can choose any name for command, basically it should be ``{name}-{arch}-build``):
-         its pacman database.
 
-      Both configuration locations are below the repository root and must be writable by the
+         .. code-block:: shell
-      user running ahriman. Existing system-wide overrides remain supported; see
+
-      :doc:`the 2.22.0 migration guide <migrations/2.22.0>` when upgrading.
+            ln -s /usr/bin/archbuild /usr/local/bin/aur-x86_64-build
+
+      #. 
+         Create configuration file (same as previous ``{name}.conf``):
+
+         .. code-block:: shell
+
+            cp /usr/share/devtools/pacman.conf.d/{extra,aur}.conf
+
+      #. 
+         Change configuration file, add your own repository, add multilib repository etc:
+
+         .. code-block:: shell
+
+            echo '[multilib]' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+            echo 'Include = /etc/pacman.d/mirrorlist' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+
+            echo '[aur]' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+            echo 'SigLevel = Optional TrustAll' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+            echo 'Server = file:///var/lib/ahriman/repository/$repo/$arch' | tee -a /usr/share/devtools/pacman.conf.d/aur-x86_64.conf
+
+      #. 
+         Set ``build_command`` option to point to your command:
+
+         .. code-block:: shell
+
+            echo '[build]' | tee -a /etc/ahriman.ini.d/build.ini
+            echo 'build_command = aur-x86_64-build' | tee -a /etc/ahriman.ini.d/build.ini
+
+      #.
+         Configure ``/etc/sudoers.d/ahriman`` to allow running command without a password:
+
+         .. code-block:: shell
+
+            echo 'Cmnd_Alias CARCHBUILD_CMD = /usr/local/bin/aur-x86_64-build *' | tee -a /etc/sudoers.d/ahriman
+            echo 'ahriman ALL=(ALL) NOPASSWD:SETENV: CARCHBUILD_CMD' | tee -a /etc/sudoers.d/ahriman
+            chmod 400 /etc/sudoers.d/ahriman
 
    This command supports several arguments, kindly refer to its help message.
 
@@ -44,14 +77,14 @@ Initial setup
 
    .. code-block:: shell
 
-       sudo systemctl enable --now ahriman@x86_64-aur.timer
+       systemctl enable --now ahriman@x86_64-aur.timer
 
 #. 
    Start and enable status page:
 
    .. code-block:: shell
 
-       sudo systemctl enable --now ahriman-web
+       systemctl enable --now ahriman-web
 
 #. 
    Add packages by using ``ahriman package-add {package}`` command:

frontend/package.json

@@ -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.3.0 <9.4.0",
+        "@mui/icons-material": ">=7.3.0 <7.4.0",
-        "@mui/material": ">=9.3.0 <9.4.0",
+        "@mui/material": ">=7.3.0 <7.4.0",
-        "@mui/x-data-grid": ">=9.11.0 <9.12.0",
+        "@mui/x-data-grid": ">=8.28.0 <8.29.0",
-        "@tanstack/react-query": ">=5.101.0 <5.102.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",
+        "eslint-plugin-simple-import-sort": ">=12.1.0 <12.2.0",
-        "typescript": ">=6.0.0 <6.1.0",
+        "typescript": ">=5.9.0 <5.10.0",
-        "typescript-eslint": ">=8.67.0 <8.68.0",
+        "typescript-eslint": ">=8.57.0 <8.58.0",
-        "vite": ">=8.2.0 <8.3.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.22.1"
+    "version": "2.20.0"
 }

frontend/src/App.tsx

@@ -21,7 +21,6 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import AppLayout from "components/layout/AppLayout";
 import { AuthProvider } from "contexts/AuthProvider";
 import { ClientProvider } from "contexts/ClientProvider";
-import { EventStreamProvider } from "contexts/EventStreamProvider";
 import { NotificationProvider } from "contexts/NotificationProvider";
 import { RepositoryProvider } from "contexts/RepositoryProvider";
 import { ThemeProvider } from "contexts/ThemeProvider";
@@ -31,6 +30,7 @@ const queryClient = new QueryClient({
     defaultOptions: {
         queries: {
             retry: 1,
+            staleTime: 30_000,
         },
     },
 });
@@ -42,9 +42,7 @@ export default function App(): React.JSX.Element {
                 <ClientProvider>
                     <AuthProvider>
                         <RepositoryProvider>
-                            <EventStreamProvider>
+                            <AppLayout />
-                                <AppLayout />
-                            </EventStreamProvider>
                         </RepositoryProvider>
                     </AuthProvider>
                 </ClientProvider>

frontend/src/components/common/AutoRefreshControl.tsx

@@ -0,0 +1,91 @@
+/*
+ * 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/>.
+ */
+import CheckIcon from "@mui/icons-material/Check";
+import TimerIcon from "@mui/icons-material/Timer";
+import TimerOffIcon from "@mui/icons-material/TimerOff";
+import { IconButton, ListItemIcon, ListItemText, Menu, MenuItem, Tooltip } from "@mui/material";
+import type { AutoRefreshInterval } from "models/AutoRefreshInterval";
+import React, { useState } from "react";
+
+interface AutoRefreshControlProps {
+    currentInterval: number;
+    intervals: AutoRefreshInterval[];
+    onIntervalChange: (interval: number) => void;
+}
+
+export default function AutoRefreshControl({
+    currentInterval,
+    intervals,
+    onIntervalChange,
+}: AutoRefreshControlProps): React.JSX.Element | null {
+    const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
+
+    if (intervals.length === 0) {
+        return null;
+    }
+
+    const enabled = currentInterval > 0;
+
+    return <>
+        <Tooltip title="Auto-refresh">
+            <IconButton
+                aria-label="Auto-refresh"
+                color={enabled ? "primary" : "default"}
+                onClick={event => setAnchorEl(event.currentTarget)}
+                size="small"
+            >
+                {enabled ? <TimerIcon fontSize="small" /> : <TimerOffIcon fontSize="small" />}
+            </IconButton>
+        </Tooltip>
+        <Menu
+            anchorEl={anchorEl}
+            onClose={() => setAnchorEl(null)}
+            open={Boolean(anchorEl)}
+        >
+            <MenuItem
+                onClick={() => {
+                    onIntervalChange(0);
+                    setAnchorEl(null);
+                }}
+                selected={!enabled}
+            >
+                <ListItemIcon>
+                    {!enabled && <CheckIcon fontSize="small" />}
+                </ListItemIcon>
+                <ListItemText>Off</ListItemText>
+            </MenuItem>
+            {intervals.map(interval =>
+                <MenuItem
+                    key={interval.interval}
+                    onClick={() => {
+                        onIntervalChange(interval.interval);
+                        setAnchorEl(null);
+                    }}
+                    selected={enabled && interval.interval === currentInterval}
+                >
+                    <ListItemIcon>
+                        {enabled && interval.interval === currentInterval && <CheckIcon fontSize="small" />}
+                    </ListItemIcon>
+                    <ListItemText>{interval.text}</ListItemText>
+                </MenuItem>,
+            )}
+        </Menu>
+    </>;
+}

frontend/src/components/dialogs/PackageInfoDialog.tsx

@@ -32,22 +32,27 @@ import PkgbuildTab from "components/package/PkgbuildTab";
 import { type TabKey, tabs } from "components/package/TabKey";
 import { QueryKeys } from "hooks/QueryKeys";
 import { useAuth } from "hooks/useAuth";
+import { useAutoRefresh } from "hooks/useAutoRefresh";
 import { useClient } from "hooks/useClient";
 import { useNotification } from "hooks/useNotification";
 import { useRepository } from "hooks/useRepository";
+import type { AutoRefreshInterval } from "models/AutoRefreshInterval";
 import type { Dependencies } from "models/Dependencies";
 import type { PackageStatus } from "models/PackageStatus";
 import type { Patch } from "models/Patch";
 import React, { useState } from "react";
 import { StatusHeaderStyles } from "theme/StatusColors";
+import { defaultInterval } from "utils";
 
 interface PackageInfoDialogProps {
+    autoRefreshIntervals: AutoRefreshInterval[];
     onClose: () => void;
     open: boolean;
     packageBase: string | null;
 }
 
 export default function PackageInfoDialog({
+    autoRefreshIntervals,
     onClose,
     open,
     packageBase,
@@ -58,7 +63,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);
 
@@ -68,11 +77,14 @@ export default function PackageInfoDialog({
         onClose();
     };
 
+    const autoRefresh = useAutoRefresh("package-info-autoreload-button", defaultInterval(autoRefreshIntervals));
+
     const { data: packageData } = useQuery<PackageStatus[]>({
         enabled: open,
         queryFn: localPackageBase && currentRepository ?
             () => client.fetch.fetchPackage(localPackageBase, currentRepository) : skipToken,
         queryKey: localPackageBase && currentRepository ? QueryKeys.package(localPackageBase, currentRepository) : ["packages"],
+        refetchInterval: autoRefresh.interval > 0 ? autoRefresh.interval : false,
     });
 
     const { data: dependencies } = useQuery<Dependencies>({
@@ -153,42 +165,39 @@ 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}
+                            refreshInterval={autoRefresh.interval}
                             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}
                         />
@@ -198,8 +207,11 @@ export default function PackageInfoDialog({
         </DialogContent>
 
         <PackageInfoActions
+            autoRefreshInterval={autoRefresh.interval}
+            autoRefreshIntervals={autoRefreshIntervals}
             isAuthorized={isAuthorized}
             isHeld={status?.is_held ?? false}
+            onAutoRefreshIntervalChange={autoRefresh.setInterval}
             onHoldToggle={() => void handleHoldToggle()}
             onRefreshDatabaseChange={setRefreshDatabase}
             onRemove={() => void handleRemove()}

frontend/src/components/layout/AppLayout.tsx

@@ -69,7 +69,7 @@ export default function AppLayout(): React.JSX.Element {
             </Tooltip>
         </Box>
 
-        <PackageTable />
+        <PackageTable autoRefreshIntervals={info?.autorefresh_intervals ?? []} />
 
         <Footer
             docsEnabled={info?.docs_enabled ?? false}

frontend/src/components/package/ArtifactsTab.tsx

@@ -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"
                         >

frontend/src/components/package/BuildLogsTab.tsx

@@ -23,7 +23,6 @@ import { keepPreviousData, skipToken, useQuery } from "@tanstack/react-query";
 import CodeBlock from "components/common/CodeBlock";
 import { QueryKeys } from "hooks/QueryKeys";
 import { useAutoScroll } from "hooks/useAutoScroll";
-import { useBuildLogStream } from "hooks/useBuildLogStream";
 import { useClient } from "hooks/useClient";
 import type { LogRecord } from "models/LogRecord";
 import type { RepositoryId } from "models/RepositoryId";
@@ -38,6 +37,7 @@ interface Logs {
 
 interface BuildLogsTabProps {
     packageBase: string;
+    refreshInterval: number;
     repository: RepositoryId;
 }
 
@@ -50,10 +50,10 @@ function convertLogs(records: LogRecord[], filter?: (record: LogRecord) => boole
 
 export default function BuildLogsTab({
     packageBase,
+    refreshInterval,
     repository,
 }: BuildLogsTabProps): React.JSX.Element {
     const client = useClient();
-    useBuildLogStream(packageBase, repository);
     const [selectedVersionKey, setSelectedVersionKey] = useState<string | null>(null);
     const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
 
@@ -61,7 +61,7 @@ export default function BuildLogsTab({
         enabled: !!packageBase,
         queryFn: () => client.fetch.fetchPackageLogs(packageBase, repository),
         queryKey: QueryKeys.logs(packageBase, repository),
-        refetchOnMount: "always",
+        refetchInterval: refreshInterval > 0 ? refreshInterval : false,
     });
 
     // Build version selectors from all logs
@@ -117,7 +117,7 @@ export default function BuildLogsTab({
             )
             : skipToken,
         queryKey: QueryKeys.logsVersion(packageBase, repository, activeVersion?.version ?? "", activeVersion?.processId ?? ""),
-        refetchOnMount: "always",
+        refetchInterval: refreshInterval > 0 ? refreshInterval : false,
     });
 
     // Derive displayed logs: prefer fresh polled data when available

frontend/src/components/package/EventsTab.tsx

@@ -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) => ({

frontend/src/components/package/PackageDetailsGrid.tsx

@@ -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>,
                 )}
@@ -98,7 +98,7 @@ export default function PackageDetailsGrid({ dependencies, pkg }: PackageDetails
             <Grid size={{ md: 5, xs: 8 }}>
                 <Typography variant="body2">
                     {aurUrl &&
-                        <Link href={aurUrl} rel="noopener noreferrer" target="_blank" underline="hover">{aurUrl}</Link>
+                        <Link href={aurUrl} rel="noopener noreferrer" target="_blank" underline="hover">AUR link</Link>
                     }
                 </Typography>
             </Grid>

frontend/src/components/package/PackageInfoActions.tsx

@@ -22,11 +22,16 @@ import PauseCircleIcon from "@mui/icons-material/PauseCircle";
 import PlayArrowIcon from "@mui/icons-material/PlayArrow";
 import PlayCircleIcon from "@mui/icons-material/PlayCircle";
 import { Button, Checkbox, DialogActions, FormControlLabel } from "@mui/material";
+import AutoRefreshControl from "components/common/AutoRefreshControl";
+import type { AutoRefreshInterval } from "models/AutoRefreshInterval";
 import type React from "react";
 
 interface PackageInfoActionsProps {
+    autoRefreshInterval: number;
+    autoRefreshIntervals: AutoRefreshInterval[];
     isAuthorized: boolean;
     isHeld: boolean;
+    onAutoRefreshIntervalChange: (interval: number) => void;
     onHoldToggle: () => void;
     onRefreshDatabaseChange: (checked: boolean) => void;
     onRemove: () => void;
@@ -35,8 +40,11 @@ interface PackageInfoActionsProps {
 }
 
 export default function PackageInfoActions({
+    autoRefreshInterval,
+    autoRefreshIntervals,
     isAuthorized,
     isHeld,
+    onAutoRefreshIntervalChange,
     onHoldToggle,
     onRefreshDatabaseChange,
     onRemove,
@@ -61,5 +69,10 @@ export default function PackageInfoActions({
                 </Button>
             </>
         }
+        <AutoRefreshControl
+            currentInterval={autoRefreshInterval}
+            intervals={autoRefreshIntervals}
+            onIntervalChange={onAutoRefreshIntervalChange}
+        />
     </DialogActions>;
 }

frontend/src/components/table/PackageTable.tsx

@@ -35,9 +35,14 @@ import PackageTableToolbar from "components/table/PackageTableToolbar";
 import StatusCell from "components/table/StatusCell";
 import { useDebounce } from "hooks/useDebounce";
 import { usePackageTable } from "hooks/usePackageTable";
+import type { AutoRefreshInterval } from "models/AutoRefreshInterval";
 import type { PackageRow } from "models/PackageRow";
 import React, { useMemo } from "react";
 
+interface PackageTableProps {
+    autoRefreshIntervals: AutoRefreshInterval[];
+}
+
 function createListColumn(
     field: keyof PackageRow,
     headerName: string,
@@ -54,8 +59,8 @@ function createListColumn(
     };
 }
 
-export default function PackageTable(): React.JSX.Element {
+export default function PackageTable({ autoRefreshIntervals }: PackageTableProps): React.JSX.Element {
-    const table = usePackageTable();
+    const table = usePackageTable(autoRefreshIntervals);
     const apiRef = useGridApiRef();
     const debouncedSearch = useDebounce(table.searchText, 300);
 
@@ -113,6 +118,11 @@ export default function PackageTable(): React.JSX.Element {
                 onRemoveClick: () => void table.handleRemove(),
                 onUpdateClick: () => void table.handleUpdate(),
             }}
+            autoRefresh={{
+                autoRefreshIntervals,
+                currentInterval: table.autoRefreshInterval,
+                onIntervalChange: table.onAutoRefreshIntervalChange,
+            }}
             isAuthorized={table.isAuthorized}
             hasSelection={table.selectionModel.length > 0}
             onSearchChange={table.setSearchText}
@@ -165,6 +175,7 @@ export default function PackageTable(): React.JSX.Element {
         <PackageRebuildDialog onClose={() => table.setDialogOpen(null)} open={table.dialogOpen === "rebuild"} />
         <KeyImportDialog onClose={() => table.setDialogOpen(null)} open={table.dialogOpen === "keyImport"} />
         <PackageInfoDialog
+            autoRefreshIntervals={autoRefreshIntervals}
             onClose={() => table.setSelectedPackage(null)}
             open={table.selectedPackage !== null}
             packageBase={table.selectedPackage}

frontend/src/components/table/PackageTableToolbar.tsx

@@ -30,10 +30,18 @@ import ReplayIcon from "@mui/icons-material/Replay";
 import SearchIcon from "@mui/icons-material/Search";
 import VpnKeyIcon from "@mui/icons-material/VpnKey";
 import { Box, Button, Divider, IconButton, InputAdornment, Menu, MenuItem, TextField, Tooltip } from "@mui/material";
+import AutoRefreshControl from "components/common/AutoRefreshControl";
+import type { AutoRefreshInterval } from "models/AutoRefreshInterval";
 import type { BuildStatus } from "models/BuildStatus";
 import React, { useState } from "react";
 import { StatusColors } from "theme/StatusColors";
 
+export interface AutoRefreshProps {
+    autoRefreshIntervals: AutoRefreshInterval[];
+    currentInterval: number;
+    onIntervalChange: (interval: number) => void;
+}
+
 export interface ToolbarActions {
     onAddClick: () => void;
     onDashboardClick: () => void;
@@ -48,6 +56,7 @@ export interface ToolbarActions {
 
 interface PackageTableToolbarProps {
     actions: ToolbarActions;
+    autoRefresh: AutoRefreshProps;
     hasSelection: boolean;
     isAuthorized: boolean;
     onSearchChange: (text: string) => void;
@@ -57,6 +66,7 @@ interface PackageTableToolbarProps {
 
 export default function PackageTableToolbar({
     actions,
+    autoRefresh,
     hasSelection,
     isAuthorized,
     onSearchChange,
@@ -133,6 +143,12 @@ export default function PackageTableToolbar({
             reload
         </Button>
 
+        <AutoRefreshControl
+            currentInterval={autoRefresh.currentInterval}
+            intervals={autoRefresh.autoRefreshIntervals}
+            onIntervalChange={autoRefresh.onIntervalChange}
+        />
+
         <Box sx={{ flexGrow: 1 }} />
 
         <TextField

frontend/src/hooks/useAutoRefresh.ts

@@ -0,0 +1,49 @@
+/*
+ * 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/>.
+ */
+import { useLocalStorage } from "hooks/useLocalStorage";
+import { type Dispatch, type SetStateAction, useEffect, useState } from "react";
+
+interface AutoRefreshResult {
+    interval: number;
+    setInterval: Dispatch<SetStateAction<number>>;
+    setPaused: Dispatch<SetStateAction<boolean>>;
+}
+
+export function useAutoRefresh(key: string, defaultInterval: number): AutoRefreshResult {
+    const storageKey = `ahriman-${key}`;
+    const [interval, setInterval] = useLocalStorage<number>(storageKey, defaultInterval);
+    const [paused, setPaused] = useState(false);
+
+    // Apply defaultInterval when it becomes available (e.g. after info endpoint loads)
+    // but only if the user hasn't explicitly set a preference
+    useEffect(() => {
+        if (defaultInterval > 0 && window.localStorage.getItem(storageKey) === null) {
+            setInterval(defaultInterval);
+        }
+    }, [storageKey, defaultInterval, setInterval]);
+
+    const effectiveInterval = paused ? 0 : interval;
+
+    return {
+        interval: effectiveInterval,
+        setInterval,
+        setPaused,
+    };
+}

frontend/src/hooks/useBuildLogStream.ts

@@ -1,96 +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/>.
- */
-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";
-
-interface BuildLogEvent {
-    created: number;
-    message: string;
-    process_id: string;
-    version: string;
-}
-
-function appendLogRecord(existing: LogRecord[] | undefined, record: LogRecord): 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 record: LogRecord = {
-                created: data.created,
-                message: data.message,
-                process_id: data.process_id,
-                version: data.version,
-            };
-
-            // Append to the all-logs cache
-            queryClient.setQueryData<LogRecord[]>(
-                ["logs", repository.key, packageBase],
-                existing => appendLogRecord(existing, record),
-            );
-
-            // Append to the version-specific cache
-            queryClient.setQueryData<LogRecord[]>(
-                ["logs", repository.key, packageBase, record.version, record.process_id],
-                existing => appendLogRecord(existing, record),
-            );
-        });
-
-        return () => {
-            source.close();
-        };
-    }, [queryClient, packageBase, repository, showError]);
-}

frontend/src/hooks/useEventStream.ts

@@ -1,127 +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/>.
- */
-import type { QueryClient } from "@tanstack/react-query";
-import { useNotification } from "hooks/useNotification";
-import type { RepositoryId } from "models/RepositoryId";
-import { useEffect } from "react";
-
-const GLOBAL_EVENT_TYPES = [
-    "package-held",
-    "package-outdated",
-    "package-removed",
-    "package-status-changed",
-    "package-update-failed",
-    "package-updated",
-    "service-status-changed",
-] as const;
-
-function invalidateForEvent(
-    queryClient: QueryClient,
-    repositoryKey: string,
-    eventType: string,
-    objectId?: string,
-): void {
-    switch (eventType) {
-        case "package-status-changed":
-        case "package-updated":
-        case "package-removed":
-        case "package-held":
-            void queryClient.invalidateQueries({ queryKey: ["packages", repositoryKey] });
-            void queryClient.invalidateQueries({ queryKey: ["status", repositoryKey] });
-            if (objectId) {
-                void queryClient.invalidateQueries({ queryKey: ["packages", repositoryKey, objectId] });
-                void queryClient.invalidateQueries({ queryKey: ["events", repositoryKey, objectId] });
-            }
-            break;
-        case "service-status-changed":
-            void queryClient.invalidateQueries({ queryKey: ["status", repositoryKey] });
-            break;
-        case "package-outdated":
-        case "package-update-failed":
-            void queryClient.invalidateQueries({ queryKey: ["packages", repositoryKey] });
-            if (objectId) {
-                void queryClient.invalidateQueries({ queryKey: ["packages", repositoryKey, objectId] });
-            }
-            break;
-    }
-}
-
-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[],
-    objectId?: string,
-): string {
-    const params = new URLSearchParams(repository.toQuery());
-    if (events) {
-        for (const event of events) {
-            params.append("event", event);
-        }
-    }
-    if (objectId) {
-        params.set("object_id", objectId);
-    }
-    return `/api/v1/events/stream?${params.toString()}`;
-}
-
-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);
-                }
-            });
-        }
-
-        return () => {
-            source.close();
-        };
-    }, [queryClient, repository, showError]);
-}

frontend/src/hooks/usePackageChanges.ts

@@ -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;

frontend/src/hooks/usePackageData.ts

@@ -20,37 +20,46 @@
 import { skipToken, useQuery } from "@tanstack/react-query";
 import { QueryKeys } from "hooks/QueryKeys";
 import { useAuth } from "hooks/useAuth";
+import { useAutoRefresh } from "hooks/useAutoRefresh";
 import { useClient } from "hooks/useClient";
 import { useRepository } from "hooks/useRepository";
+import type { AutoRefreshInterval } from "models/AutoRefreshInterval";
 import type { BuildStatus } from "models/BuildStatus";
 import { PackageRow } from "models/PackageRow";
 import { useMemo } from "react";
+import { defaultInterval } from "utils";
 
 export interface UsePackageDataResult {
+    autoRefresh: ReturnType<typeof useAutoRefresh>;
     isAuthorized: boolean;
     isLoading: boolean;
     rows: PackageRow[];
     status: BuildStatus | undefined;
 }
 
-export function usePackageData(): UsePackageDataResult {
+export function usePackageData(autoRefreshIntervals: AutoRefreshInterval[]): UsePackageDataResult {
     const client = useClient();
     const { currentRepository } = useRepository();
     const { isAuthorized } = useAuth();
 
+    const autoRefresh = useAutoRefresh("table-autoreload-button", defaultInterval(autoRefreshIntervals));
+
     const { data: packages = [], isLoading } = useQuery({
         queryFn: currentRepository ? () => client.fetch.fetchPackages(currentRepository) : skipToken,
         queryKey: currentRepository ? QueryKeys.packages(currentRepository) : ["packages"],
+        refetchInterval: autoRefresh.interval > 0 ? autoRefresh.interval : false,
     });
 
     const { data: status } = useQuery({
         queryFn: currentRepository ? () => client.fetch.fetchServerStatus(currentRepository) : skipToken,
         queryKey: currentRepository ? QueryKeys.status(currentRepository) : ["status"],
+        refetchInterval: autoRefresh.interval > 0 ? autoRefresh.interval : false,
     });
 
     const rows = useMemo(() => packages.map(descriptor => new PackageRow(descriptor)), [packages]);
 
     return {
+        autoRefresh,
         isLoading,
         isAuthorized,
         rows,

frontend/src/hooks/usePackageTable.ts

@@ -21,10 +21,13 @@ import type { GridFilterModel } from "@mui/x-data-grid";
 import { usePackageActions } from "hooks/usePackageActions";
 import { usePackageData } from "hooks/usePackageData";
 import { useTableState } from "hooks/useTableState";
+import type { AutoRefreshInterval } from "models/AutoRefreshInterval";
 import type { BuildStatus } from "models/BuildStatus";
 import type { PackageRow } from "models/PackageRow";
+import { useEffect } from "react";
 
 export interface UsePackageTableResult {
+    autoRefreshInterval: number;
     columnVisibility: Record<string, boolean>;
     dialogOpen: "dashboard" | "add" | "rebuild" | "keyImport" | null;
     filterModel: GridFilterModel;
@@ -34,6 +37,7 @@ export interface UsePackageTableResult {
     handleUpdate: () => Promise<void>;
     isAuthorized: boolean;
     isLoading: boolean;
+    onAutoRefreshIntervalChange: (interval: number) => void;
     paginationModel: { page: number; pageSize: number };
     rows: PackageRow[];
     searchText: string;
@@ -49,14 +53,23 @@ export interface UsePackageTableResult {
     status: BuildStatus | undefined;
 }
 
-export function usePackageTable(): UsePackageTableResult {
+export function usePackageTable(autoRefreshIntervals: AutoRefreshInterval[]): UsePackageTableResult {
-    const { rows, isLoading, isAuthorized, status } = usePackageData();
+    const { rows, isLoading, isAuthorized, status, autoRefresh } = usePackageData(autoRefreshIntervals);
     const tableState = useTableState();
     const actions = usePackageActions(tableState.selectionModel, tableState.setSelectionModel);
 
+    // Pause auto-refresh when dialog is open
+    const isDialogOpen = tableState.dialogOpen !== null || tableState.selectedPackage !== null;
+    const setPaused = autoRefresh.setPaused;
+    useEffect(() => {
+        setPaused(isDialogOpen);
+    }, [isDialogOpen, setPaused]);
+
     return {
+        autoRefreshInterval: autoRefresh.interval,
         isLoading,
         isAuthorized,
+        onAutoRefreshIntervalChange: autoRefresh.setInterval,
         rows,
         status,
         ...actions,

frontend/src/models/AutoRefreshInterval.ts

@@ -17,16 +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 { useQueryClient } from "@tanstack/react-query";
+export interface AutoRefreshInterval {
-import { useEventStream } from "hooks/useEventStream";
+    interval: number;
-import { useRepository } from "hooks/useRepository";
+    is_active: boolean;
-import type { ReactNode } from "react";
+    text: string;
-
-export function EventStreamProvider({ children }: { children: ReactNode }): ReactNode {
-    const queryClient = useQueryClient();
-    const { currentRepository } = useRepository();
-
-    useEventStream(queryClient, currentRepository);
-
-    return children;
 }

frontend/src/models/InfoResponse.ts

@@ -18,10 +18,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import type { AuthInfo } from "models/AuthInfo";
+import type { AutoRefreshInterval } from "models/AutoRefreshInterval";
 import type { RepositoryId } from "models/RepositoryId";
 
 export interface InfoResponse {
     auth: AuthInfo;
+    autorefresh_intervals: AutoRefreshInterval[];
     docs_enabled: boolean;
     index_url?: string;
     repositories: RepositoryId[];

frontend/src/utils.ts

@@ -17,6 +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 { AutoRefreshInterval } from "models/AutoRefreshInterval";
+
 export const DETAIL_TABLE_PROPS = {
     density: "compact" as const,
     disableColumnSorting: true,
@@ -25,6 +27,10 @@ export const DETAIL_TABLE_PROPS = {
     sx: { height: 400, mt: 1 },
 };
 
+export function defaultInterval(intervals: AutoRefreshInterval[]): number {
+    return intervals.find(interval => interval.is_active)?.interval ?? 0;
+}
+
 declare global {
     interface Array<T> {
         unique(): T[];

frontend/tsconfig.json

@@ -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,

frontend/vite.config.ts

@@ -19,7 +19,7 @@ export default defineConfig({
     build: {
         chunkSizeWarningLimit: 10000,
         emptyOutDir: false,
-        outDir: path.resolve(import.meta.dirname, "../ahriman-web/package/share/ahriman/templates"),
+        outDir: path.resolve(__dirname, "../package/share/ahriman/templates"),
         rolldownOptions: {
             output: {
                 assetFileNames: "static/[name].[ext]",

package/archlinux/PKGBUILD

@@ -2,18 +2,17 @@
 
 pkgbase='ahriman'
 pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.22.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"
+        "$pkgbase.tmpfiles")
-        "sudoers.conf")
 
 build() {
     cd "$pkgbase-$pkgver"
@@ -21,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
-    python -m build --wheel --no-isolation "ahriman-triggers"
-    python -m build --wheel --no-isolation "ahriman-web"
 }
 
 package_ahriman() {
@@ -51,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"
@@ -60,8 +58,6 @@ package_ahriman-core() {
 
     install -Dm644 "$srcdir/$pkgbase.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf"
     install -Dm644 "$srcdir/$pkgbase.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf"
-
-    install -Dm440 "$srcdir/sudoers.conf" "$pkgdir/etc/sudoers.d/$pkgname"
 }
 
 package_ahriman-triggers() {
@@ -72,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"
 }
@@ -91,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"
 }

package/share/ahriman/settings/ahriman.ini

@@ -1,7 +1,6 @@
 [settings]
 ; Relative path to directory with configuration files overrides. Overrides will be applied in alphabetic order.
-include[] = ahriman.ini.d
+include = ahriman.ini.d
-include[] = ${repository:root}/.config/ahriman/ahriman.ini.d
 ; Relative path to configuration used by logging package.
 logging = ahriman.ini.d/logging.ini
 ; Perform database migrations on the application start. Do not touch this option unless you know what you are doing.
@@ -35,24 +34,16 @@ retry_backoff = 1.0
 [build]
 ; List of additional flags passed to archbuild command.
 ;archbuild_flags =
-; Path to local directory with devtools configuration files, which will be bind-mounted for devtools.
-devtools_configs = ${repository:root}/.config/ahriman/pacman.conf.d
 ; Path to build command.
-devtools_wrapper = ahriman-archbuild
+;build_command =
 ; List of packages to be ignored during automatic updates.
 ;ignore_packages =
 ; Include debug packages.
 ;include_debug_packages = yes
-; List of additional flags passed to make via environment variable via makepkg command.
-;make_flags =
 ; List of additional flags passed to makechrootpkg command.
 ;makechrootpkg_flags =
 ; List of additional flags passed to makepkg command.
 makepkg_flags = --nocolor --ignorearch
-; Minimal age in seconds since the latest AUR package modification before automatic updates are allowed.
-;min_age = 0
-; Default packager identifier to be used for package builds
-;packager =
 ; List of paths to be used for implicit dependency scan. Regular expressions are supported.
 scan_paths = ^usr/lib(?!/cmake).*$
 ; List of enabled triggers in the order of calls.

package/share/ahriman/settings/ahriman.ini.d/00-web.ini

@@ -46,8 +46,6 @@ host = 127.0.0.1
 ;index_url =
 ; Max file size in bytes which can be uploaded to the server. Requires ${web:enable_archive_upload} to be enabled.
 ;max_body_size =
-; Max event queue size used for server sent event endpoints (0 is infinite)
-;max_queue_size = 0
 ; Port to listen. Must be set, if the web service is enabled.
 ;port =
 ; Disable status (e.g. package status, logs, etc) endpoints. Useful for build only modes.

package/share/bash-completion/completions/_ahriman

@@ -1,129 +1,134 @@
-# AUTOMATICALLY GENERATED by https://github.com/tqdm/shtab
+# 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_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_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_aur_search_option_strings=(-h --help -e --exit-code --info --no-info --sort-by)
+_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_check_option_strings=(-h --help --changes --no-changes --check-files --no-check-files -e --exit-code --vcs --no-vcs -y --refresh)
+_shtab_ahriman_aur_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
-_shtab_ahriman_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
+_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_config_option_strings=(-h --help --info --no-info --secure --no-secure)
+_shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
-_shtab_ahriman_config_validate_option_strings=(-h --help -e --exit-code)
+_shtab_ahriman_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
-_shtab_ahriman_copy_option_strings=(-h --help -e --exit-code --remove)
+_shtab_ahriman_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
-_shtab_ahriman_daemon_option_strings=(-h --help -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 --refresh)
+_shtab_ahriman_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
-_shtab_ahriman_help_option_strings=(-h --help)
+_shtab_ahriman_daemon_option_strings=('-h' '--help' '-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' '--refresh')
-_shtab_ahriman_help_commands_unsafe_option_strings=(-h --help)
+_shtab_ahriman_help_option_strings=('-h' '--help')
-_shtab_ahriman_help_updates_option_strings=(-h --help -e --exit-code)
+_shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help')
-_shtab_ahriman_help_version_option_strings=(-h --help)
+_shtab_ahriman_help_updates_option_strings=('-h' '--help' '-e' '--exit-code')
-_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_help_version_option_strings=('-h' '--help')
-_shtab_ahriman_key_import_option_strings=(-h --help --key-server)
+_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_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_key_import_option_strings=('-h' '--help' '--key-server')
-_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_option_strings=('-h' '--help' '-e' '--exit-code')
-_shtab_ahriman_package_changes_remove_option_strings=(-h --help)
+_shtab_ahriman_package_changes_remove_option_strings=('-h' '--help')
-_shtab_ahriman_package_copy_option_strings=(-h --help -e --exit-code --remove)
+_shtab_ahriman_package_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
-_shtab_ahriman_package_hold_option_strings=(-h --help)
+_shtab_ahriman_package_remove_option_strings=('-h' '--help')
-_shtab_ahriman_package_pkgbuild_option_strings=(-h --help -e --exit-code)
+_shtab_ahriman_package_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
-_shtab_ahriman_package_pkgbuild_remove_option_strings=(-h --help)
+_shtab_ahriman_package_status_remove_option_strings=('-h' '--help')
-_shtab_ahriman_package_remove_option_strings=(-h --help)
+_shtab_ahriman_package_status_update_option_strings=('-h' '--help' '-s' '--status')
-_shtab_ahriman_package_rollback_option_strings=(-h --help --hold --no-hold -u --username)
+_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_package_status_option_strings=(-h --help --ahriman -e --exit-code --info --no-info -s --status)
+_shtab_ahriman_patch_add_option_strings=('-h' '--help')
-_shtab_ahriman_package_status_remove_option_strings=(-h --help)
+_shtab_ahriman_patch_list_option_strings=('-h' '--help' '-e' '--exit-code' '-v' '--variable')
-_shtab_ahriman_package_status_update_option_strings=(-h --help -s --status)
+_shtab_ahriman_patch_remove_option_strings=('-h' '--help' '-v' '--variable')
-_shtab_ahriman_package_unhold_option_strings=(-h --help)
+_shtab_ahriman_patch_set_add_option_strings=('-h' '--help' '-t' '--track')
-_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_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
-_shtab_ahriman_patch_add_option_strings=(-h --help)
+_shtab_ahriman_remove_option_strings=('-h' '--help')
-_shtab_ahriman_patch_list_option_strings=(-h --help -e --exit-code -v --variable)
+_shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
-_shtab_ahriman_patch_remove_option_strings=(-h --help -v --variable)
+_shtab_ahriman_repo_backup_option_strings=('-h' '--help')
-_shtab_ahriman_patch_set_add_option_strings=(-h --help -t --track)
+_shtab_ahriman_repo_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_rebuild_option_strings=(-h --help --depends-on --dry-run --from-database --increment --no-increment -e --exit-code -s --status -u --username)
+_shtab_ahriman_repo_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
-_shtab_ahriman_remove_option_strings=(-h --help)
+_shtab_ahriman_repo_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
-_shtab_ahriman_remove_unknown_option_strings=(-h --help --dry-run)
+_shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
-_shtab_ahriman_repo_backup_option_strings=(-h --help)
+_shtab_ahriman_repo_create_keyring_option_strings=('-h' '--help')
-_shtab_ahriman_repo_check_option_strings=(-h --help --changes --no-changes --check-files --no-check-files -e --exit-code --vcs --no-vcs -y --refresh)
+_shtab_ahriman_repo_create_mirrorlist_option_strings=('-h' '--help')
-_shtab_ahriman_repo_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
+_shtab_ahriman_repo_daemon_option_strings=('-h' '--help' '-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' '--refresh')
-_shtab_ahriman_repo_config_option_strings=(-h --help --info --no-info --secure --no-secure)
+_shtab_ahriman_repo_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_repo_config_validate_option_strings=(-h --help -e --exit-code)
+_shtab_ahriman_repo_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
-_shtab_ahriman_repo_create_keyring_option_strings=(-h --help)
+_shtab_ahriman_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
-_shtab_ahriman_repo_create_mirrorlist_option_strings=(-h --help)
+_shtab_ahriman_repo_report_option_strings=('-h' '--help')
-_shtab_ahriman_repo_daemon_option_strings=(-h --help -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 --refresh)
+_shtab_ahriman_repo_restore_option_strings=('-h' '--help' '-o' '--output')
-_shtab_ahriman_repo_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_repo_setup_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_repo_rebuild_option_strings=(-h --help --depends-on --dry-run --from-database --increment --no-increment -e --exit-code -s --status -u --username)
+_shtab_ahriman_repo_sign_option_strings=('-h' '--help')
-_shtab_ahriman_repo_remove_unknown_option_strings=(-h --help --dry-run)
+_shtab_ahriman_repo_statistics_option_strings=('-h' '--help' '--chart' '-e' '--event' '--from-date' '--limit' '--offset' '--to-date')
-_shtab_ahriman_repo_report_option_strings=(-h --help)
+_shtab_ahriman_repo_status_update_option_strings=('-h' '--help' '-s' '--status')
-_shtab_ahriman_repo_restore_option_strings=(-h --help -o --output)
+_shtab_ahriman_repo_sync_option_strings=('-h' '--help')
-_shtab_ahriman_repo_setup_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_repo_tree_option_strings=('-h' '--help' '-p' '--partitions')
-_shtab_ahriman_repo_sign_option_strings=(-h --help)
+_shtab_ahriman_repo_triggers_option_strings=('-h' '--help')
-_shtab_ahriman_repo_statistics_option_strings=(-h --help --chart -e --event --from-date --limit --offset --to-date)
+_shtab_ahriman_repo_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_repo_status_update_option_strings=(-h --help -s --status)
+_shtab_ahriman_report_option_strings=('-h' '--help')
-_shtab_ahriman_repo_sync_option_strings=(-h --help)
+_shtab_ahriman_run_option_strings=('-h' '--help')
-_shtab_ahriman_repo_tree_option_strings=(-h --help -p --partitions)
+_shtab_ahriman_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
-_shtab_ahriman_repo_triggers_option_strings=(-h --help)
+_shtab_ahriman_service_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
-_shtab_ahriman_repo_update_option_strings=(-h --help --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run -e --exit-code --increment --no-increment --local --no-local --manual --no-manual -u --username --vcs --no-vcs -y --refresh)
+_shtab_ahriman_service_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
-_shtab_ahriman_report_option_strings=(-h --help)
+_shtab_ahriman_service_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
-_shtab_ahriman_run_option_strings=(-h --help)
+_shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server')
-_shtab_ahriman_search_option_strings=(-h --help -e --exit-code --info --no-info --sort-by)
+_shtab_ahriman_service_repositories_option_strings=('-h' '--help' '--id-only' '--no-id-only')
-_shtab_ahriman_service_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
+_shtab_ahriman_service_run_option_strings=('-h' '--help')
-_shtab_ahriman_service_config_option_strings=(-h --help --info --no-info --secure --no-secure)
+_shtab_ahriman_service_setup_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_service_config_validate_option_strings=(-h --help -e --exit-code)
+_shtab_ahriman_service_shell_option_strings=('-h' '--help' '-o' '--output')
-_shtab_ahriman_service_key_import_option_strings=(-h --help --key-server)
+_shtab_ahriman_service_tree_migrate_option_strings=('-h' '--help')
-_shtab_ahriman_service_repositories_option_strings=(-h --help --id-only --no-id-only)
+_shtab_ahriman_setup_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_service_run_option_strings=(-h --help)
+_shtab_ahriman_shell_option_strings=('-h' '--help' '-o' '--output')
-_shtab_ahriman_service_setup_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_sign_option_strings=('-h' '--help')
-_shtab_ahriman_service_shell_option_strings=(-h --help -o --output)
+_shtab_ahriman_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
-_shtab_ahriman_service_tree_migrate_option_strings=(-h --help)
+_shtab_ahriman_status_update_option_strings=('-h' '--help' '-s' '--status')
-_shtab_ahriman_setup_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_sync_option_strings=('-h' '--help')
-_shtab_ahriman_shell_option_strings=(-h --help -o --output)
+_shtab_ahriman_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_sign_option_strings=(-h --help)
+_shtab_ahriman_user_add_option_strings=('-h' '--help' '--key' '--packager' '-p' '--password' '-R' '--role')
-_shtab_ahriman_status_option_strings=(-h --help --ahriman -e --exit-code --info --no-info -s --status)
+_shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-R' '--role')
-_shtab_ahriman_status_update_option_strings=(-h --help -s --status)
+_shtab_ahriman_user_remove_option_strings=('-h' '--help')
-_shtab_ahriman_sync_option_strings=(-h --help)
+_shtab_ahriman_version_option_strings=('-h' '--help')
-_shtab_ahriman_update_option_strings=(-h --help --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run -e --exit-code --increment --no-increment --local --no-local --manual --no-manual -u --username --vcs --no-vcs -y --refresh)
+_shtab_ahriman_web_option_strings=('-h' '--help')
-_shtab_ahriman_user_add_option_strings=(-h --help --key --packager -p --password -R --role)
+_shtab_ahriman_web_reload_option_strings=('-h' '--help')
-_shtab_ahriman_user_list_option_strings=(-h --help -e --exit-code -R --role)
-_shtab_ahriman_user_remove_option_strings=(-h --help)
-_shtab_ahriman_version_option_strings=(-h --help)
-_shtab_ahriman_web_option_strings=(-h --help)
-_shtab_ahriman_web_reload_option_strings=(-h --help)
-_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__s_choices=(auto archive aur directory local remote repository)
+_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_add___source_choices=(auto archive aur directory local remote repository)
+_shtab_ahriman___log_handler_choices=('console' 'syslog' 'journald')
-_shtab_ahriman_aur_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)
+_shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_init___sign_target_choices=(disabled packages repository)
+_shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_package_add__s_choices=(auto archive aur directory local remote repository)
+_shtab_ahriman_aur_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')
-_shtab_ahriman_package_add___source_choices=(auto archive aur directory local remote repository)
+_shtab_ahriman_init___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_package_status__s_choices=(unknown pending building failed success)
+_shtab_ahriman_package_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_package_status___status_choices=(unknown pending building failed success)
+_shtab_ahriman_package_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_package_status_update__s_choices=(unknown pending building failed success)
+_shtab_ahriman_package_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_package_status_update___status_choices=(unknown pending building failed success)
+_shtab_ahriman_package_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_package_update__s_choices=(auto archive aur directory local remote repository)
+_shtab_ahriman_package_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_package_update___source_choices=(auto archive aur directory local remote repository)
+_shtab_ahriman_package_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_rebuild__s_choices=(unknown pending building failed success)
+_shtab_ahriman_package_update__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_rebuild___status_choices=(unknown pending building failed success)
+_shtab_ahriman_package_update___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_repo_init___sign_target_choices=(disabled packages repository)
+_shtab_ahriman_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_repo_rebuild__s_choices=(unknown pending building failed success)
+_shtab_ahriman_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_repo_rebuild___status_choices=(unknown pending building failed success)
+_shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_repo_setup___sign_target_choices=(disabled packages repository)
+_shtab_ahriman_repo_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_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_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_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_setup___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_repo_status_update__s_choices=(unknown pending building failed success)
+_shtab_ahriman_repo_statistics__e_choices=('package-outdated' 'package-removed' 'package-update-failed' 'package-updated')
-_shtab_ahriman_repo_status_update___status_choices=(unknown pending building failed success)
+_shtab_ahriman_repo_statistics___event_choices=('package-outdated' 'package-removed' 'package-update-failed' 'package-updated')
-_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)
+_shtab_ahriman_repo_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_service_setup___sign_target_choices=(disabled packages repository)
+_shtab_ahriman_repo_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_setup___sign_target_choices=(disabled packages repository)
+_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')
-_shtab_ahriman_status__s_choices=(unknown pending building failed success)
+_shtab_ahriman_service_setup___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_status___status_choices=(unknown pending building failed success)
+_shtab_ahriman_setup___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_status_update__s_choices=(unknown pending building failed success)
+_shtab_ahriman_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_status_update___status_choices=(unknown pending building failed success)
+_shtab_ahriman_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_user_add__R_choices=(unauthorized read reporter full)
+_shtab_ahriman_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_user_add___role_choices=(unauthorized read reporter full)
+_shtab_ahriman_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_user_list__R_choices=(unauthorized read reporter full)
+_shtab_ahriman_user_add__R_choices=('unauthorized' 'read' 'reporter' 'full')
-_shtab_ahriman_user_list___role_choices=(unauthorized read reporter full)
+_shtab_ahriman_user_add___role_choices=('unauthorized' 'read' 'reporter' 'full')
-_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_user_list__R_choices=('unauthorized' 'read' 'reporter' 'full')
-_shtab_ahriman___log_handler_choices=(console syslog journald)
+_shtab_ahriman_user_list___role_choices=('unauthorized' 'read' 'reporter' 'full')
 
+_shtab_ahriman_pos_0_nargs=A...
+_shtab_ahriman__h_nargs=0
+_shtab_ahriman___help_nargs=0
+_shtab_ahriman___force_nargs=0
+_shtab_ahriman__q_nargs=0
+_shtab_ahriman___quiet_nargs=0
+_shtab_ahriman___report_nargs=0
+_shtab_ahriman___no_report_nargs=0
+_shtab_ahriman___unsafe_nargs=0
+_shtab_ahriman__V_nargs=0
+_shtab_ahriman___version_nargs=0
 _shtab_ahriman_add_pos_0_nargs=+
 _shtab_ahriman_add__h_nargs=0
 _shtab_ahriman_add___help_nargs=0
@@ -146,7 +151,7 @@ _shtab_ahriman_aur_search__e_nargs=0
 _shtab_ahriman_aur_search___exit_code_nargs=0
 _shtab_ahriman_aur_search___info_nargs=0
 _shtab_ahriman_aur_search___no_info_nargs=0
-_shtab_ahriman_check_pos_0_nargs='*'
+_shtab_ahriman_check_pos_0_nargs=*
 _shtab_ahriman_check__h_nargs=0
 _shtab_ahriman_check___help_nargs=0
 _shtab_ahriman_check___changes_nargs=0
@@ -212,7 +217,7 @@ _shtab_ahriman_daemon__y_nargs=0
 _shtab_ahriman_daemon___refresh_nargs=0
 _shtab_ahriman_help__h_nargs=0
 _shtab_ahriman_help___help_nargs=0
-_shtab_ahriman_help_commands_unsafe_pos_0_nargs='*'
+_shtab_ahriman_help_commands_unsafe_pos_0_nargs=*
 _shtab_ahriman_help_commands_unsafe__h_nargs=0
 _shtab_ahriman_help_commands_unsafe___help_nargs=0
 _shtab_ahriman_help_updates__h_nargs=0
@@ -246,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
@@ -264,23 +263,10 @@ _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_status_pos_0_nargs=*
-_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
 _shtab_ahriman_package_status___ahriman_nargs=0
@@ -291,12 +277,9 @@ _shtab_ahriman_package_status___no_info_nargs=0
 _shtab_ahriman_package_status_remove_pos_0_nargs=+
 _shtab_ahriman_package_status_remove__h_nargs=0
 _shtab_ahriman_package_status_remove___help_nargs=0
-_shtab_ahriman_package_status_update_pos_0_nargs='*'
+_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
@@ -338,7 +321,7 @@ _shtab_ahriman_remove_unknown___help_nargs=0
 _shtab_ahriman_remove_unknown___dry_run_nargs=0
 _shtab_ahriman_repo_backup__h_nargs=0
 _shtab_ahriman_repo_backup___help_nargs=0
-_shtab_ahriman_repo_check_pos_0_nargs='*'
+_shtab_ahriman_repo_check_pos_0_nargs=*
 _shtab_ahriman_repo_check__h_nargs=0
 _shtab_ahriman_repo_check___help_nargs=0
 _shtab_ahriman_repo_check___changes_nargs=0
@@ -431,7 +414,7 @@ _shtab_ahriman_repo_setup___makeflags_jobs_nargs=0
 _shtab_ahriman_repo_setup___no_makeflags_jobs_nargs=0
 _shtab_ahriman_repo_setup___multilib_nargs=0
 _shtab_ahriman_repo_setup___no_multilib_nargs=0
-_shtab_ahriman_repo_sign_pos_0_nargs='*'
+_shtab_ahriman_repo_sign_pos_0_nargs=*
 _shtab_ahriman_repo_sign__h_nargs=0
 _shtab_ahriman_repo_sign___help_nargs=0
 _shtab_ahriman_repo_statistics__h_nargs=0
@@ -442,10 +425,10 @@ _shtab_ahriman_repo_sync__h_nargs=0
 _shtab_ahriman_repo_sync___help_nargs=0
 _shtab_ahriman_repo_tree__h_nargs=0
 _shtab_ahriman_repo_tree___help_nargs=0
-_shtab_ahriman_repo_triggers_pos_0_nargs='*'
+_shtab_ahriman_repo_triggers_pos_0_nargs=*
 _shtab_ahriman_repo_triggers__h_nargs=0
 _shtab_ahriman_repo_triggers___help_nargs=0
-_shtab_ahriman_repo_update_pos_0_nargs='*'
+_shtab_ahriman_repo_update_pos_0_nargs=*
 _shtab_ahriman_repo_update__h_nargs=0
 _shtab_ahriman_repo_update___help_nargs=0
 _shtab_ahriman_repo_update___aur_nargs=0
@@ -522,6 +505,8 @@ _shtab_ahriman_service_setup___multilib_nargs=0
 _shtab_ahriman_service_setup___no_multilib_nargs=0
 _shtab_ahriman_service_shell__h_nargs=0
 _shtab_ahriman_service_shell___help_nargs=0
+_shtab_ahriman_service_shell__v_nargs=0
+_shtab_ahriman_service_shell___verbose_nargs=0
 _shtab_ahriman_service_tree_migrate__h_nargs=0
 _shtab_ahriman_service_tree_migrate___help_nargs=0
 _shtab_ahriman_setup__h_nargs=0
@@ -534,10 +519,12 @@ _shtab_ahriman_setup___multilib_nargs=0
 _shtab_ahriman_setup___no_multilib_nargs=0
 _shtab_ahriman_shell__h_nargs=0
 _shtab_ahriman_shell___help_nargs=0
-_shtab_ahriman_sign_pos_0_nargs='*'
+_shtab_ahriman_shell__v_nargs=0
+_shtab_ahriman_shell___verbose_nargs=0
+_shtab_ahriman_sign_pos_0_nargs=*
 _shtab_ahriman_sign__h_nargs=0
 _shtab_ahriman_sign___help_nargs=0
-_shtab_ahriman_status_pos_0_nargs='*'
+_shtab_ahriman_status_pos_0_nargs=*
 _shtab_ahriman_status__h_nargs=0
 _shtab_ahriman_status___help_nargs=0
 _shtab_ahriman_status___ahriman_nargs=0
@@ -545,12 +532,12 @@ _shtab_ahriman_status__e_nargs=0
 _shtab_ahriman_status___exit_code_nargs=0
 _shtab_ahriman_status___info_nargs=0
 _shtab_ahriman_status___no_info_nargs=0
-_shtab_ahriman_status_update_pos_0_nargs='*'
+_shtab_ahriman_status_update_pos_0_nargs=*
 _shtab_ahriman_status_update__h_nargs=0
 _shtab_ahriman_status_update___help_nargs=0
 _shtab_ahriman_sync__h_nargs=0
 _shtab_ahriman_sync___help_nargs=0
-_shtab_ahriman_update_pos_0_nargs='*'
+_shtab_ahriman_update_pos_0_nargs=*
 _shtab_ahriman_update__h_nargs=0
 _shtab_ahriman_update___help_nargs=0
 _shtab_ahriman_update___aur_nargs=0
@@ -588,17 +575,6 @@ _shtab_ahriman_web__h_nargs=0
 _shtab_ahriman_web___help_nargs=0
 _shtab_ahriman_web_reload__h_nargs=0
 _shtab_ahriman_web_reload___help_nargs=0
-_shtab_ahriman_pos_0_nargs=A...
-_shtab_ahriman__h_nargs=0
-_shtab_ahriman___help_nargs=0
-_shtab_ahriman___force_nargs=0
-_shtab_ahriman__q_nargs=0
-_shtab_ahriman___quiet_nargs=0
-_shtab_ahriman___report_nargs=0
-_shtab_ahriman___no_report_nargs=0
-_shtab_ahriman___unsafe_nargs=0
-_shtab_ahriman__V_nargs=0
-_shtab_ahriman___version_nargs=0
 
 
 # $1=COMP_WORDS[1]
@@ -676,7 +652,7 @@ _shtab_ahriman() {
 
   local prefix=_shtab_ahriman
   local word_index=0
-  local pos_only=0 # "--" delimiter not encountered yet
+  local pos_only=0 # "--" delimeter not encountered yet
   _set_parser_defaults
   word_index=1
 
@@ -709,7 +685,7 @@ _shtab_ahriman() {
         _set_new_action "pos_${completed_positional_actions}" true
       fi
     else
-      pos_only=1 # "--" delimiter encountered
+      pos_only=1 # "--" delimeter encountered
     fi
 
     let "word_index+=1"
@@ -717,21 +693,20 @@ _shtab_ahriman() {
 
   # Generate the completions
 
-  COMPREPLY=()
   if [[ $pos_only = 0 && "${completing_word}" == -* ]]; then
     # optional argument started: use option strings
-    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
+    COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
-      compgen -W "${current_option_strings[*]}" -- "${completing_word}")
+  elif [[ "${previous_word}" == ">" || "${previous_word}" == ">>" ||
-  elif [[ "${previous_word}" =~ ^[0-9\&]*[\<\>]\>?$ ]]; then
+          "${previous_word}" =~ ^[12]">" || "${previous_word}" =~ ^[12]">>" ]]; then
     # handle redirection operators
-    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(compgen -f -- "${completing_word}")
+    COMPREPLY=( $(compgen -f -- "${completing_word}") )
   else
     # use choices & compgen
-    [ -n "${current_action_compgen}" ] &&
+    local IFS=$'\n' # items may contain spaces, so delimit using newline
-      while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
+    COMPREPLY=( $([ -n "${current_action_compgen}" ] \
-        "${current_action_compgen}" "${completing_word}")
+                  && "${current_action_compgen}" "${completing_word}") )
-    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
+    unset IFS
-      compgen -W "${current_action_choices[*]}" -- "${completing_word}")
+    COMPREPLY+=( $(compgen -W "${current_action_choices[*]}" -- "${completing_word}") )
   fi
 
   return 0