fix(codex): write token refresh to openai provider ID

AGENTS.md

@@ -16,6 +16,8 @@
 
 - Avoid testing logic directly inside Solid.js `.tsx` files if they import JSX runtimes, as `bun test` may fail with `jsxDEV` errors.
 - Separate pure logic into `.ts` files (e.g., `theme-utils.ts`) and test those instead.
+- Run tests from `packages/opencode` directory - the repo root has a guard file that prevents test execution.
+- `bun run lint` in `packages/opencode` runs the full test suite with coverage.
 
 ## Upstream Merge Operations
 

packages/opencode/src/auth/index.ts

@@ -2,9 +2,12 @@ import path from "path"
 import { Global } from "../global"
 import fs from "fs/promises"
 import z from "zod"
+import { Log } from "../util/log"
 
 export const OAUTH_DUMMY_KEY = "opencode-oauth-dummy-key"
 
+const log = Log.create({ service: "auth" })
+
 export namespace Auth {
   export const Oauth = z
     .object({
@@ -14,6 +17,10 @@ export namespace Auth {
       expires: z.number(),
       accountId: z.string().optional(),
       enterpriseUrl: z.string().optional(),
+      email: z.string().optional(),
+      name: z.string().optional(),
+      plan: z.string().optional(),
+      orgName: z.string().optional(),
     })
     .meta({ ref: "OAuth" })
 
@@ -39,7 +46,16 @@ export namespace Auth {
 
   export async function get(providerID: string) {
     const auth = await all()
-    return auth[providerID]
+    const entry = auth[providerID]
+    if (entry || providerID !== "openai") return entry
+    const legacy = auth.codex
+    if (legacy) {
+      log.info("auth migration: using legacy codex entry", { providerID: "openai" })
+    }
+    if (legacy?.type === "oauth") {
+      await set("openai", legacy)
+    }
+    return legacy
   }
 
   export async function all(): Promise<Record<string, Info>> {

packages/opencode/src/cli/cmd/tui/component/account-badge.tsx

@@ -0,0 +1,22 @@
+import { createMemo } from "solid-js"
+import { useSync } from "@tui/context/sync"
+import { useTheme } from "../context/theme"
+
+export function AccountBadge() {
+  const sync = useSync()
+  const { theme } = useTheme()
+
+  const authInfo = createMemo(() => sync.data.provider_auth_info.openai)
+
+  return () => {
+    const info = authInfo()
+    if (!info?.authenticated || !info.email) return null
+
+    return (
+      <box flexDirection="row" gap={1} alignItems="center">
+        <text>{info.email}</text>
+        {info.plan && <text fg={theme.primary}>[{info.plan.charAt(0).toUpperCase() + info.plan.slice(1)}]</text>}
+      </box>
+    )
+  }
+}

packages/opencode/src/cli/cmd/tui/component/dialog-provider.tsx

@@ -30,16 +30,27 @@ export function createDialogProviderOptions() {
     return pipe(
       sync.data.provider_next.all,
       sortBy((x) => PROVIDER_PRIORITY[x.id] ?? 99),
-      map((provider) => ({
-        title: provider.name,
-        value: provider.id,
-        description: {
-          opencode: "(Recommended)",
-          anthropic: "(Claude Max or API key)",
-          openai: "(ChatGPT Plus/Pro or API key)",
-        }[provider.id],
-        category: provider.id in PROVIDER_PRIORITY ? "Popular" : "Other",
-        async onSelect() {
+      map((provider) => {
+        const authInfo = sync.data.provider_auth_info[provider.id]
+        const isOAuthConnected = authInfo?.authenticated && authInfo?.email
+
+        let description: string
+        if (isOAuthConnected) {
+          description = `Connected: ${authInfo.email}${authInfo.plan ? ` [${authInfo.plan}]` : ""}`
+        } else {
+          description = {
+            opencode: "(Recommended)",
+            anthropic: "(Claude Max or API key)",
+            openai: "(ChatGPT Plus/Pro or API key)",
+          }[provider.id] || ""
+        }
+
+        return {
+          title: provider.name,
+          value: provider.id,
+          description,
+          category: provider.id in PROVIDER_PRIORITY ? "Popular" : "Other",
+          async onSelect() {
           const methods = sync.data.provider_auth[provider.id] ?? [
             {
               type: "api",

packages/opencode/src/cli/cmd/tui/context/sync.tsx

@@ -80,6 +80,16 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
       formatter: FormatterStatus[]
       vcs: VcsInfo | undefined
       path: Path
+      provider_auth_info: Record<
+        string,
+        {
+          authenticated: boolean
+          type?: string
+          email?: string
+          plan?: string
+          accountId?: string
+        }
+      >
     }>({
       provider_next: {
         all: [],
@@ -107,6 +117,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
       formatter: [],
       vcs: undefined,
       path: { state: "", config: "", worktree: "", directory: "" },
+      provider_auth_info: {},
     })
 
     const sdk = useSDK()
@@ -121,7 +132,11 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
           const requests = store.permission[event.properties.sessionID]
           if (!requests) break
           // Note: upstream uses requestID, SDK may show permissionID until regenerated
-          const match = Binary.search(requests, (event.properties as unknown as { requestID: string }).requestID, (r) => r.id)
+          const match = Binary.search(
+            requests,
+            (event.properties as unknown as { requestID: string }).requestID,
+            (r) => r.id,
+          )
           if (!match.found) break
           setStore(
             "permission",
@@ -369,14 +384,33 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
             sdk.client.lsp.status().then((x) => setStore("lsp", reconcile(x.data!))),
             sdk.client.mcp.status().then((x) => setStore("mcp", reconcile(x.data!))),
             // TODO: Re-enable after SDK regeneration (Phase 15) - sdk.client.experimental.resource.list()
-            (sdk.client as { experimental?: { resource: { list: () => Promise<{ data?: Record<string, McpResource> }> } } }).experimental?.resource.list().then((x) => setStore("mcp_resource", reconcile(x?.data ?? {}))),
+            (
+              sdk.client as {
+                experimental?: { resource: { list: () => Promise<{ data?: Record<string, McpResource> }> } }
+              }
+            ).experimental?.resource
+              .list()
+              .then((x) => setStore("mcp_resource", reconcile(x?.data ?? {}))),
             sdk.client.formatter.status().then((x) => setStore("formatter", reconcile(x.data!))),
             sdk.client.session.status().then((x) => {
               setStore("session_status", reconcile(x.data!))
             }),
             sdk.client.provider.auth().then((x) => setStore("provider_auth", reconcile(x.data ?? {}))),
             sdk.client.vcs.get().then((x) => setStore("vcs", reconcile(x.data))),
             sdk.client.path.get().then((x) => setStore("path", reconcile(x.data!))),
+            (
+              sdk.client.auth as unknown as {
+                info: (opts: {
+                  path: { providerID: string }
+                }) => Promise<{
+                  data: { authenticated: boolean; type?: string; email?: string; plan?: string; accountId?: string }
+                }>
+              }
+            )
+              .info({ path: { providerID: "openai" } })
+              .then((x) => {
+                setStore("provider_auth_info", "openai", x.data)
+              }),
           ]).then(() => {
             setStore("status", "complete")
           })

packages/opencode/src/cli/cmd/tui/routes/session/footer.tsx

@@ -5,11 +5,14 @@ import { useDirectory } from "../../context/directory"
 import { useConnected } from "../../component/dialog-model"
 import { createStore } from "solid-js/store"
 import { useRoute } from "../../context/route"
+import { AccountBadge } from "../../component/account-badge"
+import { useLocal } from "../../context/local"
 
 export function Footer() {
   const { theme } = useTheme()
   const sync = useSync()
   const route = useRoute()
+  const local = useLocal()
   const mcp = createMemo(() => Object.values(sync.data.mcp).filter((x) => x.status === "connected").length)
   const mcpError = createMemo(() => Object.values(sync.data.mcp).some((x) => x.status === "failed"))
   const lsp = createMemo(() => Object.keys(sync.data.lsp))
@@ -19,6 +22,12 @@ export function Footer() {
   })
   const directory = useDirectory()
   const connected = useConnected()
+  const currentModel = createMemo(() => local.model.current())
+  const showAccountBadge = createMemo(() => {
+    const model = currentModel()
+    const authInfo = sync.data.provider_auth_info.openai
+    return model?.providerID === "openai" && authInfo?.authenticated && authInfo?.email
+  })
 
   const [store, setStore] = createStore({
     welcome: false,
@@ -50,6 +59,9 @@ export function Footer() {
     <box flexDirection="row" justifyContent="space-between" gap={1} flexShrink={0}>
       <text fg={theme.textMuted}>{directory()}</text>
       <box gap={2} flexDirection="row" flexShrink={0}>
+        <Show when={showAccountBadge()}>
+          <AccountBadge />
+        </Show>
         <Switch>
           <Match when={store.welcome}>
             <text fg={theme.text}>

packages/opencode/src/config/config.ts

@@ -1046,6 +1046,11 @@ export namespace Config {
           chatMaxRetries: z.number().optional().describe("Number of retries for chat completions on failure"),
           disable_paste_summary: z.boolean().optional(),
           batch_tool: z.boolean().optional().describe("Enable the batch tool"),
+          openai_multi_account: z
+            .boolean()
+            .optional()
+            .default(false)
+            .describe("Enable multi-account storage and switching for OpenAI OAuth"),
           openTelemetry: z
             .boolean()
             .optional()
@@ -1055,12 +1060,24 @@ export namespace Config {
             .optional()
             .describe("Tools that should only be available to primary agents."),
           continue_loop_on_deny: z.boolean().optional().describe("Continue the agent loop when a tool call is denied"),
-          mcp_timeout: z
-            .number()
-            .int()
-            .positive()
-            .optional()
-            .describe("Timeout in milliseconds for model context protocol (MCP) requests"),
+          mcp_timeout: z.number().int().optional().describe("Timeout in milliseconds for MCP server initialization"),
+          skills: z
+            .object({
+              registries: z
+                .array(
+                  z.object({
+                    id: z.string(),
+                    type: z.enum(["github", "clawdhub", "url"]),
+                    url: z.string().url(),
+                    enabled: z.boolean().optional().default(true),
+                    globs: z.array(z.string()).optional().default(["*/SKILL.md", "skills/**/SKILL.md"]),
+                  }),
+                )
+                .optional(),
+              default_scope: z.enum(["user", "project"]).optional().default("project"),
+              auto_update: z.boolean().optional().default(false),
+            })
+            .optional(),
         })
         .optional(),
     })