move command palette

Author: kommander

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

@@ -64,7 +64,7 @@ import { TuiPluginRuntime } from "@/cli/cmd/tui/plugin/runtime"
 import { createTuiApi } from "@/cli/cmd/tui/plugin/api"
 import type { RouteMap } from "@/cli/cmd/tui/plugin/api"
 import { FormatError, FormatUnknownError } from "@/cli/error"
-import { CommandPaletteProvider } from "./context/command-palette"
+import { COMMAND_PALETTE_DIALOG, CommandPaletteDialog } from "./component/command-palette"
 import {
   OPENCODE_BASE_MODE,
   OpencodeKeymapProvider,
@@ -190,17 +190,15 @@ export function tui(input: {
                                   <LocalProvider>
                                     <PromptStashProvider>
                                       <DialogProvider>
-                                        <CommandPaletteProvider>
-                                          <FrecencyProvider>
-                                            <PromptHistoryProvider>
-                                              <PromptRefProvider>
-                                                <EditorContextProvider>
-                                                  <App onSnapshot={input.onSnapshot} />
-                                                </EditorContextProvider>
-                                              </PromptRefProvider>
-                                            </PromptHistoryProvider>
-                                          </FrecencyProvider>
-                                        </CommandPaletteProvider>
+                                        <FrecencyProvider>
+                                          <PromptHistoryProvider>
+                                            <PromptRefProvider>
+                                              <EditorContextProvider>
+                                                <App onSnapshot={input.onSnapshot} />
+                                              </EditorContextProvider>
+                                            </PromptRefProvider>
+                                          </PromptHistoryProvider>
+                                        </FrecencyProvider>
                                       </DialogProvider>
                                     </PromptStashProvider>
                                   </LocalProvider>
@@ -404,6 +402,14 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
   const connected = useConnected()
   const appCommands = createMemo(() =>
     [
+      {
+        name: COMMAND_PALETTE_DIALOG,
+        title: "Show command palette",
+        hidden: true,
+        run: () => {
+          dialog.replace(() => <CommandPaletteDialog />)
+        },
+      },
       {
         name: "session.list",
         title: "Switch session",

…/cli/cmd/tui/context/command-palette.tsx …li/cmd/tui/component/command-palette.tsxpackages/opencode/src/cli/cmd/tui/context/command-palette.tsx renamed to packages/opencode/src/cli/cmd/tui/component/command-palette.tsx packages/opencode/src/cli/cmd/tui/context/command-palette.tsx renamed to packages/opencode/src/cli/cmd/tui/component/command-palette.tsx

@@ -1,14 +1,8 @@
-import { createMemo, type Accessor, type ParentProps } from "solid-js"
+import { createMemo, type Accessor } from "solid-js"
 import { DialogSelect, type DialogSelectRef } from "@tui/ui/dialog-select"
-import { useDialog, type DialogContext } from "@tui/ui/dialog"
-import {
-  formatKeyBindings,
-  type OpenTuiKeymap,
-  useBindings,
-  useKeymapSelector,
-  useOpencodeKeymap,
-} from "../keymap"
-import { useTuiConfig } from "./tui-config"
+import { type DialogContext } from "@tui/ui/dialog"
+import { formatKeyBindings, type OpenTuiKeymap, useKeymapSelector, useOpencodeKeymap } from "../keymap"
+import { useTuiConfig } from "../context/tui-config"
 
 type SlashEntry = {
   display: string
@@ -17,7 +11,7 @@ type SlashEntry = {
   onSelect: () => void
 }
 
-const COMMAND_PALETTE_DIALOG = "command.palette.show"
+export const COMMAND_PALETTE_DIALOG = "command.palette.show"
 type PaletteCommandEntry = ReturnType<OpenTuiKeymap["getCommandEntries"]>[number]
 
 function isVisiblePaletteCommand(entry: PaletteCommandEntry) {
@@ -31,25 +25,7 @@ function isSuggestedPaletteCommand(entry: PaletteCommandEntry) {
   return false
 }
 
-export function CommandPaletteProvider(props: ParentProps) {
-  const dialog = useDialog()
-  useBindings(() => ({
-    commands: [
-      {
-        name: COMMAND_PALETTE_DIALOG,
-        title: "Show command palette",
-        hidden: true,
-        run() {
-          dialog.replace(() => <CommandPaletteDialog />)
-        },
-      },
-    ],
-  }))
-
-  return <>{props.children}</>
-}
-
-function CommandPaletteDialog() {
+export function CommandPaletteDialog() {
   const config = useTuiConfig()
   const keymap = useOpencodeKeymap()
   const entries = useKeymapSelector((keymap: OpenTuiKeymap) => {

packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx

@@ -12,7 +12,7 @@ import { getScrollAcceleration } from "../../util/scroll"
 import { useTuiConfig } from "../../context/tui-config"
 import { useTheme, selectedForeground } from "@tui/context/theme"
 import { SplitBorder } from "@tui/component/border"
-import { useCommandSlashes } from "../../context/command-palette"
+import { useCommandSlashes } from "../command-palette"
 import { useTerminalDimensions } from "@opentui/solid"
 import { Locale } from "@/util/locale"
 import type { PromptInfo } from "./history"