move more

Author: kommander

packages/opencode/src/cli/cmd/tui/app.tsx

@@ -81,6 +81,7 @@ import { DialogVariant } from "./component/dialog-variant"
 
 const appGlobalBindingCommands = [
   "session.list",
+  "session.new",
   "session.quick_switch.1",
   "session.quick_switch.2",
   "session.quick_switch.3",
@@ -94,7 +95,6 @@ const appGlobalBindingCommands = [
 
 const appBindingCommands = [
   "command.palette.show",
-  "session.new",
   "model.list",
   "model.cycle_recent",
   "model.cycle_recent_reverse",

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

@@ -133,12 +133,6 @@ const sessionBindingCommands = [
   "session.toggle.actions",
   "session.toggle.scrollbar",
   "session.toggle.generic_tool_output",
-  "session.page.up",
-  "session.page.down",
-  "session.line.up",
-  "session.line.down",
-  "session.half.page.up",
-  "session.half.page.down",
   "session.first",
   "session.last",
   "session.messages_last_user",
@@ -153,6 +147,15 @@ const sessionBindingCommands = [
   "session.child.previous",
 ] as const
 
+const sessionGlobalBindingCommands = [
+  "session.page.up",
+  "session.page.down",
+  "session.line.up",
+  "session.line.down",
+  "session.half.page.up",
+  "session.half.page.down",
+] as const
+
 const context = createContext<{
   width: number
   sessionID: string
@@ -1061,6 +1064,10 @@ export function Session() {
     commands: sessionCommands(),
   }))
 
+  useBindings(() => ({
+    bindings: tuiConfig.keybinds.gather("session.global", sessionGlobalBindingCommands),
+  }))
+
   useBindings(() => ({
     mode: OPENCODE_BASE_MODE,
     bindings: tuiConfig.keybinds.gather("session", sessionBindingCommands),

packages/opencode/test/cli/tui/keymap.test.tsx

@@ -67,18 +67,25 @@ test("mode-less bindings stay active when opencode mode changes", async () => {
     const config = createTuiResolvedConfig()
     const offKeymap = registerOpencodeKeymap(keymap, renderer, config)
     const offGlobal = keymap.registerLayer({
-      commands: [{ name: "session.list", run() {} }],
-      bindings: config.keybinds.gather("test.global", ["session.list"]),
+      commands: [
+        { name: "session.list", run() {} },
+        { name: "session.new", run() {} },
+        { name: "session.page.up", run() {} },
+      ],
+      bindings: config.keybinds.gather("test.global", ["session.list", "session.new", "session.page.up"]),
     })
     const offBase = keymap.registerLayer({
       mode: OPENCODE_BASE_MODE,
-      commands: [{ name: "session.new", run() {} }],
-      bindings: config.keybinds.gather("test.base", ["session.new"]),
+      commands: [{ name: "model.list", run() {} }],
+      bindings: config.keybinds.gather("test.base", ["model.list"]),
     })
     const activeCounts = () =>
       Object.fromEntries(
         Array.from(
-          keymap.getCommandBindings({ visibility: "active", commands: ["session.list", "session.new"] }),
+          keymap.getCommandBindings({
+            visibility: "active",
+            commands: ["session.list", "session.new", "session.page.up", "model.list"],
+          }),
           ([command, bindings]) => [command, bindings.length],
         ),
       )
@@ -107,9 +114,9 @@ test("mode-less bindings stay active when opencode mode changes", async () => {
   const app = await testRender(() => <Harness />)
   try {
     expect(counts).toEqual({
-      base: { "session.list": 1, "session.new": 1 },
-      question: { "session.list": 1, "session.new": 0 },
-      autocomplete: { "session.list": 1, "session.new": 0 },
+      base: { "session.list": 1, "session.new": 1, "session.page.up": 2, "model.list": 1 },
+      question: { "session.list": 1, "session.new": 1, "session.page.up": 2, "model.list": 0 },
+      autocomplete: { "session.list": 1, "session.new": 1, "session.page.up": 2, "model.list": 0 },
     })
   } finally {
     app.renderer.destroy()