fix: align agent cli detection and counts

Author: runkids

internal/agent/chat_generic_cli.go

@@ -191,11 +191,7 @@ func newCodexChatProvider(binPath string, prepareImage PrepareImageFunc) *CLICha
 
 func newAntigravityChatProvider(binPath string, prepareImage PrepareImageFunc) *CLIChatProvider {
 	return newCLIChatProvider(binPath, "antigravity", prepareImage, func(req ChatRequest) []string {
-		args := []string{"--output-format", "text", "--yolo"}
-		if req.Model != "" {
-			args = append(args, "--model", req.Model)
-		}
-		return args
+		return []string{"--print", "--dangerously-skip-permissions"}
 	})
 }
 

internal/agent/chat_test.go

@@ -65,6 +65,15 @@ func TestNewChatProvider_Unsupported(t *testing.T) {
 	}
 }
 
+func TestAntigravityChatProviderUsesAgyPrintMode(t *testing.T) {
+	p := newAntigravityChatProvider("/usr/bin/agy", nil)
+	args := p.buildArgs(ChatRequest{Model: "ignored"})
+	want := []string{"--print", "--dangerously-skip-permissions"}
+	if strings.Join(args, "\x00") != strings.Join(want, "\x00") {
+		t.Fatalf("args = %#v, want %#v", args, want)
+	}
+}
+
 func TestLocalLLMChatBatch(t *testing.T) {
 	called := 0
 	mp := &mockProvider{

internal/agent/detect.go

@@ -9,7 +9,7 @@ var defaultAdapters = []Adapter{
 	&CLIAdapter{AdapterCodex, "Codex CLI", "codex"},
 	&CLIAdapter{AdapterClaude, "Claude Code", "claude"},
 	&CLIAdapter{AdapterCursorAgent, "Cursor Agent", "cursor-agent"},
-	&CLIAdapter{AdapterAntigravity, "Antigravity 2.0", "antigravity"},
+	&CLIAdapter{AdapterAntigravity, "Antigravity 2.0", "agy"},
 	&CLIAdapter{AdapterCopilot, "Copilot CLI", "copilot"},
 	&CLIAdapter{AdapterPi, "Pi", "pi"},
 }

internal/agent/detect_test.go

@@ -64,6 +64,20 @@ func TestBuildRuntimeStatus(t *testing.T) {
 	}
 }
 
+func TestDefaultAntigravityAdapterUsesAgyCLI(t *testing.T) {
+	for _, adapter := range defaultAdapters {
+		cli, ok := adapter.(*CLIAdapter)
+		if !ok || cli.id != AdapterAntigravity {
+			continue
+		}
+		if cli.bin != "agy" {
+			t.Fatalf("expected Antigravity CLI binary agy, got %s", cli.bin)
+		}
+		return
+	}
+	t.Fatal("expected Antigravity adapter")
+}
+
 func TestLocalLLMDetect_Enabled(t *testing.T) {
 	a := NewLocalLLMAdapter(LLMInfo{Enabled: true, Provider: "ollama", Model: "llava:7b"})
 	info, err := a.Detect(context.Background())

ui/src/features/settings/AISettingsCard.tsx

@@ -48,7 +48,11 @@ import {
 import type { Mode } from "@/ui";
 import { FieldRow } from "./index";
 import type { SettingsDraft } from "./types";
-import { deriveHost, sortedTranslationLocales } from "./aiSectionUtils";
+import {
+  agentCliAdapters,
+  deriveHost,
+  sortedTranslationLocales,
+} from "./aiSectionUtils";
 
 type AISettingsCardProps = {
   draft: SettingsDraft;
@@ -83,6 +87,7 @@ export function AISettingsCard({
     "local" | "agent" | "backend" | "prompts" | "search"
   >("local");
 
+  const agentAdapters = agentCliAdapters(settings?.agentRuntime?.adapters);
   const host = deriveHost(settings?.llmEndpoint);
   const defaultEndpoints: Record<string, string> = {
     ollama: `http://${host}:11434`,
@@ -171,10 +176,8 @@ export function AISettingsCard({
                 value: "agent" as const,
                 label: t("settings.aiTabAgent"),
                 icon: <Bot />,
-                badge: settings?.agentRuntime?.adapters?.length ? (
-                  <Badge tone="green">
-                    {settings.agentRuntime.adapters.length}
-                  </Badge>
+                badge: agentAdapters.length ? (
+                  <Badge tone="green">{agentAdapters.length}</Badge>
                 ) : undefined,
               },
               {
@@ -454,20 +457,18 @@ export function AISettingsCard({
             <FieldRow
               label={t("settings.agentAvailable")}
               description={
-                settings?.agentRuntime?.adapters?.length
+                agentAdapters.length
                   ? undefined
                   : t("settings.agentNoneDetected")
               }
             >
               <div className="flex flex-wrap items-center gap-1.5">
-                {settings?.agentRuntime?.adapters
-                  ?.filter((a) => a.id !== "local-llm")
-                  .map((a) => (
-                    <Badge key={a.id} tone="green">
-                      {a.name}
-                      {a.version ? ` ${a.version}` : ""}
-                    </Badge>
-                  ))}
+                {agentAdapters.map((a) => (
+                  <Badge key={a.id} tone="green">
+                    {a.name}
+                    {a.version ? ` ${a.version}` : ""}
+                  </Badge>
+                ))}
                 <Tooltip label={t("settings.agentDetectTooltip")}>
                   <IconButton
                     size="sm"
@@ -476,10 +477,9 @@ export function AISettingsCard({
                     onClick={() =>
                       detectMutation.mutate(undefined, {
                         onSuccess: (data) => {
-                          const count =
-                            data.settings.agentRuntime?.adapters?.filter(
-                              (a) => a.id !== "local-llm",
-                            ).length ?? 0;
+                          const count = agentCliAdapters(
+                            data.settings.agentRuntime?.adapters,
+                          ).length;
                           toast.success(
                             t("settings.agentDetectDone", { count }),
                           );

ui/src/features/settings/VLMBackendSelect.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
 import { Badge, TextInput } from "@/components/ui";
 import type { AgentRuntime, LLMModel, LLMRuntime } from "@/types";
+import { agentCliAdapters } from "./aiSectionUtils";
 
 type ParsedBackend =
   | { type: "inherit" }
@@ -76,8 +77,7 @@ export function VLMBackendSelect({
     setAgentModel(agentModelFromValue);
   }
 
-  const adapters =
-    agentRuntime?.adapters?.filter((a) => a.id !== "local-llm") ?? [];
+  const adapters = agentCliAdapters(agentRuntime?.adapters);
   const localModels = Array.isArray(models) ? models : [];
   const isConnected = !!llmRuntime?.connected;
   const hasLocalGroup = localModels.length > 0 || isConnected;

ui/src/features/settings/aiSectionUtils.test.ts

@@ -0,0 +1,22 @@
+import { describe, expect, it } from "vitest";
+import { agentCliAdapters } from "./aiSectionUtils";
+import type { AgentAdapterInfo } from "@/types";
+
+describe("agentCliAdapters", () => {
+  it("excludes Local LLM from Agent CLI counts and lists", () => {
+    const adapters: AgentAdapterInfo[] = [
+      { id: "codex", name: "Codex CLI", version: "0.1.0", path: "/bin/codex" },
+      { id: "local-llm", name: "Local LLM", version: "ollama/llava", path: "" },
+      { id: "pi", name: "Pi", version: "", path: "/bin/pi" },
+    ];
+
+    expect(agentCliAdapters(adapters).map((adapter) => adapter.id)).toEqual([
+      "codex",
+      "pi",
+    ]);
+  });
+
+  it("returns an empty list when no adapters were reported", () => {
+    expect(agentCliAdapters(undefined)).toEqual([]);
+  });
+});

ui/src/features/settings/aiSectionUtils.ts

@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
 import type { AITagActivityState } from "@/activity/aiTagActivity";
 import type { VLMOcrActivityState } from "@/activity/vlmOcrActivity";
 import type { EmbedActivityState } from "@/activity/embedActivity";
-import type { SettingsInfo, Workspace } from "@/types";
+import type { AgentAdapterInfo, SettingsInfo, Workspace } from "@/types";
 import type { Mode } from "@/ui";
 import type { ScopeProject } from "./AIScopePicker";
 import type { SettingsDraft } from "./types";
@@ -107,6 +107,12 @@ export function deriveHost(endpoint: string | undefined): string {
   }
 }
 
+export function agentCliAdapters(
+  adapters: AgentAdapterInfo[] | undefined,
+): AgentAdapterInfo[] {
+  return adapters?.filter((adapter) => adapter.id !== "local-llm") ?? [];
+}
+
 // ── Locale helpers ─────────────────────────────────────────────────
 
 export const ALL_TRANSLATION_LOCALES = [