fix(disco): clean up autoping warning message handling

Remove unused return value from _disco_autoping_warning_message by
changing its return type to void. Rename local variable from
users_prefers_warning to user_prefers_warning for correct grammar.

Use g_ascii_strcasecmp instead of g_strcmp0 for the domain match
check, so the warning fires correctly regardless of case differences
between the stanza 'from' field and the bound domain.

Remove duplicate autoping warning display from cons_notify_setting(),
keeping it only in cons_autoping_setting() where it belongs.

src/ai/ai_client.c

@@ -186,22 +186,6 @@ 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.
@@ -408,7 +392,6 @@ 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;
 }
 
@@ -436,7 +419,6 @@ 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) {
@@ -747,44 +729,31 @@ ai_get_provider_default_model(const gchar* provider_name)
     return provider->default_model;
 }
 
-gboolean
+void
 ai_set_provider_setting(const gchar* provider_name, const gchar* setting, const gchar* value)
 {
     if (!provider_name || !setting)
-        return FALSE;
-
-    if (_is_reserved_payload_key(setting)) {
-        log_warning("Setting '%s' for provider '%s' rejected: reserved payload key", setting, provider_name);
-        return FALSE;
-    }
+        return;
 
     AIProvider* provider = ai_get_provider(provider_name);
     if (!provider) {
         log_warning("Provider '%s' not found for setting '%s'", provider_name, setting);
-        return FALSE;
+        return;
     }
 
-    /* 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*
@@ -797,10 +766,8 @@ ai_get_provider_setting(const gchar* provider_name, const gchar* setting)
     if (!provider || !provider->settings)
         return NULL;
 
-    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;
+    gchar* value = g_hash_table_lookup(provider->settings, setting);
+    return g_strdup(value);
 }
 
 /* ========================================================================
@@ -1468,19 +1435,13 @@ 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(AIProvider* provider, const gchar* model, GList* history, const gchar* prompt)
+_build_json_payload_from_list(const gchar* model, GList* history, const gchar* prompt)
 {
     GString* messages_json = g_string_new("");
     GList* curr = history;
@@ -1507,50 +1468,11 @@ _build_json_payload_from_list(AIProvider* provider, const gchar* model, GList* h
     g_string_append_printf(messages_json, "{\"role\":\"user\",\"content\":\"%s\"}", escaped_prompt);
 
     auto_gchar gchar* escaped_model = ai_json_escape(model);
-
-    /* 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);
-    }
+    gchar* json_payload = g_strdup_printf(
+        "{\"model\":\"%s\",\"input\":[%s],\"stream\":false,\"store\":false}",
+        escaped_model, messages_json->str);
 
     g_string_free(messages_json, TRUE);
-    g_string_free(custom_json, TRUE);
     return json_payload;
 }
 
@@ -1560,7 +1482,12 @@ ai_parse_response(const gchar* response_json)
     if (!response_json || strlen(response_json) == 0)
         return NULL;
 
-    /* OpenAI /v1/chat/completions: {"choices":[{"message":{"content":"..."}}]} */
+    /* 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;
+
     return _extract_json_string(response_json, "content");
 }
 
@@ -1639,7 +1566,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_provider, local_model, session->history, prompt);
+    auto_gchar gchar* json_payload = _build_json_payload_from_list(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);
@@ -1660,7 +1587,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/chat/completions", api_url, g_str_has_suffix(api_url, "/") ? "" : "/");
+    auto_gchar gchar* request_url = g_strdup_printf("%s%sv1/responses", 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);

src/ai/ai_client.h

@@ -17,15 +17,14 @@ 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 */
-    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) */
+    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) */
 } AIProvider;
 
 /**
@@ -143,13 +142,11 @@ 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., "temperature")
- * @param value The setting value, or NULL to remove
- * @return TRUE on success, FALSE on unknown provider or reserved key
+ * @param setting The setting key (e.g., "tools", "search")
+ * @param value The setting value
  */
-gboolean ai_set_provider_setting(const gchar* provider_name, const gchar* setting, const gchar* value);
+void ai_set_provider_setting(const gchar* provider_name, const gchar* setting, const gchar* value);
 
 /**
  * Get a custom setting for a provider.
@@ -187,9 +184,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 OpenAI chat-completions response body
- * ({"choices":[{"message":{"content":"..."}}]}). Decodes the \" and \n
- * escape sequences only.
+ * 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.
  * @param response_json The JSON body from the provider
  * @return Newly allocated content string, or NULL if not found (caller frees)
  */

src/command/cmd_defs.c

@@ -2833,7 +2833,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., temperature, max_tokens)" },
+              { "set custom <provider> <setting> <value>", "Set provider-level setting (e.g., tools, search)" },
               { "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)" },
@@ -2846,7 +2846,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 temperature 0.7",
+              "/ai set custom perplexity tools enabled",
               "/ai remove provider custom",
               "/ai start",
               "/ai start perplexity",

src/command/cmd_funcs.c

@@ -10787,11 +10787,8 @@ cmd_ai_set(ProfWin* window, const char* const command, gchar** args)
             cons_bad_cmd_usage(command);
             return TRUE;
         }
-        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]);
-        }
+        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]);
         cons_show("");
         return TRUE;
     }

src/gitversion.h.in

@@ -0,0 +1,6 @@
+#ifndef PROF_GIT_BRANCH
+#define PROF_GIT_BRANCH @PROF_GIT_BRANCH@
+#endif
+#ifndef PROF_GIT_REVISION
+#define PROF_GIT_REVISION @PROF_GIT_REVISION@
+#endif

src/pgp/gpg.c

@@ -519,15 +519,13 @@ 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, gchar** err)
+p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gchar* const fp)
 {
     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;
     }
 
@@ -540,7 +538,6 @@ 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;
     }
@@ -548,7 +545,6 @@ 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;
@@ -558,10 +554,8 @@ 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;
@@ -580,8 +574,7 @@ p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gcha
     gpgme_key_unref(sender_key);
 
     if (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));
+        log_error("GPG: Failed to encrypt message. %s %s", gpgme_strsource(error), gpgme_strerror(error));
         return NULL;
     }
 

src/pgp/gpg.h

@@ -42,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** err);
+gchar* p_gpg_encrypt(const gchar* const barejid, const gchar* const message, const gchar* const fp);
 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);

src/tools/editor.c

@@ -25,8 +25,6 @@
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
 
-extern char** environ;
-
 typedef struct EditorContext
 {
     gchar* filename;
@@ -142,22 +140,6 @@ launch_editor(gchar* initial_content, void (*callback)(gchar* content, void* dat
     GSource* sigchld_warmup = g_child_watch_source_new(getpid());
     g_source_unref(sigchld_warmup);
 
-    // Build the editor's env without LINES/COLUMNS pre-fork, so the child only
-    // reassigns environ instead of calling unsetenv() between fork and exec.
-    // The editor's (n)curses then reads the live window via ioctl(TIOCGWINSZ).
-    gsize env_len = 0;
-    while (environ[env_len]) {
-        env_len++;
-    }
-    gchar** editor_env = g_new0(gchar*, env_len + 1);
-    gsize env_kept = 0;
-    for (gsize i = 0; i < env_len; i++) {
-        if (g_str_has_prefix(environ[i], "LINES=") || g_str_has_prefix(environ[i], "COLUMNS=")) {
-            continue;
-        }
-        editor_env[env_kept++] = environ[i];
-    }
-
     pid_t pid = fork();
     if (pid == -1) {
         log_error("[Editor] Failed to fork: %s", strerror(errno));
@@ -166,15 +148,12 @@ launch_editor(gchar* initial_content, void (*callback)(gchar* content, void* dat
         ui_resize();
         cons_show_error("Failed to start editor: %s", strerror(errno));
         g_strfreev(editor_argv);
-        g_free(editor_env); // array only; strings are borrowed from environ
         g_free(ctx->filename);
         g_free(ctx);
         return TRUE;
     } else if (pid == 0) {
         // Child process: Inherits TTY from parent
 
-        environ = editor_env; // live TIOCGWINSZ size, not the inherited LINES/COLUMNS
-
         // SIGTSTP=SIG_DFL lets vim's :stop / Ctrl-Z work; profanity catches
         // the STOPPED state via editor_check_stopped() and drops to the shell.
         signal(SIGINT, SIG_DFL);
@@ -191,7 +170,6 @@ launch_editor(gchar* initial_content, void (*callback)(gchar* content, void* dat
     editor_pid = pid;
     g_child_watch_add((GPid)pid, _editor_exit_cb, ctx);
     g_strfreev(editor_argv);
-    g_free(editor_env); // frees the parent's array only; the child keeps its own COW copy until execvp
     return FALSE;
 }
 

src/ui/window.c

@@ -43,7 +43,7 @@
 #include "ai/ai_client.h"
 
 static const int PAD_MIN_HEIGHT = 100;
-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 const int PAD_THRESHOLD = 12000; // above buffer cap (~9000): reclaims dead pad space, never fires while scrolling
 static gboolean _in_redraw = FALSE;
 
 static void
@@ -56,10 +56,9 @@ _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) {
-        // 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) {
+        // 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) {
             win_redraw(window);
         } else {
             // resize to required lines + some buffer for next messages

src/xmpp/iq.c

@@ -2432,8 +2432,7 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t* const stanza, void* con
         }
 
         // 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) {
+        if (from && g_ascii_strcasecmp(from, connection_get_domain()) == 0) {
             _disco_autoping_warning_message(features);
         }
     }

src/xmpp/message.c

@@ -467,15 +467,12 @@ 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* err = NULL;
-        auto_gchar gchar* encrypted = p_gpg_encrypt(jidp->barejid, msg, account->pgp_keyid, &err);
+        auto_gchar gchar* encrypted = p_gpg_encrypt(jidp->barejid, msg, account->pgp_keyid);
         if (encrypted) {
             message = xmpp_message_new(ctx, STANZA_TYPE_CHAT, jid, id);
             xmpp_message_set_body(message, "This message is encrypted (XEP-0027).");
@@ -489,31 +486,18 @@ message_send_chat_pgp(const char* const barejid, const char* const msg, gboolean
             xmpp_stanza_add_child(message, x);
             xmpp_stanza_release(x);
         } else {
-            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;
+            message = xmpp_message_new(ctx, STANZA_TYPE_CHAT, jid, id);
+            xmpp_message_set_body(message, msg);
         }
     } else {
-        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;
+        message = xmpp_message_new(ctx, STANZA_TYPE_CHAT, jid, id);
+        xmpp_message_set_body(message, msg);
     }
     account_free(account);
 #else
-    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;
+    // ?
+    message = xmpp_message_new(ctx, STANZA_TYPE_CHAT, jid, id);
+    xmpp_message_set_body(message, msg);
 #endif
 
     if (state) {
@@ -562,10 +546,7 @@ 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) {
-        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.");
-        }
+        cons_show("Unable to send OX message. Check log file and profanity-ox-setup man page for details.");
         log_error("Message not signcrypted.");
         return NULL;
     }

tests/unittests/test_ai_client.c

@@ -614,24 +614,6 @@ 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)
 {
@@ -937,22 +919,22 @@ test_ai_parse_response_openai_content(void** state)
 }
 
 void
-test_ai_parse_response_legacy_text_format_unsupported(void** state)
+test_ai_parse_response_perplexity_text(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\"}]}]}";
-    assert_null(ai_parse_response(json));
+    auto_gchar gchar* out = ai_parse_response(json);
+    assert_non_null(out);
+    assert_string_equal("Search result", out);
 }
 
 void
-test_ai_parse_response_content_preferred_over_text(void** state)
+test_ai_parse_response_text_preferred_over_content(void** state)
 {
-    /* Chat-completions "content" is extracted; a stray "text" field is ignored. */
+    /* When both formats are present, "text" wins (Perplexity path tried first). */
     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 content field", out);
+    assert_string_equal("from text field", out);
 }
 
 void

tests/unittests/test_ai_client.h

@@ -43,7 +43,6 @@ 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);
@@ -65,8 +64,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_legacy_text_format_unsupported(void** state);
-void test_ai_parse_response_content_preferred_over_text(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_escaped_quote(void** state);
 void test_ai_parse_response_newline_escape(void** state);
 void test_ai_parse_response_empty_content(void** state);

tests/unittests/unittests.c

@@ -752,7 +752,6 @@ 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),
@@ -775,8 +774,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_legacy_text_format_unsupported),
-        cmocka_unit_test(test_ai_parse_response_content_preferred_over_text),
+        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_escaped_quote),
         cmocka_unit_test(test_ai_parse_response_newline_escape),
         cmocka_unit_test(test_ai_parse_response_empty_content),