Try alternative normalizeKey

Author: razor-x

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

@@ -74,13 +74,6 @@ export const { use: useKeybind, provider: KeybindProvider } = createSimpleContex
         return store.leader
       },
       parse(evt: ParsedKey): Keybind.Info {
-        if (evt.name === "\x00") {
-          return Keybind.fromParsedKey({ ...evt, name: "space", ctrl: true }, store.leader)
-        }
-        // Handle special case for Ctrl+Underscore (represented as \x1F)
-        if (evt.name === "\x1F") {
-          return Keybind.fromParsedKey({ ...evt, name: "_", ctrl: true }, store.leader)
-        }
         return Keybind.fromParsedKey(evt, store.leader)
       },
       match(key: keyof KeybindsConfig, evt: ParsedKey) {

packages/opencode/src/util/keybind.ts

@@ -10,10 +10,11 @@ export namespace Keybind {
     leader: boolean // our custom field
   }
 
-  const normalizeName = (name: string | undefined) => {
-    if (name === "\x00") return "space"
-    if (name === " ") return "space"
-    return name ?? ""
+  const normalizeKey = (key: ParsedKey): ParsedKey => {
+    if (key.name === "\x00") return { ...key, name: "space", ctrl: true }
+    if (key.name === "\x1F") return { ...key, name: "_", ctrl: true }
+    if (key.name === " ") return { ...key, name: "space" }
+    return key
   }
 
   export function match(a: Info, b: Info): boolean {
@@ -28,12 +29,13 @@ export namespace Keybind {
    * This helper ensures all required fields are present and avoids manual object creation.
    */
   export function fromParsedKey(key: ParsedKey, leader = false): Info {
+    const normalized = normalizeKey(key)
     return {
-      name: normalizeName(key.name),
-      ctrl: key.ctrl,
-      meta: key.meta,
-      shift: key.shift,
-      super: key.super ?? false,
+      name: normalized.name ?? "",
+      ctrl: normalized.ctrl,
+      meta: normalized.meta,
+      shift: normalized.shift,
+      super: normalized.super ?? false,
       leader,
     }
   }

packages/opencode/test/keybind.test.ts

@@ -1,4 +1,5 @@
 import { describe, test, expect } from "bun:test"
+import type { ParsedKey } from "@opentui/core"
 import { Keybind } from "../src/util/keybind"
 
 describe("Keybind.toString", () => {
@@ -186,6 +187,21 @@ describe("Keybind.match", () => {
   })
 })
 
+describe("Keybind.fromParsedKey", () => {
+  test("should normalize ctrl+space NUL", () => {
+    const key = { name: "\x00", ctrl: false, meta: false, shift: false, super: false } as ParsedKey
+    const result = Keybind.fromParsedKey(key)
+    expect(result).toEqual({
+      ctrl: true,
+      meta: false,
+      shift: false,
+      super: false,
+      leader: false,
+      name: "space",
+    })
+  })
+})
+
 describe("Keybind.parse", () => {
   test("should parse simple key", () => {
     const result = Keybind.parse("f")
@@ -226,19 +242,6 @@ describe("Keybind.parse", () => {
     ])
   })
 
-  test("should parse ctrl+space", () => {
-    const result = Keybind.parse("ctrl+space")
-    expect(result).toEqual([
-      {
-        ctrl: true,
-        meta: false,
-        shift: false,
-        leader: false,
-        name: "space",
-      },
-    ])
-  })
-
   test("should parse multiple modifiers", () => {
     const result = Keybind.parse("ctrl+alt+u")
     expect(result).toEqual([