project config can override keybind

packages/opencode/src/config/tui-schema.ts

@@ -1,6 +1,15 @@
 import z from "zod"
 import { Config } from "./config"
 
+const KeybindOverride = z
+  .object(
+    Object.fromEntries(Object.keys(Config.Keybinds.shape).map((key) => [key, z.string().optional()])) as Record<
+      string,
+      z.ZodOptional<z.ZodString>
+    >,
+  )
+  .strict()
+
 export const TuiOptions = z.object({
   scroll_speed: z.number().min(0.001).optional().describe("TUI scroll speed"),
   scroll_acceleration: z
@@ -19,7 +28,7 @@ export const TuiInfo = z
   .object({
     $schema: z.string().optional(),
     theme: z.string().optional(),
-    keybinds: Config.Keybinds.optional(),
+    keybinds: KeybindOverride.optional(),
   })
   .extend(TuiOptions.shape)
   .strict()

packages/opencode/src/config/tui.ts

@@ -66,7 +66,7 @@ export namespace TuiConfig {
       }
     }
 
-    result.keybinds ??= Config.Keybinds.parse({})
+    result.keybinds = Config.Keybinds.parse(result.keybinds ?? {})
 
     return {
       config: result,

packages/opencode/test/config/tui.test.ts

@@ -315,6 +315,24 @@ test("project config takes precedence over OPENCODE_TUI_CONFIG (matches OPENCODE
   })
 })
 
+test("merges keybind overrides across precedence layers", async () => {
+  await using tmp = await tmpdir({
+    init: async (dir) => {
+      await Bun.write(path.join(Global.Path.config, "tui.json"), JSON.stringify({ keybinds: { app_exit: "ctrl+q" } }))
+      await Bun.write(path.join(dir, "tui.json"), JSON.stringify({ keybinds: { theme_list: "ctrl+k" } }))
+    },
+  })
+
+  await Instance.provide({
+    directory: tmp.path,
+    fn: async () => {
+      const config = await TuiConfig.get()
+      expect(config.keybinds?.app_exit).toBe("ctrl+q")
+      expect(config.keybinds?.theme_list).toBe("ctrl+k")
+    },
+  })
+})
+
 test("OPENCODE_TUI_CONFIG provides settings when no project config exists", async () => {
   await using tmp = await tmpdir({
     init: async (dir) => {