map Claude Code model strings to OpenCode format with proper object structure

The installer was writing Antigravity provider config and calling a no-op addAuthPlugins function. Since opencode-antigravity-auth is no longer auto-installed and OpenCode supports native Google/Gemini auth, all Antigravity-related installer code is dead. Gemini detection now checks for native google provider instead.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>

src/cli/cli-installer.test.ts

@@ -21,19 +21,9 @@ describe("runCliInstaller", () => {
     console.error = originalConsoleError
   })
 
-  it("runs auth and provider setup steps when openai or copilot are enabled without gemini", async () => {
+  it("completes installation without auth plugin or provider config steps", async () => {
     //#given
-    const addAuthPluginsSpy = spyOn(configManager, "addAuthPlugins").mockResolvedValue({
-      success: true,
-      configPath: "/tmp/opencode.jsonc",
-    })
-    const addProviderConfigSpy = spyOn(configManager, "addProviderConfig").mockReturnValue({
-      success: true,
-      configPath: "/tmp/opencode.jsonc",
-    })
     const restoreSpies = [
-      addAuthPluginsSpy,
-      addProviderConfigSpy,
       spyOn(configManager, "detectCurrentConfig").mockReturnValue({
         isInstalled: false,
         hasClaude: false,
@@ -73,8 +63,6 @@ describe("runCliInstaller", () => {
 
     //#then
     expect(result).toBe(0)
-    expect(addAuthPluginsSpy).toHaveBeenCalledTimes(1)
-    expect(addProviderConfigSpy).toHaveBeenCalledTimes(1)
 
     for (const spy of restoreSpies) {
       spy.mockRestore()

src/cli/cli-installer.ts

@@ -1,9 +1,7 @@
 import color from "picocolors"
 import type { InstallArgs } from "./types"
 import {
-  addAuthPlugins,
   addPluginToOpenCodeConfig,
-  addProviderConfig,
   detectCurrentConfig,
   getOpenCodeVersion,
   isOpenCodeInstalled,
@@ -45,7 +43,7 @@ export async function runCliInstaller(args: InstallArgs, version: string): Promi
 
   printHeader(isUpdate)
 
-  const totalSteps = 6
+  const totalSteps = 4
   let step = 1
 
   printStep(step++, totalSteps, "Checking OpenCode installation...")
@@ -77,28 +75,6 @@ export async function runCliInstaller(args: InstallArgs, version: string): Promi
     `Plugin ${isUpdate ? "verified" : "added"} ${SYMBOLS.arrow} ${color.dim(pluginResult.configPath)}`,
   )
 
-  const needsProviderSetup = config.hasGemini || config.hasOpenAI || config.hasCopilot
-
-  if (needsProviderSetup) {
-    printStep(step++, totalSteps, "Adding auth plugins...")
-    const authResult = await addAuthPlugins(config)
-    if (!authResult.success) {
-      printError(`Failed: ${authResult.error}`)
-      return 1
-    }
-    printSuccess(`Auth plugins configured ${SYMBOLS.arrow} ${color.dim(authResult.configPath)}`)
-
-    printStep(step++, totalSteps, "Adding provider configurations...")
-    const providerResult = addProviderConfig(config)
-    if (!providerResult.success) {
-      printError(`Failed: ${providerResult.error}`)
-      return 1
-    }
-    printSuccess(`Providers configured ${SYMBOLS.arrow} ${color.dim(providerResult.configPath)}`)
-  } else {
-    step += 2
-  }
-
   printStep(step++, totalSteps, "Writing oh-my-opencode configuration...")
   const omoResult = writeOmoConfig(config)
   if (!omoResult.success) {
@@ -156,7 +132,7 @@ export async function runCliInstaller(args: InstallArgs, version: string): Promi
     printBox(
       `Run ${color.cyan("opencode auth login")} and select your provider:\n` +
         (config.hasClaude ? `  ${SYMBOLS.bullet} Anthropic ${color.gray("→ Claude Pro/Max")}\n` : "") +
-        (config.hasGemini ? `  ${SYMBOLS.bullet} Google ${color.gray("→ OAuth with Antigravity")}\n` : "") +
+        (config.hasGemini ? `  ${SYMBOLS.bullet} Google ${color.gray("→ Gemini")}\n` : "") +
         (config.hasCopilot ? `  ${SYMBOLS.bullet} GitHub ${color.gray("→ Copilot")}` : ""),
       "Authenticate Your Providers",
     )

src/cli/config-manager.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test, mock, afterEach } from "bun:test"
 
-import { ANTIGRAVITY_PROVIDER_CONFIG, getPluginNameWithVersion, fetchNpmDistTags, generateOmoConfig } from "./config-manager"
+import { getPluginNameWithVersion, fetchNpmDistTags, generateOmoConfig } from "./config-manager"
 import type { InstallConfig } from "./types"
 
 describe("getPluginNameWithVersion", () => {
@@ -169,76 +169,6 @@ describe("fetchNpmDistTags", () => {
   })
 })
 
-describe("config-manager ANTIGRAVITY_PROVIDER_CONFIG", () => {
-  test("all models include full spec (limit + modalities + Antigravity label)", () => {
-    const google = (ANTIGRAVITY_PROVIDER_CONFIG as any).google
-    expect(google).toBeTruthy()
-
-    const models = google.models as Record<string, any>
-    expect(models).toBeTruthy()
-
-    const required = [
-      "antigravity-gemini-3.1-pro",
-      "antigravity-gemini-3-flash",
-      "antigravity-claude-sonnet-4-6",
-      "antigravity-claude-sonnet-4-6-thinking",
-      "antigravity-claude-opus-4-5-thinking",
-    ]
-
-    for (const key of required) {
-      const model = models[key]
-      expect(model).toBeTruthy()
-      expect(typeof model.name).toBe("string")
-      expect(model.name.includes("(Antigravity)")).toBe(true)
-
-      expect(model.limit).toBeTruthy()
-      expect(typeof model.limit.context).toBe("number")
-      expect(typeof model.limit.output).toBe("number")
-
-      expect(model.modalities).toBeTruthy()
-      expect(Array.isArray(model.modalities.input)).toBe(true)
-      expect(Array.isArray(model.modalities.output)).toBe(true)
-    }
-  })
-
-  test("Gemini models have variant definitions", () => {
-    // #given the antigravity provider config
-    const models = (ANTIGRAVITY_PROVIDER_CONFIG as any).google.models as Record<string, any>
-
-    // #when checking Gemini Pro variants
-    const pro = models["antigravity-gemini-3.1-pro"]
-    // #then should have low and high variants
-    expect(pro.variants).toBeTruthy()
-    expect(pro.variants.low).toBeTruthy()
-    expect(pro.variants.high).toBeTruthy()
-
-    // #when checking Gemini Flash variants
-    const flash = models["antigravity-gemini-3-flash"]
-    // #then should have minimal, low, medium, high variants
-    expect(flash.variants).toBeTruthy()
-    expect(flash.variants.minimal).toBeTruthy()
-    expect(flash.variants.low).toBeTruthy()
-    expect(flash.variants.medium).toBeTruthy()
-    expect(flash.variants.high).toBeTruthy()
-  })
-
-  test("Claude thinking models have variant definitions", () => {
-    // #given the antigravity provider config
-    const models = (ANTIGRAVITY_PROVIDER_CONFIG as any).google.models as Record<string, any>
-
-    // #when checking Claude thinking variants
-    const sonnetThinking = models["antigravity-claude-sonnet-4-6-thinking"]
-    const opusThinking = models["antigravity-claude-opus-4-5-thinking"]
-
-    // #then both should have low and max variants
-    for (const model of [sonnetThinking, opusThinking]) {
-      expect(model.variants).toBeTruthy()
-      expect(model.variants.low).toBeTruthy()
-      expect(model.variants.max).toBeTruthy()
-    }
-  })
-})
-
 describe("generateOmoConfig - model fallback system", () => {
   test("uses github-copilot sonnet fallback when only copilot available", () => {
     // #given user has only copilot (no max plan)

src/cli/config-manager.ts

@@ -14,9 +14,6 @@ export { writeOmoConfig } from "./config-manager/write-omo-config"
 
 export { isOpenCodeInstalled, getOpenCodeVersion } from "./config-manager/opencode-binary"
 
-export { fetchLatestVersion, addAuthPlugins } from "./config-manager/auth-plugins"
-export { ANTIGRAVITY_PROVIDER_CONFIG } from "./config-manager/antigravity-provider-configuration"
-export { addProviderConfig } from "./config-manager/add-provider-config"
 export { detectCurrentConfig } from "./config-manager/detect-current-config"
 
 export type { BunInstallResult } from "./config-manager/bun-install"

src/cli/config-manager/add-provider-config.test.ts

@@ -1,205 +0,0 @@
-import { describe, expect, it } from "bun:test"
-import { modifyProviderInJsonc } from "./jsonc-provider-editor"
-import { parseJsonc } from "../../shared/jsonc-parser"
-
-describe("modifyProviderInJsonc", () => {
-  describe("Test 1: Basic JSONC with existing provider", () => {
-    it("replaces provider value, preserves comments and other keys", () => {
-      // given
-      const content = `{
-  // my config
-  "provider": { "openai": {} },
-  "plugin": ["foo"]
-}`
-      const newProviderValue = { google: { name: "Google" } }
-
-      // when
-      const result = modifyProviderInJsonc(content, newProviderValue)
-
-      // then
-      expect(result).toContain('"google"')
-      expect(result).toContain('"plugin": ["foo"]')
-      expect(result).toContain('// my config')
-
-      // Post-write validation
-      const parsed = parseJsonc<Record<string, unknown>>(result)
-      expect(parsed).toHaveProperty('plugin')
-      expect(parsed).toHaveProperty('provider')
-    })
-  })
-
-  describe("Test 2: Comment containing '}' inside provider block", () => {
-    it("must NOT corrupt file", () => {
-      // given
-      const content = `{
-  "provider": {
-    // } this brace should be ignored
-    "openai": {}
-  },
-  "other": 1
-}`
-      const newProviderValue = { google: { name: "Google" } }
-
-      // when
-      const result = modifyProviderInJsonc(content, newProviderValue)
-
-      // then
-      expect(result).toContain('"other"')
-
-      // Post-write validation
-      const parsed = parseJsonc<Record<string, unknown>>(result)
-      expect(parsed).toHaveProperty('other')
-      expect(parsed.other).toBe(1)
-    })
-  })
-
-  describe("Test 3: Comment containing '\"provider\"' before real key", () => {
-    it("must NOT match wrong location", () => {
-      // given
-      const content = `{
-  // "provider": { "example": true }
-  "provider": { "openai": {} },
-  "other": 1
-}`
-      const newProviderValue = { google: { name: "Google" } }
-
-      // when
-      const result = modifyProviderInJsonc(content, newProviderValue)
-
-      // then
-      expect(result).toContain('"other"')
-
-      // Post-write validation
-      const parsed = parseJsonc<Record<string, unknown>>(result)
-      expect(parsed).toHaveProperty('other')
-      expect(parsed.other).toBe(1)
-      expect(parsed.provider).toHaveProperty('google')
-    })
-  })
-
-  describe("Test 4: Comment containing '{' inside provider", () => {
-    it("must NOT mess up depth", () => {
-      // given
-      const content = `{
-  "provider": {
-    // { unmatched brace in comment
-    "openai": {}
-  },
-  "other": 1
-}`
-      const newProviderValue = { google: { name: "Google" } }
-
-      // when
-      const result = modifyProviderInJsonc(content, newProviderValue)
-
-      // then
-      expect(result).toContain('"other"')
-
-      // Post-write validation
-      const parsed = parseJsonc<Record<string, unknown>>(result)
-      expect(parsed).toHaveProperty('other')
-      expect(parsed.other).toBe(1)
-    })
-  })
-
-  describe("Test 5: No existing provider key", () => {
-    it("inserts provider without corrupting", () => {
-      // given
-      const content = `{
-  // config comment
-  "plugin": ["foo"]
-}`
-      const newProviderValue = { google: { name: "Google" } }
-
-      // when
-      const result = modifyProviderInJsonc(content, newProviderValue)
-
-      // then
-      expect(result).toContain('"provider"')
-      expect(result).toContain('"plugin"')
-      expect(result).toContain('foo')
-      expect(result).toContain('// config comment')
-
-      // Post-write validation
-      const parsed = parseJsonc<Record<string, unknown>>(result)
-      expect(parsed).toHaveProperty('provider')
-      expect(parsed).toHaveProperty('plugin')
-      expect(parsed.plugin).toEqual(['foo'])
-    })
-  })
-
-  describe("Test 6: String value exactly 'provider' before real key", () => {
-    it("must NOT match wrong location", () => {
-      // given
-      const content = `{
-  "note": "provider",
-  "provider": { "openai": {} },
-  "other": 1
-}`
-      const newProviderValue = { google: { name: "Google" } }
-
-      // when
-      const result = modifyProviderInJsonc(content, newProviderValue)
-
-      // then
-      expect(result).toContain('"other"')
-      expect(result).toContain('"note": "provider"')
-
-      // Post-write validation
-      const parsed = parseJsonc<Record<string, unknown>>(result)
-      expect(parsed).toHaveProperty('other')
-      expect(parsed.other).toBe(1)
-      expect(parsed.note).toBe('provider')
-    })
-  })
-
-  describe("Test 7: Post-write validation", () => {
-    it("result file must be valid JSONC for all cases", () => {
-      // Test Case 1
-      const content1 = `{
-  "provider": { "openai": {} },
-  "plugin": ["foo"]
-}`
-      const result1 = modifyProviderInJsonc(content1, { google: {} })
-      expect(() => parseJsonc(result1)).not.toThrow()
-
-      // Test Case 2
-      const content2 = `{
-  "provider": {
-    // } comment
-    "openai": {}
-  }
-}`
-      const result2 = modifyProviderInJsonc(content2, { google: {} })
-      expect(() => parseJsonc(result2)).not.toThrow()
-
-      // Test Case 3
-      const content3 = `{
-  "plugin": ["foo"]
-}`
-      const result3 = modifyProviderInJsonc(content3, { google: {} })
-      expect(() => parseJsonc(result3)).not.toThrow()
-    })
-  })
-
-  describe("Test 8: Trailing commas preserved", () => {
-    it("file is valid JSONC with trailing commas", () => {
-      // given
-      const content = `{
-  "provider": { "openai": {}, },
-  "plugin": ["foo",],
-}`
-      const newProviderValue = { google: { name: "Google" } }
-
-      // when
-      const result = modifyProviderInJsonc(content, newProviderValue)
-
-      // then
-      expect(() => parseJsonc(result)).not.toThrow()
-
-      const parsed = parseJsonc<Record<string, unknown>>(result)
-      expect(parsed).toHaveProperty('plugin')
-      expect(parsed.plugin).toEqual(['foo'])
-    })
-  })
-})

src/cli/config-manager/add-provider-config.ts

@@ -1,82 +0,0 @@
-import { readFileSync, writeFileSync, copyFileSync } from "node:fs"
-import type { ConfigMergeResult, InstallConfig } from "../types"
-import { getConfigDir } from "./config-context"
-import { ensureConfigDirectoryExists } from "./ensure-config-directory-exists"
-import { formatErrorWithSuggestion } from "./format-error-with-suggestion"
-import { detectConfigFormat } from "./opencode-config-format"
-import { parseOpenCodeConfigFileWithError, type OpenCodeConfig } from "./parse-opencode-config-file"
-import { ANTIGRAVITY_PROVIDER_CONFIG } from "./antigravity-provider-configuration"
-import { modifyProviderInJsonc } from "./jsonc-provider-editor"
-import { parseJsonc } from "../../shared/jsonc-parser"
-
-export function addProviderConfig(config: InstallConfig): ConfigMergeResult {
-  try {
-    ensureConfigDirectoryExists()
-  } catch (err) {
-    return {
-      success: false,
-      configPath: getConfigDir(),
-      error: formatErrorWithSuggestion(err, "create config directory"),
-    }
-  }
-
-  const { format, path } = detectConfigFormat()
-
-  try {
-    let existingConfig: OpenCodeConfig | null = null
-    if (format !== "none") {
-      const parseResult = parseOpenCodeConfigFileWithError(path)
-      if (parseResult.error && !parseResult.config) {
-        return {
-          success: false,
-          configPath: path,
-          error: `Failed to parse config file: ${parseResult.error}`,
-        }
-      }
-      existingConfig = parseResult.config
-    }
-
-    const newConfig = { ...(existingConfig ?? {}) }
-    const providers = (newConfig.provider ?? {}) as Record<string, unknown>
-
-    if (config.hasGemini) {
-      providers.google = ANTIGRAVITY_PROVIDER_CONFIG.google
-    }
-
-    if (Object.keys(providers).length > 0) {
-      newConfig.provider = providers
-    }
-
-    if (format === "jsonc") {
-      const content = readFileSync(path, "utf-8")
-
-      // Backup original file
-      copyFileSync(path, `${path}.bak`)
-
-      const providerValue = (newConfig.provider ?? {}) as Record<string, unknown>
-      const newContent = modifyProviderInJsonc(content, providerValue)
-
-      // Post-write validation
-      try {
-        parseJsonc(newContent)
-      } catch (error) {
-        return {
-          success: false,
-          configPath: path,
-          error: `Generated JSONC is invalid: ${error instanceof Error ? error.message : String(error)}`,
-        }
-      }
-
-      writeFileSync(path, newContent)
-    } else {
-      writeFileSync(path, JSON.stringify(newConfig, null, 2) + "\n")
-    }
-    return { success: true, configPath: path }
-  } catch (err) {
-    return {
-      success: false,
-      configPath: path,
-      error: formatErrorWithSuggestion(err, "add provider config"),
-    }
-  }
-}

src/cli/config-manager/antigravity-provider-configuration.ts

@@ -1,64 +0,0 @@
-/**
- * Antigravity Provider Configuration
- *
- * IMPORTANT: Model names MUST use `antigravity-` prefix for stability.
- *
- * Since opencode-antigravity-auth v1.3.0, models use a variant system:
- * - `antigravity-gemini-3.1-pro` with variants: low, high
- * - `antigravity-gemini-3-flash` with variants: minimal, low, medium, high
- *
- * Legacy tier-suffixed names (e.g., `antigravity-gemini-3.1-pro-high`) still work
- * but variants are the recommended approach.
- *
- * @see https://github.com/NoeFabris/opencode-antigravity-auth#models
- */
-export const ANTIGRAVITY_PROVIDER_CONFIG = {
-  google: {
-    name: "Google",
-    models: {
-      "antigravity-gemini-3.1-pro": {
-        name: "Gemini 3 Pro (Antigravity)",
-        limit: { context: 1048576, output: 65535 },
-        modalities: { input: ["text", "image", "pdf"], output: ["text"] },
-        variants: {
-          low: { thinkingLevel: "low" },
-          high: { thinkingLevel: "high" },
-        },
-      },
-      "antigravity-gemini-3-flash": {
-        name: "Gemini 3 Flash (Antigravity)",
-        limit: { context: 1048576, output: 65536 },
-        modalities: { input: ["text", "image", "pdf"], output: ["text"] },
-        variants: {
-          minimal: { thinkingLevel: "minimal" },
-          low: { thinkingLevel: "low" },
-          medium: { thinkingLevel: "medium" },
-          high: { thinkingLevel: "high" },
-        },
-      },
-      "antigravity-claude-sonnet-4-6": {
-        name: "Claude Sonnet 4.6 (Antigravity)",
-        limit: { context: 200000, output: 64000 },
-        modalities: { input: ["text", "image", "pdf"], output: ["text"] },
-      },
-      "antigravity-claude-sonnet-4-6-thinking": {
-        name: "Claude Sonnet 4.6 Thinking (Antigravity)",
-        limit: { context: 200000, output: 64000 },
-        modalities: { input: ["text", "image", "pdf"], output: ["text"] },
-        variants: {
-          low: { thinkingConfig: { thinkingBudget: 8192 } },
-          max: { thinkingConfig: { thinkingBudget: 32768 } },
-        },
-      },
-      "antigravity-claude-opus-4-5-thinking": {
-        name: "Claude Opus 4.5 Thinking (Antigravity)",
-        limit: { context: 200000, output: 64000 },
-        modalities: { input: ["text", "image", "pdf"], output: ["text"] },
-        variants: {
-          low: { thinkingConfig: { thinkingBudget: 8192 } },
-          max: { thinkingConfig: { thinkingBudget: 32768 } },
-        },
-      },
-    },
-  },
-}

src/cli/config-manager/auth-plugins.test.ts

@@ -1,230 +0,0 @@
-import { describe, expect, it, beforeEach, afterEach, spyOn } from "bun:test"
-import { tmpdir } from "node:os"
-import { join } from "node:path"
-import { writeFileSync, readFileSync, existsSync, rmSync, mkdirSync } from "node:fs"
-import { parseJsonc } from "../../shared/jsonc-parser"
-import type { InstallConfig } from "../types"
-import { resetConfigContext } from "./config-context"
-
-let testConfigPath: string
-let testConfigDir: string
-let testCounter = 0
-let fetchVersionSpy: unknown
-
-beforeEach(async () => {
-  testCounter++
-  testConfigDir = join(tmpdir(), `test-opencode-${Date.now()}-${testCounter}`)
-  testConfigPath = join(testConfigDir, "opencode.jsonc")
-  mkdirSync(testConfigDir, { recursive: true })
-
-  process.env.OPENCODE_CONFIG_DIR = testConfigDir
-  resetConfigContext()
-
-  const module = await import("./auth-plugins")
-  fetchVersionSpy = spyOn(module, "fetchLatestVersion").mockResolvedValue("1.2.3")
-})
-
-afterEach(() => {
-  try {
-    rmSync(testConfigDir, { recursive: true, force: true })
-  } catch {}
-})
-
-const testConfig: InstallConfig = {
-  hasClaude: false,
-  isMax20: false,
-  hasOpenAI: false,
-  hasGemini: true,
-  hasCopilot: false,
-  hasOpencodeZen: false,
-  hasZaiCodingPlan: false,
-  hasKimiForCoding: false,
-}
-
-describe("addAuthPlugins", () => {
-  describe("Test 1: JSONC with commented plugin line", () => {
-    it("preserves comment, does NOT add antigravity plugin", async () => {
-      const content = `{
-  // "plugin": ["old-plugin"]
-  "plugin": ["existing-plugin"],
-  "provider": {}
-}`
-      writeFileSync(testConfigPath, content, "utf-8")
-
-      const { addAuthPlugins } = await import("./auth-plugins")
-      const result = await addAuthPlugins(testConfig)
-
-      expect(result.success).toBe(true)
-
-      const newContent = readFileSync(result.configPath, "utf-8")
-      expect(newContent).toContain('// "plugin": ["old-plugin"]')
-      expect(newContent).toContain('existing-plugin')
-      // antigravity plugin should NOT be auto-added anymore
-      expect(newContent).not.toContain('opencode-antigravity-auth')
-
-      const parsed = parseJsonc<Record<string, unknown>>(newContent)
-      const plugins = parsed.plugin as string[]
-      expect(plugins).toContain('existing-plugin')
-      expect(plugins.some((p) => p.startsWith('opencode-antigravity-auth'))).toBe(false)
-    })
-  })
-
-  describe("Test 2: Plugin array already contains antigravity", () => {
-    it("preserves existing antigravity, does not add another", async () => {
-      const content = `{
-  "plugin": ["existing-plugin", "opencode-antigravity-auth"],
-  "provider": {}
-}`
-      writeFileSync(testConfigPath, content, "utf-8")
-
-      const { addAuthPlugins } = await import("./auth-plugins")
-      const result = await addAuthPlugins(testConfig)
-
-      expect(result.success).toBe(true)
-
-      const newContent = readFileSync(testConfigPath, "utf-8")
-      const parsed = parseJsonc<Record<string, unknown>>(newContent)
-      const plugins = parsed.plugin as string[]
-
-      const antigravityCount = plugins.filter((p) => p.startsWith('opencode-antigravity-auth')).length
-      expect(antigravityCount).toBe(1)
-      expect(plugins).toContain('existing-plugin')
-    })
-  })
-
-  describe("Test 3: Backup created before write", () => {
-    it("creates .bak file", async () => {
-      const originalContent = `{
-  "plugin": ["existing-plugin"],
-  "provider": {}
-}`
-      writeFileSync(testConfigPath, originalContent, "utf-8")
-      readFileSync(testConfigPath, "utf-8")
-
-      const { addAuthPlugins } = await import("./auth-plugins")
-      const result = await addAuthPlugins(testConfig)
-
-      expect(result.success).toBe(true)
-      expect(existsSync(`${result.configPath}.bak`)).toBe(true)
-
-      const backupContent = readFileSync(`${result.configPath}.bak`, "utf-8")
-      expect(backupContent).toBe(originalContent)
-    })
-  })
-
-  describe("Test 4: Comment with } character", () => {
-    it("preserves comments with special characters", async () => {
-      const content = `{
-  // This comment has } special characters
-  "plugin": ["existing-plugin"],
-  "provider": {}
-}`
-      writeFileSync(testConfigPath, content, "utf-8")
-
-      const { addAuthPlugins } = await import("./auth-plugins")
-      const result = await addAuthPlugins(testConfig)
-
-      expect(result.success).toBe(true)
-
-      const newContent = readFileSync(testConfigPath, "utf-8")
-      expect(newContent).toContain('// This comment has } special characters')
-
-      expect(() => parseJsonc(newContent)).not.toThrow()
-    })
-  })
-
-  describe("Test 5: Comment containing 'plugin' string", () => {
-    it("must NOT match comment location", async () => {
-      const content = `{
-  // "plugin": ["fake"]
-  "plugin": ["existing-plugin"],
-  "provider": {}
-}`
-      writeFileSync(testConfigPath, content, "utf-8")
-
-      const { addAuthPlugins } = await import("./auth-plugins")
-      const result = await addAuthPlugins(testConfig)
-
-      expect(result.success).toBe(true)
-
-      const newContent = readFileSync(testConfigPath, "utf-8")
-      expect(newContent).toContain('// "plugin": ["fake"]')
-
-      const parsed = parseJsonc<Record<string, unknown>>(newContent)
-      const plugins = parsed.plugin as string[]
-      expect(plugins).toContain('existing-plugin')
-      expect(plugins).not.toContain('fake')
-    })
-  })
-
-  describe("Test 6: No existing plugin array", () => {
-    it("creates empty plugin array when none exists, does NOT add antigravity", async () => {
-      const content = `{
-  "provider": {}
-}`
-      writeFileSync(testConfigPath, content, "utf-8")
-
-      const { addAuthPlugins } = await import("./auth-plugins")
-      const result = await addAuthPlugins(testConfig)
-
-      expect(result.success).toBe(true)
-
-      const newContent = readFileSync(result.configPath, "utf-8")
-
-      const parsed = parseJsonc<Record<string, unknown>>(newContent)
-      expect(parsed).toHaveProperty('plugin')
-      const plugins = parsed.plugin as string[]
-      // antigravity plugin should NOT be auto-added anymore
-      expect(plugins.some((p) => p.startsWith('opencode-antigravity-auth'))).toBe(false)
-      expect(plugins.length).toBe(0)
-    })
-  })
-
-  describe("Test 7: Post-write validation ensures valid JSONC", () => {
-    it("result file must be valid JSONC", async () => {
-      const content = `{
-  "plugin": ["existing-plugin"],
-  "provider": {}
-}`
-      writeFileSync(testConfigPath, content, "utf-8")
-
-      const { addAuthPlugins } = await import("./auth-plugins")
-      const result = await addAuthPlugins(testConfig)
-
-      expect(result.success).toBe(true)
-
-      const newContent = readFileSync(testConfigPath, "utf-8")
-      expect(() => parseJsonc(newContent)).not.toThrow()
-
-      const parsed = parseJsonc<Record<string, unknown>>(newContent)
-      expect(parsed).toHaveProperty('plugin')
-      expect(parsed).toHaveProperty('provider')
-    })
-  })
-
-  describe("Test 8: Multiple plugins in array", () => {
-    it("preserves existing plugins, does NOT add antigravity", async () => {
-      const content = `{
-  "plugin": ["plugin-1", "plugin-2", "plugin-3"],
-  "provider": {}
-}`
-      writeFileSync(testConfigPath, content, "utf-8")
-
-      const { addAuthPlugins } = await import("./auth-plugins")
-      const result = await addAuthPlugins(testConfig)
-
-      expect(result.success).toBe(true)
-
-      const newContent = readFileSync(result.configPath, "utf-8")
-      const parsed = parseJsonc<Record<string, unknown>>(newContent)
-      const plugins = parsed.plugin as string[]
-
-      expect(plugins).toContain('plugin-1')
-      expect(plugins).toContain('plugin-2')
-      expect(plugins).toContain('plugin-3')
-      // antigravity plugin should NOT be auto-added anymore
-      expect(plugins.some((p) => p.startsWith('opencode-antigravity-auth'))).toBe(false)
-      expect(plugins.length).toBe(3)
-    })
-  })
-})

src/cli/config-manager/auth-plugins.ts

@@ -1,140 +0,0 @@
-import { readFileSync, writeFileSync, copyFileSync, existsSync } from "node:fs"
-import { modify, applyEdits } from "jsonc-parser"
-import type { ConfigMergeResult, InstallConfig } from "../types"
-import { getConfigDir } from "./config-context"
-import { ensureConfigDirectoryExists } from "./ensure-config-directory-exists"
-import { formatErrorWithSuggestion } from "./format-error-with-suggestion"
-import { detectConfigFormat } from "./opencode-config-format"
-import { parseOpenCodeConfigFileWithError, type OpenCodeConfig } from "./parse-opencode-config-file"
-import { parseJsonc } from "../../shared/jsonc-parser"
-
-export async function fetchLatestVersion(packageName: string): Promise<string | null> {
-  try {
-    const res = await fetch(`https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`)
-    if (!res.ok) return null
-    const data = (await res.json()) as { version: string }
-    return data.version
-  } catch {
-    return null
-  }
-}
-
-export async function addAuthPlugins(config: InstallConfig): Promise<ConfigMergeResult> {
-  try {
-    ensureConfigDirectoryExists()
-  } catch (err) {
-    return {
-      success: false,
-      configPath: getConfigDir(),
-      error: formatErrorWithSuggestion(err, "create config directory"),
-    }
-  }
-
-  const { format, path } = detectConfigFormat()
-  const backupPath = `${path}.bak`
-
-  try {
-    let existingConfig: OpenCodeConfig | null = null
-    if (format !== "none") {
-      const parseResult = parseOpenCodeConfigFileWithError(path)
-      if (parseResult.error && !parseResult.config) {
-        return {
-          success: false,
-          configPath: path,
-          error: `Failed to parse config file: ${parseResult.error}`,
-        }
-      }
-      existingConfig = parseResult.config
-    }
-
-    const rawPlugins = existingConfig?.plugin
-    const plugins: string[] = Array.isArray(rawPlugins) ? rawPlugins : []
-
-    // Note: opencode-antigravity-auth plugin auto-installation has been removed
-    // Users can manually add auth plugins if needed
-
-    const newConfig = { ...(existingConfig ?? {}), plugin: plugins }
-
-    if (format !== "none" && existsSync(path)) {
-      copyFileSync(path, backupPath)
-    }
-
-    if (format === "jsonc") {
-      const content = readFileSync(path, "utf-8")
-
-      const newContent = applyEdits(
-        content,
-        modify(content, ["plugin"], plugins, {
-          formattingOptions: { tabSize: 2, insertSpaces: true },
-        })
-      )
-
-      try {
-        parseJsonc(newContent)
-      } catch (error) {
-        if (existsSync(backupPath)) {
-          copyFileSync(backupPath, path)
-        }
-        throw new Error(`Generated JSONC is invalid: ${error instanceof Error ? error.message : String(error)}`)
-      }
-
-      try {
-        writeFileSync(path, newContent)
-      } catch (error) {
-        const hasBackup = existsSync(backupPath)
-        try {
-          if (hasBackup) {
-            copyFileSync(backupPath, path)
-          }
-        } catch (restoreError) {
-          return {
-            success: false,
-            configPath: path,
-            error: `Failed to write config file, and restore from backup failed: ${String(error)}; restore error: ${String(restoreError)}`,
-          }
-        }
-
-        return {
-          success: false,
-          configPath: path,
-          error: hasBackup
-            ? `Failed to write config file. Restored from backup: ${String(error)}`
-            : `Failed to write config file. No backup was available: ${String(error)}`,
-        }
-      }
-    } else {
-      const nextContent = JSON.stringify(newConfig, null, 2) + "\n"
-      try {
-        writeFileSync(path, nextContent)
-      } catch (error) {
-        const hasBackup = existsSync(backupPath)
-        try {
-          if (hasBackup) {
-            copyFileSync(backupPath, path)
-          }
-        } catch (restoreError) {
-          return {
-            success: false,
-            configPath: path,
-            error: `Failed to write config file, and restore from backup failed: ${String(error)}; restore error: ${String(restoreError)}`,
-          }
-        }
-
-        return {
-          success: false,
-          configPath: path,
-          error: hasBackup
-            ? `Failed to write config file. Restored from backup: ${String(error)}`
-            : `Failed to write config file. No backup was available: ${String(error)}`,
-        }
-      }
-    }
-    return { success: true, configPath: path }
-  } catch (err) {
-    return {
-      success: false,
-      configPath: path,
-      error: formatErrorWithSuggestion(err, "add auth plugins to config"),
-    }
-  }
-}

src/cli/config-manager/detect-current-config.ts

@@ -66,7 +66,8 @@ export function detectCurrentConfig(): DetectedConfig {
     return result
   }
 
-  result.hasGemini = plugins.some((p) => p.startsWith("opencode-antigravity-auth"))
+  const providers = openCodeConfig.provider as Record<string, unknown> | undefined
+  result.hasGemini = providers ? "google" in providers : false
 
   const { hasOpenAI, hasOpencodeZen, hasZaiCodingPlan, hasKimiForCoding } = detectProvidersFromOmoConfig()
   result.hasOpenAI = hasOpenAI

src/cli/config-manager/jsonc-provider-editor.ts

@@ -1,11 +0,0 @@
-import { modify, applyEdits } from "jsonc-parser"
-
-export function modifyProviderInJsonc(
-  content: string,
-  newProviderValue: Record<string, unknown>
-): string {
-  const edits = modify(content, ["provider"], newProviderValue, {
-    formattingOptions: { tabSize: 2, insertSpaces: true },
-  })
-  return applyEdits(content, edits)
-}

src/cli/tui-installer.ts

@@ -2,9 +2,7 @@ import * as p from "@clack/prompts"
 import color from "picocolors"
 import type { InstallArgs } from "./types"
 import {
-  addAuthPlugins,
   addPluginToOpenCodeConfig,
-  addProviderConfig,
   detectCurrentConfig,
   getOpenCodeVersion,
   isOpenCodeInstalled,
@@ -54,26 +52,6 @@ export async function runTuiInstaller(args: InstallArgs, version: string): Promi
   }
   spinner.stop(`Plugin added to ${color.cyan(pluginResult.configPath)}`)
 
-  if (config.hasGemini) {
-    spinner.start("Adding auth plugins (fetching latest versions)")
-    const authResult = await addAuthPlugins(config)
-    if (!authResult.success) {
-      spinner.stop(`Failed to add auth plugins: ${authResult.error}`)
-      p.outro(color.red("Installation failed."))
-      return 1
-    }
-    spinner.stop(`Auth plugins added to ${color.cyan(authResult.configPath)}`)
-
-    spinner.start("Adding provider configurations")
-    const providerResult = addProviderConfig(config)
-    if (!providerResult.success) {
-      spinner.stop(`Failed to add provider config: ${providerResult.error}`)
-      p.outro(color.red("Installation failed."))
-      return 1
-    }
-    spinner.stop(`Provider config added to ${color.cyan(providerResult.configPath)}`)
-  }
-
   spinner.start("Writing oh-my-opencode configuration")
   const omoResult = writeOmoConfig(config)
   if (!omoResult.success) {
@@ -123,7 +101,7 @@ export async function runTuiInstaller(args: InstallArgs, version: string): Promi
   if ((config.hasClaude || config.hasGemini || config.hasCopilot) && !args.skipAuth) {
     const providers: string[] = []
     if (config.hasClaude) providers.push(`Anthropic ${color.gray("→ Claude Pro/Max")}`)
-    if (config.hasGemini) providers.push(`Google ${color.gray("→ OAuth with Antigravity")}`)
+    if (config.hasGemini) providers.push(`Google ${color.gray("→ Gemini")}`)
     if (config.hasCopilot) providers.push(`GitHub ${color.gray("→ Copilot")}`)
 
     console.log()

src/features/builtin-skills/agent-browser/SKILL.md

@@ -26,29 +26,35 @@ agent-browser close             # Close browser
 
 ### Navigation
 ```bash
-agent-browser open <url>      # Navigate to URL
+agent-browser open <url>      # Navigate to URL (aliases: goto, navigate)
 agent-browser back            # Go back
 agent-browser forward         # Go forward
 agent-browser reload          # Reload page
-agent-browser close           # Close browser
+agent-browser close           # Close browser (aliases: quit, exit)
 ```
 
 ### Snapshot (page analysis)
 ```bash
 agent-browser snapshot            # Full accessibility tree
 agent-browser snapshot -i         # Interactive elements only (recommended)
-agent-browser snapshot -c         # Compact output
+agent-browser snapshot -i -C      # Include cursor-interactive elements (divs with onclick, etc.)
+agent-browser snapshot -c         # Compact (remove empty structural elements)
 agent-browser snapshot -d 3       # Limit depth to 3
 agent-browser snapshot -s "#main" # Scope to CSS selector
+agent-browser snapshot -i -c -d 5 # Combine options
 ```
 
+The `-C` flag is useful for modern web apps that use custom clickable elements (divs, spans) instead of standard buttons/links.
+
 ### Interactions (use @refs from snapshot)
 ```bash
-agent-browser click @e1           # Click
+agent-browser click @e1           # Click (--new-tab to open in new tab)
 agent-browser dblclick @e1        # Double-click
 agent-browser focus @e1           # Focus element
 agent-browser fill @e2 "text"     # Clear and type
 agent-browser type @e2 "text"     # Type without clearing
+agent-browser keyboard type "text"     # Type with real keystrokes (no selector, current focus)
+agent-browser keyboard inserttext "text"  # Insert text without key events (no selector)
 agent-browser press Enter         # Press key
 agent-browser press Control+a     # Key combination
 agent-browser keydown Shift       # Hold key down
@@ -57,8 +63,8 @@ agent-browser hover @e1           # Hover
 agent-browser check @e1           # Check checkbox
 agent-browser uncheck @e1         # Uncheck checkbox
 agent-browser select @e1 "value"  # Select dropdown
-agent-browser scroll down 500     # Scroll page
-agent-browser scrollintoview @e1  # Scroll element into view
+agent-browser scroll down 500     # Scroll page (--selector <sel> for container)
+agent-browser scrollintoview @e1  # Scroll element into view (alias: scrollinto)
 agent-browser drag @e1 @e2        # Drag and drop
 agent-browser upload @e1 file.pdf # Upload files
 ```
@@ -73,6 +79,7 @@ agent-browser get title           # Get page title
 agent-browser get url             # Get current URL
 agent-browser get count ".item"   # Count matching elements
 agent-browser get box @e1         # Get bounding box
+agent-browser get styles @e1      # Get computed styles
 ```
 
 ### Check state
@@ -84,12 +91,20 @@ agent-browser is checked @e1      # Check if checked
 
 ### Screenshots & PDF
 ```bash
-agent-browser screenshot          # Screenshot to stdout
+agent-browser screenshot          # Screenshot (saves to temp dir if no path)
 agent-browser screenshot path.png # Save to file
 agent-browser screenshot --full   # Full page
+agent-browser screenshot --annotate   # Annotated screenshot with numbered element labels
 agent-browser pdf output.pdf      # Save as PDF
 ```
 
+Annotated screenshots overlay numbered labels `[N]` on interactive elements. Each label corresponds to ref `@eN`, so refs work for both visual and text workflows:
+```bash
+agent-browser screenshot --annotate ./page.png
+# Output: [1] @e1 button "Submit", [2] @e2 link "Home", [3] @e3 textbox "Email"
+agent-browser click @e2     # Click the "Home" link labeled [2]
+```
+
 ### Video recording
 ```bash
 agent-browser record start ./demo.webm    # Start recording (uses current URL + state)
@@ -109,10 +124,12 @@ agent-browser wait --load networkidle      # Wait for network idle
 agent-browser wait --fn "window.ready"     # Wait for JS condition
 ```
 
+Load states: `load`, `domcontentloaded`, `networkidle`
+
 ### Mouse control
 ```bash
 agent-browser mouse move 100 200      # Move mouse
-agent-browser mouse down left         # Press button
+agent-browser mouse down left         # Press button (left/right/middle)
 agent-browser mouse up left           # Release button
 agent-browser mouse wheel 100         # Scroll wheel
 ```
@@ -122,10 +139,18 @@ agent-browser mouse wheel 100         # Scroll wheel
 agent-browser find role button click --name "Submit"
 agent-browser find text "Sign In" click
 agent-browser find label "Email" fill "user@test.com"
+agent-browser find placeholder "Search..." fill "query"
+agent-browser find alt "Logo" click
+agent-browser find title "Close" click
+agent-browser find testid "submit-btn" click
 agent-browser find first ".item" click
+agent-browser find last ".item" click
 agent-browser find nth 2 "a" text
 ```
 
+Actions: `click`, `fill`, `type`, `hover`, `focus`, `check`, `uncheck`, `text`
+Options: `--name <name>` (filter role by accessible name), `--exact` (require exact text match)
+
 ### Browser settings
 ```bash
 agent-browser set viewport 1920 1080      # Set viewport size
@@ -142,14 +167,13 @@ agent-browser set media dark              # Emulate color scheme
 agent-browser cookies                     # Get all cookies
 agent-browser cookies set name value      # Set cookie
 agent-browser cookies clear               # Clear cookies
+
 agent-browser storage local               # Get all localStorage
 agent-browser storage local key           # Get specific key
 agent-browser storage local set k v       # Set value
 agent-browser storage local clear         # Clear all
-agent-browser storage session             # Get all sessionStorage
-agent-browser storage session key         # Get specific key
-agent-browser storage session set k v     # Set value
-agent-browser storage session clear       # Clear all
+
+agent-browser storage session             # Same for sessionStorage
 ```
 
 ### Network
@@ -179,13 +203,59 @@ agent-browser frame main          # Back to main frame
 
 ### Dialogs
 ```bash
-agent-browser dialog accept [text]  # Accept dialog
+agent-browser dialog accept [text]  # Accept dialog (with optional prompt text)
 agent-browser dialog dismiss        # Dismiss dialog
 ```
 
+### Diff (compare snapshots, screenshots, URLs)
+```bash
+agent-browser diff snapshot                              # Compare current vs last snapshot
+agent-browser diff snapshot --baseline before.txt        # Compare current vs saved snapshot file
+agent-browser diff snapshot --selector "#main" --compact # Scoped snapshot diff
+agent-browser diff screenshot --baseline before.png      # Visual pixel diff against baseline
+agent-browser diff screenshot --baseline b.png -o d.png  # Save diff image to custom path
+agent-browser diff screenshot --baseline b.png -t 0.2    # Adjust color threshold (0-1)
+agent-browser diff url https://v1.com https://v2.com     # Compare two URLs (snapshot diff)
+agent-browser diff url https://v1.com https://v2.com --screenshot  # Also visual diff
+agent-browser diff url https://v1.com https://v2.com --selector "#main"  # Scope to element
+```
+
 ### JavaScript
 ```bash
 agent-browser eval "document.title"   # Run JavaScript
+agent-browser eval -b "base64code"    # Run base64-encoded JS
+agent-browser eval --stdin            # Read JS from stdin
+```
+
+### Debug & Profiling
+```bash
+agent-browser console                 # View console messages
+agent-browser console --clear         # Clear console
+agent-browser errors                  # View page errors
+agent-browser errors --clear          # Clear errors
+agent-browser highlight @e1           # Highlight element
+agent-browser trace start             # Start recording trace
+agent-browser trace stop trace.zip    # Stop and save trace
+agent-browser profiler start          # Start Chrome DevTools profiling
+agent-browser profiler stop profile.json  # Stop and save profile
+```
+
+### State management
+```bash
+agent-browser state save auth.json    # Save auth state
+agent-browser state load auth.json    # Load auth state
+agent-browser state list              # List saved state files
+agent-browser state show <file>       # Show state summary
+agent-browser state rename <old> <new>  # Rename state file
+agent-browser state clear [name]      # Clear states for session
+agent-browser state clear --all       # Clear all saved states
+agent-browser state clean --older-than <days>  # Delete old states
+```
+
+### Setup
+```bash
+agent-browser install                 # Download Chromium browser
+agent-browser install --with-deps     # Also install system deps (Linux)
 ```
 
 ## Global Options
@@ -193,19 +263,60 @@ agent-browser eval "document.title"   # Run JavaScript
 | Option | Description |
 |--------|-------------|
 | `--session <name>` | Isolated browser session (`AGENT_BROWSER_SESSION` env) |
+| `--session-name <name>` | Auto-save/restore session state (`AGENT_BROWSER_SESSION_NAME` env) |
 | `--profile <path>` | Persistent browser profile (`AGENT_BROWSER_PROFILE` env) |
+| `--state <path>` | Load storage state from JSON file (`AGENT_BROWSER_STATE` env) |
 | `--headers <json>` | HTTP headers scoped to URL's origin |
 | `--executable-path <path>` | Custom browser binary (`AGENT_BROWSER_EXECUTABLE_PATH` env) |
+| `--extension <path>` | Load browser extension (repeatable; `AGENT_BROWSER_EXTENSIONS` env) |
 | `--args <args>` | Browser launch args (`AGENT_BROWSER_ARGS` env) |
 | `--user-agent <ua>` | Custom User-Agent (`AGENT_BROWSER_USER_AGENT` env) |
 | `--proxy <url>` | Proxy server (`AGENT_BROWSER_PROXY` env) |
 | `--proxy-bypass <hosts>` | Hosts to bypass proxy (`AGENT_BROWSER_PROXY_BYPASS` env) |
+| `--ignore-https-errors` | Ignore HTTPS certificate errors |
+| `--allow-file-access` | Allow file:// URLs to access local files |
 | `-p, --provider <name>` | Cloud browser provider (`AGENT_BROWSER_PROVIDER` env) |
+| `--device <name>` | iOS device name (`AGENT_BROWSER_IOS_DEVICE` env) |
 | `--json` | Machine-readable JSON output |
-| `--headed` | Show browser window (not headless) |
+| `--full, -f` | Full page screenshot |
+| `--annotate` | Annotated screenshot with numbered labels (`AGENT_BROWSER_ANNOTATE` env) |
+| `--headed` | Show browser window (`AGENT_BROWSER_HEADED` env) |
 | `--cdp <port\|wss://url>` | Connect via Chrome DevTools Protocol |
+| `--auto-connect` | Auto-discover running Chrome (`AGENT_BROWSER_AUTO_CONNECT` env) |
+| `--color-scheme <scheme>` | Color scheme: dark, light, no-preference (`AGENT_BROWSER_COLOR_SCHEME` env) |
+| `--download-path <path>` | Default download directory (`AGENT_BROWSER_DOWNLOAD_PATH` env) |
+| `--native` | [Experimental] Use native Rust daemon (`AGENT_BROWSER_NATIVE` env) |
+| `--config <path>` | Custom config file (`AGENT_BROWSER_CONFIG` env) |
 | `--debug` | Debug output |
 
+### Security options
+| Option | Description |
+|--------|-------------|
+| `--content-boundaries` | Wrap page output in boundary markers (`AGENT_BROWSER_CONTENT_BOUNDARIES` env) |
+| `--max-output <chars>` | Truncate page output to N characters (`AGENT_BROWSER_MAX_OUTPUT` env) |
+| `--allowed-domains <list>` | Comma-separated allowed domain patterns (`AGENT_BROWSER_ALLOWED_DOMAINS` env) |
+| `--action-policy <path>` | Path to action policy JSON file (`AGENT_BROWSER_ACTION_POLICY` env) |
+| `--confirm-actions <list>` | Action categories requiring confirmation (`AGENT_BROWSER_CONFIRM_ACTIONS` env) |
+
+## Configuration file
+
+Create `agent-browser.json` for persistent defaults (no need to repeat flags):
+
+**Locations (lowest to highest priority):**
+1. `~/.agent-browser/config.json` — user-level defaults
+2. `./agent-browser.json` — project-level overrides
+3. `AGENT_BROWSER_*` environment variables
+4. CLI flags override everything
+
+```json
+{
+  "headed": true,
+  "proxy": "http://localhost:8080",
+  "profile": "./browser-data",
+  "native": true
+}
+```
+
 ## Example: Form submission
 
 ```bash
@@ -247,6 +358,13 @@ agent-browser open other-site.com
 agent-browser set headers '{"X-Custom-Header": "value"}'
 ```
 
+### Authentication Vault
+```bash
+# Store credentials locally (encrypted). The LLM never sees passwords.
+echo "pass" | agent-browser auth save github --url https://github.com/login --username user --password-stdin
+agent-browser auth login github
+```
+
 ## Sessions & Persistent Profiles
 
 ### Sessions (parallel browsers)
@@ -256,6 +374,13 @@ agent-browser --session test2 open site-b.com
 agent-browser session list
 ```
 
+### Session persistence (auto-save/restore)
+```bash
+agent-browser --session-name twitter open twitter.com
+# Login once, state persists automatically across restarts
+# State files stored in ~/.agent-browser/sessions/
+```
+
 ### Persistent Profiles
 Persists cookies, localStorage, IndexedDB, service workers, cache, login sessions across browser restarts.
 ```bash
@@ -263,9 +388,6 @@ agent-browser --profile ~/.myapp-profile open myapp.com
 # Or via env var
 AGENT_BROWSER_PROFILE=~/.myapp-profile agent-browser open myapp.com
 ```
-- Use different profile paths for different projects
-- Login once → restart browser → still logged in
-- Stores: cookies, localStorage, IndexedDB, service workers, browser cache
 
 ## JSON output (for parsing)
 
@@ -275,62 +397,54 @@ agent-browser snapshot -i --json
 agent-browser get text @e1 --json
 ```
 
-## Debugging
+## Local files
 
 ```bash
-agent-browser open example.com --headed              # Show browser window
-agent-browser console                                # View console messages
-agent-browser errors                                 # View page errors
-agent-browser record start ./debug.webm              # Record from current page
-agent-browser record stop                            # Save recording
-agent-browser connect 9222                           # Local CDP port
+agent-browser --allow-file-access open file:///path/to/document.pdf
+agent-browser --allow-file-access open file:///path/to/page.html
+```
+
+## CDP Mode
+
+```bash
+agent-browser connect 9222                                          # Local CDP port
+agent-browser --cdp 9222 snapshot                                   # Direct CDP on each command
 agent-browser --cdp "wss://browser-service.com/cdp?token=..." snapshot  # Remote via WebSocket
-agent-browser console --clear                        # Clear console
-agent-browser errors --clear                         # Clear errors
-agent-browser highlight @e1                          # Highlight element
-agent-browser trace start                            # Start recording trace
-agent-browser trace stop trace.zip                   # Stop and save trace
+agent-browser --auto-connect snapshot                               # Auto-discover running Chrome
+```
+
+## Cloud providers
+
+```bash
+# Browserbase
+BROWSERBASE_API_KEY="key" BROWSERBASE_PROJECT_ID="id" agent-browser -p browserbase open example.com
+
+# Browser Use
+BROWSER_USE_API_KEY="key" agent-browser -p browseruse open example.com
+
+# Kernel
+KERNEL_API_KEY="key" agent-browser -p kernel open example.com
+```
+
+## iOS Simulator
+
+```bash
+agent-browser device list                                        # List available simulators
+agent-browser -p ios --device "iPhone 16 Pro" open example.com   # Launch Safari
+agent-browser -p ios snapshot -i                                 # Same commands as desktop
+agent-browser -p ios tap @e1                                     # Tap
+agent-browser -p ios swipe up                                    # Mobile-specific
+agent-browser -p ios close                                       # Close session
+```
+
+## Native Mode (Experimental)
+
+Pure Rust daemon using direct CDP — no Node.js/Playwright required:
+```bash
+agent-browser --native open example.com
+# Or: export AGENT_BROWSER_NATIVE=1
+# Or: {"native": true} in agent-browser.json
 ```
 
 ---
-
-## Installation
-
-### Step 1: Install agent-browser CLI
-
-```bash
-bun add -g agent-browser
-```
-
-### Step 2: Install Playwright browsers
-
-**IMPORTANT**: `agent-browser install` may fail on some platforms (e.g., darwin-arm64) with "No binary found" error. In that case, install Playwright browsers directly:
-
-```bash
-# Create a temp project and install playwright
-cd /tmp && bun init -y && bun add playwright
-
-# Install Chromium browser
-bun playwright install chromium
-```
-
-This downloads Chrome for Testing to `~/Library/Caches/ms-playwright/`.
-
-### Verify installation
-
-```bash
-agent-browser open https://example.com --headed
-```
-
-If the browser opens successfully, installation is complete.
-
-### Troubleshooting
-
-| Error | Solution |
-|-------|----------|
-| `No binary found for darwin-arm64` | Run `bun playwright install chromium` in a project with playwright dependency |
-| `Executable doesn't exist at .../chromium-XXXX` | Re-run `bun playwright install chromium` |
-| Browser doesn't open | Ensure `--headed` flag is used for visible browser |
-
----
-Run `agent-browser --help` for all commands. Repo: https://github.com/vercel-labs/agent-browser
+Install: `bun add -g agent-browser && agent-browser install`. Run `agent-browser --help` for all commands. Repo: https://github.com/vercel-labs/agent-browser

src/features/builtin-skills/skills/playwright.ts

@@ -40,29 +40,35 @@ agent-browser close             # Close browser
 
 ### Navigation
 \`\`\`bash
-agent-browser open <url>      # Navigate to URL
+agent-browser open <url>      # Navigate to URL (aliases: goto, navigate)
 agent-browser back            # Go back
 agent-browser forward         # Go forward
 agent-browser reload          # Reload page
-agent-browser close           # Close browser
+agent-browser close           # Close browser (aliases: quit, exit)
 \`\`\`
 
 ### Snapshot (page analysis)
 \`\`\`bash
 agent-browser snapshot            # Full accessibility tree
 agent-browser snapshot -i         # Interactive elements only (recommended)
-agent-browser snapshot -c         # Compact output
+agent-browser snapshot -i -C      # Include cursor-interactive elements (divs with onclick, etc.)
+agent-browser snapshot -c         # Compact (remove empty structural elements)
 agent-browser snapshot -d 3       # Limit depth to 3
 agent-browser snapshot -s "#main" # Scope to CSS selector
+agent-browser snapshot -i -c -d 5 # Combine options
 \`\`\`
 
+The \`-C\` flag is useful for modern web apps that use custom clickable elements (divs, spans) instead of standard buttons/links.
+
 ### Interactions (use @refs from snapshot)
 \`\`\`bash
-agent-browser click @e1           # Click
+agent-browser click @e1           # Click (--new-tab to open in new tab)
 agent-browser dblclick @e1        # Double-click
 agent-browser focus @e1           # Focus element
 agent-browser fill @e2 "text"     # Clear and type
 agent-browser type @e2 "text"     # Type without clearing
+agent-browser keyboard type "text"     # Type with real keystrokes (no selector, current focus)
+agent-browser keyboard inserttext "text"  # Insert text without key events (no selector)
 agent-browser press Enter         # Press key
 agent-browser press Control+a     # Key combination
 agent-browser keydown Shift       # Hold key down
@@ -71,8 +77,8 @@ agent-browser hover @e1           # Hover
 agent-browser check @e1           # Check checkbox
 agent-browser uncheck @e1         # Uncheck checkbox
 agent-browser select @e1 "value"  # Select dropdown
-agent-browser scroll down 500     # Scroll page
-agent-browser scrollintoview @e1  # Scroll element into view
+agent-browser scroll down 500     # Scroll page (--selector <sel> for container)
+agent-browser scrollintoview @e1  # Scroll element into view (alias: scrollinto)
 agent-browser drag @e1 @e2        # Drag and drop
 agent-browser upload @e1 file.pdf # Upload files
 \`\`\`
@@ -87,6 +93,7 @@ agent-browser get title           # Get page title
 agent-browser get url             # Get current URL
 agent-browser get count ".item"   # Count matching elements
 agent-browser get box @e1         # Get bounding box
+agent-browser get styles @e1      # Get computed styles
 \`\`\`
 
 ### Check state
@@ -98,12 +105,20 @@ agent-browser is checked @e1      # Check if checked
 
 ### Screenshots & PDF
 \`\`\`bash
-agent-browser screenshot          # Screenshot to stdout
+agent-browser screenshot          # Screenshot (saves to temp dir if no path)
 agent-browser screenshot path.png # Save to file
 agent-browser screenshot --full   # Full page
+agent-browser screenshot --annotate   # Annotated screenshot with numbered element labels
 agent-browser pdf output.pdf      # Save as PDF
 \`\`\`
 
+Annotated screenshots overlay numbered labels \`[N]\` on interactive elements. Each label corresponds to ref \`@eN\`, so refs work for both visual and text workflows:
+\`\`\`bash
+agent-browser screenshot --annotate ./page.png
+# Output: [1] @e1 button "Submit", [2] @e2 link "Home", [3] @e3 textbox "Email"
+agent-browser click @e2     # Click the "Home" link labeled [2]
+\`\`\`
+
 ### Video recording
 \`\`\`bash
 agent-browser record start ./demo.webm    # Start recording (uses current URL + state)
@@ -123,10 +138,12 @@ agent-browser wait --load networkidle      # Wait for network idle
 agent-browser wait --fn "window.ready"     # Wait for JS condition
 \`\`\`
 
+Load states: \`load\`, \`domcontentloaded\`, \`networkidle\`
+
 ### Mouse control
 \`\`\`bash
 agent-browser mouse move 100 200      # Move mouse
-agent-browser mouse down left         # Press button
+agent-browser mouse down left         # Press button (left/right/middle)
 agent-browser mouse up left           # Release button
 agent-browser mouse wheel 100         # Scroll wheel
 \`\`\`
@@ -136,10 +153,18 @@ agent-browser mouse wheel 100         # Scroll wheel
 agent-browser find role button click --name "Submit"
 agent-browser find text "Sign In" click
 agent-browser find label "Email" fill "user@test.com"
+agent-browser find placeholder "Search..." fill "query"
+agent-browser find alt "Logo" click
+agent-browser find title "Close" click
+agent-browser find testid "submit-btn" click
 agent-browser find first ".item" click
+agent-browser find last ".item" click
 agent-browser find nth 2 "a" text
 \`\`\`
 
+Actions: \`click\`, \`fill\`, \`type\`, \`hover\`, \`focus\`, \`check\`, \`uncheck\`, \`text\`
+Options: \`--name <name>\` (filter role by accessible name), \`--exact\` (require exact text match)
+
 ### Browser settings
 \`\`\`bash
 agent-browser set viewport 1920 1080      # Set viewport size
@@ -156,14 +181,13 @@ agent-browser set media dark              # Emulate color scheme
 agent-browser cookies                     # Get all cookies
 agent-browser cookies set name value      # Set cookie
 agent-browser cookies clear               # Clear cookies
+
 agent-browser storage local               # Get all localStorage
 agent-browser storage local key           # Get specific key
 agent-browser storage local set k v       # Set value
 agent-browser storage local clear         # Clear all
-agent-browser storage session             # Get all sessionStorage
-agent-browser storage session key         # Get specific key
-agent-browser storage session set k v     # Set value
-agent-browser storage session clear       # Clear all
+
+agent-browser storage session             # Same for sessionStorage
 \`\`\`
 
 ### Network
@@ -193,13 +217,59 @@ agent-browser frame main          # Back to main frame
 
 ### Dialogs
 \`\`\`bash
-agent-browser dialog accept [text]  # Accept dialog
+agent-browser dialog accept [text]  # Accept dialog (with optional prompt text)
 agent-browser dialog dismiss        # Dismiss dialog
 \`\`\`
 
+### Diff (compare snapshots, screenshots, URLs)
+\`\`\`bash
+agent-browser diff snapshot                              # Compare current vs last snapshot
+agent-browser diff snapshot --baseline before.txt        # Compare current vs saved snapshot file
+agent-browser diff snapshot --selector "#main" --compact # Scoped snapshot diff
+agent-browser diff screenshot --baseline before.png      # Visual pixel diff against baseline
+agent-browser diff screenshot --baseline b.png -o d.png  # Save diff image to custom path
+agent-browser diff screenshot --baseline b.png -t 0.2    # Adjust color threshold (0-1)
+agent-browser diff url https://v1.com https://v2.com     # Compare two URLs (snapshot diff)
+agent-browser diff url https://v1.com https://v2.com --screenshot  # Also visual diff
+agent-browser diff url https://v1.com https://v2.com --selector "#main"  # Scope to element
+\`\`\`
+
 ### JavaScript
 \`\`\`bash
 agent-browser eval "document.title"   # Run JavaScript
+agent-browser eval -b "base64code"    # Run base64-encoded JS
+agent-browser eval --stdin            # Read JS from stdin
+\`\`\`
+
+### Debug & Profiling
+\`\`\`bash
+agent-browser console                 # View console messages
+agent-browser console --clear         # Clear console
+agent-browser errors                  # View page errors
+agent-browser errors --clear          # Clear errors
+agent-browser highlight @e1           # Highlight element
+agent-browser trace start             # Start recording trace
+agent-browser trace stop trace.zip    # Stop and save trace
+agent-browser profiler start          # Start Chrome DevTools profiling
+agent-browser profiler stop profile.json  # Stop and save profile
+\`\`\`
+
+### State management
+\`\`\`bash
+agent-browser state save auth.json    # Save auth state
+agent-browser state load auth.json    # Load auth state
+agent-browser state list              # List saved state files
+agent-browser state show <file>       # Show state summary
+agent-browser state rename <old> <new>  # Rename state file
+agent-browser state clear [name]      # Clear states for session
+agent-browser state clear --all       # Clear all saved states
+agent-browser state clean --older-than <days>  # Delete old states
+\`\`\`
+
+### Setup
+\`\`\`bash
+agent-browser install                 # Download Chromium browser
+agent-browser install --with-deps     # Also install system deps (Linux)
 \`\`\`
 
 ## Global Options
@@ -207,19 +277,60 @@ agent-browser eval "document.title"   # Run JavaScript
 | Option | Description |
 |--------|-------------|
 | \`--session <name>\` | Isolated browser session (\`AGENT_BROWSER_SESSION\` env) |
+| \`--session-name <name>\` | Auto-save/restore session state (\`AGENT_BROWSER_SESSION_NAME\` env) |
 | \`--profile <path>\` | Persistent browser profile (\`AGENT_BROWSER_PROFILE\` env) |
+| \`--state <path>\` | Load storage state from JSON file (\`AGENT_BROWSER_STATE\` env) |
 | \`--headers <json>\` | HTTP headers scoped to URL's origin |
 | \`--executable-path <path>\` | Custom browser binary (\`AGENT_BROWSER_EXECUTABLE_PATH\` env) |
+| \`--extension <path>\` | Load browser extension (repeatable; \`AGENT_BROWSER_EXTENSIONS\` env) |
 | \`--args <args>\` | Browser launch args (\`AGENT_BROWSER_ARGS\` env) |
 | \`--user-agent <ua>\` | Custom User-Agent (\`AGENT_BROWSER_USER_AGENT\` env) |
 | \`--proxy <url>\` | Proxy server (\`AGENT_BROWSER_PROXY\` env) |
 | \`--proxy-bypass <hosts>\` | Hosts to bypass proxy (\`AGENT_BROWSER_PROXY_BYPASS\` env) |
+| \`--ignore-https-errors\` | Ignore HTTPS certificate errors |
+| \`--allow-file-access\` | Allow file:// URLs to access local files |
 | \`-p, --provider <name>\` | Cloud browser provider (\`AGENT_BROWSER_PROVIDER\` env) |
+| \`--device <name>\` | iOS device name (\`AGENT_BROWSER_IOS_DEVICE\` env) |
 | \`--json\` | Machine-readable JSON output |
-| \`--headed\` | Show browser window (not headless) |
+| \`--full, -f\` | Full page screenshot |
+| \`--annotate\` | Annotated screenshot with numbered labels (\`AGENT_BROWSER_ANNOTATE\` env) |
+| \`--headed\` | Show browser window (\`AGENT_BROWSER_HEADED\` env) |
 | \`--cdp <port\\|wss://url>\` | Connect via Chrome DevTools Protocol |
+| \`--auto-connect\` | Auto-discover running Chrome (\`AGENT_BROWSER_AUTO_CONNECT\` env) |
+| \`--color-scheme <scheme>\` | Color scheme: dark, light, no-preference (\`AGENT_BROWSER_COLOR_SCHEME\` env) |
+| \`--download-path <path>\` | Default download directory (\`AGENT_BROWSER_DOWNLOAD_PATH\` env) |
+| \`--native\` | [Experimental] Use native Rust daemon (\`AGENT_BROWSER_NATIVE\` env) |
+| \`--config <path>\` | Custom config file (\`AGENT_BROWSER_CONFIG\` env) |
 | \`--debug\` | Debug output |
 
+### Security options
+| Option | Description |
+|--------|-------------|
+| \`--content-boundaries\` | Wrap page output in boundary markers (\`AGENT_BROWSER_CONTENT_BOUNDARIES\` env) |
+| \`--max-output <chars>\` | Truncate page output to N characters (\`AGENT_BROWSER_MAX_OUTPUT\` env) |
+| \`--allowed-domains <list>\` | Comma-separated allowed domain patterns (\`AGENT_BROWSER_ALLOWED_DOMAINS\` env) |
+| \`--action-policy <path>\` | Path to action policy JSON file (\`AGENT_BROWSER_ACTION_POLICY\` env) |
+| \`--confirm-actions <list>\` | Action categories requiring confirmation (\`AGENT_BROWSER_CONFIRM_ACTIONS\` env) |
+
+## Configuration file
+
+Create \`agent-browser.json\` for persistent defaults (no need to repeat flags):
+
+**Locations (lowest to highest priority):**
+1. \`~/.agent-browser/config.json\` — user-level defaults
+2. \`./agent-browser.json\` — project-level overrides
+3. \`AGENT_BROWSER_*\` environment variables
+4. CLI flags override everything
+
+\`\`\`json
+{
+  "headed": true,
+  "proxy": "http://localhost:8080",
+  "profile": "./browser-data",
+  "native": true
+}
+\`\`\`
+
 ## Example: Form submission
 
 \`\`\`bash
@@ -261,6 +372,13 @@ agent-browser open other-site.com
 agent-browser set headers '{"X-Custom-Header": "value"}'
 \`\`\`
 
+### Authentication Vault
+\`\`\`bash
+# Store credentials locally (encrypted). The LLM never sees passwords.
+echo "pass" | agent-browser auth save github --url https://github.com/login --username user --password-stdin
+agent-browser auth login github
+\`\`\`
+
 ## Sessions & Persistent Profiles
 
 ### Sessions (parallel browsers)
@@ -270,6 +388,13 @@ agent-browser --session test2 open site-b.com
 agent-browser session list
 \`\`\`
 
+### Session persistence (auto-save/restore)
+\`\`\`bash
+agent-browser --session-name twitter open twitter.com
+# Login once, state persists automatically across restarts
+# State files stored in ~/.agent-browser/sessions/
+\`\`\`
+
 ### Persistent Profiles
 Persists cookies, localStorage, IndexedDB, service workers, cache, login sessions across browser restarts.
 \`\`\`bash
@@ -277,9 +402,6 @@ agent-browser --profile ~/.myapp-profile open myapp.com
 # Or via env var
 AGENT_BROWSER_PROFILE=~/.myapp-profile agent-browser open myapp.com
 \`\`\`
-- Use different profile paths for different projects
-- Login once → restart browser → still logged in
-- Stores: cookies, localStorage, IndexedDB, service workers, browser cache
 
 ## JSON output (for parsing)
 
@@ -289,21 +411,53 @@ agent-browser snapshot -i --json
 agent-browser get text @e1 --json
 \`\`\`
 
-## Debugging
+## Local files
 
 \`\`\`bash
-agent-browser open example.com --headed              # Show browser window
-agent-browser console                                # View console messages
-agent-browser errors                                 # View page errors
-agent-browser record start ./debug.webm              # Record from current page
-agent-browser record stop                            # Save recording
-agent-browser connect 9222                           # Local CDP port
+agent-browser --allow-file-access open file:///path/to/document.pdf
+agent-browser --allow-file-access open file:///path/to/page.html
+\`\`\`
+
+## CDP Mode
+
+\`\`\`bash
+agent-browser connect 9222                                          # Local CDP port
+agent-browser --cdp 9222 snapshot                                   # Direct CDP on each command
 agent-browser --cdp "wss://browser-service.com/cdp?token=..." snapshot  # Remote via WebSocket
-agent-browser console --clear                        # Clear console
-agent-browser errors --clear                         # Clear errors
-agent-browser highlight @e1                          # Highlight element
-agent-browser trace start                            # Start recording trace
-agent-browser trace stop trace.zip                   # Stop and save trace
+agent-browser --auto-connect snapshot                               # Auto-discover running Chrome
+\`\`\`
+
+## Cloud providers
+
+\`\`\`bash
+# Browserbase
+BROWSERBASE_API_KEY="key" BROWSERBASE_PROJECT_ID="id" agent-browser -p browserbase open example.com
+
+# Browser Use
+BROWSER_USE_API_KEY="key" agent-browser -p browseruse open example.com
+
+# Kernel
+KERNEL_API_KEY="key" agent-browser -p kernel open example.com
+\`\`\`
+
+## iOS Simulator
+
+\`\`\`bash
+agent-browser device list                                        # List available simulators
+agent-browser -p ios --device "iPhone 16 Pro" open example.com   # Launch Safari
+agent-browser -p ios snapshot -i                                 # Same commands as desktop
+agent-browser -p ios tap @e1                                     # Tap
+agent-browser -p ios swipe up                                    # Mobile-specific
+agent-browser -p ios close                                       # Close session
+\`\`\`
+
+## Native Mode (Experimental)
+
+Pure Rust daemon using direct CDP — no Node.js/Playwright required:
+\`\`\`bash
+agent-browser --native open example.com
+# Or: export AGENT_BROWSER_NATIVE=1
+# Or: {"native": true} in agent-browser.json
 \`\`\`
 
 ---

src/features/claude-code-agent-loader/claude-model-mapper.test.ts

@@ -0,0 +1,108 @@
+/// <reference types="bun-types" />
+
+import { describe, it, expect } from "bun:test"
+import { mapClaudeModelToOpenCode } from "./claude-model-mapper"
+
+describe("mapClaudeModelToOpenCode", () => {
+  describe("#given undefined or empty input", () => {
+    it("#when called with undefined #then returns undefined", () => {
+      expect(mapClaudeModelToOpenCode(undefined)).toBeUndefined()
+    })
+
+    it("#when called with empty string #then returns undefined", () => {
+      expect(mapClaudeModelToOpenCode("")).toBeUndefined()
+    })
+
+    it("#when called with whitespace-only string #then returns undefined", () => {
+      expect(mapClaudeModelToOpenCode("   ")).toBeUndefined()
+    })
+  })
+
+  describe("#given Claude Code alias", () => {
+    it("#when called with sonnet #then maps to anthropic claude-sonnet-4-6 object", () => {
+      expect(mapClaudeModelToOpenCode("sonnet")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-6" })
+    })
+
+    it("#when called with opus #then maps to anthropic claude-opus-4-6 object", () => {
+      expect(mapClaudeModelToOpenCode("opus")).toEqual({ providerID: "anthropic", modelID: "claude-opus-4-6" })
+    })
+
+    it("#when called with haiku #then maps to anthropic claude-haiku-4-5 object", () => {
+      expect(mapClaudeModelToOpenCode("haiku")).toEqual({ providerID: "anthropic", modelID: "claude-haiku-4-5" })
+    })
+
+    it("#when called with Sonnet (capitalized) #then maps case-insensitively to object", () => {
+      expect(mapClaudeModelToOpenCode("Sonnet")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-6" })
+    })
+  })
+
+  describe("#given inherit", () => {
+    it("#when called with inherit #then returns undefined", () => {
+      expect(mapClaudeModelToOpenCode("inherit")).toBeUndefined()
+    })
+  })
+
+  describe("#given bare Claude model name", () => {
+    it("#when called with claude-sonnet-4-5-20250514 #then adds anthropic object format", () => {
+      expect(mapClaudeModelToOpenCode("claude-sonnet-4-5-20250514")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-5-20250514" })
+    })
+
+    it("#when called with claude-opus-4-6 #then adds anthropic object format", () => {
+      expect(mapClaudeModelToOpenCode("claude-opus-4-6")).toEqual({ providerID: "anthropic", modelID: "claude-opus-4-6" })
+    })
+
+    it("#when called with claude-haiku-4-5-20251001 #then adds anthropic object format", () => {
+      expect(mapClaudeModelToOpenCode("claude-haiku-4-5-20251001")).toEqual({ providerID: "anthropic", modelID: "claude-haiku-4-5-20251001" })
+    })
+
+    it("#when called with claude-3-5-sonnet-20241022 #then adds anthropic object format", () => {
+      expect(mapClaudeModelToOpenCode("claude-3-5-sonnet-20241022")).toEqual({ providerID: "anthropic", modelID: "claude-3-5-sonnet-20241022" })
+    })
+  })
+
+  describe("#given model with dot version numbers", () => {
+    it("#when called with claude-3.5-sonnet #then normalizes dots and returns object format", () => {
+      expect(mapClaudeModelToOpenCode("claude-3.5-sonnet")).toEqual({ providerID: "anthropic", modelID: "claude-3-5-sonnet" })
+    })
+
+    it("#when called with claude-3.5-sonnet-20241022 #then normalizes dots and returns object format", () => {
+      expect(mapClaudeModelToOpenCode("claude-3.5-sonnet-20241022")).toEqual({ providerID: "anthropic", modelID: "claude-3-5-sonnet-20241022" })
+    })
+  })
+
+  describe("#given model already in provider/model format", () => {
+    it("#when called with anthropic/claude-sonnet-4-6 #then splits into object format", () => {
+      expect(mapClaudeModelToOpenCode("anthropic/claude-sonnet-4-6")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-6" })
+    })
+
+    it("#when called with openai/gpt-5.2 #then splits into object format", () => {
+      expect(mapClaudeModelToOpenCode("openai/gpt-5.2")).toEqual({ providerID: "openai", modelID: "gpt-5.2" })
+    })
+  })
+
+  describe("#given non-Claude bare model", () => {
+    it("#when called with gpt-5.2 #then returns undefined", () => {
+      expect(mapClaudeModelToOpenCode("gpt-5.2")).toBeUndefined()
+    })
+
+    it("#when called with gemini-3-flash #then returns undefined", () => {
+      expect(mapClaudeModelToOpenCode("gemini-3-flash")).toBeUndefined()
+    })
+  })
+
+  describe("#given prototype property name", () => {
+    it("#when called with constructor #then returns undefined", () => {
+      expect(mapClaudeModelToOpenCode("constructor")).toBeUndefined()
+    })
+
+    it("#when called with toString #then returns undefined", () => {
+      expect(mapClaudeModelToOpenCode("toString")).toBeUndefined()
+    })
+  })
+
+  describe("#given model with leading/trailing whitespace", () => {
+    it("#when called with padded string #then trims before returning object format", () => {
+      expect(mapClaudeModelToOpenCode("  claude-sonnet-4-6  ")).toEqual({ providerID: "anthropic", modelID: "claude-sonnet-4-6" })
+    })
+  })
+})

src/features/claude-code-agent-loader/claude-model-mapper.ts

@@ -0,0 +1,39 @@
+import { normalizeModelFormat } from "../../shared/model-format-normalizer"
+import { normalizeModelID } from "../../shared/model-normalization"
+
+const ANTHROPIC_PREFIX = "anthropic/"
+
+const CLAUDE_CODE_ALIAS_MAP = new Map<string, string>([
+  ["sonnet", `${ANTHROPIC_PREFIX}claude-sonnet-4-6`],
+  ["opus", `${ANTHROPIC_PREFIX}claude-opus-4-6`],
+  ["haiku", `${ANTHROPIC_PREFIX}claude-haiku-4-5`],
+])
+
+function mapClaudeModelString(model: string | undefined): string | undefined {
+  if (!model) return undefined
+
+  const trimmed = model.trim()
+  if (trimmed.length === 0) return undefined
+
+  if (trimmed === "inherit") return undefined
+
+  const aliasResult = CLAUDE_CODE_ALIAS_MAP.get(trimmed.toLowerCase())
+  if (aliasResult) return aliasResult
+
+  if (trimmed.includes("/")) return trimmed
+
+  const normalized = normalizeModelID(trimmed)
+
+  if (normalized.startsWith("claude-")) {
+    return `${ANTHROPIC_PREFIX}${normalized}`
+  }
+
+  return undefined
+}
+
+export function mapClaudeModelToOpenCode(
+  model: string | undefined
+): { providerID: string; modelID: string } | undefined {
+  const mappedModel = mapClaudeModelString(model)
+  return mappedModel ? normalizeModelFormat(mappedModel) : undefined
+}

src/features/claude-code-agent-loader/loader.ts

@@ -1,10 +1,10 @@
 import { existsSync, readdirSync, readFileSync } from "fs"
 import { join, basename } from "path"
-import type { AgentConfig } from "@opencode-ai/sdk"
 import { parseFrontmatter } from "../../shared/frontmatter"
 import { isMarkdownFile } from "../../shared/file-utils"
 import { getClaudeConfigDir } from "../../shared"
-import type { AgentScope, AgentFrontmatter, LoadedAgent } from "./types"
+import type { AgentScope, AgentFrontmatter, ClaudeCodeAgentConfig, LoadedAgent } from "./types"
+import { mapClaudeModelToOpenCode } from "./claude-model-mapper"
 
 function parseToolsConfig(toolsStr?: string): Record<string, boolean> | undefined {
   if (!toolsStr) return undefined
@@ -42,10 +42,13 @@ function loadAgentsFromDir(agentsDir: string, scope: AgentScope): LoadedAgent[]
 
        const formattedDescription = `(${scope}) ${originalDescription}`
 
-       const config: AgentConfig = {
+       const mappedModelOverride = mapClaudeModelToOpenCode(data.model)
+
+       const config: ClaudeCodeAgentConfig = {
          description: formattedDescription,
          mode: "subagent",
          prompt: body.trim(),
+         ...(mappedModelOverride ? { model: mappedModelOverride } : {}),
        }
 
        const toolsConfig = parseToolsConfig(data.tools)
@@ -67,22 +70,22 @@ function loadAgentsFromDir(agentsDir: string, scope: AgentScope): LoadedAgent[]
   return agents
 }
 
-export function loadUserAgents(): Record<string, AgentConfig> {
+export function loadUserAgents(): Record<string, ClaudeCodeAgentConfig> {
   const userAgentsDir = join(getClaudeConfigDir(), "agents")
   const agents = loadAgentsFromDir(userAgentsDir, "user")
 
-  const result: Record<string, AgentConfig> = {}
+  const result: Record<string, ClaudeCodeAgentConfig> = {}
   for (const agent of agents) {
     result[agent.name] = agent.config
   }
   return result
 }
 
-export function loadProjectAgents(directory?: string): Record<string, AgentConfig> {
+export function loadProjectAgents(directory?: string): Record<string, ClaudeCodeAgentConfig> {
   const projectAgentsDir = join(directory ?? process.cwd(), ".claude", "agents")
   const agents = loadAgentsFromDir(projectAgentsDir, "project")
 
-  const result: Record<string, AgentConfig> = {}
+  const result: Record<string, ClaudeCodeAgentConfig> = {}
   for (const agent of agents) {
     result[agent.name] = agent.config
   }

src/features/claude-code-agent-loader/types.ts

@@ -2,6 +2,10 @@ import type { AgentConfig } from "@opencode-ai/sdk"
 
 export type AgentScope = "user" | "project"
 
+export type ClaudeCodeAgentConfig = Omit<AgentConfig, "model"> & {
+  model?: string | { providerID: string; modelID: string }
+}
+
 export interface AgentFrontmatter {
   name?: string
   description?: string
@@ -12,6 +16,6 @@ export interface AgentFrontmatter {
 export interface LoadedAgent {
   name: string
   path: string
-  config: AgentConfig
+  config: ClaudeCodeAgentConfig
   scope: AgentScope
 }

src/features/claude-code-plugin-loader/agent-loader.ts

@@ -1,10 +1,10 @@
 import { existsSync, readdirSync, readFileSync } from "fs"
 import { basename, join } from "path"
-import type { AgentConfig } from "@opencode-ai/sdk"
 import { parseFrontmatter } from "../../shared/frontmatter"
 import { isMarkdownFile } from "../../shared/file-utils"
 import { log } from "../../shared/logger"
-import type { AgentFrontmatter } from "../claude-code-agent-loader/types"
+import type { AgentFrontmatter, ClaudeCodeAgentConfig } from "../claude-code-agent-loader/types"
+import { mapClaudeModelToOpenCode } from "../claude-code-agent-loader/claude-model-mapper"
 import type { LoadedPlugin } from "./types"
 
 function parseToolsConfig(toolsStr?: string): Record<string, boolean> | undefined {
@@ -24,8 +24,8 @@ function parseToolsConfig(toolsStr?: string): Record<string, boolean> | undefine
   return result
 }
 
-export function loadPluginAgents(plugins: LoadedPlugin[]): Record<string, AgentConfig> {
-  const agents: Record<string, AgentConfig> = {}
+export function loadPluginAgents(plugins: LoadedPlugin[]): Record<string, ClaudeCodeAgentConfig> {
+  const agents: Record<string, ClaudeCodeAgentConfig> = {}
 
   for (const plugin of plugins) {
     if (!plugin.agentsDir || !existsSync(plugin.agentsDir)) continue
@@ -46,10 +46,13 @@ export function loadPluginAgents(plugins: LoadedPlugin[]): Record<string, AgentC
         const originalDescription = data.description || ""
         const formattedDescription = `(plugin: ${plugin.name}) ${originalDescription}`
 
-        const config: AgentConfig = {
+        const mappedModelOverride = mapClaudeModelToOpenCode(data.model)
+
+        const config: ClaudeCodeAgentConfig = {
           description: formattedDescription,
           mode: "subagent",
           prompt: body.trim(),
+          ...(mappedModelOverride ? { model: mappedModelOverride } : {}),
         }
 
         const toolsConfig = parseToolsConfig(data.tools)

src/features/claude-code-plugin-loader/loader.ts

@@ -1,7 +1,7 @@
 import { log } from "../../shared/logger"
-import type { AgentConfig } from "@opencode-ai/sdk"
 import type { CommandDefinition } from "../claude-code-command-loader/types"
 import type { McpServerConfig } from "../claude-code-mcp-loader/types"
+import type { ClaudeCodeAgentConfig } from "../claude-code-agent-loader/types"
 import type { HooksConfig, LoadedPlugin, PluginLoadError, PluginLoaderOptions } from "./types"
 import { discoverInstalledPlugins } from "./discovery"
 import { loadPluginCommands } from "./command-loader"
@@ -20,7 +20,7 @@ export { loadPluginHooksConfigs } from "./hook-loader"
 export interface PluginComponentsResult {
   commands: Record<string, CommandDefinition>
   skills: Record<string, CommandDefinition>
-  agents: Record<string, AgentConfig>
+  agents: Record<string, ClaudeCodeAgentConfig>
   mcpServers: Record<string, McpServerConfig>
   hooksConfigs: HooksConfig[]
   plugins: LoadedPlugin[]