improve anthropic oauth token caching and authentication handling

🤖 Generated with [opencode](https://opencode.ai)

Co-Authored-By: opencode <noreply@opencode.ai>

README.md

@@ -61,9 +61,53 @@ The Models.dev dataset is also used to detect common environment variables like
 
 If there are additional providers you want to use you can submit a PR to the [Models.dev repo](https://github.com/sst/models.dev). If configuring just for yourself check out the Config section below.
 
+### Global Config
+
+Some basic configuration is available in the global config file.
+
+```toml
+# ~/.config/opencode/config
+theme = "opencode"
+provider = "anthropic"
+model = "claude-sonnet-4-20250514"
+autoupdate = true
+```
+
+You can also extend the models.dev database with your own providers by mirroring the structure found [here](https://github.com/sst/models.dev/tree/dev/providers/anthropic)
+
+Start with a `provider.toml` file in `~/.config/opencode/providers`
+
+```toml
+# ~/.config/opencode/providers/openrouter/provider.toml
+[provider]
+name = "OpenRouter"
+env = ["OPENROUTER_API_KEY"]
+npm = "@openrouter/ai-sdk-provider"
+```
+
+And models in `~/.config/opencode/providers/openrouter/models/[model-id]`
+
+```toml
+# ~/.config/opencode/providers/openrouter/models/anthropic/claude-3.5-sonnet.toml
+name = "Claude 4 Sonnet"
+attachment = true
+reasoning = false
+temperature = true
+
+[cost]
+input = 3.00
+output = 15.00
+inputCached = 3.75
+outputCached = 0.30
+
+[limit]
+context = 200_000
+output = 50_000
+```
+
 ### Project Config
 
-Project configuration is optional. You can place an `opencode.json` file in the root of your repo, and it'll be loaded.
+Project configuration is optional. You can place an `opencode.json` file in the root of your repo and is meant to be checked in and shared with your team.
 
 ```json title="opencode.json"
 {
@@ -106,9 +150,7 @@ You can use opencode with any provider listed at [here](https://ai-sdk.dev/provi
         "baseURL": "http://localhost:11434/v1"
       },
       "models": {
-        "llama2": {
-          "name": "llama2"
-        }
+        "llama2": {}
       }
     }
   }

bun.lock

@@ -45,6 +45,7 @@
         "zod-openapi": "4.2.4",
       },
       "devDependencies": {
+        "@ai-sdk/anthropic": "1.2.12",
         "@tsconfig/bun": "1.0.7",
         "@types/bun": "latest",
         "@types/turndown": "5.0.5",
@@ -86,6 +87,9 @@
     "sharp",
     "esbuild",
   ],
+  "patchedDependencies": {
+    "ai@4.3.16": "patches/ai@4.3.16.patch",
+  },
   "overrides": {
     "zod": "3.24.2",
   },
@@ -96,6 +100,8 @@
     "zod": "3.24.2",
   },
   "packages": {
+    "@ai-sdk/anthropic": ["@ai-sdk/anthropic@1.2.12", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "@ai-sdk/provider-utils": "2.2.8" }, "peerDependencies": { "zod": "^3.0.0" } }, "sha512-YSzjlko7JvuiyQFmI9RN1tNZdEiZxc+6xld/0tq/VkJaHpEzGAb1yiNxxvmYVcjvfu/PcvCxAAYXmTYQQ63IHQ=="],
+
     "@ai-sdk/provider": ["@ai-sdk/provider@1.1.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg=="],
 
     "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.2.8", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA=="],

package.json

@@ -37,5 +37,8 @@
     "esbuild",
     "protobufjs",
     "sharp"
-  ]
+  ],
+  "patchedDependencies": {
+    "ai@4.3.16": "patches/ai@4.3.16.patch"
+  }
 }

packages/opencode/package.json

@@ -20,7 +20,8 @@
     "@types/turndown": "5.0.5",
     "@types/yargs": "17.0.33",
     "typescript": "catalog:",
-    "zod-to-json-schema": "3.24.5"
+    "zod-to-json-schema": "3.24.5",
+    "@ai-sdk/anthropic": "1.2.12"
   },
   "dependencies": {
     "@clack/prompts": "0.11.0",

packages/opencode/src/app/app.ts

@@ -18,6 +18,7 @@ export namespace App {
         data: z.string(),
         root: z.string(),
         cwd: z.string(),
+        state: z.string(),
       }),
       time: z.object({
         initialized: z.number().optional(),
@@ -68,6 +69,7 @@ export namespace App {
       git: git !== undefined,
       path: {
         config: Global.Path.config,
+        state: Global.Path.state,
         data,
         root: git ?? input.cwd,
         cwd: input.cwd,

packages/opencode/src/auth/anthropic.ts

@@ -48,6 +48,7 @@ export namespace AuthAnthropic {
     await Auth.set("anthropic", {
       type: "oauth",
       refresh: json.refresh_token as string,
+      access: json.access_token as string,
       expires: Date.now() + json.expires_in * 1000,
     })
   }
@@ -55,6 +56,7 @@ export namespace AuthAnthropic {
   export async function access() {
     const info = await Auth.get("anthropic")
     if (!info || info.type !== "oauth") return
+    if (info.access && info.expires > Date.now()) return info.access
     const response = await fetch(
       "https://console.anthropic.com/v1/oauth/token",
       {
@@ -74,6 +76,7 @@ export namespace AuthAnthropic {
     await Auth.set("anthropic", {
       type: "oauth",
       refresh: json.refresh_token as string,
+      access: json.access_token as string,
       expires: Date.now() + json.expires_in * 1000,
     })
     return json.access_token as string

packages/opencode/src/auth/index.ts

@@ -7,6 +7,7 @@ export namespace Auth {
   export const Oauth = z.object({
     type: z.literal("oauth"),
     refresh: z.string(),
+    access: z.string(),
     expires: z.number(),
   })
 

packages/opencode/src/global/config.ts

@@ -5,10 +5,11 @@ import path from "path"
 
 export namespace GlobalConfig {
   export const Info = z.object({
-    autoupdate: z.boolean().optional(),
-    autoshare: z.boolean().optional(),
     provider: z.string().optional(),
     model: z.string().optional(),
+    autoupdate: z.boolean().optional(),
+    autoshare: z.boolean().optional(),
+    disabled_providers: z.array(z.string()).optional(),
   })
   export type Info = z.infer<typeof Info>
 

packages/opencode/src/global/index.ts

@@ -1,5 +1,5 @@
 import fs from "fs/promises"
-import { xdgData, xdgCache, xdgConfig } from "xdg-basedir"
+import { xdgData, xdgCache, xdgConfig, xdgState } from "xdg-basedir"
 import path from "path"
 
 const app = "opencode"
@@ -7,18 +7,23 @@ const app = "opencode"
 const data = path.join(xdgData!, app)
 const cache = path.join(xdgCache!, app)
 const config = path.join(xdgConfig!, app)
-
-await Promise.all([
-  fs.mkdir(data, { recursive: true }),
-  fs.mkdir(config, { recursive: true }),
-  fs.mkdir(cache, { recursive: true }),
-])
+const state = path.join(xdgState!, app)
 
 export namespace Global {
   export const Path = {
     data,
     bin: path.join(data, "bin"),
+    providers: path.join(config, "providers"),
     cache,
     config,
+    state,
   } as const
 }
+
+await Promise.all([
+  fs.mkdir(Global.Path.data, { recursive: true }),
+  fs.mkdir(Global.Path.config, { recursive: true }),
+  fs.mkdir(Global.Path.cache, { recursive: true }),
+  fs.mkdir(Global.Path.providers, { recursive: true }),
+  fs.mkdir(Global.Path.state, { recursive: true }),
+])

packages/opencode/src/index.ts

@@ -93,8 +93,11 @@ const cli = yargs(hideBin(process.argv))
             if (Installation.VERSION === latest) return
             const method = await Installation.method()
             if (method === "unknown") return
-            await Installation.upgrade(method, latest).catch(() => {})
-            Bus.publish(Installation.Event.Updated, { version: latest })
+            await Installation.upgrade(method, latest)
+              .then(() => {
+                Bus.publish(Installation.Event.Updated, { version: latest })
+              })
+              .catch(() => {})
           })()
 
           await proc.exited

packages/opencode/src/installation/index.ts

@@ -117,6 +117,6 @@ export namespace Installation {
   export async function latest() {
     return fetch("https://api.github.com/repos/sst/opencode/releases/latest")
       .then((res) => res.json())
-      .then((data) => data.tag_name.slice(1))
+      .then((data) => data.tag_name.slice(1) as string)
   }
 }

packages/opencode/src/provider/provider.ts

@@ -1,4 +1,5 @@
 import z from "zod"
+import path from "path"
 import { App } from "../app/app"
 import { Config } from "../config/config"
 import { mergeDeep, sortBy } from "remeda"
@@ -23,6 +24,8 @@ import { ModelsDev } from "./models"
 import { NamedError } from "../util/error"
 import { Auth } from "../auth"
 import { TaskTool } from "../tool/task"
+import { GlobalConfig } from "../global/config"
+import { Global } from "../global"
 
 export namespace Provider {
   const log = Log.create({ service: "provider" })
@@ -47,9 +50,18 @@ export namespace Provider {
       }
       return {
         apiKey: "",
-        headers: {
-          authorization: `Bearer ${access}`,
-          "anthropic-beta": "oauth-2025-04-20",
+        async fetch(input: any, init: any) {
+          const access = await AuthAnthropic.access()
+          const headers = {
+            ...init.headers,
+            authorization: `Bearer ${access}`,
+            "anthropic-beta": "oauth-2025-04-20",
+          }
+          delete headers["x-api-key"]
+          return fetch(input, {
+            ...init,
+            headers,
+          })
         },
       }
     },
@@ -102,9 +114,35 @@ export namespace Provider {
       provider.source = source
     }
 
-    for (const [providerID, provider] of Object.entries(
-      config.provider ?? {},
-    )) {
+    const configProviders = Object.entries(config.provider ?? {})
+    for await (const providerPath of new Bun.Glob("*/provider.toml").scan({
+      cwd: Global.Path.providers,
+    })) {
+      const [providerID] = providerPath.split("/")
+      const toml = await import(
+        path.join(Global.Path.providers, providerPath),
+        {
+          with: {
+            type: "toml",
+          },
+        }
+      ).then((mod) => mod.default)
+      toml.models = {}
+      const modelsPath = path.join(Global.Path.providers, providerID, "models")
+      for await (const modelPath of new Bun.Glob("**/*.toml").scan({
+        cwd: modelsPath,
+      })) {
+        const modelID = modelPath.slice(0, -5)
+        toml.models[modelID] = await import(path.join(modelsPath, modelPath), {
+          with: {
+            type: "toml",
+          },
+        })
+      }
+      configProviders.unshift([providerID, toml])
+    }
+
+    for (const [providerID, provider] of configProviders) {
       const existing = database[providerID]
       const parsed: ModelsDev.Provider = {
         id: providerID,
@@ -140,8 +178,12 @@ export namespace Provider {
       database[providerID] = parsed
     }
 
+    const disabled = await GlobalConfig.get().then(
+      (cfg) => new Set(cfg.disabled_providers ?? []),
+    )
     // load env
     for (const [providerID, provider] of Object.entries(database)) {
+      if (disabled.has(providerID)) continue
       if (provider.env.some((item) => process.env[item])) {
         mergeProvider(providerID, {}, "env")
       }
@@ -149,6 +191,7 @@ export namespace Provider {
 
     // load apikeys
     for (const [providerID, provider] of Object.entries(await Auth.all())) {
+      if (disabled.has(providerID)) continue
       if (provider.type === "api") {
         mergeProvider(providerID, { apiKey: provider.key }, "api")
       }
@@ -156,6 +199,7 @@ export namespace Provider {
 
     // load custom
     for (const [providerID, fn] of Object.entries(CUSTOM_LOADERS)) {
+      if (disabled.has(providerID)) continue
       const result = await fn(database[providerID])
       if (result) mergeProvider(providerID, result, "custom")
     }
@@ -257,7 +301,10 @@ export namespace Provider {
   }
 
   export async function defaultModel() {
-    const [provider] = await list().then((val) => Object.values(val))
+    const cfg = await GlobalConfig.get()
+    const provider = await list()
+      .then((val) => Object.values(val))
+      .then((x) => x.find((p) => !cfg.provider || cfg.provider === p.info.id))
     if (!provider) throw new Error("no providers found")
     const [model] = sort(Object.values(provider.info.models))
     if (!model) throw new Error("no models found")
@@ -285,11 +332,16 @@ export namespace Provider {
     TaskTool,
     TodoReadTool,
   ]
+
   const TOOL_MAPPING: Record<string, Tool.Info[]> = {
     anthropic: TOOLS.filter((t) => t.id !== "opencode.patch"),
-    openai: TOOLS,
+    openai: TOOLS.map((t) => ({
+      ...t,
+      parameters: optionalToNullable(t.parameters),
+    })),
     google: TOOLS,
   }
+
   export async function tools(providerID: string) {
     /*
     const cfg = await Config.get()
@@ -301,6 +353,38 @@ export namespace Provider {
     return TOOL_MAPPING[providerID] ?? TOOLS
   }
 
+  function optionalToNullable(schema: z.ZodTypeAny): z.ZodTypeAny {
+    if (schema instanceof z.ZodObject) {
+      const shape = schema.shape
+      const newShape: Record<string, z.ZodTypeAny> = {}
+
+      for (const [key, value] of Object.entries(shape)) {
+        const zodValue = value as z.ZodTypeAny
+        if (zodValue instanceof z.ZodOptional) {
+          newShape[key] = zodValue.unwrap().nullable()
+        } else {
+          newShape[key] = optionalToNullable(zodValue)
+        }
+      }
+
+      return z.object(newShape)
+    }
+
+    if (schema instanceof z.ZodArray) {
+      return z.array(optionalToNullable(schema.element))
+    }
+
+    if (schema instanceof z.ZodUnion) {
+      return z.union(
+        schema.options.map((option: z.ZodTypeAny) =>
+          optionalToNullable(option),
+        ) as [z.ZodTypeAny, z.ZodTypeAny, ...z.ZodTypeAny[]],
+      )
+    }
+
+    return schema
+  }
+
   export const ModelNotFoundError = NamedError.create(
     "ProviderModelNotFoundError",
     z.object({

packages/opencode/src/session/index.ts

@@ -210,8 +210,9 @@ export namespace Session {
         previous.metadata.assistant.tokens.cache.write +
         previous.metadata.assistant.tokens.output
       if (
+        model.info.limit.context &&
         tokens >
-        (model.info.limit.context - (model.info.limit.output ?? 0)) * 0.9
+          (model.info.limit.context - (model.info.limit.output ?? 0)) * 0.9
       ) {
         await summarize({
           sessionID: input.sessionID,
@@ -496,7 +497,7 @@ export namespace Session {
           msgs.map(toUIMessage).filter((x) => x.parts.length > 0),
         ),
       ],
-      temperature: model.info.id === "codex-mini-latest" ? undefined : 0,
+      temperature: model.info.temperature ? 0 : undefined,
       tools: {
         ...tools,
       },

packages/opencode/src/tool/bash.ts

@@ -35,7 +35,7 @@ export const BashTool = Tool.define({
       .min(0)
       .max(MAX_TIMEOUT)
       .describe("Optional timeout in milliseconds")
-      .nullable(),
+      .optional(),
     description: z
       .string()
       .describe(

packages/opencode/src/tool/edit.ts

@@ -21,7 +21,7 @@ export const EditTool = Tool.define({
       ),
     replaceAll: z
       .boolean()
-      .nullable()
+      .optional()
       .describe("Replace all occurences of old_string (default false)"),
   }),
   async execute(params, ctx) {

packages/opencode/src/tool/glob.ts

@@ -11,7 +11,7 @@ export const GlobTool = Tool.define({
     pattern: z.string().describe("The glob pattern to match files against"),
     path: z
       .string()
-      .nullable()
+      .optional()
       .describe(
         `The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter "undefined" or "null" - simply omit it for the default behavior. Must be a valid directory path if provided.`,
       ),

packages/opencode/src/tool/grep.ts

@@ -14,13 +14,13 @@ export const GrepTool = Tool.define({
       .describe("The regex pattern to search for in file contents"),
     path: z
       .string()
-      .nullable()
+      .optional()
       .describe(
         "The directory to search in. Defaults to the current working directory.",
       ),
     include: z
       .string()
-      .nullable()
+      .optional()
       .describe(
         'File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")',
       ),

packages/opencode/src/tool/ls.ts

@@ -29,11 +29,11 @@ export const ListTool = Tool.define({
       .describe(
         "The absolute path to the directory to list (must be absolute, not relative)",
       )
-      .nullable(),
+      .optional(),
     ignore: z
       .array(z.string())
       .describe("List of glob patterns to ignore")
-      .nullable(),
+      .optional(),
   }),
   async execute(params) {
     const app = App.info()

packages/opencode/src/tool/read.ts

@@ -19,11 +19,11 @@ export const ReadTool = Tool.define({
     offset: z
       .number()
       .describe("The line number to start reading from (0-based)")
-      .nullable(),
+      .optional(),
     limit: z
       .number()
       .describe("The number of lines to read (defaults to 2000)")
-      .nullable(),
+      .optional(),
   }),
   async execute(params, ctx) {
     let filePath = params.filePath

packages/opencode/src/tool/webfetch.ts

@@ -22,7 +22,7 @@ export const WebFetchTool = Tool.define({
       .min(0)
       .max(MAX_TIMEOUT / 1000)
       .describe("Optional timeout in seconds (max 120)")
-      .nullable(),
+      .optional(),
   }),
   async execute(params, ctx) {
     // Validate URL

packages/opencode/test/tool/tool.test.ts

@@ -9,7 +9,7 @@ describe("tool.glob", () => {
       let result = await GlobTool.execute(
         {
           pattern: "./node_modules/**/*",
-          path: null,
+          path: undefined,
         },
         {
           sessionID: "test",
@@ -25,7 +25,7 @@ describe("tool.glob", () => {
       let result = await GlobTool.execute(
         {
           pattern: "*.json",
-          path: null,
+          path: undefined,
         },
         {
           sessionID: "test",

patches/ai@4.3.16.patch

@@ -0,0 +1,13 @@
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 92a80377692488c4ba8801ce33e7736ad7055e43..add6281bbecaa1c03d3b48eb99aead4a7a7336b2 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -1593,7 +1593,7 @@ function prepareCallSettings({
+   return {
+     maxTokens,
+     // TODO v5 remove default 0 for temperature
+-    temperature: temperature != null ? temperature : 0,
++    temperature: temperature,
+     topP,
+     topK,
+     presencePenalty,