diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c
index 5c3b7486..6db15c90 100644
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -4445,84 +4445,61 @@ static char*
 _ai_autocomplete(ProfWin* window, const char* const input, gboolean previous)
 {
     char* result = NULL;
-    gboolean parsed = FALSE;
 
-    auto_gcharv gchar** args = parse_args(input, 0, 3, &parsed);
-
-    if (parsed) {
-        int num_args = g_strv_length(args);
-
-        /* Top-level /ai <subcommand> autocomplete (e.g., /ai s<tab> -> /ai set) */
-        if (num_args >= 1) {
-            if (g_strcmp0(args[0], "set") == 0) {
-                if (num_args >= 2) {
-                    if (g_strcmp0(args[1], "provider") == 0) {
-                        // /ai set provider <name> <url> - autocomplete provider names
-                        result = autocomplete_param_with_func(input, "/ai set provider", ai_providers_find, previous, NULL);
-                        if (result) {
-                            return result;
-                        }
-                    } else if (g_strcmp0(args[1], "token") == 0) {
-                        // /ai set token <provider> <token> - autocomplete provider names
-                        result = autocomplete_param_with_func(input, "/ai set token", ai_providers_find, previous, NULL);
-                        if (result) {
-                            return result;
-                        }
-                    } else if (g_strcmp0(args[1], "org") == 0) {
-                        // /ai set org <provider> <org_id> - autocomplete provider names
-                        result = autocomplete_param_with_func(input, "/ai set org", ai_providers_find, previous, NULL);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                }
-                // /ai set <subcommand> - autocomplete subcommands
-                result = autocomplete_param_with_ac(input, "/ai set", ai_set_subcommands_ac, TRUE, previous);
-                if (result) {
-                    return result;
-                }
-            } else if (g_strcmp0(args[0], "remove") == 0) {
-                if (num_args >= 2 && g_strcmp0(args[1], "provider") == 0) {
-                    // /ai remove provider <name> - autocomplete provider names
-                    result = autocomplete_param_with_func(input, "/ai remove provider", ai_providers_find, previous, NULL);
-                    if (result) {
-                        return result;
-                    }
-                } else {
-                    result = autocomplete_param_with_ac(input, "/ai remove", ai_remove_subcommands_ac, TRUE, previous);
-                    if (result) {
-                        return result;
-                    }
-                }
-            } else if (g_strcmp0(args[0], "start") == 0) {
-                // /ai start [<provider>/<model>] - autocomplete provider names
-                result = autocomplete_param_with_func(input, "/ai start", ai_providers_find, previous, NULL);
-                if (result) {
-                    return result;
-                }
-            } else if (g_strcmp0(args[0], "clear") == 0) {
-                // /ai clear [<provider>] - autocomplete provider names
-                result = autocomplete_param_with_func(input, "/ai clear", ai_providers_find, previous, NULL);
-                if (result) {
-                    return result;
-                }
-            } else if (g_strcmp0(args[0], "correct") == 0) {
-                // /ai correct <provider> <text>
-                result = autocomplete_param_with_func(input, "/ai correct", ai_providers_find, previous, NULL);
-                if (result) {
-                    return result;
-                }
-            } else if (g_strcmp0(args[0], "providers") == 0) {
-                // /ai providers - no subcommands
-                return NULL;
-            }
-        }
-
-        result = autocomplete_param_with_ac(input, "/ai", ai_subcommands_ac, FALSE, previous);
-        if (result) {
-            return result;
-        }
+    /* Top-level /ai <subcommand> autocomplete (e.g., /ai s<tab> -> /ai set) */
+    result = autocomplete_param_with_func(input, "/ai set provider", ai_providers_find, previous, NULL);
+    if (result) {
+        return result;
     }
 
+    // /ai set token <provider> <token> - autocomplete provider names
+    result = autocomplete_param_with_func(input, "/ai set token", ai_providers_find, previous, NULL);
+    if (result) {
+        return result;
+    }
+
+    // /ai set org <provider> <org_id> - autocomplete provider names
+    result = autocomplete_param_with_func(input, "/ai set org", ai_providers_find, previous, NULL);
+    if (result) {
+        return result;
+    }
+
+    // /ai set <subcommand> - autocomplete subcommands
+    result = autocomplete_param_with_ac(input, "/ai set", ai_set_subcommands_ac, TRUE, previous);
+    if (result) {
+        return result;
+    }
+
+    // /ai remove provider <name> - autocomplete provider names
+    result = autocomplete_param_with_func(input, "/ai remove provider", ai_providers_find, previous, NULL);
+    if (result) {
+        return result;
+    }
+
+    result = autocomplete_param_with_ac(input, "/ai remove", ai_remove_subcommands_ac, TRUE, previous);
+    if (result) {
+        return result;
+    }
+
+    // /ai start [<provider>/<model>] - autocomplete provider names
+    result = autocomplete_param_with_func(input, "/ai start", ai_providers_find, previous, NULL);
+    if (result) {
+        return result;
+    }
+
+    // /ai clear [<provider>] - autocomplete provider names
+    result = autocomplete_param_with_func(input, "/ai clear", ai_providers_find, previous, NULL);
+    if (result) {
+        return result;
+    }
+
+    // /ai correct <provider> <text>
+    result = autocomplete_param_with_func(input, "/ai correct", ai_providers_find, previous, NULL);
+    if (result) {
+        return result;
+    }
+
+    result = autocomplete_param_with_ac(input, "/ai", ai_subcommands_ac, FALSE, previous);
+
     return result;
 }
\ No newline at end of file