remove 'scope' parameter from commands

Author: Brendonovich

packages/app/src/components/command-palette.ts

@@ -92,7 +92,7 @@ export function createCommandPaletteModel(props: { filesOnly?: () => boolean; on
 
   const allowedCommands = createMemo(() => {
     if (filesOnly()) return []
-    return commandPaletteOptions(command.options, "session")
+    return commandPaletteOptions(command.options)
   })
   const commandEntries = createMemo(() => {
     const category = language.t("palette.group.commands")

packages/app/src/components/dialog-command-palette-v2.tsx

@@ -73,7 +73,7 @@ export function DialogHomeCommandPaletteV2(props: {
   const state = { cleanup: undefined as (() => void) | void, committed: false }
   const commandEntries = createMemo(() => {
     const category = language.t("palette.group.commands")
-    return commandPaletteOptions(command.options, "general").map((option) =>
+    return commandPaletteOptions(command.options).map((option) =>
       createCommandPaletteCommandEntry(option, category),
     )
   })

packages/app/src/components/prompt-input.tsx

@@ -536,7 +536,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     {
       id: "file.attach",
       title: language.t("prompt.action.attachFile"),
-      scope: "session",
       category: language.t("command.category.file"),
       keybind: "mod+u",
       disabled: store.mode !== "normal",
@@ -545,7 +544,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     {
       id: "prompt.mode.shell",
       title: language.t("command.prompt.mode.shell"),
-      scope: "session",
       category: language.t("command.category.session"),
       keybind: shellModeKey,
       disabled: store.mode === "shell",
@@ -554,7 +552,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     {
       id: "prompt.mode.normal",
       title: language.t("command.prompt.mode.normal"),
-      scope: "session",
       category: language.t("command.category.session"),
       keybind: normalModeKey,
       disabled: store.mode === "normal",

packages/app/src/context/command.test.ts

@@ -3,22 +3,15 @@ import { commandPaletteOptions, resolveKeybindOption, upsertCommandRegistration,
 
 const paletteOptions: CommandOption[] = [
   { id: "settings.open", title: "Open settings" },
-  { id: "session.undo", title: "Undo", scope: "session" },
-  { id: "file.open", title: "Open file", scope: "session" },
+  { id: "session.undo", title: "Undo" },
+  { id: "file.open", title: "Open file" },
   { id: "hidden", title: "Hidden", hidden: true },
   { id: "disabled", title: "Disabled", disabled: true },
 ]
 
 describe("commandPaletteOptions", () => {
-  test("keeps only general commands on home", () => {
-    expect(commandPaletteOptions(paletteOptions, "general").map((option) => option.id)).toEqual(["settings.open"])
-  })
-
-  test("keeps general and session commands in sessions", () => {
-    expect(commandPaletteOptions(paletteOptions, "session").map((option) => option.id)).toEqual([
-      "settings.open",
-      "session.undo",
-    ])
+  test("keeps visible enabled commands", () => {
+    expect(commandPaletteOptions(paletteOptions).map((option) => option.id)).toEqual(["settings.open", "session.undo"])
   })
 })
 

packages/app/src/context/command.tsx

@@ -75,7 +75,6 @@ export interface Keybind {
 export interface CommandOption {
   id: string
   title: string
-  scope?: "general" | "session"
   description?: string
   category?: string
   keybind?: KeybindConfig
@@ -88,14 +87,13 @@ export interface CommandOption {
   onHighlight?: () => (() => void) | void
 }
 
-export function commandPaletteOptions(options: CommandOption[], scope: "general" | "session") {
+export function commandPaletteOptions(options: CommandOption[]) {
   return options.filter(
     (option) =>
       !option.disabled &&
       !option.hidden &&
       !option.id.startsWith(SUGGESTED_PREFIX) &&
-      option.id !== "file.open" &&
-      (scope === "session" || option.scope !== "session"),
+      option.id !== "file.open",
   )
 }
 

packages/app/src/pages/layout.tsx

@@ -946,39 +946,34 @@ export default function LegacyLayout(props: ParentProps) {
       {
         id: "session.previous",
         title: language.t("command.session.previous"),
-        scope: "session",
         category: language.t("command.category.session"),
         keybind: "alt+arrowup",
         onSelect: () => navigateSessionByOffset(-1),
       },
       {
         id: "session.next",
         title: language.t("command.session.next"),
-        scope: "session",
         category: language.t("command.category.session"),
         keybind: "alt+arrowdown",
         onSelect: () => navigateSessionByOffset(1),
       },
       {
         id: "session.previous.unseen",
         title: language.t("command.session.previous.unseen"),
-        scope: "session",
         category: language.t("command.category.session"),
         keybind: "shift+alt+arrowup",
         onSelect: () => navigateSessionByUnseen(-1),
       },
       {
         id: "session.next.unseen",
         title: language.t("command.session.next.unseen"),
-        scope: "session",
         category: language.t("command.category.session"),
         keybind: "shift+alt+arrowdown",
         onSelect: () => navigateSessionByUnseen(1),
       },
       {
         id: "session.archive",
         title: language.t("command.session.archive"),
-        scope: "session",
         category: language.t("command.category.session"),
         keybind: "mod+shift+backspace",
         disabled: !params.dir || !params.id,

packages/app/src/pages/new-session.tsx

@@ -3,6 +3,7 @@ import { createStore } from "solid-js/store"
 import { Portal } from "solid-js/web"
 import { useSearchParams } from "@solidjs/router"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
+import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { NewSessionDesignView } from "@/components/session"
@@ -51,6 +52,7 @@ export default function NewSessionPage() {
   const comments = useComments()
   const language = useLanguage()
   const settings = useSettings()
+  const dialog = useDialog()
   const command = useCommand()
   const providers = useProviders(() => sdk().directory)
   const openProviderSettings = useSettingsDialog("providers")
@@ -76,10 +78,18 @@ export default function NewSessionPage() {
   })
 
   command.register("new-session", () => [
+    {
+      id: "command.palette",
+      title: language.t("command.palette"),
+      hidden: true,
+      onSelect: async () => {
+        const { DialogSelectFile } = await import("@/components/dialog-select-file")
+        void dialog.show(() => <DialogSelectFile />)
+      },
+    },
     {
       id: "input.focus",
       title: language.t("command.input.focus"),
-      scope: "session",
       category: language.t("command.category.view"),
       keybind: "ctrl+l",
       onSelect: () => inputRef?.focus(),

packages/app/src/pages/session.tsx

@@ -41,6 +41,7 @@ import { useLocation, useNavigate, useParams, useSearchParams } from "@solidjs/r
 import { NewSessionView, SessionHeader } from "@/components/session"
 import { ErrorPage } from "@/pages/error"
 import { CommentsProvider, useComments } from "@/context/comments"
+import { useCommand } from "@/context/command"
 import { DirectoryDataProvider } from "@/pages/directory-layout"
 import { useServerSync } from "@/context/server-sync"
 import { useLanguage } from "@/context/language"
@@ -350,6 +351,7 @@ export default function Page() {
   const platform = usePlatform()
   const prompt = usePrompt()
   const comments = useComments()
+  const command = useCommand()
   const terminal = useTerminal()
   const [searchParams, setSearchParams] = useSearchParams<{ prompt?: string }>()
   const location = useLocation()
@@ -1120,6 +1122,14 @@ export default function Page() {
     review: reviewTab,
     fileBrowser: () => newSessionDesign() && isDesktop() && !!params.id,
   })
+  command.register("session-palette", () => [
+    {
+      id: "command.palette",
+      title: language.t("command.palette"),
+      hidden: true,
+      onSelect: () => command.trigger("file.open", "palette"),
+    },
+  ])
 
   const openReviewFile = createOpenReviewFile({
     showAllFiles,

packages/app/src/pages/session/use-composer-commands.tsx

@@ -11,7 +11,6 @@ const withCategory = (category: string) => {
   return (option: Omit<CommandOption, "category">): CommandOption => ({
     ...option,
     category,
-    scope: "session",
   })
 }
 

packages/app/src/pages/session/use-session-commands.tsx

@@ -32,7 +32,6 @@ const withCategory = (category: string) => {
   return (option: Omit<CommandOption, "category">): CommandOption => ({
     ...option,
     category,
-    scope: "session",
   })
 }
 
@@ -464,12 +463,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
   const fileCmds = () => {
     const tab = closableTab()
     return [
-      fileCommand({
-        id: "command.palette",
-        title: language.t("command.palette"),
-        hidden: true,
-        onSelect: openFile,
-      }),
       fileCommand({
         id: "file.open",
         title: language.t("command.file.open"),