ci(docker): add Docker publishing workflow and Dockerfile

Introduce GitHub Actions workflow for automated Docker image publishing to Docker Hub, along with a dedicated Dockerfile in the ci directory to streamline container builds.
fix(xmpp): obfuscate client identity in protocol exchanges
2026-07-11 17:43:16 +00:00 · 2026-07-10 08:54:24 +00:00 · 2026-07-10 08:12:56 +00:00 · 2026-07-08 11:00:31 +00:00 · 2026-07-04 14:07:22 +03:00 · 2026-07-04 14:07:22 +03:00
56 changed files with 1002 additions and 203 deletions
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,44 @@
+name: Publish Docker image
+
+on:
+  push:
+    branches: [master]
+  release:
+    types: [published]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v7
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
+        with:
+          images: cproofdev/cproof
+          tags: |
+            type=raw,value=dev,enable={{is_default_branch}}
+            type=sha,prefix=nightly-,enable={{is_default_branch}}
+            type=ref,event=tag
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
+
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@2bd26e71295ee32cbf6a73510d165bf7232460f3
+        with:
+          context: .
+          file: ./ci/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -0,0 +1,106 @@
+# =============================================================================
+# Stage 1: Build
+# =============================================================================
+FROM ubuntu:26.04 AS builder
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    autoconf \
+    automake \
+    autoconf-archive \
+    ca-certificates \
+    libtool \
+    pkg-config \
+    git \
+    wget \
+    libglib2.0-dev \
+    libcurl4-openssl-dev \
+    libsqlite3-dev \
+    libncurses-dev \
+    libreadline-dev \
+    libnotify-dev \
+    python3-dev \
+    python3 \
+    libgpgme-dev \
+    libotr5-dev \
+    libgtk-3-dev \
+    libgdk-pixbuf-2.0-dev \
+    libsignal-protocol-c-dev \
+    libgcrypt20-dev \
+    libqrencode-dev \
+    libxss-dev \
+    libcmocka-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Build libstrophe from source (not available as Ubuntu package)
+RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh-mirror.git /tmp/libstrophe \
+    && cd /tmp/libstrophe \
+    && autoreconf -i \
+    && ./configure --prefix=/usr \
+    && make -j$(nproc) \
+    && make install \
+    && rm -rf /tmp/libstrophe
+
+WORKDIR /src
+
+COPY . .
+
+RUN ./bootstrap.sh \
+    && ./configure \
+        --enable-notifications \
+        --enable-icons-and-clipboard \
+        --enable-otr \
+        --enable-pgp \
+        --enable-omemo \
+        --enable-plugins \
+        --enable-c-plugins \
+        --enable-python-plugins \
+        --with-xscreensaver \
+        --enable-omemo-qrcode \
+        --enable-gdk-pixbuf \
+    && make -j$(nproc) \
+    && make install
+
+# =============================================================================
+# Stage 2: Runtime (minimal)
+# =============================================================================
+FROM ubuntu:26.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    libglib2.0-0t64 \
+    libcurl4t64 \
+    libsqlite3-0 \
+    libncursesw6 \
+    libreadline8t64 \
+    libnotify4 \
+    python3 \
+    libpython3.14 \
+    libgpgme45 \
+    libotr5t64 \
+    libgtk-3-0t64 \
+    libgdk-pixbuf-2.0-0 \
+    libsignal-protocol-c2.3.2 \
+    libgcrypt20 \
+    libqrencode4 \
+    libxss1 \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
+
+COPY --from=builder /usr/local/bin/profanity /usr/local/bin/profanity
+COPY --from=builder /usr/local/lib/libprofanity* /usr/local/lib/
+COPY --from=builder /usr/local/include/profapi.h /usr/local/include/
+COPY --from=builder /usr/local/share/profanity /usr/local/share/profanity
+COPY --from=builder /usr/lib/libstrophe.so* /usr/lib/
+
+RUN ldconfig
+
+RUN ldd /usr/local/bin/profanity | grep 'not found' && exit 1 || true
+
+RUN mkdir -p /root/.config/profanity
+
+ENTRYPOINT ["profanity"]
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,10 @@ AC_ARG_ENABLE([omemo-qrcode],
    [AS_HELP_STRING([--enable-omemo-qrcode], [enable ability to display omemo qr code])])
 AC_ARG_ENABLE([coverage],
    [AS_HELP_STRING([--enable-coverage], [enable code coverage analysis])])
+AC_ARG_ENABLE([sanitizers],
+    [AS_HELP_STRING([--enable-sanitizers], [enable AddressSanitizer + UndefinedBehaviorSanitizer + unsigned-integer-overflow])])
+AC_ARG_ENABLE([hardening],
+    [AS_HELP_STRING([--enable-hardening], [enable extra hardening warnings (e.g. -Wnull-dereference) that may produce false positives under -O2])])

 m4_include([m4/ax_valgrind_check.m4])
 AX_VALGRIND_DFLT([drd], [off])
@@ -395,7 +399,7 @@ AC_SUBST([FORKPTY_LIB])

 ## Default parameters
 AM_CFLAGS="$AM_CFLAGS -Wall -Wextra -Wformat=2 -Wno-format-zero-length"
-AM_CFLAGS="$AM_CFLAGS -Wno-deprecated-declarations -Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare -Wno-cast-function-type"
+AM_CFLAGS="$AM_CFLAGS -Wno-deprecated-declarations -Wno-unused-parameter -Wno-missing-field-initializers -Wno-cast-function-type"
 AM_CFLAGS="$AM_CFLAGS -Wpointer-arith"
 AM_CFLAGS="$AM_CFLAGS -Wimplicit-function-declaration"
 AM_CFLAGS="$AM_CFLAGS -Wundef"
@@ -406,7 +410,8 @@ AM_CFLAGS="$AM_CFLAGS -std=gnu99 -ggdb3"
 # GCC-specific warnings (not supported by clang) — test each one
 saved_CFLAGS="$CFLAGS"
 for _flag in -Wlogical-op -Wduplicated-cond -Wduplicated-branches \
-             -Wstringop-overflow -Warray-bounds=2 -Walloc-zero; do
+             -Wstringop-overflow -Warray-bounds=2 -Walloc-zero \
+             -Wsign-compare; do
    AC_MSG_CHECKING([whether $CC supports $_flag])
    CFLAGS="$saved_CFLAGS $_flag -Werror"
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
@@ -433,11 +438,46 @@ AS_IF([test "x$enable_coverage" = xyes],
     AM_LDFLAGS="$AM_LDFLAGS --coverage"
     AC_MSG_NOTICE([Code coverage analysis enabled])])

+AS_IF([test "x$enable_sanitizers" = xyes],
+    [SAN_FLAGS="-fsanitize=address,undefined"
+     saved_CFLAGS="$CFLAGS"
+     CFLAGS="$saved_CFLAGS -fsanitize=unsigned-integer-overflow -Werror"
+     AC_MSG_CHECKING([whether $CC supports -fsanitize=unsigned-integer-overflow])
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+         [AC_MSG_RESULT([yes]); SAN_FLAGS="$SAN_FLAGS,unsigned-integer-overflow"],
+         [AC_MSG_RESULT([no])])
+     CFLAGS="$saved_CFLAGS"
+     AM_CFLAGS="$AM_CFLAGS $SAN_FLAGS -fno-sanitize-recover=all -fno-omit-frame-pointer"
+     AM_LDFLAGS="$AM_LDFLAGS -fsanitize=address,undefined"
+     AC_MSG_NOTICE([Sanitizers enabled: $SAN_FLAGS])])
+
+AS_IF([test "x$enable_hardening" = xyes],
+    [saved_CFLAGS="$CFLAGS"
+     for _flag in -Wnull-dereference; do
+         AC_MSG_CHECKING([whether $CC supports $_flag])
+         CFLAGS="$saved_CFLAGS $_flag -Werror"
+         AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+             [AC_MSG_RESULT([yes]); AM_CFLAGS="$AM_CFLAGS $_flag"],
+             [AC_MSG_RESULT([no])])
+     done
+     CFLAGS="$saved_CFLAGS"
+     AC_MSG_NOTICE([Extra hardening warnings enabled])])
+
+# Skip _FORTIFY_SOURCE=2 if env already set one (Pikaur/makepkg) or under coverage -O0 (FORTIFY needs -O>0).
+AS_IF([test "x$enable_coverage" != xyes],
+    [AS_CASE([" ${CPPFLAGS} ${CFLAGS} "],
+        [*_FORTIFY_SOURCE=*], [AC_MSG_NOTICE([_FORTIFY_SOURCE preset from environment, leaving as-is])],
+        [AM_CFLAGS="$AM_CFLAGS -D_FORTIFY_SOURCE=2"])])
+
 AS_IF([test "x$PACKAGE_STATUS" = xdevelopment],
    [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"])
 AS_IF([test "x$PLATFORM" = xosx],
    [AM_CFLAGS="$AM_CFLAGS -Qunused-arguments"])

+# Treat glib/gio headers as system to keep their macros out of our -W* set.
+glib_CFLAGS=$(echo "$glib_CFLAGS" | sed 's/-I/-isystem /g')
+gio_CFLAGS=$(echo "$gio_CFLAGS" | sed 's/-I/-isystem /g')
+
 AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS $glib_CFLAGS $gio_CFLAGS $curl_CFLAGS ${SQLITE_CFLAGS}"
 AM_CFLAGS="$AM_CFLAGS $libnotify_CFLAGS ${GTK_CFLAGS} $python_CFLAGS"
 AM_CFLAGS="$AM_CFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\" -DICONS_PATH=\"\\\"$ICONS_PATH\\\"\" -DGLOBAL_PYTHON_PLUGINS_PATH=\"\\\"$GLOBAL_PYTHON_PLUGINS_PATH\\\"\" -DGLOBAL_C_PLUGINS_PATH=\"\\\"$GLOBAL_C_PLUGINS_PATH\\\"\""
--- a/src/ai/ai_client.c
+++ b/src/ai/ai_client.c
@@ -186,6 +186,22 @@ ai_json_escape(const gchar* str)
    return g_string_free(result, FALSE);
 }

+/* Keys emitted as fixed payload fields; custom settings must not duplicate them */
+static gboolean
+_is_reserved_payload_key(const gchar* key)
+{
+    return g_strcmp0(key, "model") == 0 || g_strcmp0(key, "messages") == 0 || g_strcmp0(key, "stream") == 0;
+}
+
+/* RFC 8259 scalars (number/true/false/null) may be emitted bare in a JSON payload */
+static gboolean
+_is_json_bare_token(const gchar* value)
+{
+    if (g_strcmp0(value, "true") == 0 || g_strcmp0(value, "false") == 0 || g_strcmp0(value, "null") == 0)
+        return TRUE;
+    return g_regex_match_simple("^-?(0|[1-9][0-9]*)(\\.[0-9]+)?([eE][+-]?[0-9]+)?$", value, 0, 0);
+}
+
 /**
 * Convert a 4-hex-digit sequence at @p to a 16-bit code point.
 * Returns -1 on invalid hex.
@@ -392,6 +408,7 @@ ai_provider_new(const gchar* name, const gchar* api_url)
    provider->models = NULL;
    provider->models_fresh = FALSE;
    provider->ref_count = 1;
+    pthread_mutex_init(&provider->settings_lock, NULL);
    return provider;
 }

@@ -419,6 +436,7 @@ ai_provider_unref(AIProvider* provider)
    g_free(provider->project_id);
    g_free(provider->default_model);
    g_hash_table_destroy(provider->settings);
+    pthread_mutex_destroy(&provider->settings_lock);

    GList* curr = provider->models;
    while (curr) {
@@ -729,31 +747,44 @@ ai_get_provider_default_model(const gchar* provider_name)
    return provider->default_model;
 }

-void
+gboolean
 ai_set_provider_setting(const gchar* provider_name, const gchar* setting, const gchar* value)
 {
    if (!provider_name || !setting)
-        return;
+        return FALSE;
+
+    if (_is_reserved_payload_key(setting)) {
+        log_warning("Setting '%s' for provider '%s' rejected: reserved payload key", setting, provider_name);
+        return FALSE;
+    }

    AIProvider* provider = ai_get_provider(provider_name);
    if (!provider) {
        log_warning("Provider '%s' not found for setting '%s'", provider_name, setting);
-        return;
+        return FALSE;
    }

+    /* settings is iterated by the request thread; mutate under settings_lock */
+    pthread_mutex_lock(&provider->settings_lock);
    if (!provider->settings) {
        provider->settings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
    }

    if (value) {
        g_hash_table_insert(provider->settings, g_strdup(setting), g_strdup(value));
+    } else {
+        g_hash_table_remove(provider->settings, setting);
+    }
+    pthread_mutex_unlock(&provider->settings_lock);
+
+    if (value) {
        prefs_ai_set_setting(provider_name, setting, value);
        log_info("Setting '%s' for provider '%s' set to: %s", setting, provider_name, value);
    } else {
-        g_hash_table_remove(provider->settings, setting);
        prefs_ai_remove_setting(provider_name, setting);
        log_info("Setting '%s' removed for provider '%s'", setting, provider_name);
    }
+    return TRUE;
 }

 gchar*
@@ -766,8 +797,10 @@ ai_get_provider_setting(const gchar* provider_name, const gchar* setting)
    if (!provider || !provider->settings)
        return NULL;

-    gchar* value = g_hash_table_lookup(provider->settings, setting);
-    return g_strdup(value);
+    pthread_mutex_lock(&provider->settings_lock);
+    gchar* value = g_strdup(g_hash_table_lookup(provider->settings, setting));
+    pthread_mutex_unlock(&provider->settings_lock);
+    return value;
 }

 /* ========================================================================
@@ -1435,13 +1468,19 @@ ai_session_switch(AISession* session, const gchar* provider_name,
 * This is the thread-safe variant used by _ai_request_thread() which holds
 * the session lock while calling it.
 *
+ * Custom provider settings are merged into the payload as additional JSON
+ * key-value pairs alongside "model" and "messages": scalar values
+ * (number/true/false/null) are emitted bare, anything else as a JSON string;
+ * reserved keys (model/messages/stream) are skipped.
+ *
+ * @param provider The AI provider (for custom settings)
 * @param model The model identifier
 * @param history GList of AIMessage* (must be held under session lock)
 * @param prompt The new user prompt to append
 * @return Newly allocated JSON string (caller must free)
 */
 static gchar*
-_build_json_payload_from_list(const gchar* model, GList* history, const gchar* prompt)
+_build_json_payload_from_list(AIProvider* provider, const gchar* model, GList* history, const gchar* prompt)
 {
    GString* messages_json = g_string_new("");
    GList* curr = history;
@@ -1468,11 +1507,50 @@ _build_json_payload_from_list(const gchar* model, GList* history, const gchar* p
    g_string_append_printf(messages_json, "{\"role\":\"user\",\"content\":\"%s\"}", escaped_prompt);

    auto_gchar gchar* escaped_model = ai_json_escape(model);
-    gchar* json_payload = g_strdup_printf(
-        "{\"model\":\"%s\",\"input\":[%s],\"stream\":false,\"store\":false}",
-        escaped_model, messages_json->str);
+
+    /* Build custom settings JSON fragment; settings is mutated on the main
+     * thread (/ai set custom), so iterate under settings_lock */
+    GString* custom_json = g_string_new("");
+    if (provider) {
+        pthread_mutex_lock(&provider->settings_lock);
+        if (provider->settings) {
+            GHashTableIter iter;
+            gpointer key, value;
+            g_hash_table_iter_init(&iter, provider->settings);
+            while (g_hash_table_iter_next(&iter, &key, &value)) {
+                if (_is_reserved_payload_key((gchar*)key)) {
+                    continue; /* fixed payload fields stay authoritative */
+                }
+                auto_gchar gchar* escaped_key = ai_json_escape((gchar*)key);
+                if (custom_json->len > 0) {
+                    g_string_append_c(custom_json, ',');
+                }
+                if (_is_json_bare_token((gchar*)value)) {
+                    g_string_append_printf(custom_json, "\"%s\": %s", escaped_key, (gchar*)value);
+                } else {
+                    /* non-scalar values must be quoted, else the payload is invalid JSON */
+                    auto_gchar gchar* escaped_val = ai_json_escape((gchar*)value);
+                    g_string_append_printf(custom_json, "\"%s\": \"%s\"", escaped_key, escaped_val);
+                }
+            }
+        }
+        pthread_mutex_unlock(&provider->settings_lock);
+    }
+
+    /* Assemble final payload: model, messages, custom settings, then fixed keys */
+    gchar* json_payload;
+    if (custom_json->len > 0) {
+        json_payload = g_strdup_printf(
+            "{\"model\":\"%s\",\"messages\":[%s],%s,\"stream\":false}",
+            escaped_model, messages_json->str, custom_json->str);
+    } else {
+        json_payload = g_strdup_printf(
+            "{\"model\":\"%s\",\"messages\":[%s],\"stream\":false}",
+            escaped_model, messages_json->str);
+    }

    g_string_free(messages_json, TRUE);
+    g_string_free(custom_json, TRUE);
    return json_payload;
 }

@@ -1482,12 +1560,7 @@ ai_parse_response(const gchar* response_json)
    if (!response_json || strlen(response_json) == 0)
        return NULL;

-    /* Perplexity /v1/agent: {"output":[{"content":[{"text":"...","type":"output_text"}]}]}
-     * Legacy OpenAI:        {"choices":[{"message":{"content":"..."}}]} */
-    gchar* text = _extract_json_string(response_json, "text");
-    if (text)
-        return text;
-
+    /* OpenAI /v1/chat/completions: {"choices":[{"message":{"content":"..."}}]} */
    return _extract_json_string(response_json, "content");
 }

@@ -1566,7 +1639,7 @@ _ai_request_thread(gpointer data)
    /* Build JSON payload from history + prompt (under lock), then add user message to history */
    log_debug("[AI-THREAD] Building JSON payload...");
    pthread_mutex_lock(&session->lock);
-    auto_gchar gchar* json_payload = _build_json_payload_from_list(local_model, session->history, prompt);
+    auto_gchar gchar* json_payload = _build_json_payload_from_list(local_provider, local_model, session->history, prompt);

    /* Add user message to history now (it's in JSON but not yet in history) */
    AIMessage* user_msg = g_new0(AIMessage, 1);
@@ -1587,7 +1660,7 @@ _ai_request_thread(gpointer data)

    /* Build request URL */
    const gchar* api_url = local_provider->api_url;
-    auto_gchar gchar* request_url = g_strdup_printf("%s%sv1/responses", api_url, g_str_has_suffix(api_url, "/") ? "" : "/");
+    auto_gchar gchar* request_url = g_strdup_printf("%s%sv1/chat/completions", api_url, g_str_has_suffix(api_url, "/") ? "" : "/");
    log_debug("[AI-THREAD] API URL: %s", api_url);
    log_debug("[AI-THREAD] API Request URL: %s", request_url);
    log_debug("[AI-THREAD] Model: %s", local_model);
--- a/src/ai/ai_client.h
+++ b/src/ai/ai_client.h
@@ -17,14 +17,15 @@ typedef struct ai_message_t
 */
 typedef struct ai_provider_t
 {
-    gchar* name;           /* Provider name (e.g., "openai", "perplexity") */
-    gchar* api_url;        /* API endpoint URL */
-    gchar* project_id;     /* Optional project ID (for some providers) */
-    gchar* default_model;  /* Default model for this provider */
-    GHashTable* settings;  /* Extensible per-provider settings (e.g., tools=enabled, search=disabled) */
-    GList* models;         /* Cached models (gchar*) */
-    gboolean models_fresh; /* Whether models cache is current */
-    gint32 ref_count;      /* Reference count (atomic) */
+    gchar* name;                   /* Provider name (e.g., "openai", "perplexity") */
+    gchar* api_url;                /* API endpoint URL */
+    gchar* project_id;             /* Optional project ID (for some providers) */
+    gchar* default_model;          /* Default model for this provider */
+    pthread_mutex_t settings_lock; /* Protects settings (iterated by the request thread) */
+    GHashTable* settings;          /* Extensible per-provider settings (e.g., temperature=0.7) */
+    GList* models;                 /* Cached models (gchar*) */
+    gboolean models_fresh;         /* Whether models cache is current */
+    gint32 ref_count;              /* Reference count (atomic) */
 } AIProvider;

 /**
@@ -142,11 +143,13 @@ const gchar* ai_get_provider_default_model(const gchar* provider_name);

 /**
 * Set a custom setting for a provider.
+ * Reserved payload keys (model, messages, stream) are rejected.
 * @param provider_name The provider name
- * @param setting The setting key (e.g., "tools", "search")
- * @param value The setting value
+ * @param setting The setting key (e.g., "temperature")
+ * @param value The setting value, or NULL to remove
+ * @return TRUE on success, FALSE on unknown provider or reserved key
 */
-void ai_set_provider_setting(const gchar* provider_name, const gchar* setting, const gchar* value);
+gboolean ai_set_provider_setting(const gchar* provider_name, const gchar* setting, const gchar* value);

 /**
 * Get a custom setting for a provider.
@@ -184,9 +187,9 @@ gboolean ai_models_are_fresh(const gchar* provider_name);
 void ai_parse_models_from_json(AIProvider* provider, const gchar* json);

 /**
- * Extract assistant content from an LLM response body. Tries Perplexity
- * /v1/responses "text" first, falls back to OpenAI "content". Decodes
- * the \" and \n escape sequences only.
+ * Extract assistant content from an OpenAI chat-completions response body
+ * ({"choices":[{"message":{"content":"..."}}]}). Decodes the \" and \n
+ * escape sequences only.
 * @param response_json The JSON body from the provider
 * @return Newly allocated content string, or NULL if not found (caller frees)
 */
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -42,11 +42,13 @@

 #include "ai/ai_client.h"

+static char* _caps_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _sub_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _notify_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _theme_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _spellcheck_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _autoaway_autocomplete(ProfWin* window, const char* const input, gboolean previous);
+static char* _autoping_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _autoconnect_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _account_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _who_autocomplete(ProfWin* window, const char* const input, gboolean previous);
@@ -150,6 +152,7 @@ static Autocomplete account_clear_ac;
 static Autocomplete account_default_ac;
 static Autocomplete account_status_ac;
 static Autocomplete disco_ac;
+static Autocomplete caps_subcommands_ac;
 static Autocomplete wins_ac;
 static Autocomplete roster_ac;
 static Autocomplete roster_show_ac;
@@ -320,6 +323,7 @@ static Autocomplete* all_acs[] = {
    &account_default_ac,
    &account_status_ac,
    &disco_ac,
+    &caps_subcommands_ac,
    &wins_ac,
    &roster_ac,
    &roster_show_ac,
@@ -596,6 +600,8 @@ cmd_ac_init(void)
    autocomplete_add(disco_ac, "info");
    autocomplete_add(disco_ac, "items");

+    autocomplete_add(caps_subcommands_ac, "clear");
+
    autocomplete_add(account_ac, "list");
    autocomplete_add(account_ac, "show");
    autocomplete_add(account_ac, "add");
@@ -1056,6 +1062,7 @@ cmd_ac_init(void)

    autocomplete_add(autoping_ac, "set");
    autocomplete_add(autoping_ac, "timeout");
+    autocomplete_add(autoping_ac, "warning");

    autocomplete_add(plugins_ac, "install");
    autocomplete_add(plugins_ac, "update");
@@ -1407,10 +1414,12 @@ cmd_ac_init(void)
    g_hash_table_insert(ac_funcs, "/alias", _alias_autocomplete);
    g_hash_table_insert(ac_funcs, "/autoaway", _autoaway_autocomplete);
    g_hash_table_insert(ac_funcs, "/autoconnect", _autoconnect_autocomplete);
+    g_hash_table_insert(ac_funcs, "/autoping", _autoping_autocomplete);
    g_hash_table_insert(ac_funcs, "/avatar", _avatar_autocomplete);
    g_hash_table_insert(ac_funcs, "/ban", _ban_autocomplete);
    g_hash_table_insert(ac_funcs, "/blocked", _blocked_autocomplete);
    g_hash_table_insert(ac_funcs, "/bookmark", _bookmark_autocomplete);
+    g_hash_table_insert(ac_funcs, "/caps", _caps_autocomplete);
    g_hash_table_insert(ac_funcs, "/clear", _clear_autocomplete);
    g_hash_table_insert(ac_funcs, "/close", _close_autocomplete);
    g_hash_table_insert(ac_funcs, "/cmd", _adhoc_cmd_autocomplete);
@@ -1934,7 +1943,6 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
        { "/prefs", prefs_ac },
        { "/disco", disco_ac },
        { "/room", room_ac },
-        { "/autoping", autoping_ac },
        { "/mainwin", winpos_ac },
        { "/inputwin", winpos_ac },
    };
@@ -1983,6 +1991,35 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
    return NULL;
 }

+static char*
+_caps_autocomplete(ProfWin* window, const char* const input, gboolean previous)
+{
+    char* result = NULL;
+    result = autocomplete_param_with_ac(input, "/caps", caps_subcommands_ac, TRUE, previous);
+    if (result) {
+        return result;
+    }
+    if (window->type == WIN_MUC) {
+        ProfMucWin* mucwin = (ProfMucWin*)window;
+        assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
+        Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
+        if (nick_ac) {
+            result = autocomplete_param_with_ac(input, "/caps", nick_ac, TRUE, previous);
+        }
+    } else if (connection_get_status() == JABBER_CONNECTED) {
+        result = autocomplete_param_with_func(input, "/caps", roster_contact_autocomplete, previous, NULL);
+        if (result) {
+            return result;
+        }
+        result = autocomplete_param_with_func(input, "/caps", roster_barejid_autocomplete, previous, NULL);
+        if (result) {
+            return result;
+        }
+        result = autocomplete_param_with_func(input, "/caps", roster_fulljid_autocomplete, previous, NULL);
+    }
+    return result;
+}
+
 static char*
 _sub_autocomplete(ProfWin* window, const char* const input, gboolean previous)
 {
@@ -4264,6 +4301,20 @@ _executable_autocomplete(ProfWin* window, const char* const input, gboolean prev
    return result;
 }

+static char*
+_autoping_autocomplete(ProfWin* window, const char* const input, gboolean previous)
+{
+    char* result = NULL;
+
+    result = autocomplete_param_with_ac(input, "/autoping", autoping_ac, TRUE, previous);
+    if (result) {
+        return result;
+    }
+
+    result = autocomplete_param_with_func(input, "/autoping warning", prefs_autocomplete_boolean_choice, previous, NULL);
+    return result;
+}
+
 static char*
 _lastactivity_autocomplete(ProfWin* window, const char* const input, gboolean previous)
 {
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -427,17 +427,21 @@ static const struct cmd_t command_defs[] = {
              CMD_TAG_GROUPCHAT)
      CMD_SYN(
              "/caps",
-              "/caps <fulljid>|<nick>")
+              "/caps <fulljid>|<nick>",
+              "/caps clear")
      CMD_DESC(
              "Find out a contacts, or room members client software capabilities. "
-              "If in private chat initiated from a chat room, no parameter is required.")
+              "If in private chat initiated from a chat room, no parameter is required. "
+              "Use clear to remove all cached capabilities.")
      CMD_ARGS(
              { "<fulljid>", "If in the console or a chat window, the full JID for which you wish to see capabilities." },
-              { "<nick>", "If in a chat room, nickname for which you wish to see capabilities." })
+              { "<nick>", "If in a chat room, nickname for which you wish to see capabilities." },
+              { "clear", "Clear all cached capabilities." })
      CMD_EXAMPLES(
              "/caps ran@cold.sea.org/laptop",
              "/caps ran@cold.sea.org/phone",
-              "/caps aegir")
+              "/caps aegir",
+              "/caps clear")
    },

    { CMD_PREAMBLE("/software",
@@ -1964,12 +1968,14 @@ static const struct cmd_t command_defs[] = {
              CMD_TAG_CONNECTION)
      CMD_SYN(
              "/autoping set <seconds>",
-              "/autoping timeout <seconds>")
+              "/autoping timeout <seconds>",
+              "/autoping warning on|off")
      CMD_DESC(
              "Set the interval between sending ping requests to the server to ensure the connection is kept alive.")
      CMD_ARGS(
              { "set <seconds>", "Number of seconds between sending pings, a value of 0 disables autoping." },
-              { "timeout <seconds>", "Seconds to wait for autoping responses, after which the connection is considered broken." })
+              { "timeout <seconds>", "Seconds to wait for autoping responses, after which the connection is considered broken." },
+              { "warning on|off", "Enable or disable autoping availability warning." })
    },

    { CMD_PREAMBLE("/ping",
@@ -2831,7 +2837,7 @@ static const struct cmd_t command_defs[] = {
              { "set provider <name> <url>", "Add or update a provider with custom API endpoint" },
              { "set token <provider> <token>", "Set API token for a provider (e.g., openai, perplexity)" },
              { "set default-model <provider> <model>", "Set default model for a provider" },
-              { "set custom <provider> <setting> <value>", "Set provider-level setting (e.g., tools, search)" },
+              { "set custom <provider> <setting> <value>", "Set provider-level setting (e.g., temperature, max_tokens)" },
              { "remove provider <name>", "Remove a custom provider" },
              { "providers", "List configured providers with full details" },
              { "start <provider> [<model>]", "Start new AI chat (space-separated, uses defaults if omitted)" },
@@ -2844,7 +2850,7 @@ static const struct cmd_t command_defs[] = {
              "/ai set token perplexity pplx-xxx",
              "/ai set provider custom https://my-api.com/v1/chat/completions",
              "/ai set default-model perplexity sonar",
-              "/ai set custom perplexity tools enabled",
+              "/ai set custom perplexity temperature 0.7",
              "/ai remove provider custom",
              "/ai start",
              "/ai start perplexity",
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -70,6 +70,7 @@
 #include "xmpp/stanza.h"
 #include "xmpp/vcard_funcs.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/capabilities.h"

 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
@@ -3387,6 +3388,12 @@ cmd_caps(ProfWin* window, const char* const command, gchar** args)
        return TRUE;
    }

+    if (g_strcmp0(args[0], "clear") == 0) {
+        caps_cache_clear();
+        cons_show("Capabilities cache cleared.");
+        return TRUE;
+    }
+
    switch (window->type) {
    case WIN_MUC:
        if (args[0]) {
@@ -3405,6 +3412,7 @@ cmd_caps(ProfWin* window, const char* const command, gchar** args)
        break;
    case WIN_CHAT:
    case WIN_CONSOLE:
+    case WIN_XML:
        if (args[0]) {
            auto_jid Jid* jid = jid_create(args[0]);

@@ -6374,6 +6382,8 @@ cmd_autoping(ProfWin* window, const char* const command, gchar** args)
            cons_bad_cmd_usage(command);
        }

+    } else if (g_strcmp0(cmd, "warning") == 0) {
+        _cmd_set_boolean_preference(value, "Autoping availability warning", PREF_AUTOPING_WARNING);
    } else {
        cons_bad_cmd_usage(command);
    }
@@ -10063,8 +10073,14 @@ cmd_vcard_remove(ProfWin* window, const char* const command, gchar** args)
    }

    if (args[1]) {
-        vcard_user_remove_element(atoi(args[1]));
-        cons_show("Removed element at index %d", atoi(args[1]));
+        int index;
+        auto_gchar gchar* err_msg = NULL;
+        if (!strtoi_range(args[1], &index, 0, INT_MAX, &err_msg)) {
+            cons_show_error("%s", err_msg);
+            return TRUE;
+        }
+        vcard_user_remove_element((unsigned int)index);
+        cons_show("Removed element at index %d", index);
        vcardwin_update();
    } else {
        cons_bad_cmd_usage(command);
@@ -10779,8 +10795,11 @@ cmd_ai_set(ProfWin* window, const char* const command, gchar** args)
            cons_bad_cmd_usage(command);
            return TRUE;
        }
-        ai_set_provider_setting(args[2], args[3], args[4]);
-        cons_show("Setting '%s' for provider '%s' set to: %s", args[3], args[2], args[4]);
+        if (ai_set_provider_setting(args[2], args[3], args[4])) {
+            cons_show("Setting '%s' for provider '%s' set to: %s", args[3], args[2], args[4]);
+        } else {
+            cons_show_error("Cannot set '%s' for provider '%s': unknown provider or reserved key (model, messages, stream).", args[3], args[2]);
+        }
        cons_show("");
        return TRUE;
    }
--- a/src/common.c
+++ b/src/common.c
@@ -294,7 +294,7 @@ str_replace(const char* string, const char* substr,
    wr = newstr;

    while ((tok = strstr(head, substr))) {
-        size_t l = tok - head;
+        size_t l = g_diff_to_gsize(tok, head);
        memcpy(wr, head, l);
        wr += l;
        memcpy(wr, replacement, len_replacement);
@@ -309,6 +309,16 @@ str_replace(const char* string, const char* substr,
    return newstr;
 }

+gsize
+g_diff_to_gsize(const void* end, const void* start)
+{
+    if (end < start) {
+        log_error("g_diff_to_gsize: end < start (%p < %p)", end, start);
+        return 0;
+    }
+    return (gsize)((const char*)end - (const char*)start);
+}
+
 gboolean
 strtoi_range(const char* str, int* saveptr, int min, int max, gchar** err_msg)
 {
@@ -359,9 +369,9 @@ string_matches_one_of(const char* what, const char* is, gboolean is_can_be_null,
        char errmsg[256] = { 0 };
        size_t sz = 0;
        int s = snprintf(errmsg, sizeof(errmsg) - sz, "%s must be one of:", what);
-        if (s < 0 || s + sz >= sizeof(errmsg))
+        if (s < 0 || (size_t)s + sz >= sizeof(errmsg))
            return ret;
-        sz += s;
+        sz += (size_t)s;

        cur = first;
        va_start(ap, first);
@@ -375,12 +385,12 @@ string_matches_one_of(const char* what, const char* is, gboolean is_can_be_null,
                errmsg[sz] = '\0';
                s = snprintf(errmsg + sz, sizeof(errmsg) - sz, " or '%s'.", cur);
            }
-            if (s < 0 || s + sz >= sizeof(errmsg)) {
+            if (s < 0 || (size_t)s + sz >= sizeof(errmsg)) {
                log_debug("Error message too long or some other error occurred (%d).", s);
                s = -1;
                break;
            }
-            sz += s;
+            sz += (size_t)s;
            cur = next;
        }
        va_end(ap);
@@ -431,7 +441,7 @@ str_xml_sanitize(const char* const str)
        return NULL;
    }

-    GString* sanitized = g_string_new_len(NULL, strlen(str));
+    GString* sanitized = g_string_new_len(NULL, (gssize)strlen(str));
    const char* curr = str;

    while (*curr != '\0') {
@@ -690,7 +700,7 @@ get_file_paths_recursive(const char* path, GSList** contents)
 }

 gchar*
-get_random_string(int length)
+get_random_string(size_t length)
 {
    GRand* prng;
    gchar* rand;
@@ -701,7 +711,7 @@ get_random_string(int length)

    prng = g_rand_new();

-    for (int i = 0; i < length; i++) {
+    for (size_t i = 0; i < length; i++) {
        rand[i] = alphabet[g_rand_int_range(prng, 0, endrange)];
    }
    g_rand_free(prng);
@@ -748,17 +758,17 @@ call_external(gchar** argv)
 *
 * This function constructs an argument vector (argv) based on the provided template string, replacing placeholders ("%u" and "%p") with the provided URL and filename, respectively.
 *
- * @param template  The template string with placeholders.
- * @param url       The URL to replace "%u" (or NULL to skip).
- * @param filename  The filename to replace "%p" (or NULL to skip).
- * @return          The constructed argument vector (argv) as a null-terminated array of strings.
+ * @param template_fmt  The template string with placeholders.
+ * @param url           The URL to replace "%u" (or NULL to skip).
+ * @param filename      The filename to replace "%p" (or NULL to skip).
+ * @return              The constructed argument vector (argv) as a null-terminated array of strings.
 *
 * @note Remember to free the returned argument vector using `auto_gcharv` or `g_strfreev()`.
 */
 gchar**
-format_call_external_argv(const char* template, const char* url, const char* filename)
+format_call_external_argv(const char* template_fmt, const char* url, const char* filename)
 {
-    gchar** argv = g_strsplit(template, " ", 0);
+    gchar** argv = g_strsplit(template_fmt, " ", 0);

    guint num_args = 0;
    while (argv[num_args]) {
@@ -767,7 +777,7 @@ format_call_external_argv(const char* template, const char* url, const char* fil
            argv[num_args] = g_strdup(url);
        } else if (0 == g_strcmp0(argv[num_args], "%p") && filename != NULL) {
            g_free(argv[num_args]);
-            argv[num_args] = strdup(filename);
+            argv[num_args] = g_strdup(filename);
        }
        num_args++;
    }
@@ -911,7 +921,7 @@ prof_date_time_format_iso8601(GDateTime* dt)
    return ret;
 }

-/* build profanity version string.
+/* build CProof version string.
 * example: 0.13.1dev.master.69d8c1f9
 */
 gchar*
--- a/src/common.h
+++ b/src/common.h
@@ -158,6 +158,7 @@ gboolean create_dir(const char* name);
 gboolean copy_file(const char* const src, const char* const target, const gboolean overwrite_existing);
 char* str_replace(const char* string, const char* substr, const char* replacement);
 gboolean strtoi_range(const char* str, int* saveptr, int min, int max, char** err_msg);
+gsize g_diff_to_gsize(const void* end, const void* start);
 int utf8_display_len(const char* const str);
 gchar* str_xml_sanitize(const char* const str);

@@ -178,10 +179,10 @@ int is_regular_file(const char* path);
 int is_dir(const char* path);
 void get_file_paths_recursive(const char* directory, GSList** contents);

-gchar* get_random_string(int length);
+gchar* get_random_string(size_t length);

 gboolean call_external(gchar** argv);
-gchar** format_call_external_argv(const char* template, const char* url, const char* filename);
+gchar** format_call_external_argv(const char* template_fmt, const char* url, const char* filename);

 gchar* unique_filename_from_url(const char* url, const char* path);
 gchar* get_expanded_path(const char* path);
--- a/src/config/accounts.c
+++ b/src/config/accounts.c
@@ -43,8 +43,8 @@ _sanitize_account_name(const char* const name)
    gchar* sanitized = g_strdup(name);
    gchar* p = sanitized;
    while (*p) {
-        // GKeyFile special characters: [ ] = # \n \r
-        if (*p == '[' || *p == ']' || *p == '=' || *p == '#' || *p == '\n' || *p == '\r') {
+        // GKeyFile group header forbids these characters.
+        if (*p == '[' || *p == ']' || *p == '\n' || *p == '\r') {
            *p = '_';
        }
        p++;
@@ -522,7 +522,7 @@ accounts_set_script_start(const char* const account_name, const char* const valu
 void
 accounts_set_client(const char* const account_name, const char* const value)
 {
-    _accounts_set_string_option(account_name, "client.name", value);
+    _accounts_set_string_option(account_name, "client.account_name", value);
 }

 void
@@ -576,7 +576,7 @@ accounts_clear_script_start(const char* const account_name)
 void
 accounts_clear_client(const char* const account_name)
 {
-    _accounts_clear_string_option(account_name, "client.name");
+    _accounts_clear_string_option(account_name, "client.account_name");
 }

 void
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -2290,6 +2290,7 @@ _get_group(preference_t pref)
    case PREF_TRAY:
    case PREF_TRAY_READ:
    case PREF_ADV_NOTIFY_DISCO_OR_VERSION:
+    case PREF_AUTOPING_WARNING:
        return PREF_GROUP_NOTIFICATIONS;
    case PREF_DBLOG:
    case PREF_CHLOG:
@@ -2646,6 +2647,8 @@ _get_key(preference_t pref)
        return "enabled";
    case PREF_SPELLCHECK_LANG:
        return "lang";
+    case PREF_AUTOPING_WARNING:
+        return "autoping.warning";
    default:
        return NULL;
    }
@@ -2686,7 +2689,6 @@ _get_default_boolean(preference_t pref)
    case PREF_STATUSBAR_SHOW_NUMBER:
    case PREF_STATUSBAR_SHOW_READ:
    case PREF_STATUSBAR_SHOW_DBBACKEND:
-    case PREF_REVEAL_OS:
    case PREF_CORRECTION_ALLOW:
    case PREF_RECEIPTS_SEND:
    case PREF_CARBONS:
@@ -2699,7 +2701,9 @@ _get_default_boolean(preference_t pref)
    case PREF_MOOD:
    case PREF_STROPHE_SM_ENABLED:
    case PREF_STROPHE_SM_RESEND:
+    case PREF_AUTOPING_WARNING:
        return TRUE;
+    case PREF_REVEAL_OS:
    case PREF_SPELLCHECK_ENABLE:
    case PREF_PGP_PUBKEY_AUTOIMPORT:
    case PREF_FORCE_ENCRYPTION:
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -169,6 +169,7 @@ typedef enum {
    PREF_FORCE_ENCRYPTION_MODE,
    PREF_SPELLCHECK_ENABLE,
    PREF_SPELLCHECK_LANG,
+    PREF_AUTOPING_WARNING
 } preference_t;

 typedef struct prof_alias_t
--- a/src/database_export.c
+++ b/src/database_export.c
@@ -282,7 +282,7 @@ _export_one_contact(const char* contact)
        gchar* key = _make_dedup_key(pl->stanza_id, pl->timestamp_str, pl->from_jid, pl->message);
        g_hash_table_add(seen_keys, key);
    }
-    int existing_count = g_slist_length(existing);
+    int existing_count = (int)g_slist_length(existing);

    // 2. Query SQLite for this contact — get ALL messages via direct SQL
    GSList* sqlite_lines = db_sqlite_get_all_chat(contact);
@@ -581,7 +581,7 @@ log_database_import_from_flatfile(const gchar* const contact_jid)
        //    Wrap in a transaction for atomicity and performance
        int contact_imported = 0;
        int contact_skipped = 0;
-        int total_lines = g_slist_length(ff_lines);
+        int total_lines = (int)g_slist_length(ff_lines);

        db_sqlite_begin_transaction();
        gboolean import_ok = TRUE;
--- a/src/database_flatfile.c
+++ b/src/database_flatfile.c
@@ -88,7 +88,7 @@ _ff_cache_line_ids(ff_contact_state_t* state, const char* line)
        return;

    // Split metadata on unescaped '|'
-    auto_gchar gchar* meta_str = g_strndup(bracket + 1, close - bracket - 1);
+    auto_gchar gchar* meta_str = g_strndup(bracket + 1, g_diff_to_gsize(close, bracket + 1));
    char** parts = ff_split_meta(meta_str);

    char* stanza_id = NULL;
@@ -111,9 +111,9 @@ _ff_cache_line_ids(ff_contact_state_t* state, const char* line)
        const char* sender_start = close + 2;
        const char* colonspace = ff_find_unescaped_colonspace(sender_start);
        if (colonspace) {
-            const char* slash = memchr(sender_start, '/', colonspace - sender_start);
+            const char* slash = memchr(sender_start, '/', g_diff_to_gsize(colonspace, sender_start));
            const char* jid_end = slash ? slash : colonspace;
-            from_jid = g_strndup(sender_start, jid_end - sender_start);
+            from_jid = g_strndup(sender_start, g_diff_to_gsize(jid_end, sender_start));
        }
    }

@@ -140,7 +140,7 @@ _ff_maybe_index_line(ff_contact_state_t* state, const char* buf, off_t pos)
    if (!space)
        return;

-    auto_gchar gchar* ts_str = g_strndup(buf, space - buf);
+    auto_gchar gchar* ts_str = g_strndup(buf, g_diff_to_gsize(space, buf));
    GDateTime* dt = g_date_time_new_from_iso8601(ts_str, NULL);
    if (!dt) {
        log_warning("flatfile: unparsable timestamp in %s at offset %ld: %s",
@@ -771,7 +771,7 @@ _flatfile_get_previous_chat(const gchar* const contact_barejid, const gchar* sta

    // For "last N messages": back up from read_to using index
    if (!from_start) {
-        int margin_entries = (MESSAGES_TO_RETRIEVE * 3) / FF_INDEX_STEP + 2;
+        size_t margin_entries = (MESSAGES_TO_RETRIEVE * 3) / FF_INDEX_STEP + 2;

        // Find index entry closest to (but before) read_to
        size_t entry_idx = 0;
@@ -781,7 +781,7 @@ _flatfile_get_previous_chat(const gchar* const contact_barejid, const gchar* sta
            entry_idx = i;
        }

-        size_t start_entry = entry_idx > (size_t)margin_entries
+        size_t start_entry = entry_idx > margin_entries
                                 ? entry_idx - margin_entries
                                 : 0;
        off_t backed = state->entries[start_entry].byte_offset;
--- a/src/database_flatfile_parser.c
+++ b/src/database_flatfile_parser.c
@@ -553,7 +553,7 @@ ff_split_meta(const char* meta)
            continue;
        }
        if (*p == '|' || *p == '\0') {
-            g_ptr_array_add(arr, g_strndup(start, p - start));
+            g_ptr_array_add(arr, g_strndup(start, g_diff_to_gsize(p, start)));
            if (*p == '\0')
                break;
            start = p + 1;
@@ -710,7 +710,7 @@ ff_parse_line(const char* line)

    if (bracket_start && first_space && first_space < bracket_start) {
        // Standard format with metadata: {timestamp} [{meta}] {sender}: {msg}
-        result->timestamp_str = g_strndup(work, first_space - work);
+        result->timestamp_str = g_strndup(work, g_diff_to_gsize(first_space, work));

        // Parse metadata section [...]
        const char* bracket_end = ff_find_unescaped_char(bracket_start + 1, ']');
@@ -721,7 +721,7 @@ ff_parse_line(const char* line)
            return NULL;
        }

-        auto_gchar gchar* meta_content = g_strndup(bracket_start + 1, bracket_end - bracket_start - 1);
+        auto_gchar gchar* meta_content = g_strndup(bracket_start + 1, g_diff_to_gsize(bracket_end, bracket_start + 1));
        char** parts = ff_split_meta(meta_content);
        if (parts) {
            _ff_parse_meta_parts(parts, result);
@@ -736,12 +736,12 @@ ff_parse_line(const char* line)
        // Find first *unescaped* ': ' which separates sender from message.
        const char* colon = ff_find_unescaped_colonspace(after_meta);
        if (colon) {
-            auto_gchar gchar* raw_sender = g_strndup(after_meta, colon - after_meta);
+            auto_gchar gchar* raw_sender = g_strndup(after_meta, g_diff_to_gsize(colon, after_meta));

            // Split sender into jid/resource, then unescape resource
            char* slash = strchr(raw_sender, '/');
            if (slash) {
-                result->from_jid = g_strndup(raw_sender, slash - raw_sender);
+                result->from_jid = g_strndup(raw_sender, g_diff_to_gsize(slash, raw_sender));
                result->from_resource = ff_unescape_sender_resource(slash + 1);
            } else {
                result->from_jid = g_strdup(raw_sender);
@@ -755,7 +755,7 @@ ff_parse_line(const char* line)
        }
    } else if (first_space) {
        // Legacy/simple format without metadata: {timestamp} - {sender}: {msg}
-        result->timestamp_str = g_strndup(work, first_space - work);
+        result->timestamp_str = g_strndup(work, g_diff_to_gsize(first_space, work));
        result->type = g_strdup("chat");
        result->enc = g_strdup("none");

@@ -767,10 +767,10 @@ ff_parse_line(const char* line)

        char* colon = strstr(rest, ": ");
        if (colon) {
-            char* sender = g_strndup(rest, colon - rest);
+            char* sender = g_strndup(rest, g_diff_to_gsize(colon, rest));
            char* slash = strchr(sender, '/');
            if (slash) {
-                result->from_jid = g_strndup(sender, slash - sender);
+                result->from_jid = g_strndup(sender, g_diff_to_gsize(slash, sender));
                result->from_resource = g_strdup(slash + 1);
            } else {
                result->from_jid = g_strdup(sender);
--- a/src/event/common.h
+++ b/src/event/common.h
@@ -10,6 +10,8 @@
 #ifndef EVENT_COMMON_H
 #define EVENT_COMMON_H

+#include "glib.h"
+
 void ev_disconnect_cleanup(void);
 void ev_inc_connection_counter(void);
 void ev_reset_connection_counter(void);
--- a/src/gitversion.h.in
+++ b/src/gitversion.h.in
@@ -1,6 +0,0 @@
-#ifndef PROF_GIT_BRANCH
-#define PROF_GIT_BRANCH @PROF_GIT_BRANCH@
-#endif
-#ifndef PROF_GIT_REVISION
-#define PROF_GIT_REVISION @PROF_GIT_REVISION@
-#endif
--- a/src/main.c
+++ b/src/main.c
@@ -77,7 +77,7 @@ main(int argc, char** argv)

    if (version == TRUE) {
        auto_gchar gchar* prof_version = prof_get_version();
-        g_print("Profanity, version %s\n", prof_version);
+        g_print("CProof, version %s\n", prof_version);

        // lets use fixed email instead of PACKAGE_BUGREPORT
        g_print("Copyright (C) 2012 - 2019 James Booth <boothj5web@gmail.com>.\n");
--- a/src/omemo/omemo.c
+++ b/src/omemo/omemo.c
@@ -260,7 +260,12 @@ omemo_on_connect(ProfAccount* account)
            return;
    }

-    _omemo_finalize_identity_load(account);
+    if (!_omemo_finalize_identity_load(account)) {
+        omemo_ctx.loaded = FALSE;
+        log_error("[OMEMO] failed to load OMEMO state from disk for %s", account->jid);
+        cons_show_error("OMEMO: could not load encryption state from disk; OMEMO will be unavailable this session.");
+        return;
+    }

    wins_omemo_trust_changed(NULL);
 }
@@ -1278,8 +1283,12 @@ omemo_is_trusted_identity(const char* const jid, const char* const fingerprint)
        .device_id = GPOINTER_TO_UINT(device_id),
    };

-    size_t fingerprint_len;
+    size_t fingerprint_len = 0;
    unsigned char* fingerprint_raw = _omemo_fingerprint_decode(fingerprint, &fingerprint_len);
+    if (!fingerprint_raw) {
+        log_error("[OMEMO] omemo_is_trusted_identity: failed to decode fingerprint for %s", jid);
+        return FALSE;
+    }
    unsigned char djb_type[] = { '\x05' };
    signal_buffer* buffer = signal_buffer_create(djb_type, 1);
    buffer = signal_buffer_append(buffer, fingerprint_raw, fingerprint_len);
@@ -1463,6 +1472,10 @@ _omemo_fingerprint(ec_public_key* identity, gboolean formatted)
 static unsigned char*
 _omemo_fingerprint_decode(const char* const fingerprint, size_t* len)
 {
+    if (!fingerprint) {
+        *len = 0;
+        return NULL;
+    }
    unsigned char* output = malloc(strlen(fingerprint) / 2 + 1);
    if (!output) {
        *len = 0;
@@ -1529,6 +1542,11 @@ omemo_trust(const char* const jid, const char* const fingerprint_formatted)
    };

    unsigned char* fingerprint_raw = _omemo_fingerprint_decode(fingerprint_formatted, &len);
+    if (!fingerprint_raw) {
+        log_error("[OMEMO] omemo_trust: failed to decode fingerprint for %s", jid);
+        cons_show_error("Failed to trust device: could not decode fingerprint.");
+        return;
+    }
    unsigned char djb_type[] = { '\x05' };
    signal_buffer* buffer = signal_buffer_create(djb_type, 1);
    buffer = signal_buffer_append(buffer, fingerprint_raw, len);
@@ -1546,8 +1564,10 @@ omemo_untrust(const char* const jid, const char* const fingerprint_formatted)
 {
    size_t len;
    unsigned char* identity = _omemo_fingerprint_decode(fingerprint_formatted, &len);
-    if (!identity)
+    if (!identity) {
+        log_error("[OMEMO] omemo_untrust: failed to decode fingerprint for %s", jid);
        return;
+    }

    GHashTableIter iter;
    gpointer key, value;
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -278,7 +278,8 @@ otr_on_message_recv(const char* const barejid, const char* const resource, const
                if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) {
                    tag_length = 32;
                }
-                memmove(whitespace_base, whitespace_base + tag_length, tag_length);
+                // Move the rest of the message (with NUL) over the tag.
+                memmove(whitespace_base, whitespace_base + tag_length, strlen(whitespace_base + tag_length) + 1);
                char* otr_query_message = otr_start_query();
                cons_show("OTR Whitespace pattern detected. Attempting to start OTR session…");
                free(message_send_chat_otr(barejid, otr_query_message, FALSE, NULL));
--- a/src/pgp/gpg.c
+++ b/src/pgp/gpg.c
@@ -519,13 +519,15 @@ p_gpg_sign(const gchar* const str, const gchar* const fp)
 }

 gchar*
-p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gchar* const fp)
+p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gchar* const fp, gchar** err)
 {
    ProfPGPPubKeyId* pubkeyid = g_hash_table_lookup(pubkeys, barejid);
    if (!pubkeyid) {
+        *err = g_strdup("No PGP key found for recipient");
        return NULL;
    }
    if (!pubkeyid->id) {
+        *err = g_strdup("No key ID found for recipient");
        return NULL;
    }

@@ -538,6 +540,7 @@ p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gcha
    gpgme_ctx_t ctx;
    gpgme_error_t error = gpgme_new(&ctx);
    if (error) {
+        *err = g_strdup_printf("Failed to create GPGME context: %s %s", gpgme_strsource(error), gpgme_strerror(error));
        log_error("GPG: Failed to create gpgme context. %s %s", gpgme_strsource(error), gpgme_strerror(error));
        return NULL;
    }
@@ -545,6 +548,7 @@ p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gcha
    gpgme_key_t receiver_key;
    error = gpgme_get_key(ctx, pubkeyid->id, &receiver_key, 0);
    if (error || receiver_key == NULL) {
+        *err = g_strdup_printf("Failed to get receiver key '%s': %s %s", pubkeyid->id, gpgme_strsource(error), gpgme_strerror(error));
        log_error("GPG: Failed to get receiver_key. %s %s", gpgme_strsource(error), gpgme_strerror(error));
        gpgme_release(ctx);
        return NULL;
@@ -554,8 +558,10 @@ p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gcha
    gpgme_key_t sender_key = NULL;
    error = gpgme_get_key(ctx, fp, &sender_key, 0);
    if (error || sender_key == NULL) {
+        *err = g_strdup_printf("Failed to get sender key '%s': %s %s", fp, gpgme_strsource(error), gpgme_strerror(error));
        log_error("GPG: Failed to get sender_key. %s %s", gpgme_strsource(error), gpgme_strerror(error));
        gpgme_release(ctx);
+        gpgme_key_unref(receiver_key);
        return NULL;
    }
    keys[1] = sender_key;
@@ -574,7 +580,8 @@ p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gcha
    gpgme_key_unref(sender_key);

    if (error) {
-        log_error("GPG: Failed to encrypt message. %s %s", gpgme_strsource(error), gpgme_strerror(error));
+        *err = g_strdup_printf("Encryption failed: (%s) %s", gpgme_strsource(error), gpgme_strerror(error));
+        log_error("GPG: Failed to encrypt message. (%s) %s", gpgme_strsource(error), gpgme_strerror(error));
        return NULL;
    }

--- a/src/pgp/gpg.h
+++ b/src/pgp/gpg.h
@@ -10,6 +10,8 @@
 #ifndef PGP_GPG_H
 #define PGP_GPG_H

+#include "glib.h"
+
 typedef struct pgp_key_t
 {
    gchar* id;
@@ -40,7 +42,7 @@ gboolean p_gpg_available(const gchar* const barejid);
 const gchar* p_gpg_libver(void);
 gchar* p_gpg_sign(const gchar* const str, const gchar* const fp);
 void p_gpg_verify(const gchar* const barejid, const gchar* const sign);
-gchar* p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gchar* const fp);
+gchar* p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gchar* const fp, gchar** err);
 gchar* p_gpg_decrypt(const gchar* const cipher);
 void p_gpg_free_decrypted(gchar* decrypted);
 gchar* p_gpg_autocomplete_key(const gchar* const search_str, gboolean previous, void* context);
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -138,7 +138,7 @@ prof_run(gchar* log_level, gchar* account_name, gchar* config_file, gchar* log_f
                     * so we can be sure there's runtime left after executing
                     * the last command.
                     */
-                    min_runtime += waittime;
+                    min_runtime += (unsigned int)waittime;
                } else {
                    log_error("%s", err_msg);
                    g_free(err_msg);
@@ -253,7 +253,7 @@ _init(char* log_level, char* config_file, char* log_file, char* theme_name)
    log_stderr_init(PROF_LEVEL_ERROR);

    auto_gchar gchar* prof_version = prof_get_version();
-    log_info("Starting Profanity (%s)…", prof_version);
+    log_info("Starting CProof (%s)…", prof_version);

    chatlog_init();
    accounts_load();
--- a/src/tools/bookmark_ignore.h
+++ b/src/tools/bookmark_ignore.h
@@ -10,8 +10,10 @@
 #ifndef BOOKMARK_IGNORE_H
 #define BOOKMARK_IGNORE_H

+#include "xmpp/xmpp.h"
+
 void bookmark_ignore_on_connect(const char* const barejid);
-void bookmark_ignore_on_disconnect(void);
+void bookmark_ignore_on_disconnect();
 gboolean bookmark_ignored(Bookmark* bookmark);
 gchar** bookmark_ignore_list(gsize* len);
 void bookmark_ignore_add(const char* const barejid);
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1703,6 +1703,11 @@ cons_notify_setting(void)
    else
        cons_show("Subscription requests (/notify sub) : OFF");

+    if (prefs_get_boolean(PREF_AUTOPING_WARNING))
+        cons_show("Autoping warning (/autoping warning): ON");
+    else
+        cons_show("Autoping warning (/autoping warning): OFF");
+
    gint remind_period = prefs_get_notify_remind();
    if (remind_period == 0) {
        cons_show("Reminder period (/notify remind)    : OFF");
@@ -2003,21 +2008,26 @@ cons_autoping_setting(void)
 {
    gint autoping_interval = prefs_get_autoping();
    if (autoping_interval == 0) {
-        cons_show("Autoping interval (/autoping)   : OFF");
+        cons_show("Autoping interval (/autoping)       : OFF");
    } else if (autoping_interval == 1) {
-        cons_show("Autoping interval (/autoping)   : 1 second");
+        cons_show("Autoping interval (/autoping)       : 1 second");
    } else {
-        cons_show("Autoping interval (/autoping)   : %d seconds", autoping_interval);
+        cons_show("Autoping interval (/autoping)       : %d seconds", autoping_interval);
    }

    gint autoping_timeout = prefs_get_autoping_timeout();
    if (autoping_timeout == 0) {
-        cons_show("Autoping timeout (/autoping)    : OFF");
+        cons_show("Autoping timeout (/autoping)        : OFF");
    } else if (autoping_timeout == 1) {
-        cons_show("Autoping timeout (/autoping)    : 1 second");
+        cons_show("Autoping timeout (/autoping)        : 1 second");
    } else {
-        cons_show("Autoping timeout (/autoping)    : %d seconds", autoping_timeout);
+        cons_show("Autoping timeout (/autoping)        : %d seconds", autoping_timeout);
    }
+
+    if (prefs_get_boolean(PREF_AUTOPING_WARNING))
+        cons_show("Autoping warning (/autoping warning): ON");
+    else
+        cons_show("Autoping warning (/autoping warning): OFF");
 }

 void
@@ -2820,8 +2830,7 @@ cons_privacy_setting(void)
        if (account->client) {
            cons_show("Client name (/account set <account> clientid)              : %s", account->client);
        } else {
-            auto_gchar gchar* prof_version = prof_get_version();
-            cons_show("Client name (/account set <account> clientid)              : Profanity %s", prof_version);
+            cons_show("Client name (/account set <account> clientid)              : Pidgin");
        }
        if (account->max_sessions > 0) {
            cons_show("Max sessions alarm (/account set <account> session_alarm)  : %d", account->max_sessions);
--- a/src/ui/titlebar.h
+++ b/src/ui/titlebar.h
@@ -10,6 +10,8 @@
 #ifndef UI_TITLEBAR_H
 #define UI_TITLEBAR_H

+#include "glib.h"
+
 void create_title_bar(void);
 void free_title_bar(void);
 void title_bar_update_virtual(void);
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -43,7 +43,7 @@
 #include "ai/ai_client.h"

 static const int PAD_MIN_HEIGHT = 100;
-static const int PAD_THRESHOLD = 12000; // above buffer cap (~9000): reclaims dead pad space, never fires while scrolling
+static const int PAD_DEAD_SPACE_LIMIT = 2000; // reclaim once the pad holds this much dead space (cursor past live buffer); size-independent, so it never fires while scrolling
 static gboolean _in_redraw = FALSE;

 static void
@@ -56,9 +56,10 @@ _win_ensure_pad_capacity(ProfWin* window, WINDOW* win, int lines_needed)
    int cur_height = getmaxy(win);
    int cur_width = getmaxx(win);
    if (lines_needed >= cur_height - 1) {
-        // If we are getting too large, trigger a redraw to clean up old lines
-        // but only if we are not already in a redraw process.
-        if (window && cur_height >= PAD_THRESHOLD && !_in_redraw) {
+        // redraw to reclaim dead pad space (cursor far past live buffer, e.g. a long
+        // append-only session); dead space never accrues while scrolling, only here
+        int dead = window ? getcury(win) - window->layout->buffer->lines : 0;
+        if (window && dead > PAD_DEAD_SPACE_LIMIT && !_in_redraw) {
            win_redraw(window);
        } else {
            // resize to required lines + some buffer for next messages
@@ -67,6 +68,20 @@ _win_ensure_pad_capacity(ProfWin* window, WINDOW* win, int lines_needed)
        }
    }
 }
+
+// upper-bound estimate of rows a message body occupies (hard newlines + soft-wrap), to reserve pad space before printing so a tall message isn't clipped (a clipped height desyncs the scroll offset)
+static int
+_win_estimated_lines(WINDOW* win, const char* const message, int indent, int pad_indent)
+{
+    int usable = MAX(1, getmaxx(win) - (indent + pad_indent));
+    int newlines = 0;
+    for (const char* p = message; *p; p++) {
+        if (*p == '\n') {
+            newlines++;
+        }
+    }
+    return newlines + utf8_display_len(message) / usable + 2;
+}
 static const char* LOADING_MESSAGE = "Loading older messages…";
 static const char* CONS_WIN_TITLE = "CProof. Type /help for help information.";
 static const char* XML_WIN_TITLE = "XML Console";
@@ -2001,7 +2016,7 @@ _win_print_internal(ProfWin* window, const char* show_char, int pad_indent, GDat
        }
    }

-    _win_ensure_pad_capacity(window, window->layout->win, getcury(window->layout->win));
+    _win_ensure_pad_capacity(window, window->layout->win, getcury(window->layout->win) + _win_estimated_lines(window->layout->win, message + offset, indent, pad_indent));

    if (prefs_get_boolean(PREF_WRAP)) {
        _win_print_wrapped(window->layout->win, message + offset, indent, pad_indent);
@@ -2175,7 +2190,7 @@ win_redraw(ProfWin* window)
    // size the pad to fit the whole buffer (plus headroom) and erase it
    int cols = getmaxx(window->layout->win);
    int needed = window->layout->buffer->lines + 100;
-    wresize(window->layout->win, needed > PAD_MIN_HEIGHT ? needed : PAD_MIN_HEIGHT, cols);
+    wresize(window->layout->win, MAX(needed, PAD_MIN_HEIGHT), cols);
    werase(window->layout->win);

    for (unsigned int i = 0; i < size; i++) {
--- a/src/xmpp/blocking.h
+++ b/src/xmpp/blocking.h
@@ -10,6 +10,8 @@
 #ifndef XMPP_BLOCKING_H
 #define XMPP_BLOCKING_H

+#include <strophe.h>
+
 void blocking_request(void);
 int blocked_set_handler(xmpp_stanza_t* stanza);
 int reporting_set_handler(xmpp_stanza_t* stanza);
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -23,6 +23,7 @@
 #include "plugins/plugins.h"
 #include "config/files.h"
 #include "config/preferences.h"
+#include "xmpp/connection.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/stanza.h"
 #include "xmpp/form.h"
@@ -271,6 +272,19 @@ caps_map_jid_to_ver(const char* const jid, const char* const ver)
    g_hash_table_insert(jid_to_ver, strdup(jid), strdup(ver));
 }

+void
+caps_cache_clear(void)
+{
+    g_hash_table_remove_all(jid_to_ver);
+    g_hash_table_remove_all(jid_to_caps);
+    if (caps_prof_keyfile.keyfile) {
+        g_key_file_free(caps_prof_keyfile.keyfile);
+    }
+    caps_prof_keyfile.keyfile = g_key_file_new();
+    cache = caps_prof_keyfile.keyfile;
+    save_keyfile(&caps_prof_keyfile);
+}
+
 gboolean
 caps_cache_contains(const char* const ver)
 {
--- a/src/xmpp/capabilities.h
+++ b/src/xmpp/capabilities.h
@@ -28,5 +28,6 @@ void caps_map_jid_to_ver(const char* const jid, const char* const ver);
 gboolean caps_cache_contains(const char* const ver);
 GList* caps_get_features(void);
 char* caps_get_my_sha1(xmpp_ctx_t* const ctx);
+void caps_cache_clear(void);

 #endif
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -99,6 +99,7 @@ static void _disco_items_result_handler(xmpp_stanza_t* const stanza);
 static void _last_activity_get_handler(xmpp_stanza_t* const stanza);
 static void _version_get_handler(xmpp_stanza_t* const stanza);
 static void _ping_get_handler(xmpp_stanza_t* const stanza);
+static void _disco_autoping_warning_message(GHashTable* features);

 static int _version_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata);
 static int _disco_info_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata);
@@ -1680,7 +1681,7 @@ _version_get_handler(xmpp_stanza_t* const stanza)
    xmpp_stanza_t* name = xmpp_stanza_new(ctx);
    xmpp_stanza_set_name(name, "name");
    xmpp_stanza_t* name_txt = xmpp_stanza_new(ctx);
-    xmpp_stanza_set_text(name_txt, is_custom_client ? client : "Profanity");
+    xmpp_stanza_set_text(name_txt, is_custom_client ? client : "Pidgin");
    xmpp_stanza_add_child(name, name_txt);
    xmpp_stanza_add_child(query, name);
    bool include_os = prefs_get_boolean(PREF_REVEAL_OS) && !is_custom_client;
@@ -1689,7 +1690,7 @@ _version_get_handler(xmpp_stanza_t* const stanza)
    xmpp_stanza_t* version = xmpp_stanza_new(ctx);
    xmpp_stanza_set_name(version, "version");
    xmpp_stanza_t* version_txt = xmpp_stanza_new(ctx);
-    auto_gchar gchar* prof_version = prof_get_version();
+    auto_gchar gchar* prof_version = g_strdup("");

    if (!is_custom_client) {
        xmpp_stanza_set_text(version_txt, prof_version);
@@ -2429,6 +2430,12 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t* const stanza, void* con
            }
            child = xmpp_stanza_get_next(child);
        }
+
+        // Prevent repetitions by avoiding checks of disco items (from connection_set_disco_items)
+        const char* domain = connection_get_domain();
+        if (from && domain && g_ascii_strcasecmp(from, domain) == 0) {
+            _disco_autoping_warning_message(features);
+        }
    }

    connection_features_received(from);
@@ -2436,6 +2443,21 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t* const stanza, void* con
    return 0;
 }

+static void
+_disco_autoping_warning_message(GHashTable* features)
+{
+    gboolean server_supports_ping = g_hash_table_contains(features, "urn:xmpp:ping");
+    gboolean user_prefers_warning = prefs_get_boolean(PREF_AUTOPING_WARNING);
+    gboolean is_autoping_enabled = prefs_get_autoping() != 0;
+
+    if (!is_autoping_enabled && server_supports_ping && user_prefers_warning) {
+        cons_show("This server supports XEP-0199: XMPP Ping (better keepalive detection),\n"
+                  "but autoping feature is currently disabled in settings.\n"
+                  "Consider enabling it (e.g., `/autoping set 30`) for improved connection stability.\n"
+                  "Use `/autoping warning off` to disable this message.");
+    }
+}
+
 static int
 _http_upload_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
 {
--- a/src/xmpp/iq.h
+++ b/src/xmpp/iq.h
@@ -10,6 +10,8 @@
 #ifndef XMPP_IQ_H
 #define XMPP_IQ_H

+#include <strophe.h>
+
 typedef int (*ProfIqCallback)(xmpp_stanza_t* const stanza, void* const userdata);
 typedef void (*ProfIqFreeCallback)(void* userdata);

--- a/src/xmpp/jid.c
+++ b/src/xmpp/jid.c
@@ -117,7 +117,7 @@ jid_is_valid(const gchar* const str)

    // Localpart validation
    if (at) {
-        size_t local_len = at - str;
+        size_t local_len = g_diff_to_gsize(at, str);
        if (local_len == 0 || local_len > JID_MAX_PART_LEN) {
            return FALSE;
        }
@@ -135,7 +135,7 @@ jid_is_valid(const gchar* const str)

    // Resourcepart validation if present
    if (slash) {
-        domain_len = slash - domain_start;
+        domain_len = g_diff_to_gsize(slash, domain_start);
        size_t resource_len = strlen(slash + 1);
        if (resource_len > JID_MAX_PART_LEN) {
            return FALSE;
@@ -280,9 +280,13 @@ jid_fulljid_or_barejid(Jid* jid)
 gchar*
 jid_random_resource(void)
 {
-    auto_gchar gchar* rand = get_random_string(4);
+    gchar* rand = g_malloc0(29);
+    const gchar* digits = "0123456789";

-    gchar* result = g_strdup_printf("profanity.%s", rand);
+    for (int i = 0; i < 28; i++) {
+        rand[i] = digits[g_random_int_range(0, 10)];
+    }
+    rand[28] = '\0';

-    return result;
+    return rand;
 }
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -65,6 +65,7 @@ static void _handle_pubsub(xmpp_stanza_t* const stanza, xmpp_stanza_t* const eve
 static gboolean _handle_form(xmpp_stanza_t* const stanza);
 static gboolean _handle_jingle_message(xmpp_stanza_t* const stanza);
 static gboolean _should_ignore_based_on_silence(xmpp_stanza_t* const stanza);
+static gboolean _stanza_id_by_trusted(const char* by);
 #ifdef HAVE_OMEMO
 static void _receive_omemo(xmpp_stanza_t* const stanza, ProfMessage* message);
 #endif
@@ -466,12 +467,15 @@ message_send_chat_pgp(const char* const barejid, const char* const msg, gboolean
    auto_char char* jid = chat_session_get_jid(barejid);
    char* id = connection_create_stanza_id();

+    ProfWin* current = wins_get_current();
+
    xmpp_stanza_t* message = NULL;
 #ifdef HAVE_LIBGPGME
    ProfAccount* account = accounts_get_account(session_get_account_name());
    if (account->pgp_keyid) {
        auto_jid Jid* jidp = jid_create(jid);
-        auto_gchar gchar* encrypted = p_gpg_encrypt(jidp->barejid, msg, account->pgp_keyid);
+        auto_gchar gchar* err = NULL;
+        auto_gchar gchar* encrypted = p_gpg_encrypt(jidp->barejid, msg, account->pgp_keyid, &err);
        if (encrypted) {
            message = xmpp_message_new(ctx, STANZA_TYPE_CHAT, jid, id);
            xmpp_message_set_body(message, "This message is encrypted (XEP-0027).");
@@ -485,18 +489,31 @@ message_send_chat_pgp(const char* const barejid, const char* const msg, gboolean
            xmpp_stanza_add_child(message, x);
            xmpp_stanza_release(x);
        } else {
-            message = xmpp_message_new(ctx, STANZA_TYPE_CHAT, jid, id);
-            xmpp_message_set_body(message, msg);
+            if (current) {
+                win_println(current, THEME_ERROR, "-", "Unable to encrypt message for %s: %s.", jid, err);
+            }
+            log_error("Message not encrypted for %s: %s.", jid, err);
+            account_free(account);
+            free(id);
+            return NULL;
        }
    } else {
-        message = xmpp_message_new(ctx, STANZA_TYPE_CHAT, jid, id);
-        xmpp_message_set_body(message, msg);
+        if (current) {
+            win_println(current, THEME_ERROR, "-", "No PGP key configured for this account.");
+        }
+        log_error("No PGP key configured, message not sent.");
+        account_free(account);
+        free(id);
+        return NULL;
    }
    account_free(account);
 #else
-    // ?
-    message = xmpp_message_new(ctx, STANZA_TYPE_CHAT, jid, id);
-    xmpp_message_set_body(message, msg);
+    if (current) {
+        win_println(current, THEME_ERROR, "-", "LibGPGME not available, message not sent.");
+    }
+    log_error("LibGPGME not available, message not sent.");
+    free(id);
+    return NULL;
 #endif

    if (state) {
@@ -545,7 +562,10 @@ message_send_chat_ox(const char* const barejid, const char* const msg, gboolean
    xmpp_stanza_to_text(signcrypt, &c, &s);
    char* signcrypt_e = p_ox_gpg_signcrypt(account->jid, barejid, c);
    if (signcrypt_e == NULL) {
-        cons_show("Unable to send OX message. Check log file and profanity-ox-setup man page for details.");
+        ProfWin* current = wins_get_current();
+        if (current) {
+            win_println(current, THEME_ERROR, "-", "Unable to send OX message. Check log file and profanity-ox-setup man page for details.");
+        }
        log_error("Message not signcrypted.");
        return NULL;
    }
@@ -1088,7 +1108,7 @@ _handle_groupchat(xmpp_stanza_t* const stanza)
    xmpp_stanza_t* stanzaidst = xmpp_stanza_get_child_by_name_and_ns(stanza, STANZA_NAME_STANZA_ID, STANZA_NS_STABLE_ID);
    if (stanzaidst) {
        const char* by = xmpp_stanza_get_attribute(stanzaidst, "by");
-        if (by && (g_strcmp0(by, from_jid->barejid) == 0)) {
+        if (by && g_strcmp0(by, from_jid->barejid) == 0 && _stanza_id_by_trusted(by)) {
            stanzaid = (char*)xmpp_stanza_get_attribute(stanzaidst, STANZA_ATTR_ID);
            if (stanzaid) {
                message->stanzaid = strdup(stanzaid);
@@ -1397,7 +1417,7 @@ _handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, c
        xmpp_stanza_t* stanzaidst = xmpp_stanza_get_child_by_name_and_ns(stanza, STANZA_NAME_STANZA_ID, STANZA_NS_STABLE_ID);
        if (stanzaidst) {
            const char* by = xmpp_stanza_get_attribute(stanzaidst, "by");
-            if (by && equals_our_barejid(by)) {
+            if (by && equals_our_barejid(by) && _stanza_id_by_trusted(by)) {
                stanzaid = (char*)xmpp_stanza_get_attribute(stanzaidst, STANZA_ATTR_ID);
                if (stanzaid) {
                    message->stanzaid = strdup(stanzaid);
@@ -1735,3 +1755,22 @@ _should_ignore_based_on_silence(xmpp_stanza_t* const stanza)
    }
    return FALSE;
 }
+
+// XEP-0359 §6 disco-gate; falls back to domain since that's what disco is run against.
+static gboolean
+_stanza_id_by_trusted(const char* by)
+{
+    if (!by) {
+        return FALSE;
+    }
+    GHashTable* features = connection_get_features(by);
+    if (features && g_hash_table_contains(features, STANZA_NS_STABLE_ID)) {
+        return TRUE;
+    }
+    const char* at = strchr(by, '@');
+    if (!at) {
+        return FALSE;
+    }
+    features = connection_get_features(at + 1);
+    return features && g_hash_table_contains(features, STANZA_NS_STABLE_ID);
+}
--- a/src/xmpp/muc.c
+++ b/src/xmpp/muc.c
@@ -707,7 +707,7 @@ muc_autocomplete(ProfWin* window, const char* const input, gboolean previous)
    } else {
        search_str = last_space + 1;
        if (!chat_room->autocomplete_prefix) {
-            chat_room->autocomplete_prefix = g_strndup(input, search_str - input);
+            chat_room->autocomplete_prefix = g_strndup(input, g_diff_to_gsize(search_str, input));
        }
    }

--- a/src/xmpp/ox.h
+++ b/src/xmpp/ox.h
@@ -7,6 +7,8 @@
 * SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
 */

+#include "glib.h"
+
 /*!
 * \page OX OX Implementation
 *
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -621,15 +621,20 @@ _available_handler(xmpp_stanza_t* const stanza)
    }

    if (g_strcmp0(xmpp_presence->jid->barejid, my_jid->barejid) == 0) {
-        connection_add_available_resource(resource);
+        // Copy what we read before connection_add_available_resource() takes ownership.
        Resource* resource_for_roster = resource_copy(resource);
+        auto_gchar gchar* resource_name = g_strdup(resource->name);
+        auto_gchar gchar* resource_status = resource->status ? g_strdup(resource->status) : NULL;
+        int resource_priority = resource->priority;
+        resource_presence_t resource_presence = resource->presence;
+        connection_add_available_resource(resource);
        sv_ev_contact_online(xmpp_presence->jid->barejid, resource_for_roster, xmpp_presence->last_activity, pgpsig);
        const char* account_name = session_get_account_name();
        int max_sessions = accounts_get_max_sessions(account_name);
        if (max_sessions > 0) {
            auto_gchar gchar* cur_resource = accounts_get_resource(account_name);
            int res_count = connection_count_available_resources();
-            if (res_count > max_sessions && g_strcmp0(cur_resource, resource->name)) {
+            if (res_count > max_sessions && g_strcmp0(cur_resource, resource_name)) {
                ProfWin* console = wins_get_console();
                ProfWin* current_window = wins_get_current();
                auto_gchar gchar* message = g_strdup_printf("Max sessions alarm! (%d/%d devices in use)", res_count, max_sessions);
@@ -639,14 +644,14 @@ _available_handler(xmpp_stanza_t* const stanza)
                }
                notify(message, 10000, "Security alert");

-                const char* resource_presence = string_from_resource_presence(resource->presence);
-                win_print(console, THEME_DEFAULT, "|", "New device info: \n    %s (%d), %s", resource->name, resource->priority, resource_presence);
+                const char* resource_presence_str = string_from_resource_presence(resource_presence);
+                win_print(console, THEME_DEFAULT, "|", "New device info: \n    %s (%d), %s", resource_name, resource_priority, resource_presence_str);

-                if (resource->status) {
-                    win_append(console, THEME_DEFAULT, ", \"%s\"", resource->status);
+                if (resource_status) {
+                    win_append(console, THEME_DEFAULT, ", \"%s\"", resource_status);
                }
                win_appendln(console, THEME_DEFAULT, "");
-                auto_jid Jid* jidp = jid_create_from_bare_and_resource(my_jid->barejid, resource->name);
+                auto_jid Jid* jidp = jid_create_from_bare_and_resource(my_jid->barejid, resource_name);
                EntityCapabilities* caps = caps_lookup(jidp->fulljid);

                if (caps) {
--- a/src/xmpp/roster.h
+++ b/src/xmpp/roster.h
@@ -10,6 +10,9 @@
 #ifndef XMPP_ROSTER_H
 #define XMPP_ROSTER_H

+#include "glib.h"
+#include <strophe.h>
+
 void roster_request(void);
 void roster_set_handler(xmpp_stanza_t* const stanza);
 void roster_result_handler(xmpp_stanza_t* const stanza);
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -178,7 +178,7 @@ session_connect_with_details(const char* const jid, const char* const passwd, co
        saved_details.auth_policy = NULL;
    }

-    // use 'profanity' when no resourcepart in provided jid
+    // use random string when no resourcepart in provided jid
    auto_jid Jid* jidp = jid_create(jid);
    if (jidp->resourcepart == NULL) {
        auto_gchar gchar* resource = jid_random_resource();
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -32,6 +32,7 @@

 static void _stanza_add_unique_id(xmpp_stanza_t* stanza);
 static gchar* _stanza_create_sha1_hash(char* str);
+static const char* _stanza_get_caps_node(const char* const client);

 #if 0
 xmpp_stanza_t*
@@ -930,23 +931,22 @@ stanza_create_caps_query_element(xmpp_ctx_t* ctx)

    xmpp_stanza_t* identity = xmpp_stanza_new(ctx);
    xmpp_stanza_set_name(identity, "identity");
+    xmpp_stanza_set_type(identity, "pc");
    xmpp_stanza_set_attribute(identity, "category", "client");

    ProfAccount* account = accounts_get_account(session_get_account_name());
-    gchar* client = account->client;
-    bool is_custom_client = client != NULL;

-    GString* name_str = g_string_new(is_custom_client ? client : "Profanity ");
-    if (!is_custom_client) {
-        xmpp_stanza_set_type(identity, "console");
-        auto_gchar gchar* prof_version = prof_get_version();
-        g_string_append(name_str, prof_version);
+    auto_gchar gchar* name = g_strdup(account->client ? account->client : "Pidgin");
+
+    if (account->client) {
+        gchar* space = strchr(name, ' ');
+        if (space) {
+            *space = '\0';
+        }
    }
-
    account_free(account);

-    xmpp_stanza_set_attribute(identity, "name", name_str->str);
-    g_string_free(name_str, TRUE);
+    xmpp_stanza_set_attribute(identity, "name", name);
    xmpp_stanza_add_child(query, identity);
    xmpp_stanza_release(identity);

@@ -1994,6 +1994,42 @@ stanza_attach_last_activity(xmpp_ctx_t* const ctx,
    xmpp_stanza_release(query);
 }

+static const char*
+_stanza_get_caps_node(const char* const client)
+{
+    if (!client || g_strcmp0(client, "") == 0) {
+        return "http://pidgin.im";
+    }
+
+    auto_gchar gchar* lower = g_ascii_strdown(client, -1);
+
+    if (g_str_has_prefix(lower, "pidgin")) {
+        return "http://pidgin.im";
+    }
+
+    if (g_str_has_prefix(lower, "gajim")) {
+        return "https://gajim.org";
+    }
+
+    if (g_str_has_prefix(lower, "conversations")) {
+        return "https://conversations.im";
+    }
+
+    if (g_str_has_prefix(lower, "psi+")) {
+        return "http://psi-plus.com";
+    }
+
+    if (g_str_has_prefix(lower, "psi")) {
+        return "http://psi-im.org";
+    }
+
+    if (g_str_has_prefix(lower, "profanity")) {
+        return "http://profanity-im.github.io";
+    }
+
+    return "";
+}
+
 void
 stanza_attach_caps(xmpp_ctx_t* const ctx, xmpp_stanza_t* const presence)
 {
@@ -2002,9 +2038,13 @@ stanza_attach_caps(xmpp_ctx_t* const ctx, xmpp_stanza_t* const presence)
    xmpp_stanza_set_ns(caps, STANZA_NS_CAPS);
    xmpp_stanza_t* query = stanza_create_caps_query_element(ctx);

+    ProfAccount* account = accounts_get_account(session_get_account_name());
+    const char* node = _stanza_get_caps_node(account->client);
+    account_free(account);
+
    char* sha1 = caps_get_my_sha1(ctx);
    xmpp_stanza_set_attribute(caps, STANZA_ATTR_HASH, "sha-1");
-    xmpp_stanza_set_attribute(caps, STANZA_ATTR_NODE, "http://profanity-im.github.io");
+    xmpp_stanza_set_attribute(caps, STANZA_ATTR_NODE, node);
    xmpp_stanza_set_attribute(caps, STANZA_ATTR_VER, sha1);
    xmpp_stanza_add_child(presence, caps);
    xmpp_stanza_release(caps);
--- a/src/xmpp/vcard_funcs.h
+++ b/src/xmpp/vcard_funcs.h
@@ -12,6 +12,7 @@

 #include "ui/win_types.h"
 #include "xmpp/vcard.h"
+#include <strophe.h>

 vCard* vcard_new();
 void vcard_free(vCard* vcard);
--- a/tests/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
@@ -150,6 +150,14 @@ main(int argc, char* argv[])
        PROF_FUNC_TEST(autoping_sends_ping_after_interval),
        PROF_FUNC_TEST(autoping_server_not_supporting_ping),

+        /* Autoping availability warning - negative cases wait ~3s */
+        PROF_FUNC_TEST(autoping_warning_shown_when_disabled),
+        PROF_FUNC_TEST(autoping_warning_not_shown_when_server_unsupported),
+        PROF_FUNC_TEST(autoping_warning_not_shown_when_autoping_enabled),
+        PROF_FUNC_TEST(autoping_warning_not_shown_when_user_disabled),
+        PROF_FUNC_TEST(autoping_warning_not_shown_for_user_jid),
+        PROF_FUNC_TEST(autoping_warning_not_shown_for_subdomain_service),
+
        /* Service Discovery - XEP-0030 */
        PROF_FUNC_TEST(disco_info_shows_identity),
        PROF_FUNC_TEST(disco_info_shows_features),
@@ -253,6 +261,10 @@ main(int argc, char* argv[])
        PROF_FUNC_TEST(message_receive_console),
        PROF_FUNC_TEST(message_receive_chatwin),

+        /* XEP-0359 disco gate for stanza-id trust */
+        PROF_FUNC_TEST(stanza_id_dedup_fires_when_server_announces_sid0),
+        PROF_FUNC_TEST(stanza_id_not_trusted_when_server_does_not_announce_sid0),
+
 #ifdef HAVE_SQLITE
        /* MUC (groupchat) database — export/import of type="muc" messages */
        PROF_FUNC_TEST(muc_export_sqlite_to_flatfile),
--- a/tests/functionaltests/proftest.c
+++ b/tests/functionaltests/proftest.c
@@ -119,10 +119,9 @@ _create_dir(const char* name)
 gboolean
 _mkdir_recursive(const char* dir)
 {
-    int i;
    gboolean result = TRUE;

-    for (i = 1; i <= strlen(dir); i++) {
+    for (size_t i = 1; i <= strlen(dir); i++) {
        if (dir[i] == '/' || dir[i] == '\0') {
            gchar* next_dir = g_strndup(dir, i);
            result = _create_dir(next_dir);
@@ -602,11 +601,11 @@ prof_connect_with_roster(const char* roster)
    assert_true(prof_output_regex(".+online.+ \\(priority 0\\)\\."));

    expect_timeout = EXPECT_TIMEOUT_CONNECT;
-    // Wait for presence stanza to be sent (content-based, not ID-based)
+    // Wait for presence stanza to be sent
    // Match the actual attribute order from stanza_attach_caps
    assert_true(stbbr_received(
        "<presence id=\"*\">"
-        "<c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"http://profanity-im.github.io\" ver=\"*\"/>"
+        "<c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"*\" ver=\"*\"/>"
        "</presence>"));
 }

--- a/tests/functionaltests/test_autoping.c
+++ b/tests/functionaltests/test_autoping.c
@@ -112,3 +112,144 @@ autoping_server_not_supporting_ping(void** state)
    // Should show error about ping not being supported
    assert_true(prof_output_regex("Server ping not supported"));
 }
+
+/*
+ * Autoping availability warning.
+ *
+ * The warning fires from the on-connect disco handler, so the three inputs
+ * (server ping support, autoping interval, warning preference) must all be
+ * set before prof_connect().
+ */
+
+/* Stable substring of the warning text emitted by iq.c. */
+#define AUTOPING_WARNING_MATCH "This server supports XEP-0199"
+
+static void
+_stub_server_disco(gboolean with_ping)
+{
+    if (with_ping) {
+        stbbr_for_query("http://jabber.org/protocol/disco#info",
+            "<iq to='stabber@localhost/profanity' type='result' from='localhost'>"
+                "<query xmlns='http://jabber.org/protocol/disco#info'>"
+                    "<identity category='server' type='im' name='Stabber'/>"
+                    "<feature var='urn:xmpp:ping'/>"
+                "</query>"
+            "</iq>"
+        );
+    } else {
+        stbbr_for_query("http://jabber.org/protocol/disco#info",
+            "<iq to='stabber@localhost/profanity' type='result' from='localhost'>"
+                "<query xmlns='http://jabber.org/protocol/disco#info'>"
+                    "<identity category='server' type='im' name='Stabber'/>"
+                "</query>"
+            "</iq>"
+        );
+    }
+}
+
+void
+autoping_warning_shown_when_disabled(void** state)
+{
+    // All conditions met: server supports ping, autoping off, warning on (default).
+    _stub_server_disco(TRUE);
+
+    prof_input("/autoping set 0");
+    assert_true(prof_output_exact("Autoping disabled."));
+
+    prof_connect();
+
+    assert_true(prof_output_regex(AUTOPING_WARNING_MATCH));
+}
+
+void
+autoping_warning_not_shown_when_server_unsupported(void** state)
+{
+    // Server does not advertise urn:xmpp:ping -> no warning even with autoping off.
+    _stub_server_disco(FALSE);
+
+    prof_input("/autoping set 0");
+    assert_true(prof_output_exact("Autoping disabled."));
+
+    prof_connect();
+
+    prof_timeout(NEGATIVE_ASSERT_TIMEOUT);
+    assert_false(prof_output_regex(AUTOPING_WARNING_MATCH));
+}
+
+void
+autoping_warning_not_shown_when_autoping_enabled(void** state)
+{
+    // Warning is suppressed while autoping is enabled.
+    _stub_server_disco(TRUE);
+
+    prof_input("/autoping set 30");
+    assert_true(prof_output_exact("Autoping interval set to 30 seconds."));
+
+    prof_connect();
+
+    prof_timeout(NEGATIVE_ASSERT_TIMEOUT);
+    assert_false(prof_output_regex(AUTOPING_WARNING_MATCH));
+}
+
+void
+autoping_warning_not_shown_when_user_disabled(void** state)
+{
+    // User opted out -> no warning.
+    _stub_server_disco(TRUE);
+
+    prof_input("/autoping set 0");
+    assert_true(prof_output_exact("Autoping disabled."));
+
+    prof_input("/autoping warning off");
+    assert_true(prof_output_exact("Autoping availability warning disabled."));
+
+    prof_connect();
+
+    prof_timeout(NEGATIVE_ASSERT_TIMEOUT);
+    assert_false(prof_output_regex(AUTOPING_WARNING_MATCH));
+}
+
+void
+autoping_warning_not_shown_for_user_jid(void** state)
+{
+    // disco#info from a user JID (with '@') should not trigger the warning,
+    // only server responses (no '@') should.
+    stbbr_for_query("http://jabber.org/protocol/disco#info",
+        "<iq to='stabber@localhost/profanity' type='result' from='buddy1@localhost'>"
+            "<query xmlns='http://jabber.org/protocol/disco#info'>"
+                "<identity category='person' type='chat' name='Buddy1'/>"
+                "<feature var='urn:xmpp:ping'/>"
+            "</query>"
+        "</iq>"
+    );
+
+    prof_input("/autoping set 0");
+    assert_true(prof_output_exact("Autoping disabled."));
+
+    prof_connect();
+
+    prof_timeout(NEGATIVE_ASSERT_TIMEOUT);
+    assert_false(prof_output_regex(AUTOPING_WARNING_MATCH));
+}
+
+void
+autoping_warning_not_shown_for_subdomain_service(void** state)
+{
+    // disco#info from a subdomain service should not trigger the warning, only the server's own domain should
+    stbbr_for_query("http://jabber.org/protocol/disco#info",
+        "<iq to='stabber@localhost/profanity' type='result' from='conf.localhost'>"
+            "<query xmlns='http://jabber.org/protocol/disco#info'>"
+                "<identity category='conference' type='text' name='Conference Service'/>"
+                "<feature var='urn:xmpp:ping'/>"
+            "</query>"
+        "</iq>"
+    );
+
+    prof_input("/autoping set 0");
+    assert_true(prof_output_exact("Autoping disabled."));
+
+    prof_connect();
+
+    prof_timeout(NEGATIVE_ASSERT_TIMEOUT);
+    assert_false(prof_output_regex(AUTOPING_WARNING_MATCH));
+}
--- a/tests/functionaltests/test_autoping.h
+++ b/tests/functionaltests/test_autoping.h
@@ -4,3 +4,9 @@ void autoping_timeout_set(void** state);
 void autoping_timeout_zero_disables(void** state);
 void autoping_sends_ping_after_interval(void** state);
 void autoping_server_not_supporting_ping(void** state);
+void autoping_warning_shown_when_disabled(void** state);
+void autoping_warning_not_shown_when_server_unsupported(void** state);
+void autoping_warning_not_shown_when_autoping_enabled(void** state);
+void autoping_warning_not_shown_when_user_disabled(void** state);
+void autoping_warning_not_shown_for_user_jid(void** state);
+void autoping_warning_not_shown_for_subdomain_service(void** state);
--- a/tests/functionaltests/test_connect.c
+++ b/tests/functionaltests/test_connect.c
@@ -25,7 +25,7 @@ connect_jid_sends_presence_after_receiving_roster(void **state)

    assert_true(stbbr_received(
        "<presence id='*'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
--- a/tests/functionaltests/test_export_import.c
+++ b/tests/functionaltests/test_export_import.c
@@ -1289,7 +1289,7 @@ _join_muc(const char* room)
    snprintf(presence, sizeof(presence),
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='%s/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' "
-               "node='http://profanity-im.github.io' ver='*'/>"
+               "node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
--- a/tests/functionaltests/test_message.c
+++ b/tests/functionaltests/test_message.c
@@ -56,3 +56,70 @@ message_receive_chatwin(void **state)

    assert_true(prof_output_regex("someuser@chatserv.org/laptop: .+How are you?"));
 }
+
+// XEP-0359 disco gate: server announces urn:xmpp:sid:0 -> stanza-id trusted -> replay flagged as duplicate.
+void
+stanza_id_dedup_fires_when_server_announces_sid0(void **state)
+{
+    stbbr_for_query("http://jabber.org/protocol/disco#info",
+        "<iq type='result' to='stabber@localhost/profanity' from='localhost'>"
+            "<query xmlns='http://jabber.org/protocol/disco#info'>"
+                "<identity category='server' type='im' name='TestServer'/>"
+                "<feature var='urn:xmpp:sid:0'/>"
+            "</query>"
+        "</iq>"
+    );
+
+    prof_connect();
+
+    stbbr_send(
+        "<message id='m-trust-1' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
+            "<body>first</body>"
+            "<stanza-id xmlns='urn:xmpp:sid:0' by='stabber@localhost' id='archive-id-42'/>"
+        "</message>"
+    );
+    assert_true(prof_output_exact("<< chat message: someuser@chatserv.org/laptop (win 2)"));
+
+    stbbr_send(
+        "<message id='m-trust-2' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
+            "<body>replay</body>"
+            "<stanza-id xmlns='urn:xmpp:sid:0' by='stabber@localhost' id='archive-id-42'/>"
+        "</message>"
+    );
+    assert_true(prof_output_exact("Got a message with duplicate (server-generated) stanza-id from someuser@chatserv.org/laptop."));
+}
+
+// XEP-0359 disco gate: server does NOT announce urn:xmpp:sid:0 -> stanza-id untrusted -> no replay error.
+void
+stanza_id_not_trusted_when_server_does_not_announce_sid0(void **state)
+{
+    stbbr_for_query("http://jabber.org/protocol/disco#info",
+        "<iq type='result' to='stabber@localhost/profanity' from='localhost'>"
+            "<query xmlns='http://jabber.org/protocol/disco#info'>"
+                "<identity category='server' type='im' name='TestServer'/>"
+                "<feature var='urn:xmpp:ping'/>"
+            "</query>"
+        "</iq>"
+    );
+
+    prof_connect();
+
+    stbbr_send(
+        "<message id='m-untrust-1' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
+            "<body>first</body>"
+            "<stanza-id xmlns='urn:xmpp:sid:0' by='stabber@localhost' id='archive-id-77'/>"
+        "</message>"
+    );
+    assert_true(prof_output_exact("<< chat message: someuser@chatserv.org/laptop (win 2)"));
+
+    stbbr_send(
+        "<message id='m-untrust-2' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
+            "<body>replay</body>"
+            "<stanza-id xmlns='urn:xmpp:sid:0' by='stabber@localhost' id='archive-id-77'/>"
+        "</message>"
+    );
+
+    prof_timeout(2);
+    assert_false(prof_output_exact("Got a message with duplicate (server-generated) stanza-id"));
+    prof_timeout_reset();
+}
--- a/tests/functionaltests/test_message.h
+++ b/tests/functionaltests/test_message.h
@@ -1,3 +1,5 @@
 void message_send(void **state);
 void message_receive_console(void **state);
 void message_receive_chatwin(void **state);
+void stanza_id_dedup_fires_when_server_announces_sid0(void **state);
+void stanza_id_not_trusted_when_server_does_not_announce_sid0(void **state);
--- a/tests/functionaltests/test_muc.c
+++ b/tests/functionaltests/test_muc.c
@@ -26,7 +26,7 @@ sends_room_join(void **state)
    assert_true(stbbr_received(
        "<presence id='*' to='testroom@conference.localhost/stabber'>"
            "<x xmlns='http://jabber.org/protocol/muc'/>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -41,7 +41,7 @@ sends_room_join_with_nick(void **state)
    assert_true(stbbr_received(
        "<presence id='*' to='testroom@conference.localhost/testnick'>"
            "<x xmlns='http://jabber.org/protocol/muc'/>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -58,7 +58,7 @@ sends_room_join_with_password(void **state)
            "<x xmlns='http://jabber.org/protocol/muc'>"
                "<password>testpassword</password>"
            "</x>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -75,7 +75,7 @@ sends_room_join_with_nick_and_password(void **state)
            "<x xmlns='http://jabber.org/protocol/muc'>"
                "<password>testpassword</password>"
            "</x>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -87,7 +87,7 @@ shows_role_and_affiliation_on_join(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -107,7 +107,7 @@ shows_subject_on_join(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -135,7 +135,7 @@ shows_history_message(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -170,7 +170,7 @@ shows_occupant_join(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -200,7 +200,7 @@ shows_message(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -227,7 +227,7 @@ shows_me_message_from_occupant(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -254,7 +254,7 @@ shows_me_message_from_self(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -281,7 +281,7 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -322,7 +322,7 @@ shows_first_message_in_console_when_window_not_focussed(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -369,7 +369,7 @@ shows_no_message_in_console_when_window_not_focussed(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -401,7 +401,7 @@ sends_affiliation_list_request(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='moderator' jid='stabber@localhost/profanity' affiliation='owner'/>"
            "</x>"
@@ -434,7 +434,7 @@ sends_kick_request(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='moderator' jid='stabber@localhost/profanity' affiliation='admin'/>"
            "</x>"
--- a/tests/functionaltests/test_presence.c
+++ b/tests/functionaltests/test_presence.c
@@ -19,7 +19,7 @@ presence_online(void **state)
    assert_true(stbbr_received(
        "<presence id='*'>"
            "<status>online</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -36,7 +36,7 @@ presence_online_with_message(void **state)
    assert_true(stbbr_received(
        "<presence id='*'>"
            "<status>Hi there</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -54,7 +54,7 @@ presence_away(void **state)
        "<presence id='*'>"
            "<show>away</show>"
            "<status>away</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -72,7 +72,7 @@ presence_away_with_message(void **state)
        "<presence id='*'>"
            "<show>away</show>"
            "<status>I'm not here for a bit</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -90,7 +90,7 @@ presence_xa(void **state)
        "<presence id='*'>"
            "<show>xa</show>"
            "<status>xa</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -108,7 +108,7 @@ presence_xa_with_message(void **state)
        "<presence id='*'>"
            "<show>xa</show>"
            "<status>Gone to the shops</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -126,7 +126,7 @@ presence_dnd(void **state)
        "<presence id='*'>"
            "<show>dnd</show>"
            "<status>dnd</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -144,7 +144,7 @@ presence_dnd_with_message(void **state)
        "<presence id='*'>"
            "<show>dnd</show>"
            "<status>Working</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -162,7 +162,7 @@ presence_chat(void **state)
        "<presence id='*'>"
            "<show>chat</show>"
            "<status>chat</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -180,7 +180,7 @@ presence_chat_with_message(void **state)
        "<presence id='*'>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -197,7 +197,7 @@ presence_set_priority(void **state)
    assert_true(stbbr_received(
        "<presence id='*'>"
            "<priority>25</priority>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -212,7 +212,7 @@ presence_includes_priority(void **state)
    assert_true(stbbr_received(
        "<presence id='*'>"
            "<priority>25</priority>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));

@@ -223,7 +223,7 @@ presence_includes_priority(void **state)
            "<priority>25</priority>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
@@ -239,7 +239,7 @@ presence_keeps_status(void **state)
        "<presence id='*'>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));

@@ -250,7 +250,7 @@ presence_keeps_status(void **state)
            "<show>chat</show>"
            "<status>Free to talk</status>"
            "<priority>25</priority>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
        "</presence>"
    ));
 }
--- a/tests/unittests/test_ai_client.c
+++ b/tests/unittests/test_ai_client.c
@@ -614,6 +614,24 @@ test_ai_set_provider_setting(void** state)
    assert_null(ai_get_provider_setting("p_set_settings", "nonexistent_setting"));
 }

+void
+test_ai_set_provider_setting_reserved_key(void** state)
+{
+    ai_add_provider("p_reserved_keys", "https://example.test/rk/");
+
+    /* Reserved payload keys are rejected (would duplicate fixed fields) */
+    assert_false(ai_set_provider_setting("p_reserved_keys", "model", "x"));
+    assert_false(ai_set_provider_setting("p_reserved_keys", "messages", "[]"));
+    assert_false(ai_set_provider_setting("p_reserved_keys", "stream", "true"));
+    assert_null(ai_get_provider_setting("p_reserved_keys", "model"));
+
+    /* Ordinary keys still work */
+    assert_true(ai_set_provider_setting("p_reserved_keys", "temperature", "0.7"));
+    auto_gchar gchar* temp = ai_get_provider_setting("p_reserved_keys", "temperature");
+    assert_non_null(temp);
+    assert_string_equal("0.7", temp);
+}
+
 void
 test_ai_get_provider_setting(void** state)
 {
@@ -919,22 +937,22 @@ test_ai_parse_response_openai_content(void** state)
 }

 void
-test_ai_parse_response_perplexity_text(void** state)
+test_ai_parse_response_legacy_text_format_unsupported(void** state)
 {
+    /* Legacy Perplexity /v1/agent format: "content" is an array, not a string.
+     * Dropped with the chat-completions alignment, so parsing yields NULL. */
    const gchar* json = "{\"output\":[{\"content\":[{\"text\":\"Search result\",\"type\":\"output_text\"}]}]}";
-    auto_gchar gchar* out = ai_parse_response(json);
-    assert_non_null(out);
-    assert_string_equal("Search result", out);
+    assert_null(ai_parse_response(json));
 }

 void
-test_ai_parse_response_text_preferred_over_content(void** state)
+test_ai_parse_response_content_preferred_over_text(void** state)
 {
-    /* When both formats are present, "text" wins (Perplexity path tried first). */
+    /* Chat-completions "content" is extracted; a stray "text" field is ignored. */
    const gchar* json = "{\"text\":\"from text field\",\"content\":\"from content field\"}";
    auto_gchar gchar* out = ai_parse_response(json);
    assert_non_null(out);
-    assert_string_equal("from text field", out);
+    assert_string_equal("from content field", out);
 }

 void
--- a/tests/unittests/test_ai_client.h
+++ b/tests/unittests/test_ai_client.h
@@ -43,6 +43,7 @@ void test_ai_providers_find_case_insensitive(void** state);
 void test_ai_set_provider_default_model(void** state);
 void test_ai_get_provider_default_model(void** state);
 void test_ai_set_provider_setting(void** state);
+void test_ai_set_provider_setting_reserved_key(void** state);
 void test_ai_get_provider_setting(void** state);
 /* Model caching tests */
 void test_ai_models_are_fresh_initial(void** state);
@@ -64,8 +65,8 @@ int ai_client_teardown_with_prefs(void** state);

 /* Chat response parser tests (ai_parse_response) */
 void test_ai_parse_response_openai_content(void** state);
-void test_ai_parse_response_perplexity_text(void** state);
-void test_ai_parse_response_text_preferred_over_content(void** state);
+void test_ai_parse_response_legacy_text_format_unsupported(void** state);
+void test_ai_parse_response_content_preferred_over_text(void** state);
 void test_ai_parse_response_escaped_quote(void** state);
 void test_ai_parse_response_newline_escape(void** state);
 void test_ai_parse_response_empty_content(void** state);
--- a/tests/unittests/unittests.c
+++ b/tests/unittests/unittests.c
@@ -752,6 +752,7 @@ main(int argc, char* argv[])
        cmocka_unit_test_setup_teardown(test_ai_set_provider_default_model, ai_client_setup, ai_client_teardown),
        cmocka_unit_test_setup_teardown(test_ai_get_provider_default_model, ai_client_setup, ai_client_teardown),
        cmocka_unit_test_setup_teardown(test_ai_set_provider_setting, ai_client_setup, ai_client_teardown),
+        cmocka_unit_test_setup_teardown(test_ai_set_provider_setting_reserved_key, ai_client_setup, ai_client_teardown),
        cmocka_unit_test_setup_teardown(test_ai_get_provider_setting, ai_client_setup, ai_client_teardown),
        /* Model caching tests */
        cmocka_unit_test_setup_teardown(test_ai_models_are_fresh_initial, ai_client_setup, ai_client_teardown),
@@ -774,8 +775,8 @@ main(int argc, char* argv[])
        cmocka_unit_test(test_ai_json_escape_backslash_quote),
        /* Chat response parser */
        cmocka_unit_test(test_ai_parse_response_openai_content),
-        cmocka_unit_test(test_ai_parse_response_perplexity_text),
-        cmocka_unit_test(test_ai_parse_response_text_preferred_over_content),
+        cmocka_unit_test(test_ai_parse_response_legacy_text_format_unsupported),
+        cmocka_unit_test(test_ai_parse_response_content_preferred_over_text),
        cmocka_unit_test(test_ai_parse_response_escaped_quote),
        cmocka_unit_test(test_ai_parse_response_newline_escape),
        cmocka_unit_test(test_ai_parse_response_empty_content),
--- a/tests/unittests/xmpp/stub_xmpp.c
+++ b/tests/unittests/xmpp/stub_xmpp.c
@@ -500,6 +500,11 @@ caps_jid_has_feature(const char* const jid, const char* const feature)
    return FALSE;
 }

+void
+caps_cache_clear(void)
+{
+}
+
 gboolean
 bookmark_add(const char* jid, const char* nick, const char* password, const char* autojoin_str, const char* name)
 {