feat: implement CSRF protection

feat: handle only unknownpackageerror on aur load
bug: filter logs by repository (twice) before rotation
2026-04-07 11:03:37 +00:00 · 2026-02-17 03:41:45 +02:00 · 2026-02-17 03:41:45 +02:00 · 2026-02-17 01:43:17 +02:00 · 2026-02-17 01:34:54 +02:00 · 2026-02-17 01:27:59 +02:00
37 changed files with 1627 additions and 2272 deletions
--- a/docs/_static/architecture.dot
+++ b/docs/_static/architecture.dot
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -97,15 +97,6 @@ libalpm and AUR related configuration. Group name can refer to architecture, e.g
 * ``sync_files_database`` - download files database from mirror, boolean, required.
 * ``use_ahriman_cache`` - use local pacman package cache instead of system one, boolean, required. With this option enabled you might want to refresh database periodically (available as additional flag for some subcommands). If set to ``no``, databases must be synchronized manually.

-``aur`` group
-------------
-
-Archlinux User Repository related configuration.
-
-* ``max_retries`` - maximum amount of retries of HTTP requests, integer, optional, default ``0``.
-* ``retry_backoff`` - retry exponential backoff, float, optional, default ``0.0``.
-* ``timeout`` - HTTP request timeout in seconds, integer, optional, default is ``30``.
-
 ``auth`` group
 --------------

@@ -167,9 +158,7 @@ Reporting to web service related settings. In most cases there is fallback to we

 * ``enabled`` - enable reporting to web service, boolean, optional, default ``yes`` for backward compatibility.
 * ``address`` - remote web service address with protocol, string, optional. In case of websocket, the ``http+unix`` scheme and URL encoded address (e.g. ``%2Fvar%2Flib%2Fahriman`` for ``/var/lib/ahriman``) must be used, e.g. ``http+unix://%2Fvar%2Flib%2Fahriman%2Fsocket``. In case if none set, it will be guessed from ``web`` section.
-* ``max_retries`` - maximum amount of retries of HTTP requests, integer, optional, default ``0``.
 * ``password`` - password to authorize in web service in order to update service status, string, required in case if authorization enabled.
-* ``retry_backoff`` - retry exponential backoff, float, optional, default ``0.0``.
 * ``suppress_http_log_errors`` - suppress HTTP log errors, boolean, optional, default ``no``. If set to ``yes``, any HTTP log errors (e.g. if web server is not available, but HTTP logging is enabled) will be suppressed.
 * ``timeout`` - HTTP request timeout in seconds, integer, optional, default is ``30``.
 * ``username`` - username to authorize in web service in order to update service status, string, required in case if authorization enabled.
@@ -378,8 +367,6 @@ Section name must be either ``telegram`` (plus optional architecture name, e.g.
 * ``chat_id`` - telegram chat id, either string with ``@`` or integer value, required.
 * ``homepage`` - link to homepage, string, optional.
 * ``link_path`` - prefix for HTML links, string, required.
-* ``max_retries`` - maximum amount of retries of HTTP requests, integer, optional, default ``0``.
-* ``retry_backoff`` - retry exponential backoff, float, optional, default ``0.0``.
 * ``rss_url`` - link to RSS feed, string, optional.
 * ``template`` - Jinja2 template name, string, required.
 * ``template_type`` - ``parse_mode`` to be passed to telegram API, one of ``MarkdownV2``, ``HTML``, ``Markdown``, string, optional, default ``HTML``.
@@ -405,7 +392,6 @@ Type will be read from several sources:
 This feature requires GitHub key creation (see below). Section name must be either ``github`` (plus optional architecture name, e.g. ``github:x86_64``) or random name with ``type`` set.

 * ``type`` - type of the upload, string, optional, must be set to ``github`` if exists.
-* ``max_retries`` - maximum amount of retries of HTTP requests, integer, optional, default ``0``.
 * ``owner`` - GitHub repository owner, string, required.
 * ``password`` - created GitHub API key. In order to create it do the following:

@@ -415,7 +401,6 @@ This feature requires GitHub key creation (see below). Section name must be eith
  #. Generate new token. Required scope is ``public_repo`` (or ``repo`` for private repository support).

 * ``repository`` - GitHub repository name, string, required. Repository must be created before any action and must have active branch (e.g. with readme).
-* ``retry_backoff`` - retry exponential backoff, float, optional, default ``0.0``.
 * ``timeout`` - HTTP request timeout in seconds, integer, optional, default is ``30``.
 * ``use_full_release_name`` - if set to ``yes``, the release will contain both repository name and architecture, and only architecture otherwise, boolean, optional, default ``no`` (legacy behavior).
 * ``username`` - GitHub authorization user, string, required. Basically the same as ``owner``.
@@ -426,8 +411,6 @@ This feature requires GitHub key creation (see below). Section name must be eith
 Section name must be either ``remote-service`` (plus optional architecture name, e.g. ``remote-service:x86_64``) or random name with ``type`` set.

 * ``type`` - type of the report, string, optional, must be set to ``remote-service`` if exists.
-* ``max_retries`` - maximum amount of retries of HTTP requests, integer, optional, default ``0``.
-* ``retry_backoff`` - retry exponential backoff, float, optional, default ``0.0``.
 * ``timeout`` - HTTP request timeout in seconds, integer, optional, default is ``30``.

 ``rsync`` type
--- a/package/archlinux/PKGBUILD
+++ b/package/archlinux/PKGBUILD
@@ -2,7 +2,7 @@

 pkgbase='ahriman'
 pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.20.0rc4
+pkgver=2.19.0
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')
--- a/package/share/ahriman/settings/ahriman.ini
+++ b/package/share/ahriman/settings/ahriman.ini
@@ -23,14 +23,6 @@ sync_files_database = yes
 ; as additional option for some subcommands). If set to no, databases must be synchronized manually.
 use_ahriman_cache = yes

-[aur]
-; Maximum amount of retries of HTTP requests.
-max_retries = 3
-; Retry exponential backoff.
-retry_backoff = 1.0
-; HTTP request timeout in seconds.
-;timeout = 30
-
 [build]
 ; List of additional flags passed to archbuild command.
 ;archbuild_flags =
@@ -81,12 +73,8 @@ enabled = yes
 ; In case if unix sockets are used, it might point to the valid socket with encoded path, e.g.:
 ;     address = http+unix://%2Fvar%2Flib%2Fahriman%2Fsocket
 ;address = http://${web:host}:${web:port}
-; Maximum amount of retries of HTTP requests.
-;max_retries = 0
 ; Optional password for authentication (if enabled).
 ;password =
-; Retry exponential backoff.
-;retry_backoff = 0.0
 ; Do not log HTTP errors if occurs.
 suppress_http_log_errors = yes
 ; HTTP request timeout in seconds.
@@ -228,10 +216,6 @@ templates[] = ${prefix}/share/ahriman/templates
 ;homepage=
 ; Prefix for packages links. Link to a package will be formed as link_path / filename.
 ;link_path =
-; Maximum amount of retries of HTTP requests.
-;max_retries = 0
-; Retry exponential backoff.
-;retry_backoff = 0.0
 ; Optional link to the RSS feed.
 ;rss_url =
 ; Template name to be used.
@@ -252,16 +236,12 @@ target =
 [github]
 ; Trigger type name.
 ;type = github
-; Maximum amount of retries of HTTP requests.
-;max_retries = 0
 ; GitHub repository owner username.
 ;owner =
 ; GitHub API key. public_repo (repo) scope is required.
 ;password =
 ; GitHub repository name.
 ;repository =
-; Retry exponential backoff.
-;retry_backoff = 0.0
 ; HTTP request timeout in seconds.
 ;timeout = 30
 ; Include repository name to release name (recommended).
@@ -273,10 +253,6 @@ target =
 [remote-service]
 ; Trigger type name.
 ;type = remote-service
-; Maximum amount of retries of HTTP requests.
-;max_retries = 0
-; Retry exponential backoff.
-;retry_backoff = 0.0
 ; HTTP request timeout in seconds.
 ;timeout = 30

--- a/package/share/ahriman/templates/build-status/table.jinja2
+++ b/package/share/ahriman/templates/build-status/table.jinja2
@@ -87,7 +87,7 @@
                        };
                    });

-                updateTable(table, payload, row => row.timestamp);
+                updateTable(table, payload);
                table.bootstrapTable("hideLoading");
            },
            onFailure,
--- a/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2
+++ b/package/share/ahriman/templates/utils/bootstrap-scripts.jinja2
@@ -195,19 +195,16 @@
        return intervalId;
    }

-    function updateTable(table, rows, rowChangedKey) {
+    function updateTable(table, rows) {
        // instead of using load method here, we just update rows manually to avoid table reinitialization
        const currentData = table.bootstrapTable("getData").reduce((accumulator, row) => {
-            accumulator[row.id] = {state: row["0"], key: rowChangedKey(row)};
+            accumulator[row.id] = row["0"];
            return accumulator;
        }, {});
-        // insert or update rows, skipping ones whose status hasn't changed
+        // insert or update rows
        rows.forEach(row => {
            if (Object.hasOwn(currentData, row.id)) {
-                if (rowChangedKey(row) === currentData[row.id].key) {
-                    return;
-                }
-                row["0"] = currentData[row.id].state; // copy checkbox state
+                row["0"] = currentData[row.id]; // copy checkbox state
                table.bootstrapTable("updateByUniqueId", {
                    id: row.id,
                    row: row,
--- a/package/share/bash-completion/completions/_ahriman
+++ b/package/share/bash-completion/completions/_ahriman
@@ -1,6 +1,6 @@
 # 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-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_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')

 _shtab_ahriman_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--log-handler' '-q' '--quiet' '--report' '--no-report' '-r' '--repository' '--unsafe' '-V' '--version' '--wait-timeout')
 _shtab_ahriman_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
@@ -78,11 +78,10 @@ _shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-R' '
 _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_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_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')
 _shtab_ahriman___log_handler_choices=('console' 'syslog' 'journald')
 _shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
 _shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
@@ -573,8 +572,6 @@ _shtab_ahriman_version__h_nargs=0
 _shtab_ahriman_version___help_nargs=0
 _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


 # $1=COMP_WORDS[1]
@@ -677,7 +674,6 @@ _shtab_ahriman() {

      if [[ "$current_action_nargs" != "*" ]] && \
         [[ "$current_action_nargs" != "+" ]] && \
-         [[ "$current_action_nargs" != "?" ]] && \
         [[ "$current_action_nargs" != *"..." ]] && \
         (( $word_index + 1 - $current_action_args_start_index - $pos_only >= \
            $current_action_nargs )); then
--- a/package/share/man/man1/ahriman.1
+++ b/package/share/man/man1/ahriman.1
@@ -1,9 +1,9 @@
-.TH AHRIMAN "1" "2026\-02\-21" "ahriman 2.20.0rc4" "ArcH linux ReposItory MANager"
+.TH AHRIMAN "1" "2025\-06\-29" "ahriman 2.19.0" "ArcH linux ReposItory MANager"
 .SH NAME
 ahriman \- ArcH linux ReposItory MANager
 .SH SYNOPSIS
-.B [0m[1;35mahriman[0m
-[[32m-h[0m] [[32m-a [33mARCHITECTURE[0m] [[32m-c [33mCONFIGURATION[0m] [[36m--force[0m] [[32m-l [33mLOCK[0m] [[36m--log-handler [33m{console,syslog,journald}[0m] [[32m-q[0m] [[36m--report | --no-report[0m] [[32m-r [33mREPOSITORY[0m] [[36m--unsafe[0m] [[32m-V[0m] [[36m--wait-timeout [33mWAIT_TIMEOUT[0m] [32m{add,aur-search,check,clean,config,config-validate,copy,daemon,help,help-commands-unsafe,help-updates,help-version,init,key-import,package-add,package-changes,package-changes-remove,package-copy,package-remove,package-status,package-status-remove,package-status-update,package-update,patch-add,patch-list,patch-remove,patch-set-add,rebuild,remove,remove-unknown,repo-backup,repo-check,repo-clean,repo-config,repo-config-validate,repo-create-keyring,repo-create-mirrorlist,repo-daemon,repo-init,repo-rebuild,repo-remove-unknown,repo-report,repo-restore,repo-setup,repo-sign,repo-statistics,repo-status-update,repo-sync,repo-tree,repo-triggers,repo-update,report,run,search,service-clean,service-config,service-config-validate,service-key-import,service-repositories,service-run,service-setup,service-shell,service-tree-migrate,setup,shell,sign,status,status-update,sync,update,user-add,user-list,user-remove,version,web,web-reload} ...[0m
+.B ahriman
+[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--log-handler {console,syslog,journald}] [-q] [--report | --no-report] [-r REPOSITORY] [--unsafe] [-V] [--wait-timeout WAIT_TIMEOUT] {add,aur-search,check,clean,config,config-validate,copy,daemon,help,help-commands-unsafe,help-updates,help-version,init,key-import,package-add,package-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} ...
 .SH DESCRIPTION
 ArcH linux ReposItory MANager

@@ -193,14 +193,11 @@ remove user
 .TP
 \fBahriman\fR \fI\,web\/\fR
 web server
-.TP
-\fBahriman\fR \fI\,web\-reload\/\fR
-reload configuration

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

 search for package in AUR using API

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

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

 show help message for application or command and exit

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

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

 list unsafe commands as defined in default args

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

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

 request AUR for current version and compare with current service version

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

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

 print application and its dependencies versions

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

 add existing or new package to the build queue

@@ -306,7 +303,7 @@ build as user
 apply specified makepkg variables to the next build

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

 retrieve package changes stored in database

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

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

 remove the package changes stored remotely

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

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

 copy package and its metadata from another repository

@@ -351,7 +348,7 @@ return non\-zero exit status if result is empty
 remove package from the source repository after

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

 remove package from the repository

@@ -360,8 +357,8 @@ remove package from the repository
 package name or base

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

 request status of the package

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

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

 remove the package from the status page

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

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

 update package status on the status page

@@ -410,7 +407,7 @@ set status for specified packages. If no packages supplied, service status will
 new package build status

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

 create or update patched PKGBUILD function or variable

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

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

 list available patches for the package

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

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

 remove patches for the package

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

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

 create or update source patches

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

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

 backup repository settings and database

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

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

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

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

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

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

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

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

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

 start process which periodically will run update process

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

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

 force rebuild whole repository

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

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

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

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

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

 generate repository report according to current settings

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

 restore settings and database

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

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

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

@@ -661,10 +658,10 @@ root path of the extracted files
 sign only specified packages

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

 fetch repository statistics

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

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

 update repository status on the status page

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

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

 sync repository files to remote server according to current settings

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

 dump repository tree based on packages dependencies

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

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

 run triggers on empty build result as configured by settings

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

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

 check for packages updates and run build process if requested

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

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

 remove local caches

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

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

 dump configuration for the specified architecture

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

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

 validate configuration and print found errors

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

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

 import PGP key from public sources to the repository user

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

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

 list all available repositories

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

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

 run multiple commands on success run of the previous command

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

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

 create initial service configuration, requires root

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

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

 drop into python shell

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

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

 migrate repository tree between versions

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

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

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

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

 list users from the user mapping and their roles

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

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

 remove user from the user mapping and update the configuration

@@ -1017,15 +1014,10 @@ remove user from the user mapping and update the configuration
 username for web service

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

 start web server

-.SH COMMAND \fI\,'ahriman web\-reload'\/\fR
-[1;34musage: [0m[1;35mahriman web\-reload[0m [[32m\-h[0m]
-
-reload web server configuration
-
 .SH COMMENTS
 Quick setup command (replace repository name, architecture and packager as needed):

--- a/package/share/zsh/site-functions/_ahriman
+++ b/package/share/zsh/site-functions/_ahriman
@@ -80,7 +80,6 @@ _shtab_ahriman_commands() {
    "user-remove:remove user from the user mapping and update the configuration"
    "version:print application and its dependencies versions"
    "web:start web server"
-    "web-reload:reload web server configuration"
  )
  _describe 'ahriman commands' _commands
 }
@@ -100,9 +99,6 @@ _shtab_ahriman_options=(
  "--wait-timeout[wait for lock to be free. Negative value will lead to immediate application run even if there is lock file. In case of zero value, the application will wait infinitely (default\: -1)]:wait_timeout:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_defaults_added=0
-
 _shtab_ahriman_add_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
@@ -117,9 +113,6 @@ _shtab_ahriman_add_options=(
  "(*):package source (base name, path to local files, remote URL):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_add_defaults_added=0
-
 _shtab_ahriman_aur_search_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
@@ -128,9 +121,6 @@ _shtab_ahriman_aur_search_options=(
  "(*):search terms, can be specified multiple times, the result will match all terms:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_aur_search_defaults_added=0
-
 _shtab_ahriman_check_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
@@ -141,9 +131,6 @@ _shtab_ahriman_check_options=(
  "(*)::filter check by package base (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_check_defaults_added=0
-
 _shtab_ahriman_clean_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
@@ -153,9 +140,6 @@ _shtab_ahriman_clean_options=(
  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_clean_defaults_added=0
-
 _shtab_ahriman_config_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
@@ -164,17 +148,11 @@ _shtab_ahriman_config_options=(
  ":filter settings by key (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_config_defaults_added=0
-
 _shtab_ahriman_config_validate_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if configuration is invalid (default\: False)]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_config_validate_defaults_added=0
-
 _shtab_ahriman_copy_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
@@ -183,9 +161,6 @@ _shtab_ahriman_copy_options=(
  "(*):package base:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_copy_defaults_added=0
-
 _shtab_ahriman_daemon_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
@@ -203,40 +178,25 @@ _shtab_ahriman_daemon_options=(
  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_daemon_defaults_added=0
-
 _shtab_ahriman_help_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  ":show help message for specific command (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_help_defaults_added=0
-
 _shtab_ahriman_help_commands_unsafe_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*)::instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1 otherwise (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_help_commands_unsafe_defaults_added=0
-
 _shtab_ahriman_help_updates_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit code if updates available (default\: False)]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_help_updates_defaults_added=0
-
 _shtab_ahriman_help_version_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_help_version_defaults_added=0
-
 _shtab_ahriman_init_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
@@ -253,18 +213,12 @@ _shtab_ahriman_init_options=(
  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_init_defaults_added=0
-
 _shtab_ahriman_key_import_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--key-server[key server for key import (default\: keyserver.ubuntu.com)]:key_server:"
  ":PGP key to import from public server:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_key_import_defaults_added=0
-
 _shtab_ahriman_package_add_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
@@ -279,26 +233,17 @@ _shtab_ahriman_package_add_options=(
  "(*):package source (base name, path to local files, remote URL):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_add_defaults_added=0
-
 _shtab_ahriman_package_changes_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
  ":package base:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_changes_defaults_added=0
-
 _shtab_ahriman_package_changes_remove_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  ":package base:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_changes_remove_defaults_added=0
-
 _shtab_ahriman_package_copy_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
@@ -307,17 +252,11 @@ _shtab_ahriman_package_copy_options=(
  "(*):package base:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_copy_defaults_added=0
-
 _shtab_ahriman_package_remove_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*):package name or base:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_remove_defaults_added=0
-
 _shtab_ahriman_package_status_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--ahriman[get service status itself (default\: False)]"
@@ -327,26 +266,17 @@ _shtab_ahriman_package_status_options=(
  "(*)::filter status by package base (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_status_defaults_added=0
-
 _shtab_ahriman_package_status_remove_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*):remove specified packages from status page:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_status_remove_defaults_added=0
-
 _shtab_ahriman_package_status_update_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-s,--status}"[new package build status (default\: success)]:status:(unknown pending building failed success)"
  "(*)::set status for specified packages. If no packages supplied, service status will be updated (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_status_update_defaults_added=0
-
 _shtab_ahriman_package_update_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
@@ -361,9 +291,6 @@ _shtab_ahriman_package_update_options=(
  "(*):package source (base name, path to local files, remote URL):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_package_update_defaults_added=0
-
 _shtab_ahriman_patch_add_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  ":package base:"
@@ -371,9 +298,6 @@ _shtab_ahriman_patch_add_options=(
  ":path to file which contains function or variable value. If not set, the value will be read from stdin (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_patch_add_defaults_added=0
-
 _shtab_ahriman_patch_list_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
@@ -381,27 +305,18 @@ _shtab_ahriman_patch_list_options=(
  ":package base:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_patch_list_defaults_added=0
-
 _shtab_ahriman_patch_remove_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "*"{-v,--variable}"[should be used for single-function patches in case if you wold like to remove only specified PKGBUILD variables. In case if not set, it will remove all patches related to the package (default\: None)]:variable:"
  ":package base:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_patch_remove_defaults_added=0
-
 _shtab_ahriman_patch_set_add_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "*"{-t,--track}"[files which has to be tracked (default\: \[\'\*.diff\', \'\*.patch\'\])]:track:"
  ":path to directory with changed files for patch addition\/update:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_patch_set_add_defaults_added=0
-
 _shtab_ahriman_rebuild_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "*--depends-on[only rebuild packages that depend on specified packages (default\: None)]:depends_on:"
@@ -413,33 +328,21 @@ _shtab_ahriman_rebuild_options=(
  {-u,--username}"[build as user (default\: None)]:username:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_rebuild_defaults_added=0
-
 _shtab_ahriman_remove_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*):package name or base:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_remove_defaults_added=0
-
 _shtab_ahriman_remove_unknown_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--dry-run[just perform check for packages without removal (default\: False)]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_remove_unknown_defaults_added=0
-
 _shtab_ahriman_repo_backup_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  ":path of the output archive:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_backup_defaults_added=0
-
 _shtab_ahriman_repo_check_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
@@ -450,9 +353,6 @@ _shtab_ahriman_repo_check_options=(
  "(*)::filter check by package base (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_check_defaults_added=0
-
 _shtab_ahriman_repo_clean_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
@@ -462,9 +362,6 @@ _shtab_ahriman_repo_clean_options=(
  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_clean_defaults_added=0
-
 _shtab_ahriman_repo_config_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
@@ -473,31 +370,19 @@ _shtab_ahriman_repo_config_options=(
  ":filter settings by key (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_config_defaults_added=0
-
 _shtab_ahriman_repo_config_validate_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if configuration is invalid (default\: False)]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_config_validate_defaults_added=0
-
 _shtab_ahriman_repo_create_keyring_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_create_keyring_defaults_added=0
-
 _shtab_ahriman_repo_create_mirrorlist_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_create_mirrorlist_defaults_added=0
-
 _shtab_ahriman_repo_daemon_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
@@ -515,9 +400,6 @@ _shtab_ahriman_repo_daemon_options=(
  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_daemon_defaults_added=0
-
 _shtab_ahriman_repo_init_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
@@ -534,9 +416,6 @@ _shtab_ahriman_repo_init_options=(
  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_init_defaults_added=0
-
 _shtab_ahriman_repo_rebuild_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "*--depends-on[only rebuild packages that depend on specified packages (default\: None)]:depends_on:"
@@ -548,33 +427,21 @@ _shtab_ahriman_repo_rebuild_options=(
  {-u,--username}"[build as user (default\: None)]:username:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_rebuild_defaults_added=0
-
 _shtab_ahriman_repo_remove_unknown_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--dry-run[just perform check for packages without removal (default\: False)]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_remove_unknown_defaults_added=0
-
 _shtab_ahriman_repo_report_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_report_defaults_added=0
-
 _shtab_ahriman_repo_restore_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-o,--output}"[root path of the extracted files (default\: \/)]:output:"
  ":path of the input archive:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_restore_defaults_added=0
-
 _shtab_ahriman_repo_setup_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
@@ -591,17 +458,11 @@ _shtab_ahriman_repo_setup_options=(
  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_setup_defaults_added=0
-
 _shtab_ahriman_repo_sign_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*)::sign only specified packages (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_sign_defaults_added=0
-
 _shtab_ahriman_repo_statistics_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--chart[create updates chart and save it to the specified path (default\: None)]:chart:"
@@ -613,40 +474,25 @@ _shtab_ahriman_repo_statistics_options=(
  ":fetch only events for the specified package (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_statistics_defaults_added=0
-
 _shtab_ahriman_repo_status_update_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-s,--status}"[new status (default\: success)]:status:(unknown pending building failed success)"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_status_update_defaults_added=0
-
 _shtab_ahriman_repo_sync_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_sync_defaults_added=0
-
 _shtab_ahriman_repo_tree_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-p,--partitions}"[also divide packages by independent partitions (default\: 1)]:partitions:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_tree_defaults_added=0
-
 _shtab_ahriman_repo_triggers_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*)::instead of running all triggers as set by configuration, just process specified ones in order of mention (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_triggers_defaults_added=0
-
 _shtab_ahriman_repo_update_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
@@ -664,24 +510,15 @@ _shtab_ahriman_repo_update_options=(
  "(*)::filter check by package base (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_repo_update_defaults_added=0
-
 _shtab_ahriman_report_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_report_defaults_added=0
-
 _shtab_ahriman_run_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*):command to be run (quoted) without \`\`ahriman\`\`:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_run_defaults_added=0
-
 _shtab_ahriman_search_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
@@ -690,9 +527,6 @@ _shtab_ahriman_search_options=(
  "(*):search terms, can be specified multiple times, the result will match all terms:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_search_defaults_added=0
-
 _shtab_ahriman_service_clean_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
@@ -702,9 +536,6 @@ _shtab_ahriman_service_clean_options=(
  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_clean_defaults_added=0
-
 _shtab_ahriman_service_config_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
@@ -713,42 +544,27 @@ _shtab_ahriman_service_config_options=(
  ":filter settings by key (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_config_defaults_added=0
-
 _shtab_ahriman_service_config_validate_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if configuration is invalid (default\: False)]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_config_validate_defaults_added=0
-
 _shtab_ahriman_service_key_import_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--key-server[key server for key import (default\: keyserver.ubuntu.com)]:key_server:"
  ":PGP key to import from public server:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_key_import_defaults_added=0
-
 _shtab_ahriman_service_repositories_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--id-only,--no-id-only}"[show machine readable identifier instead (default\: False)]:id_only:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_repositories_defaults_added=0
-
 _shtab_ahriman_service_run_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*):command to be run (quoted) without \`\`ahriman\`\`:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_run_defaults_added=0
-
 _shtab_ahriman_service_setup_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
@@ -765,25 +581,16 @@ _shtab_ahriman_service_setup_options=(
  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_setup_defaults_added=0
-
 _shtab_ahriman_service_shell_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-o,--output}"[output commands and result to the file (default\: None)]:output:"
  ":instead of dropping into shell, just execute the specified code (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_shell_defaults_added=0
-
 _shtab_ahriman_service_tree_migrate_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_service_tree_migrate_defaults_added=0
-
 _shtab_ahriman_setup_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
@@ -800,26 +607,17 @@ _shtab_ahriman_setup_options=(
  "--web-unix-socket[path to unix socket used for interprocess communications (default\: None)]:web_unix_socket:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_setup_defaults_added=0
-
 _shtab_ahriman_shell_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-o,--output}"[output commands and result to the file (default\: None)]:output:"
  ":instead of dropping into shell, just execute the specified code (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_shell_defaults_added=0
-
 _shtab_ahriman_sign_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "(*)::sign only specified packages (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_sign_defaults_added=0
-
 _shtab_ahriman_status_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--ahriman[get service status itself (default\: False)]"
@@ -829,25 +627,16 @@ _shtab_ahriman_status_options=(
  "(*)::filter status by package base (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_status_defaults_added=0
-
 _shtab_ahriman_status_update_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-s,--status}"[new package build status (default\: success)]:status:(unknown pending building failed success)"
  "(*)::set status for specified packages. If no packages supplied, service status will be updated (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_status_update_defaults_added=0
-
 _shtab_ahriman_sync_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_sync_defaults_added=0
-
 _shtab_ahriman_update_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
@@ -865,9 +654,6 @@ _shtab_ahriman_update_options=(
  "(*)::filter check by package base (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_update_defaults_added=0
-
 _shtab_ahriman_user_add_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  "--key[optional PGP key used by this user. The private key must be imported (default\: None)]:key:"
@@ -877,9 +663,6 @@ _shtab_ahriman_user_add_options=(
  ":username for web service:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_user_add_defaults_added=0
-
 _shtab_ahriman_user_list_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
@@ -887,48 +670,25 @@ _shtab_ahriman_user_list_options=(
  ":filter users by username (default\: None):"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_user_list_defaults_added=0
-
 _shtab_ahriman_user_remove_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
  ":username for web service:"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_user_remove_defaults_added=0
-
 _shtab_ahriman_version_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_version_defaults_added=0
-
 _shtab_ahriman_web_options=(
  "(- : *)"{-h,--help}"[show this help message and exit]"
 )

-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_web_defaults_added=0
-
-_shtab_ahriman_web_reload_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-)
-
-# guard to ensure default positional specs are added only once per session
-_shtab_ahriman_web_reload_defaults_added=0
-

 _shtab_ahriman() {
-  local context state line curcontext="$curcontext" one_or_more='(*)' remainder='(-)*' default='*::: :->ahriman'
+  local context state line curcontext="$curcontext" one_or_more='(-)*' remainder='(*)'

-  # Add default positional/remainder specs only if none exist, and only once per session
-  if (( ! _shtab_ahriman_defaults_added )); then
-    if (( ${_shtab_ahriman_options[(I)${(q)one_or_more}*]} +          ${_shtab_ahriman_options[(I)${(q)remainder}*]} +          ${_shtab_ahriman_options[(I)${(q)default}]} == 0 )); then
-      _shtab_ahriman_options+=(': :_shtab_ahriman_commands' '*::: :->ahriman')
-    fi
-    _shtab_ahriman_defaults_added=1
+  if ((${_shtab_ahriman_options[(I)${(q)one_or_more}*]} + ${_shtab_ahriman_options[(I)${(q)remainder}*]} == 0)); then  # noqa: E501
+    _shtab_ahriman_options+=(': :_shtab_ahriman_commands' '*::: :->ahriman')
  fi
  _arguments -C -s $_shtab_ahriman_options

@@ -1013,7 +773,6 @@ _shtab_ahriman() {
        user-remove) _arguments -C -s $_shtab_ahriman_user_remove_options ;;
        version) _arguments -C -s $_shtab_ahriman_version_options ;;
        web) _arguments -C -s $_shtab_ahriman_web_options ;;
-        web-reload) _arguments -C -s $_shtab_ahriman_web_reload_options ;;
      esac
  esac
 }
--- a/src/ahriman/init.py
+++ b/src/ahriman/init.py
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.20.0rc4"
+__version__ = "2.19.0"
--- a/src/ahriman/application/handlers/backup.py
+++ b/src/ahriman/application/handlers/backup.py
@@ -81,13 +81,11 @@ class Backup(Handler):
        Returns:
            set[Path]: map of the filesystem paths
        """
-        # configuration files
-        root, _ = configuration.check_loaded()
-        paths = set(configuration.includes)
-        paths.add(root)
+        paths = set(configuration.include.glob("*.ini"))

-        # database
-        paths.add(SQLite.database_path(configuration))
+        root, _ = configuration.check_loaded()
+        paths.add(root)  # the configuration itself
+        paths.add(SQLite.database_path(configuration))  # database

        # local caches
        repository_paths = configuration.repository_paths
--- a/src/ahriman/application/handlers/restore.py
+++ b/src/ahriman/application/handlers/restore.py
@@ -47,7 +47,7 @@ class Restore(Handler):
            report(bool): force enable or disable reporting
        """
        with tarfile.open(args.path) as archive:
-            archive.extractall(path=args.output, filter="data")
+            archive.extractall(path=args.output)  # nosec

    @staticmethod
    def _set_repo_restore_parser(root: SubParserAction) -> argparse.ArgumentParser:
--- a/src/ahriman/application/handlers/setup.py
+++ b/src/ahriman/application/handlers/setup.py
@@ -251,7 +251,7 @@ class Setup(Handler):

        content = f"PACKAGER='{packager}'\n"
        if makeflags_jobs:
-            content += "MAKEFLAGS=\"-j$(nproc)\"\n"
+            content += """MAKEFLAGS="-j$(nproc)"\n"""

        uid, _ = paths.root_owner
        home_dir = Path(getpwuid(uid).pw_dir)
--- a/src/ahriman/core/auth/oauth.py
+++ b/src/ahriman/core/auth/oauth.py
@@ -69,8 +69,8 @@ class OAuth(Mapping):
        Returns:
            str: login control as html code to insert
        """
-        return f"<a class=\"nav-link\" href=\"/api/v1/login\" title=\"login via OAuth2\"><i class=\"bi bi-{
-            self.icon}\"></i> login</a>"
+        return f"""<a class="nav-link" href="/api/v1/login" title="login via OAuth2"><i class="bi bi-{
+            self.icon}"></i> login</a>"""

    @staticmethod
    def get_provider(name: str) -> type[aioauth_client.OAuth2Client]:
@@ -86,7 +86,7 @@ class OAuth(Mapping):
        Raises:
            OptionError: in case if invalid OAuth provider name supplied
        """
-        provider: type = getattr(aioauth_client, name, type(None))
+        provider: type[aioauth_client.OAuth2Client] = getattr(aioauth_client, name)
        try:
            is_oauth2_client = issubclass(provider, aioauth_client.OAuth2Client)
        except TypeError:  # what if it is random string?
--- a/src/ahriman/core/configuration/schema.py
+++ b/src/ahriman/core/configuration/schema.py
@@ -97,26 +97,6 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
            },
        },
    },
-    "aur": {
-        "type": "dict",
-        "schema": {
-            "max_retries": {
-                "type": "integer",
-                "coerce": "integer",
-                "min": 0,
-            },
-            "retry_backoff": {
-                "type": "float",
-                "coerce": "float",
-                "min": 0,
-            },
-            "timeout": {
-                "type": "integer",
-                "coerce": "integer",
-                "min": 0,
-            },
-        },
-    },
    "auth": {
        "type": "dict",
        "schema": {
@@ -316,20 +296,10 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
                "empty": False,
                "is_url": [],
            },
-            "max_retries": {
-                "type": "integer",
-                "coerce": "integer",
-                "min": 0,
-            },
            "password": {
                "type": "string",
                "empty": False,
            },
-            "retry_backoff": {
-                "type": "float",
-                "coerce": "float",
-                "min": 0,
-            },
            "suppress_http_log_errors": {
                "type": "boolean",
                "coerce": "boolean",
--- a/src/ahriman/core/configuration/validator.py
+++ b/src/ahriman/core/configuration/validator.py
@@ -76,19 +76,6 @@ class Validator(RootValidator):
        converted: bool = self.configuration._convert_to_boolean(value)  # type: ignore[attr-defined]
        return converted

-    def _normalize_coerce_float(self, value: str) -> float:
-        """
-        extract float from string value
-
-        Args:
-            value(str): converting value
-
-        Returns:
-            float: value converted to float according to configuration rules
-        """
-        del self
-        return float(value)
-
    def _normalize_coerce_integer(self, value: str) -> int:
        """
        extract integer from string value
--- a/src/ahriman/core/http/sync_ahriman_client.py
+++ b/src/ahriman/core/http/sync_ahriman_client.py
@@ -20,9 +20,10 @@
 import contextlib
 import requests

-from requests.adapters import BaseAdapter
+from functools import cached_property
 from urllib.parse import urlparse

+from ahriman import __version__
 from ahriman.core.http.sync_http_client import SyncHttpClient


@@ -36,36 +37,32 @@ class SyncAhrimanClient(SyncHttpClient):

    address: str

-    def _login_url(self) -> str:
+    @cached_property
+    def session(self) -> requests.Session:
        """
-        get url for the login api
+        get or create session

        Returns:
-            str: full url for web service to log in
+            request.Session: created session object
        """
-        return f"{self.address}/api/v1/login"
+        if urlparse(self.address).scheme == "http+unix":
+            import requests_unixsocket
+            session: requests.Session = requests_unixsocket.Session()  # type: ignore[no-untyped-call]
+            session.headers["User-Agent"] = f"ahriman/{__version__}"
+            return session

-    def adapters(self) -> dict[str, BaseAdapter]:
+        session = requests.Session()
+        session.headers["User-Agent"] = f"ahriman/{__version__}"
+        self._login(session)
+
+        return session
+
+    def _login(self, session: requests.Session) -> None:
        """
-        get registered adapters
-
-        Returns:
-            dict[str, BaseAdapter]: map of protocol and adapter used for this protocol
-        """
-        adapters = SyncHttpClient.adapters(self)
-
-        if (scheme := urlparse(self.address).scheme) == "http+unix":
-            from requests_unixsocket.adapters import UnixAdapter
-            adapters[f"{scheme}://"] = UnixAdapter()  # type: ignore[no-untyped-call]
-
-        return adapters
-
-    def on_session_creation(self, session: requests.Session) -> None:
-        """
-        method which will be called on session creation
+        process login to the service

        Args:
-            session(requests.Session): created requests session
+            session(requests.Session): request session to login
        """
        if self.auth is None:
            return  # no auth configured
@@ -77,3 +74,12 @@ class SyncAhrimanClient(SyncHttpClient):
        }
        with contextlib.suppress(Exception):
            self.make_request("POST", self._login_url(), json=payload, session=session)
+
+    def _login_url(self) -> str:
+        """
+        get url for the login api
+
+        Returns:
+            str: full url for web service to log in
+        """
+        return f"{self.address}/api/v1/login"
--- a/src/ahriman/core/http/sync_http_client.py
+++ b/src/ahriman/core/http/sync_http_client.py
@@ -21,9 +21,7 @@ import requests
 import sys

 from functools import cached_property
-from requests.adapters import BaseAdapter, HTTPAdapter
-from typing import Any, ClassVar, IO, Literal
-from urllib3.util.retry import Retry
+from typing import Any, IO, Literal

 from ahriman import __version__
 from ahriman.core.configuration import Configuration
@@ -39,19 +37,11 @@ class SyncHttpClient(LazyLogging):
    wrapper around requests library to reduce boilerplate

    Attributes:
-        DEFAULT_MAX_RETRIES(int): (class attribute) default maximum amount of retries
-        DEFAULT_RETRY_BACKOFF(float): (class attribute) default retry exponential backoff
-        DEFAULT_TIMEOUT(int | None): (class attribute) default HTTP request timeout in seconds
        auth(tuple[str, str] | None): HTTP basic auth object if set
-        retry(Retry): retry policy of the HTTP client
        suppress_errors(bool): suppress logging of request errors
        timeout(int | None): HTTP request timeout in seconds
    """

-    DEFAULT_MAX_RETRIES: ClassVar[int] = 0
-    DEFAULT_RETRY_BACKOFF: ClassVar[float] = 0.0
-    DEFAULT_TIMEOUT: ClassVar[int | None] = 30
-
    def __init__(self, configuration: Configuration | None = None, section: str | None = None, *,
                 suppress_errors: bool = False) -> None:
        """
@@ -60,21 +50,18 @@ class SyncHttpClient(LazyLogging):
            section(str | None, optional): settings section name (Default value = None)
            suppress_errors(bool, optional): suppress logging of request errors (Default value = False)
        """
-        configuration = configuration or Configuration()  # dummy configuration
-        section = section or configuration.default_section
+        if configuration is None:
+            configuration = Configuration()  # dummy configuration
+        if section is None:
+            section = configuration.default_section

        username = configuration.get(section, "username", fallback=None)
        password = configuration.get(section, "password", fallback=None)
        self.auth = (username, password) if username and password else None

+        self.timeout: int | None = configuration.getint(section, "timeout", fallback=30)
        self.suppress_errors = suppress_errors

-        self.timeout = configuration.getint(section, "timeout", fallback=self.DEFAULT_TIMEOUT)
-        self.retry = SyncHttpClient.retry_policy(
-            max_retries=configuration.getint(section, "max_retries", fallback=self.DEFAULT_MAX_RETRIES),
-            retry_backoff=configuration.getfloat(section, "retry_backoff", fallback=self.DEFAULT_RETRY_BACKOFF),
-        )
-
    @cached_property
    def session(self) -> requests.Session:
        """
@@ -84,17 +71,11 @@ class SyncHttpClient(LazyLogging):
            request.Session: created session object
        """
        session = requests.Session()
-
-        for protocol, adapter in self.adapters().items():
-            session.mount(protocol, adapter)
-
        python_version = ".".join(map(str, sys.version_info[:3]))  # just major.minor.patch
        session.headers["User-Agent"] = f"ahriman/{__version__} " \
            f"{requests.utils.default_user_agent()} " \
            f"python/{python_version}"

-        self.on_session_creation(session)
-
        return session

    @staticmethod
@@ -111,39 +92,6 @@ class SyncHttpClient(LazyLogging):
        result: str = exception.response.text if exception.response is not None else ""
        return result

-    @staticmethod
-    def retry_policy(max_retries: int = 0, retry_backoff: float = 0.0) -> Retry:
-        """
-        build retry policy for class
-
-        Args:
-            max_retries(int, optional): maximum amount of retries allowed (Default value = 0)
-            retry_backoff(float, optional): retry exponential backoff (Default value = 0.0)
-
-        Returns:
-            Retry: built retry policy
-        """
-        return Retry(
-            total=max_retries,
-            connect=max_retries,
-            read=max_retries,
-            status=max_retries,
-            status_forcelist=[429, 500, 502, 503, 504],
-            backoff_factor=retry_backoff,
-        )
-
-    def adapters(self) -> dict[str, BaseAdapter]:
-        """
-        get registered adapters
-
-        Returns:
-            dict[str, BaseAdapter]: map of protocol and adapter used for this protocol
-        """
-        return {
-            "http://": HTTPAdapter(max_retries=self.retry),
-            "https://": HTTPAdapter(max_retries=self.retry),
-        }
-
    def make_request(self, method: Literal["DELETE", "GET", "HEAD", "POST", "PUT"], url: str, *,
                     headers: dict[str, str] | None = None,
                     params: list[tuple[str, str]] | None = None,
@@ -191,11 +139,3 @@ class SyncHttpClient(LazyLogging):
            if not suppress_errors:
                self.logger.exception("could not perform http request")
            raise
-
-    def on_session_creation(self, session: requests.Session) -> None:
-        """
-        method which will be called on session creation
-
-        Args:
-            session(requests.Session): created requests session
-        """
--- a/src/ahriman/core/report/email.py
+++ b/src/ahriman/core/report/email.py
@@ -74,18 +74,6 @@ class Email(Report, JinjaTemplate):
        self.ssl = SmtpSSLSettings.from_option(configuration.get(section, "ssl", fallback="disabled"))
        self.user = configuration.get(section, "user", fallback=None)

-    @property
-    def _smtp_session(self) -> type[smtplib.SMTP]:
-        """
-        build SMTP session based on configuration settings
-
-        Returns:
-            type[smtplib.SMTP]: SMTP or SMTP_SSL session depending on whether SSL is enabled or not
-        """
-        if self.ssl == SmtpSSLSettings.SSL:
-            return smtplib.SMTP_SSL
-        return smtplib.SMTP
-
    def _send(self, text: str, attachment: dict[str, str]) -> None:
        """
        send email callback
@@ -105,13 +93,16 @@ class Email(Report, JinjaTemplate):
            attach.add_header("Content-Disposition", "attachment", filename=filename)
            message.attach(attach)

-        with self._smtp_session(self.host, self.port) as session:
+        if self.ssl != SmtpSSLSettings.SSL:
+            session = smtplib.SMTP(self.host, self.port)
            if self.ssl == SmtpSSLSettings.STARTTLS:
                session.starttls()
-
-            if self.user is not None and self.password is not None:
-                session.login(self.user, self.password)
-            session.sendmail(self.sender, self.receivers, message.as_string())
+        else:
+            session = smtplib.SMTP_SSL(self.host, self.port)
+        if self.user is not None and self.password is not None:
+            session.login(self.user, self.password)
+        session.sendmail(self.sender, self.receivers, message.as_string())
+        session.quit()

    def generate(self, packages: list[Package], result: Result) -> None:
        """
--- a/src/ahriman/core/report/report_trigger.py
+++ b/src/ahriman/core/report/report_trigger.py
@@ -302,16 +302,6 @@ class ReportTrigger(Trigger):
                    "empty": False,
                    "is_url": [],
                },
-                "max_retries": {
-                    "type": "integer",
-                    "coerce": "integer",
-                    "min": 0,
-                },
-                "retry_backoff": {
-                    "type": "float",
-                    "coerce": "float",
-                    "min": 0,
-                },
                "rss_url": {
                    "type": "string",
                    "empty": False,
--- a/src/ahriman/core/repository/repository.py
+++ b/src/ahriman/core/repository/repository.py
@@ -21,7 +21,6 @@ from typing import Self

 from ahriman.core import _Context, context
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote import AUR
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.repository.executor import Executor
@@ -74,24 +73,9 @@ class Repository(Executor, UpdateHandler):
        """
        instance = cls(repository_id, configuration, database,
                       report=report, refresh_pacman_database=refresh_pacman_database)
-
-        instance._set_globals(configuration)
        instance._set_context()
-
        return instance

-    @staticmethod
-    def _set_globals(configuration: Configuration) -> None:
-        """
-        set global settings based on configuration via class attributes
-
-        Args:
-            configuration(Configuration): configuration instance
-        """
-        AUR.DEFAULT_MAX_RETRIES = configuration.getint("aur", "max_retries", fallback=0)
-        AUR.DEFAULT_RETRY_BACKOFF = configuration.getfloat("aur", "retry_backoff", fallback=0.0)
-        AUR.DEFAULT_TIMEOUT = configuration.getint("aur", "timeout", fallback=30)
-
    def _set_context(self) -> None:
        """
        create context variables and set their values
--- a/src/ahriman/core/upload/upload_trigger.py
+++ b/src/ahriman/core/upload/upload_trigger.py
@@ -54,11 +54,6 @@ class UploadTrigger(Trigger):
                    "type": "string",
                    "allowed": ["github"],
                },
-                "max_retries": {
-                    "type": "integer",
-                    "coerce": "integer",
-                    "min": 0,
-                },
                "owner": {
                    "type": "string",
                    "required": True,
@@ -73,11 +68,6 @@ class UploadTrigger(Trigger):
                    "required": True,
                    "empty": False,
                },
-                "retry_backoff": {
-                    "type": "float",
-                    "coerce": "float",
-                    "min": 0,
-                },
                "timeout": {
                    "type": "integer",
                    "coerce": "integer",
@@ -100,16 +90,6 @@ class UploadTrigger(Trigger):
                    "type": "string",
                    "allowed": ["ahriman", "remote-service"],
                },
-                "max_retries": {
-                    "type": "integer",
-                    "coerce": "integer",
-                    "min": 0,
-                },
-                "retry_backoff": {
-                    "type": "float",
-                    "coerce": "float",
-                    "min": 0,
-                },
                "timeout": {
                    "type": "integer",
                    "coerce": "integer",
--- a/src/ahriman/core/utils.py
+++ b/src/ahriman/core/utils.py
@@ -164,11 +164,6 @@ def check_output(*args: str, exception: Exception | Callable[[int, list[str], st
        if key in ("PATH",)  # whitelisted variables only
    } | environment

-    result: dict[str, list[str]] = {
-        "stdout": [],
-        "stderr": [],
-    }
-
    with subprocess.Popen(args, cwd=cwd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                          user=user, env=full_environment, text=True, encoding="utf8", errors="backslashreplace",
                          bufsize=1) as process:
@@ -177,27 +172,30 @@ def check_output(*args: str, exception: Exception | Callable[[int, list[str], st
            input_channel.write(input_data)
            input_channel.close()

-        with selectors.DefaultSelector() as selector:
-            selector.register(get_io(process, "stdout"), selectors.EVENT_READ, data="stdout")
-            selector.register(get_io(process, "stderr"), selectors.EVENT_READ, data="stderr")
+        selector = selectors.DefaultSelector()
+        selector.register(get_io(process, "stdout"), selectors.EVENT_READ, data="stdout")
+        selector.register(get_io(process, "stderr"), selectors.EVENT_READ, data="stderr")

-            while selector.get_map():  # while there are unread selectors, keep reading
-                for key_data, output in poll(selector):
-                    result[key_data].append(output)
+        result: dict[str, list[str]] = {
+            "stdout": [],
+            "stderr": [],
+        }
+        while selector.get_map():  # while there are unread selectors, keep reading
+            for key_data, output in poll(selector):
+                result[key_data].append(output)
+
+        stdout = "\n".join(result["stdout"]).rstrip("\n")  # remove newline at the end of any
+        stderr = "\n".join(result["stderr"]).rstrip("\n")

        status_code = process.wait()
+        if status_code != 0:
+            if isinstance(exception, Exception):
+                raise exception
+            if callable(exception):
+                raise exception(status_code, list(args), stdout, stderr)
+            raise CalledProcessError(status_code, list(args), stderr)

-    stdout = "\n".join(result["stdout"]).rstrip("\n")  # remove newline at the end of any
-    stderr = "\n".join(result["stderr"]).rstrip("\n")
-
-    if status_code != 0:
-        if isinstance(exception, Exception):
-            raise exception
-        if callable(exception):
-            raise exception(status_code, list(args), stdout, stderr)
-        raise CalledProcessError(status_code, list(args), stderr)
-
-    return stdout
+        return stdout


 def check_user(root: Path, *, unsafe: bool) -> None:
--- a/src/ahriman/models/package.py
+++ b/src/ahriman/models/package.py
@@ -375,7 +375,7 @@ class Package(LazyLogging):
        Returns:
            str: print-friendly string
        """
-        details = "" if self.is_single_package else f" ({" ".join(sorted(self.packages.keys()))})"
+        details = "" if self.is_single_package else f""" ({" ".join(sorted(self.packages.keys()))})"""
        return f"{self.base}{details}"

    def vercmp(self, version: str) -> int:
--- a/src/ahriman/models/pkgbuild_patch.py
+++ b/src/ahriman/models/pkgbuild_patch.py
@@ -147,7 +147,7 @@ class PkgbuildPatch:
        """
        if "$" in source:
            # copy from library method with double quotes instead
-            return f"\"{source.replace("\"", "'\"'")}\""
+            return f"""\"{source.replace("\"", "'\"'")}\""""
        # otherwise just return normal call
        return shlex.quote(source)

@@ -195,13 +195,13 @@ class PkgbuildPatch:
        """
        if isinstance(self.value, list):  # list like
            value = " ".join(map(self.quote, self.value))
-            return f"{self.key}=({value})"
+            return f"""{self.key}=({value})"""
        if self.is_plain_diff:  # no additional logic for plain diffs
            return self.value
        # we suppose that function values are only supported in string-like values
        if self.is_function:
            return f"{self.key} {self.value}"  # no quoting enabled here
-        return f"{self.key}={self.quote(self.value)}"
+        return f"""{self.key}={self.quote(self.value)}"""

    def substitute(self, variables: dict[str, str]) -> str | list[str]:
        """
--- a/src/ahriman/web/apispec/info.py
+++ b/src/ahriman/web/apispec/info.py
@@ -72,7 +72,7 @@ def _security() -> list[dict[str, Any]]:
    return [{
        "token": {
            "type": "apiKey",  # as per specification we are using api key
-            "name": "AHRIMAN",
+            "name": "API_SESSION",
            "in": "cookie",
        }
    }]
--- a/src/ahriman/web/middlewares/auth_handler.py
+++ b/src/ahriman/web/middlewares/auth_handler.py
@@ -149,17 +149,11 @@ def setup_auth(application: Application, configuration: Configuration, validator
        Application: configured web application
    """
    secret_key = _cookie_secret_key(configuration)
-    storage = EncryptedCookieStorage(
-        secret_key,
-        cookie_name="AHRIMAN",
-        max_age=validator.max_age,
-        httponly=True,
-        samesite="Lax",
-    )
+    storage = EncryptedCookieStorage(secret_key, cookie_name="API_SESSION", max_age=validator.max_age)
    setup_session(application, storage)

    authorization_policy = _AuthorizationPolicy(validator)
-    identity_policy = aiohttp_security.SessionIdentityPolicy("SESSION")
+    identity_policy = aiohttp_security.SessionIdentityPolicy()

    aiohttp_security.setup(application, identity_policy, authorization_policy)
    application.middlewares.append(_auth_handler(validator.allow_read_only))
--- a/src/ahriman/web/schemas/auth_schema.py
+++ b/src/ahriman/web/schemas/auth_schema.py
@@ -25,6 +25,6 @@ class AuthSchema(Schema):
    request cookie authorization schema
    """

-    AHRIMAN = fields.String(required=True, metadata={
+    API_SESSION = fields.String(required=True, metadata={
        "description": "API session key as returned from authorization",
    })
--- a/tests/ahriman/application/handlers/test_handler_restore.py
+++ b/tests/ahriman/application/handlers/test_handler_restore.py
@@ -34,7 +34,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc

    _, repository_id = configuration.check_loaded()
    Restore.run(args, repository_id, configuration, report=False)
-    extract_mock.extractall.assert_called_once_with(path=args.output, filter="data")
+    extract_mock.extractall.assert_called_once_with(path=args.output)


 def test_disallow_multi_architecture_run() -> None:
--- a/tests/ahriman/core/configuration/test_validator.py
+++ b/tests/ahriman/core/configuration/test_validator.py
@@ -33,14 +33,6 @@ def test_normalize_coerce_boolean(validator: Validator, mocker: MockerFixture) -
    convert_mock.assert_called_once_with("1")


-def test_normalize_coerce_float(validator: Validator) -> None:
-    """
-    must convert string value to float by using configuration converters
-    """
-    assert validator._normalize_coerce_float("1.5") == 1.5
-    assert validator._normalize_coerce_float("0.0") == 0.0
-
-
 def test_normalize_coerce_integer(validator: Validator) -> None:
    """
    must convert string value to integer by using configuration converters
--- a/tests/ahriman/core/http/test_sync_ahriman_client.py
+++ b/tests/ahriman/core/http/test_sync_ahriman_client.py
@@ -1,5 +1,6 @@
 import pytest
 import requests
+import requests_unixsocket

 from pytest_mock import MockerFixture

@@ -7,32 +8,31 @@ from ahriman.core.http import SyncAhrimanClient
 from ahriman.models.user import User


-def test_adapters(ahriman_client: SyncAhrimanClient) -> None:
+def test_session(ahriman_client: SyncAhrimanClient, mocker: MockerFixture) -> None:
    """
-    must return native adapters
+    must create normal requests session
    """
-    assert "http+unix://" not in ahriman_client.adapters()
+    login_mock = mocker.patch("ahriman.core.http.SyncAhrimanClient._login")
+
+    assert isinstance(ahriman_client.session, requests.Session)
+    assert not isinstance(ahriman_client.session, requests_unixsocket.Session)
+    login_mock.assert_called_once_with(pytest.helpers.anyvar(int))


-def test_adapters_unix_socket(ahriman_client: SyncAhrimanClient) -> None:
+def test_session_unix_socket(ahriman_client: SyncAhrimanClient, mocker: MockerFixture) -> None:
    """
-    must register unix socket adapter
+    must create unix socket session
    """
+    login_mock = mocker.patch("ahriman.core.http.SyncAhrimanClient._login")
    ahriman_client.address = "http+unix://path"
-    assert "http+unix://" in ahriman_client.adapters()
+
+    assert isinstance(ahriman_client.session, requests_unixsocket.Session)
+    login_mock.assert_not_called()


-def test_login_url(ahriman_client: SyncAhrimanClient) -> None:
+def test_login(ahriman_client: SyncAhrimanClient, user: User, mocker: MockerFixture) -> None:
    """
-    must generate login url correctly
-    """
-    assert ahriman_client._login_url().startswith(ahriman_client.address)
-    assert ahriman_client._login_url().endswith("/api/v1/login")
-
-
-def test_on_session_creation(ahriman_client: SyncAhrimanClient, user: User, mocker: MockerFixture) -> None:
-    """
-    must log in user on start
+    must login user
    """
    ahriman_client.auth = (user.username, user.password)
    requests_mock = mocker.patch("ahriman.core.http.SyncAhrimanClient.make_request")
@@ -42,32 +42,40 @@ def test_on_session_creation(ahriman_client: SyncAhrimanClient, user: User, mock
    }
    session = requests.Session()

-    ahriman_client.on_session_creation(session)
+    ahriman_client._login(session)
    requests_mock.assert_called_once_with("POST", pytest.helpers.anyvar(str, True), json=payload, session=session)


-def test_on_session_creation_failed(ahriman_client: SyncAhrimanClient, user: User, mocker: MockerFixture) -> None:
+def test_login_failed(ahriman_client: SyncAhrimanClient, user: User, mocker: MockerFixture) -> None:
    """
-    must suppress any exception happened during session start
+    must suppress any exception happened during login
    """
    ahriman_client.user = user
    mocker.patch("requests.Session.request", side_effect=Exception)
-    ahriman_client.on_session_creation(requests.Session())
+    ahriman_client._login(requests.Session())


-def test_start_failed_http_error(ahriman_client: SyncAhrimanClient, user: User, mocker: MockerFixture) -> None:
+def test_login_failed_http_error(ahriman_client: SyncAhrimanClient, user: User, mocker: MockerFixture) -> None:
    """
-    must suppress HTTP exception happened during session start
+    must suppress HTTP exception happened during login
    """
    ahriman_client.user = user
    mocker.patch("requests.Session.request", side_effect=requests.HTTPError)
-    ahriman_client.on_session_creation(requests.Session())
+    ahriman_client._login(requests.Session())


-def test_start_skip(ahriman_client: SyncAhrimanClient, mocker: MockerFixture) -> None:
+def test_login_skip(ahriman_client: SyncAhrimanClient, mocker: MockerFixture) -> None:
    """
    must skip login if no user set
    """
    requests_mock = mocker.patch("requests.Session.request")
-    ahriman_client.on_session_creation(requests.Session())
+    ahriman_client._login(requests.Session())
    requests_mock.assert_not_called()
+
+
+def test_login_url(ahriman_client: SyncAhrimanClient) -> None:
+    """
+    must generate login url correctly
+    """
+    assert ahriman_client._login_url().startswith(ahriman_client.address)
+    assert ahriman_client._login_url().endswith("/api/v1/login")
--- a/tests/ahriman/core/http/test_sync_http_client.py
+++ b/tests/ahriman/core/http/test_sync_http_client.py
@@ -4,7 +4,6 @@ import requests
 from pytest_mock import MockerFixture
 from unittest.mock import MagicMock, call as MockCall

-from ahriman.core.alpm.remote import AUR
 from ahriman.core.configuration import Configuration
 from ahriman.core.http import SyncHttpClient

@@ -34,33 +33,12 @@ def test_init_auth_empty() -> None:
    assert SyncHttpClient().auth is None


-def test_session(mocker: MockerFixture) -> None:
+def test_session() -> None:
    """
    must generate valid session
    """
-    on_session_creation_mock = mocker.patch("ahriman.core.http.sync_http_client.SyncHttpClient.on_session_creation")
-
    session = SyncHttpClient().session
    assert "User-Agent" in session.headers
-    on_session_creation_mock.assert_called_once_with(pytest.helpers.anyvar(int))
-
-
-def test_retry_policy() -> None:
-    """
-    must set retry policy
-    """
-    SyncHttpClient.DEFAULT_MAX_RETRIES = 1
-    SyncHttpClient.DEFAULT_RETRY_BACKOFF = 2.0
-    AUR.DEFAULT_MAX_RETRIES = 3
-    AUR.DEFAULT_RETRY_BACKOFF = 4.0
-
-    client = SyncHttpClient()
-    assert client.retry.connect == 1
-    assert client.retry.backoff_factor == 2.0
-
-    aur = AUR()
-    assert aur.retry.connect == 3
-    assert aur.retry.backoff_factor == 4.0


 def test_exception_response_text() -> None:
@@ -82,18 +60,6 @@ def test_exception_response_text_empty() -> None:
    assert SyncHttpClient.exception_response_text(exception) == ""


-def test_adapters() -> None:
-    """
-    must create adapters with retry policy
-    """
-    client = SyncHttpClient()
-    adapters = client.adapters()
-
-    assert "http://" in adapters
-    assert "https://" in adapters
-    assert all(adapter.max_retries == client.retry for adapter in adapters.values())
-
-
 def test_make_request(mocker: MockerFixture) -> None:
    """
    must make HTTP request
@@ -192,11 +158,3 @@ def test_make_request_session() -> None:
    session_mock.request.assert_called_once_with(
        "GET", "url", params=None, data=None, headers=None, files=None, json=None,
        stream=None, auth=None, timeout=client.timeout)
-
-
-def test_on_session_creation() -> None:
-    """
-    must do nothing on start
-    """
-    client = SyncHttpClient()
-    client.on_session_creation(client.session)
--- a/tests/ahriman/core/report/test_email.py
+++ b/tests/ahriman/core/report/test_email.py
@@ -1,5 +1,3 @@
-import smtplib
-
 import pytest

 from pytest_mock import MockerFixture
@@ -8,7 +6,6 @@ from ahriman.core.configuration import Configuration
 from ahriman.core.report.email import Email
 from ahriman.models.package import Package
 from ahriman.models.result import Result
-from ahriman.models.smtp_ssl_settings import SmtpSSLSettings


 def test_template(configuration: Configuration) -> None:
@@ -40,36 +37,17 @@ def test_template_full(configuration: Configuration) -> None:
    assert Email(repository_id, configuration, "email").template_full == root.parent / template


-def test_smtp_session(email: Email) -> None:
-    """
-    must build normal SMTP session if SSL is disabled
-    """
-    email.ssl = SmtpSSLSettings.Disabled
-    assert email._smtp_session == smtplib.SMTP
-
-    email.ssl = SmtpSSLSettings.STARTTLS
-    assert email._smtp_session == smtplib.SMTP
-
-
-def test_smtp_session_ssl(email: Email) -> None:
-    """
-    must build SMTP_SSL session if SSL is enabled
-    """
-    email.ssl = SmtpSSLSettings.SSL
-    assert email._smtp_session == smtplib.SMTP_SSL
-
-
 def test_send(email: Email, mocker: MockerFixture) -> None:
    """
    must send an email with attachment
    """
    smtp_mock = mocker.patch("smtplib.SMTP")
-    smtp_mock.return_value.__enter__.return_value = smtp_mock.return_value

    email._send("a text", {"attachment.html": "an attachment"})
    smtp_mock.return_value.starttls.assert_not_called()
    smtp_mock.return_value.login.assert_not_called()
    smtp_mock.return_value.sendmail.assert_called_once_with(email.sender, email.receivers, pytest.helpers.anyvar(int))
+    smtp_mock.return_value.quit.assert_called_once_with()


 def test_send_auth(configuration: Configuration, mocker: MockerFixture) -> None:
@@ -79,7 +57,6 @@ def test_send_auth(configuration: Configuration, mocker: MockerFixture) -> None:
    configuration.set_option("email", "user", "username")
    configuration.set_option("email", "password", "password")
    smtp_mock = mocker.patch("smtplib.SMTP")
-    smtp_mock.return_value.__enter__.return_value = smtp_mock.return_value
    _, repository_id = configuration.check_loaded()

    email = Email(repository_id, configuration, "email")
@@ -93,7 +70,6 @@ def test_send_auth_no_password(configuration: Configuration, mocker: MockerFixtu
    """
    configuration.set_option("email", "user", "username")
    smtp_mock = mocker.patch("smtplib.SMTP")
-    smtp_mock.return_value.__enter__.return_value = smtp_mock.return_value
    _, repository_id = configuration.check_loaded()

    email = Email(repository_id, configuration, "email")
@@ -107,7 +83,6 @@ def test_send_auth_no_user(configuration: Configuration, mocker: MockerFixture)
    """
    configuration.set_option("email", "password", "password")
    smtp_mock = mocker.patch("smtplib.SMTP")
-    smtp_mock.return_value.__enter__.return_value = smtp_mock.return_value
    _, repository_id = configuration.check_loaded()

    email = Email(repository_id, configuration, "email")
@@ -121,7 +96,6 @@ def test_send_ssl_tls(configuration: Configuration, mocker: MockerFixture) -> No
    """
    configuration.set_option("email", "ssl", "ssl")
    smtp_mock = mocker.patch("smtplib.SMTP_SSL")
-    smtp_mock.return_value.__enter__.return_value = smtp_mock.return_value
    _, repository_id = configuration.check_loaded()

    email = Email(repository_id, configuration, "email")
@@ -129,6 +103,7 @@ def test_send_ssl_tls(configuration: Configuration, mocker: MockerFixture) -> No
    smtp_mock.return_value.starttls.assert_not_called()
    smtp_mock.return_value.login.assert_not_called()
    smtp_mock.return_value.sendmail.assert_called_once_with(email.sender, email.receivers, pytest.helpers.anyvar(int))
+    smtp_mock.return_value.quit.assert_called_once_with()


 def test_send_starttls(configuration: Configuration, mocker: MockerFixture) -> None:
@@ -137,7 +112,6 @@ def test_send_starttls(configuration: Configuration, mocker: MockerFixture) -> N
    """
    configuration.set_option("email", "ssl", "starttls")
    smtp_mock = mocker.patch("smtplib.SMTP")
-    smtp_mock.return_value.__enter__.return_value = smtp_mock.return_value
    _, repository_id = configuration.check_loaded()

    email = Email(repository_id, configuration, "email")
--- a/tests/ahriman/core/repository/test_repository.py
+++ b/tests/ahriman/core/repository/test_repository.py
@@ -2,7 +2,6 @@ from pytest_mock import MockerFixture
 from unittest.mock import call as MockCall

 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote import AUR
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.repository import Repository
@@ -14,28 +13,13 @@ def test_load(configuration: Configuration, database: SQLite, mocker: MockerFixt
    """
    must correctly load instance
    """
-    globals_mock = mocker.patch("ahriman.core.repository.Repository._set_globals")
    context_mock = mocker.patch("ahriman.core.repository.Repository._set_context")
    _, repository_id = configuration.check_loaded()

    Repository.load(repository_id, configuration, database, report=False)
-    globals_mock.assert_called_once_with(configuration)
    context_mock.assert_called_once_with()


-def test_set_globals(configuration: Configuration) -> None:
-    """
-    must correctly set globals
-    """
-    configuration.set_option("aur", "timeout", "42")
-    configuration.set_option("aur", "max_retries", "10")
-
-    Repository._set_globals(configuration)
-    aur = AUR()
-    assert aur.timeout == 42
-    assert aur.retry.connect == 10
-
-
 def test_set_context(configuration: Configuration, database: SQLite, mocker: MockerFixture) -> None:
    """
    must set context variables
--- a/tests/ahriman/web/apispec/test_info.py
+++ b/tests/ahriman/web/apispec/test_info.py
@@ -23,7 +23,7 @@ def test_security() -> None:
    must generate security definitions for swagger
    """
    token = next(iter(_security()))["token"]
-    assert token == {"type": "apiKey", "name": "AHRIMAN", "in": "cookie"}
+    assert token == {"type": "apiKey", "name": "API_SESSION", "in": "cookie"}


 def test_servers(application: Application) -> None:
--- a/tests/ahriman/web/schemas/test_auth_schema.py
+++ b/tests/ahriman/web/schemas/test_auth_schema.py
@@ -6,4 +6,4 @@ def test_schema() -> None:
    must return valid schema
    """
    schema = AuthSchema()
-    assert not schema.validate({"AHRIMAN": "key"})
+    assert not schema.validate({"API_SESSION": "key"})
--- a/tests/ahriman/web/views/api/test_view_api_swagger.py
+++ b/tests/ahriman/web/views/api/test_view_api_swagger.py
@@ -27,7 +27,7 @@ def _client(client: TestClient, mocker: MockerFixture) -> TestClient:
                    "parameters": [
                        {
                            "in": "cookie",
-                            "name": "AHRIMAN",
+                            "name": "API_SESSION",
                            "schema": {
                                "type": "string",
                            },
@@ -39,7 +39,7 @@ def _client(client: TestClient, mocker: MockerFixture) -> TestClient:
                    "parameters": [
                        {
                            "in": "cookie",
-                            "name": "AHRIMAN",
+                            "name": "API_SESSION",
                            "schema": {
                                "type": "string",
                            },
@@ -60,7 +60,7 @@ def _client(client: TestClient, mocker: MockerFixture) -> TestClient:
            {
                "token": {
                    "type": "apiKey",
-                    "name": "AHRIMAN",
+                    "name": "API_SESSION",
                    "in": "cookie",
                },
            },
Author	SHA1	Message	Date
Evgenii Alekseev	431b1a7150	feat: implement CSRF protection	2026-02-17 03:41:45 +02:00
Evgenii Alekseev	3b43861bcf	feat: handle only unknownpackageerror on aur load	2026-02-17 03:41:45 +02:00
Evgenii Alekseev	c1e9534bc3	bug: filter logs by repository (twice) before rotation	2026-02-17 01:43:17 +02:00
Evgenii Alekseev	cdd0ffbbd2	bug: do not clear queue on queue fetch failures	2026-02-17 01:34:54 +02:00
Evgenii Alekseev	9fb93e4697	docs: correct docstring for list_flatmap method	2026-02-17 01:27:59 +02:00
Evgenii Alekseev	953048422c	bug: correct vcs definition for cvs packages	2026-02-17 01:18:36 +02:00
Evgenii Alekseev	2cc486eb59	bug: load gitremote triggers configuration schema from non-standard paths	2026-02-16 22:58:11 +02:00