fix: hide the upstream Claude Agent provider

AGENTS.md

@@ -36,6 +36,20 @@ identity facts when merging or refactoring:
   single bookmark, so channel inference can be ambiguous or unavailable. The
   build fails closed in that case; the explicit channel pins the intended
   database and service identity.
+- The upstream Claude Agent SDK provider stays on disk
+  (`packages/core/src/plugin/provider/claude-agent/**` and its tests, plus the
+  optional `@anthropic-ai/claude-agent-sdk` peer and `#claude-agent-sdk`
+  alias) so later syncs do not resurrect a deleted tree. It is not a Shuvcode
+  provider. The guarantee is three layers, not the bundled registry alone:
+  `ProviderPlugins` does not load it, `ConfigProviderPlugin` skips provider
+  ids `claude-agent` and `opencode.provider.claude-agent`, and every client
+  list of integrations, providers, or models calls
+  `isHiddenProvider` from `@opencode/util/hidden-provider`. Do not register
+  `ClaudeAgentPlugin` or `make(...)`, do not let config recreate the id, and
+  do not add a list surface that omits the predicate. Anthropic in the
+  product is `@shuvcode/claude-plugin` (`ClaudePlugin`). When merging
+  `upstream/dev`, drop any reintroduced registration, config path, or
+  user-facing surface for that provider.
 
 ## Live V2 TUI Testing
 

PLAN-fresh-v2-rewrite.md

@@ -54,7 +54,11 @@ still `2.0.3`). Re-fetch again at kickoff and re-run the watchlist checks.
 3. **Plugin rule:** if it can be a plugin, it is a plugin, **bundled and
    enabled** (Core `ProviderPlugins` / TUI `builtins`). Disable by config id
    (`-<id>` in `plugins`). Do not require a user `plugins` array for the
-   shipped set.
+   shipped set. Exception: the upstream Claude Agent SDK provider
+   (`packages/core/src/plugin/provider/claude-agent/**`) stays on disk for
+   sync and stays unregistered. Config must not recreate it, and client
+   lists must keep filtering it. Do not re-enable it. Anthropic remains
+   `@shuvcode/claude-plugin`. See `AGENTS.md` Shuvcode Fork.
 4. **Core may change only for:** identity, default port, XDG app id, one-shot
    DB convert script, OAuth refresh single-flight, host seams plugins cannot
    exist without, and watchlist items whose check **fails** at kickoff.

packages/app/src/composer/selection.ts

@@ -3,6 +3,7 @@ import { createStore } from "solid-js/store"
 import type { ComposerControls } from "./adapter"
 import { useLocal, type ModelKey, type ModelSelection } from "@/providers/models/selection"
 import { useWorkspaceLocation } from "@/workspaces/location"
+import { omitHiddenProviderCatalog } from "@/providers/catalog/order"
 import { useProviders } from "@/providers/catalog/providers"
 import { useData } from "@/runtime/server/current"
 import { normalizeAgentList, normalizeProviderList } from "@/runtime/server/global-sync/utils"
@@ -55,7 +56,7 @@ export function createComposerControls(input: { model?: ModelSelection } = {}) {
           const catalog = data.location.model.list(location)
 
           if (!provider || !catalog) return
-          const normalized = normalizeProviderList(provider, catalog)
+          const normalized = omitHiddenProviderCatalog(normalizeProviderList(provider, catalog))
 
           return { all: normalized.all, connected: normalized.connected }
         })

packages/app/src/providers/catalog/integrations.ts

@@ -1,6 +1,7 @@
 import { useServerSDK } from "@/runtime/server/client"
 import { useData } from "@/runtime/server/current"
 import { createEffect, type Accessor } from "solid-js"
+import { withoutHiddenProviders } from "./order"
 
 export function useIntegrations(directory: Accessor<string | undefined>) {
   const serverSDK = useServerSDK()
@@ -25,6 +26,6 @@ export function useIntegrations(directory: Accessor<string | undefined>) {
 
   return {
     ready: () => data.location.integration.list(location()) !== undefined,
-    list: () => data.location.integration.list(location()) ?? [],
+    list: () => withoutHiddenProviders(data.location.integration.list(location()) ?? []),
   }
 }

packages/app/src/providers/catalog/order.test.ts

@@ -0,0 +1,26 @@
+import { expect, test } from "bun:test"
+import { connectPopular, omitHiddenProviderCatalog, popularProviders, withoutHiddenProviders } from "./order"
+
+test("keeps Anthropic visible and drops Claude Agent from provider menus", () => {
+  expect(popularProviders).toContain("anthropic")
+  expect(connectPopular).toContain("anthropic")
+  expect(popularProviders).not.toContain("claude-agent")
+  expect(connectPopular).not.toContain("claude-agent")
+
+  expect(withoutHiddenProviders([{ id: "claude-agent" }, { id: "anthropic" }]).map((item) => item.id)).toEqual([
+    "anthropic",
+  ])
+
+  const catalog = omitHiddenProviderCatalog({
+    all: new Map<string, { name: string }>([
+      ["claude-agent", { name: "Claude Agent" }],
+      ["anthropic", { name: "Anthropic" }],
+    ]),
+    connected: ["claude-agent", "anthropic"],
+    default: { "claude-agent": "sonnet", anthropic: "claude-sonnet" },
+  })
+
+  expect([...catalog.all.keys()]).toEqual(["anthropic"])
+  expect(catalog.connected).toEqual(["anthropic"])
+  expect(catalog.default).toEqual({ anthropic: "claude-sonnet" })
+})

packages/app/src/providers/catalog/order.ts

@@ -1,11 +1,38 @@
+import { isHiddenProvider } from "@opencode/util/hidden-provider"
+
+export { isHiddenProvider }
+
 export const popularProviders = [
   "opencode-go",
   "opencode",
   "anthropic",
-  "claude-agent",
   "github-copilot",
   "openai",
   "google",
   "openrouter",
   "vercel",
 ]
+
+// Connect dialog group order. Matches the TUI priority list.
+export const connectPopular = ["opencode", "opencode-go", "openai", "github-copilot", "anthropic", "google"]
+
+// App catalogs that call these helpers omit the upstream Claude Agent id.
+// Other list surfaces call isHiddenProvider themselves.
+export function withoutHiddenProviders<T extends { id: string }>(items: readonly T[]) {
+  return items.filter((item) => !isHiddenProvider(item.id))
+}
+
+export function omitHiddenProviderCatalog<T>(catalog: {
+  all: Map<string, T>
+  connected: readonly string[]
+  default: Record<string, string>
+}) {
+  const all = new Map([...catalog.all].filter(([id]) => !isHiddenProvider(id)))
+  const connected = catalog.connected.filter((id) => !isHiddenProvider(id))
+
+  return {
+    all,
+    connected,
+    default: Object.fromEntries(Object.entries(catalog.default).filter(([id]) => !isHiddenProvider(id))),
+  }
+}

packages/app/src/providers/catalog/providers.ts

@@ -7,7 +7,7 @@ import { Iterable, pipe } from "effect"
 import { createEffect, createMemo, type Accessor } from "solid-js"
 import type { ProviderListResponse } from "@/runtime/server/types"
 import { useIntegrations } from "./integrations"
-import { popularProviders } from "./order"
+import { omitHiddenProviderCatalog, popularProviders } from "./order"
 
 export { popularProviders } from "./order"
 
@@ -49,7 +49,7 @@ export function useProviders(directory: Accessor<string | undefined>) {
 
     if (!provider || !model) return emptyProviderCatalog
 
-    return normalizeProviderList(provider, model)
+    return omitHiddenProviderCatalog(normalizeProviderList(provider, model))
   })
 
   const ready = () => {

packages/app/src/providers/connect/controller.ts

@@ -32,8 +32,6 @@ type Polling = {
 // and connects with its own methods, the same as the TUI.
 export const CONSOLE_INTEGRATION = "opencode"
 
-export const CLAUDE_AGENT_INTEGRATION = "claude-agent"
-
 // Same order as the TUI: browser and command sign-ins first, API keys last.
 export function connectMethods(integration: IntegrationInfo) {
   return integration.methods