wip(desktop): progress

4 files changed, 689 insertions, 205 deletions

diff --git a/packages/desktop/src/components/dialog-connect.tsx b/packages/desktop/src/components/dialog-connect.tsx
new file mode 100644
index 000000000..a44365069
--- /dev/null
+++ b/packages/desktop/src/components/dialog-connect.tsx
@@ -0,0 +1,406 @@
+import { Component, createMemo, Match, onCleanup, onMount, Switch } from "solid-js"
+import { createStore, produce } from "solid-js/store"
+import { useLayout } from "@/context/layout"
+import { useGlobalSync } from "@/context/global-sync"
+import { useGlobalSDK } from "@/context/global-sdk"
+import { usePlatform } from "@/context/platform"
+import { ProviderAuthMethod, ProviderAuthAuthorization } from "@opencode-ai/sdk/v2/client"
+import { Dialog } from "@opencode-ai/ui/dialog"
+import { List, ListRef } from "@opencode-ai/ui/list"
+import { Button } from "@opencode-ai/ui/button"
+import { IconButton } from "@opencode-ai/ui/icon-button"
+import { TextField } from "@opencode-ai/ui/text-field"
+import { Spinner } from "@opencode-ai/ui/spinner"
+import { Icon } from "@opencode-ai/ui/icon"
+import { showToast } from "@opencode-ai/ui/toast"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
+import { IconName } from "@opencode-ai/ui/icons/provider"
+import { iife } from "@opencode-ai/util/iife"
+import { Link } from "@/components/link"
+
+export const DialogConnect: Component = () => {
+  const layout = useLayout()
+  const globalSync = useGlobalSync()
+  const globalSDK = useGlobalSDK()
+  const platform = usePlatform()
+
+  const providerID = createMemo(() => layout.connect.provider()!)
+  const provider = createMemo(() => globalSync.data.provider.all.find((x) => x.id === providerID())!)
+  const methods = createMemo(
+    () =>
+      globalSync.data.provider_auth[providerID()] ?? [
+        {
+          type: "api",
+          label: "API key",
+        },
+      ],
+  )
+  const [store, setStore] = createStore({
+    method: undefined as undefined | ProviderAuthMethod,
+    authorization: undefined as undefined | ProviderAuthAuthorization,
+    state: "pending" as undefined | "pending" | "complete" | "error",
+    error: undefined as string | undefined,
+  })
+
+  const methodIndex = createMemo(() => methods().findIndex((x) => x.label === store.method?.label))
+
+  async function selectMethod(index: number) {
+    const method = methods()[index]
+    setStore(
+      produce((draft) => {
+        draft.method = method
+        draft.authorization = undefined
+        draft.state = undefined
+        draft.error = undefined
+      }),
+    )
+
+    if (method.type === "oauth") {
+      setStore("state", "pending")
+      const start = Date.now()
+      await globalSDK.client.provider.oauth
+        .authorize(
+          {
+            providerID: providerID(),
+            method: index,
+          },
+          { throwOnError: true },
+        )
+        .then((x) => {
+          const elapsed = Date.now() - start
+          const delay = 1000 - elapsed
+
+          if (delay > 0) {
+            setTimeout(() => {
+              setStore("state", "complete")
+              setStore("authorization", x.data!)
+            }, delay)
+            return
+          }
+          setStore("state", "complete")
+          setStore("authorization", x.data!)
+        })
+        .catch((e) => {
+          setStore("state", "error")
+          setStore("error", String(e))
+        })
+    }
+  }
+
+  let listRef: ListRef | undefined
+  function handleKey(e: KeyboardEvent) {
+    if (e.key === "Enter" && e.target instanceof HTMLInputElement) {
+      return
+    }
+    if (e.key === "Escape") return
+    listRef?.onKeyDown(e)
+  }
+
+  onMount(() => {
+    if (methods().length === 1) {
+      selectMethod(0)
+    }
+
+    document.addEventListener("keydown", handleKey)
+    onCleanup(() => {
+      document.removeEventListener("keydown", handleKey)
+    })
+  })
+
+  async function complete() {
+    await globalSDK.client.global.dispose()
+    setTimeout(() => {
+      showToast({
+        variant: "success",
+        icon: "circle-check",
+        title: `${provider().name} connected`,
+        description: `${provider().name} models are now available to use.`,
+      })
+      layout.connect.complete()
+    }, 500)
+  }
+
+  return (
+    <Dialog
+      modal
+      defaultOpen
+      onOpenChange={(open) => {
+        if (open) {
+          layout.dialog.open("connect")
+        } else {
+          layout.dialog.close("connect")
+        }
+      }}
+    >
+      <Dialog.Header class="px-4.5">
+        <Dialog.Title class="flex items-center">
+          <IconButton
+            tabIndex={-1}
+            icon="arrow-left"
+            variant="ghost"
+            onClick={() => {
+              if (methods().length === 1) {
+                layout.dialog.open("provider")
+                return
+              }
+              if (store.authorization) {
+                setStore("authorization", undefined)
+                setStore("method", undefined)
+                return
+              }
+              if (store.method) {
+                setStore("method", undefined)
+                return
+              }
+              layout.dialog.open("provider")
+            }}
+          />
+        </Dialog.Title>
+        <Dialog.CloseButton tabIndex={-1} />
+      </Dialog.Header>
+      <Dialog.Body>
+        <div class="flex flex-col gap-6 px-2.5 pb-3">
+          <div class="px-2.5 flex gap-4 items-center">
+            <ProviderIcon id={providerID() as IconName} class="size-5 shrink-0 icon-strong-base" />
+            <div class="text-16-medium text-text-strong">
+              <Switch>
+                <Match when={providerID() === "anthropic" && store.method?.label?.toLowerCase().includes("max")}>
+                  Login with Claude Pro/Max
+                </Match>
+                <Match when={true}>Connect {provider().name}</Match>
+              </Switch>
+            </div>
+          </div>
+          <div class="px-2.5 pb-10 flex flex-col gap-6">
+            <Switch>
+              <Match when={store.method === undefined}>
+                <div class="text-14-regular text-text-base">Select login method for {provider().name}.</div>
+                <div class="">
+                  <List
+                    ref={(ref) => (listRef = ref)}
+                    items={methods}
+                    key={(m) => m?.label}
+                    onSelect={async (method, index) => {
+                      if (!method) return
+                      selectMethod(index)
+                    }}
+                  >
+                    {(i) => (
+                      <div class="w-full flex items-center gap-x-4">
+                        <div class="w-4 h-2 rounded-[1px] bg-input-base shadow-xs-border-base flex items-center justify-center">
+                          <div class="w-2.5 h-0.5 bg-icon-strong-base hidden" data-slot="list-item-extra-icon" />
+                        </div>
+                        <span>{i.label}</span>
+                      </div>
+                    )}
+                  </List>
+                </div>
+              </Match>
+              <Match when={store.state === "pending"}>
+                <div class="text-14-regular text-text-base">
+                  <div class="flex items-center gap-x-4">
+                    <Spinner />
+                    <span>Authorization in progress...</span>
+                  </div>
+                </div>
+              </Match>
+              <Match when={store.state === "error"}>
+                <div class="text-14-regular text-text-base">
+                  <div class="flex items-center gap-x-4">
+                    <Icon name="circle-ban-sign" class="text-icon-critical-base" />
+                    <span>Authorization failed: {store.error}</span>
+                  </div>
+                </div>
+              </Match>
+              <Match when={store.method?.type === "api"}>
+                {iife(() => {
+                  const [formStore, setFormStore] = createStore({
+                    value: "",
+                    error: undefined as string | undefined,
+                  })
+
+                  async function handleSubmit(e: SubmitEvent) {
+                    e.preventDefault()
+
+                    const form = e.currentTarget as HTMLFormElement
+                    const formData = new FormData(form)
+                    const apiKey = formData.get("apiKey") as string
+
+                    if (!apiKey?.trim()) {
+                      setFormStore("error", "API key is required")
+                      return
+                    }
+
+                    setFormStore("error", undefined)
+                    await globalSDK.client.auth.set({
+                      providerID: providerID(),
+                      auth: {
+                        type: "api",
+                        key: apiKey,
+                      },
+                    })
+                    await complete()
+                  }
+
+                  return (
+                    <div class="flex flex-col gap-6">
+                      <Switch>
+                        <Match when={provider().id === "opencode"}>
+                          <div class="flex flex-col gap-4">
+                            <div class="text-14-regular text-text-base">
+                              OpenCode Zen gives you access to a curated set of reliable optimized models for coding
+                              agents.
+                            </div>
+                            <div class="text-14-regular text-text-base">
+                              With a single API key you'll get access to models such as Claude, GPT, Gemini, GLM and
+                              more.
+                            </div>
+                            <div class="text-14-regular text-text-base">
+                              Visit{" "}
+                              <Link href="https://opencode.ai/zen" tabIndex={-1}>
+                                opencode.ai/zen
+                              </Link>{" "}
+                              to collect your API key.
+                            </div>
+                          </div>
+                        </Match>
+                        <Match when={true}>
+                          <div class="text-14-regular text-text-base">
+                            Enter your {provider().name} API key to connect your account and use {provider().name}{" "}
+                            models in OpenCode.
+                          </div>
+                        </Match>
+                      </Switch>
+                      <form onSubmit={handleSubmit} class="flex flex-col items-start gap-4">
+                        <TextField
+                          autofocus
+                          type="text"
+                          label={`${provider().name} API key`}
+                          placeholder="API key"
+                          name="apiKey"
+                          value={formStore.value}
+                          onChange={setFormStore.bind(null, "value")}
+                          validationState={formStore.error ? "invalid" : undefined}
+                          error={formStore.error}
+                        />
+                        <Button class="w-auto" type="submit" size="large" variant="primary">
+                          Submit
+                        </Button>
+                      </form>
+                    </div>
+                  )
+                })}
+              </Match>
+              <Match when={store.method?.type === "oauth"}>
+                <Switch>
+                  <Match when={store.authorization?.method === "code"}>
+                    {iife(() => {
+                      const [formStore, setFormStore] = createStore({
+                        value: "",
+                        error: undefined as string | undefined,
+                      })
+
+                      onMount(() => {
+                        if (store.authorization?.method === "code" && store.authorization?.url) {
+                          platform.openLink(store.authorization.url)
+                        }
+                      })
+
+                      async function handleSubmit(e: SubmitEvent) {
+                        e.preventDefault()
+
+                        const form = e.currentTarget as HTMLFormElement
+                        const formData = new FormData(form)
+                        const code = formData.get("code") as string
+
+                        if (!code?.trim()) {
+                          setFormStore("error", "Authorization code is required")
+                          return
+                        }
+
+                        setFormStore("error", undefined)
+                        const { error } = await globalSDK.client.provider.oauth.callback({
+                          providerID: providerID(),
+                          method: methodIndex(),
+                          code,
+                        })
+                        if (!error) {
+                          await complete()
+                          return
+                        }
+                        setFormStore("error", "Invalid authorization code")
+                      }
+
+                      return (
+                        <div class="flex flex-col gap-6">
+                          <div class="text-14-regular text-text-base">
+                            Visit <Link href={store.authorization!.url}>this link</Link> to collect your authorization
+                            code to connect your account and use {provider().name} models in OpenCode.
+                          </div>
+                          <form onSubmit={handleSubmit} class="flex flex-col items-start gap-4">
+                            <TextField
+                              autofocus
+                              type="text"
+                              label={`${store.method?.label} authorization code`}
+                              placeholder="Authorization code"
+                              name="code"
+                              value={formStore.value}
+                              onChange={setFormStore.bind(null, "value")}
+                              validationState={formStore.error ? "invalid" : undefined}
+                              error={formStore.error}
+                            />
+                            <Button class="w-auto" type="submit" size="large" variant="primary">
+                              Submit
+                            </Button>
+                          </form>
+                        </div>
+                      )
+                    })}
+                  </Match>
+                  <Match when={store.authorization?.method === "auto"}>
+                    {iife(() => {
+                      const code = createMemo(() => {
+                        const instructions = store.authorization?.instructions
+                        if (instructions?.includes(":")) {
+                          return instructions?.split(":")[1]?.trim()
+                        }
+                        return instructions
+                      })
+
+                      onMount(async () => {
+                        const result = await globalSDK.client.provider.oauth.callback({
+                          providerID: providerID(),
+                          method: methodIndex(),
+                        })
+                        if (result.error) {
+                          // TODO: show error
+                          layout.dialog.close("connect")
+                          return
+                        }
+                        await complete()
+                      })
+
+                      return (
+                        <div class="flex flex-col gap-6">
+                          <div class="text-14-regular text-text-base">
+                            Visit <Link href={store.authorization!.url}>this link</Link> and enter the code below to
+                            connect your account and use {provider().name} models in OpenCode.
+                          </div>
+                          <TextField label="Confirmation code" class="font-mono" value={code()} readOnly copyable />
+                          <div class="text-14-regular text-text-base flex items-center gap-4">
+                            <Spinner />
+                            <span>Waiting for authorization...</span>
+                          </div>
+                        </div>
+                      )
+                    })}
+                  </Match>
+                </Switch>
+              </Match>
+            </Switch>
+          </div>
+        </div>
+      </Dialog.Body>
+    </Dialog>
+  )
+}
diff --git a/packages/desktop/src/components/dialog-model.tsx b/packages/desktop/src/components/dialog-model.tsx
new file mode 100644
index 000000000..9d36e0797
--- /dev/null
+++ b/packages/desktop/src/components/dialog-model.tsx
@@ -0,0 +1,212 @@
+import { Component, createMemo, Match, onCleanup, onMount, Show, Switch } from "solid-js"
+import { useLocal } from "@/context/local"
+import { useLayout } from "@/context/layout"
+import { popularProviders, useProviders } from "@/hooks/use-providers"
+import { SelectDialog } from "@opencode-ai/ui/select-dialog"
+import { Button } from "@opencode-ai/ui/button"
+import { Tag } from "@opencode-ai/ui/tag"
+import { Dialog } from "@opencode-ai/ui/dialog"
+import { List, ListRef } from "@opencode-ai/ui/list"
+import { iife } from "@opencode-ai/util/iife"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
+import { IconName } from "@opencode-ai/ui/icons/provider"
+
+export const DialogModel: Component = () => {
+  const local = useLocal()
+  const layout = useLayout()
+  const providers = useProviders()
+
+  return (
+    <Switch>
+      <Match when={providers.paid().length > 0}>
+        {iife(() => {
+          const models = createMemo(() =>
+            local.model
+              .list()
+              .filter((m) => m.visible)
+              .filter((m) =>
+                layout.connect.state() === "complete" ? m.provider.id === layout.connect.provider() : true,
+              ),
+          )
+          return (
+            <SelectDialog
+              defaultOpen
+              onOpenChange={(open) => {
+                if (open) {
+                  layout.dialog.open("model")
+                } else {
+                  layout.dialog.close("model")
+                }
+              }}
+              title="Select model"
+              placeholder="Search models"
+              emptyMessage="No model results"
+              key={(x) => `${x.provider.id}:${x.id}`}
+              items={models}
+              current={local.model.current()}
+              filterKeys={["provider.name", "name", "id"]}
+              sortBy={(a, b) => a.name.localeCompare(b.name)}
+              groupBy={(x) => x.provider.name}
+              sortGroupsBy={(a, b) => {
+                if (a.category === "Recent" && b.category !== "Recent") return -1
+                if (b.category === "Recent" && a.category !== "Recent") return 1
+                const aProvider = a.items[0].provider.id
+                const bProvider = b.items[0].provider.id
+                if (popularProviders.includes(aProvider) && !popularProviders.includes(bProvider)) return -1
+                if (!popularProviders.includes(aProvider) && popularProviders.includes(bProvider)) return 1
+                return popularProviders.indexOf(aProvider) - popularProviders.indexOf(bProvider)
+              }}
+              onSelect={(x) =>
+                local.model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
+                  recent: true,
+                })
+              }
+              actions={
+                <Button
+                  class="h-7 -my-1 text-14-medium"
+                  icon="plus-small"
+                  tabIndex={-1}
+                  onClick={() => layout.dialog.open("provider")}
+                >
+                  Connect provider
+                </Button>
+              }
+            >
+              {(i) => (
+                <div class="w-full flex items-center gap-x-2.5">
+                  <span>{i.name}</span>
+                  <Show when={i.provider.id === "opencode" && (!i.cost || i.cost?.input === 0)}>
+                    <Tag>Free</Tag>
+                  </Show>
+                  <Show when={i.latest}>
+                    <Tag>Latest</Tag>
+                  </Show>
+                </div>
+              )}
+            </SelectDialog>
+          )
+        })}
+      </Match>
+      <Match when={true}>
+        {iife(() => {
+          let listRef: ListRef | undefined
+          const handleKey = (e: KeyboardEvent) => {
+            if (e.key === "Escape") return
+            listRef?.onKeyDown(e)
+          }
+
+          onMount(() => {
+            document.addEventListener("keydown", handleKey)
+            onCleanup(() => {
+              document.removeEventListener("keydown", handleKey)
+            })
+          })
+
+          return (
+            <Dialog
+              modal
+              defaultOpen
+              onOpenChange={(open) => {
+                if (open) {
+                  layout.dialog.open("model")
+                } else {
+                  layout.dialog.close("model")
+                }
+              }}
+            >
+              <Dialog.Header>
+                <Dialog.Title>Select model</Dialog.Title>
+                <Dialog.CloseButton tabIndex={-1} />
+              </Dialog.Header>
+              <Dialog.Body>
+                <div class="flex flex-col gap-3 px-2.5">
+                  <div class="text-14-medium text-text-base px-2.5">Free models provided by OpenCode</div>
+                  <List
+                    ref={(ref) => (listRef = ref)}
+                    items={local.model.list}
+                    current={local.model.current()}
+                    key={(x) => `${x.provider.id}:${x.id}`}
+                    onSelect={(x) => {
+                      local.model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
+                        recent: true,
+                      })
+                      layout.dialog.close("model")
+                    }}
+                  >
+                    {(i) => (
+                      <div class="w-full flex items-center gap-x-2.5">
+                        <span>{i.name}</span>
+                        <Tag>Free</Tag>
+                        <Show when={i.latest}>
+                          <Tag>Latest</Tag>
+                        </Show>
+                      </div>
+                    )}
+                  </List>
+                  <div />
+                  <div />
+                </div>
+                <div class="px-1.5 pb-1.5">
+                  <div class="w-full rounded-sm border border-border-weak-base bg-surface-raised-base">
+                    <div class="w-full flex flex-col items-start gap-4 px-1.5 pt-4 pb-4">
+                      <div class="px-2 text-14-medium text-text-base">Add more models from popular providers</div>
+                      <div class="w-full">
+                        <List
+                          class="w-full"
+                          key={(x) => x?.id}
+                          items={providers.popular}
+                          activeIcon="plus-small"
+                          sortBy={(a, b) => {
+                            if (popularProviders.includes(a.id) && popularProviders.includes(b.id))
+                              return popularProviders.indexOf(a.id) - popularProviders.indexOf(b.id)
+                            return a.name.localeCompare(b.name)
+                          }}
+                          onSelect={(x) => {
+                            if (!x) return
+                            layout.dialog.connect(x.id)
+                          }}
+                        >
+                          {(i) => (
+                            <div class="w-full flex items-center gap-x-4">
+                              <ProviderIcon
+                                data-slot="list-item-extra-icon"
+                                id={i.id as IconName}
+                                // TODO: clean this up after we update icon in models.dev
+                                classList={{
+                                  "text-icon-weak-base": true,
+                                  "size-4 mx-0.5": i.id === "opencode",
+                                  "size-5": i.id !== "opencode",
+                                }}
+                              />
+                              <span>{i.name}</span>
+                              <Show when={i.id === "opencode"}>
+                                <Tag>Recommended</Tag>
+                              </Show>
+                              <Show when={i.id === "anthropic"}>
+                                <div class="text-14-regular text-text-weak">Connect with Claude Pro/Max or API key</div>
+                              </Show>
+                            </div>
+                          )}
+                        </List>
+                        <Button
+                          variant="ghost"
+                          class="w-full justify-start px-[11px] py-3.5 gap-4.5 text-14-medium"
+                          icon="dot-grid"
+                          onClick={() => {
+                            layout.dialog.open("provider")
+                          }}
+                        >
+                          View all providers
+                        </Button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </Dialog.Body>
+            </Dialog>
+          )
+        })}
+      </Match>
+    </Switch>
+  )
+}
diff --git a/packages/desktop/src/components/dialog-provider.tsx b/packages/desktop/src/components/dialog-provider.tsx
new file mode 100644
index 000000000..56c791479
--- /dev/null
+++ b/packages/desktop/src/components/dialog-provider.tsx
@@ -0,0 +1,68 @@
+import { Component, Show } from "solid-js"
+import { useLayout } from "@/context/layout"
+import { popularProviders, useProviders } from "@/hooks/use-providers"
+import { SelectDialog } from "@opencode-ai/ui/select-dialog"
+import { Tag } from "@opencode-ai/ui/tag"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
+import { IconName } from "@opencode-ai/ui/icons/provider"
+
+export const DialogProvider: Component = () => {
+  const layout = useLayout()
+  const providers = useProviders()
+
+  return (
+    <SelectDialog
+      defaultOpen
+      title="Connect provider"
+      placeholder="Search providers"
+      activeIcon="plus-small"
+      key={(x) => x?.id}
+      items={providers.all}
+      filterKeys={["id", "name"]}
+      groupBy={(x) => (popularProviders.includes(x.id) ? "Popular" : "Other")}
+      sortBy={(a, b) => {
+        if (popularProviders.includes(a.id) && popularProviders.includes(b.id))
+          return popularProviders.indexOf(a.id) - popularProviders.indexOf(b.id)
+        return a.name.localeCompare(b.name)
+      }}
+      sortGroupsBy={(a, b) => {
+        if (a.category === "Popular" && b.category !== "Popular") return -1
+        if (b.category === "Popular" && a.category !== "Popular") return 1
+        return 0
+      }}
+      onSelect={(x) => {
+        if (!x) return
+        layout.dialog.connect(x.id)
+      }}
+      onOpenChange={(open) => {
+        if (open) {
+          layout.dialog.open("provider")
+        } else {
+          layout.dialog.close("provider")
+        }
+      }}
+    >
+      {(i) => (
+        <div class="px-1.25 w-full flex items-center gap-x-4">
+          <ProviderIcon
+            data-slot="list-item-extra-icon"
+            id={i.id as IconName}
+            // TODO: clean this up after we update icon in models.dev
+            classList={{
+              "text-icon-weak-base": true,
+              "size-4 mx-0.5": i.id === "opencode",
+              "size-5": i.id !== "opencode",
+            }}
+          />
+          <span>{i.name}</span>
+          <Show when={i.id === "opencode"}>
+            <Tag>Recommended</Tag>
+          </Show>
+          <Show when={i.id === "anthropic"}>
+            <div class="text-14-regular text-text-weak">Connect with Claude Pro/Max or API key</div>
+          </Show>
+        </div>
+      )}
+    </SelectDialog>
+  )
+}
diff --git a/packages/desktop/src/components/prompt-input.tsx b/packages/desktop/src/components/prompt-input.tsx
index 114e6d49d..7c60a6d01 100644
--- a/packages/desktop/src/components/prompt-input.tsx
+++ b/packages/desktop/src/components/prompt-input.tsx
@@ -1,5 +1,5 @@
 import { useFilteredList } from "@opencode-ai/ui/hooks"
-import { createEffect, on, Component, Show, For, onMount, onCleanup, Switch, Match, createMemo } from "solid-js"
+import { createEffect, on, Component, Show, For, onMount, onCleanup, Switch, Match } from "solid-js"
 import { createStore } from "solid-js/store"
 import { makePersisted } from "@solid-primitives/storage"
 import { createFocusSignal } from "@solid-primitives/active-element"
@@ -9,21 +9,14 @@ import { useSDK } from "@/context/sdk"
 import { useNavigate } from "@solidjs/router"
 import { useSync } from "@/context/sync"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
-import { SelectDialog } from "@opencode-ai/ui/select-dialog"
 import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Select } from "@opencode-ai/ui/select"
-import { Tag } from "@opencode-ai/ui/tag"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import { useLayout } from "@/context/layout"
-import { popularProviders, useProviders } from "@/hooks/use-providers"
-import { Dialog } from "@opencode-ai/ui/dialog"
-import { List, ListRef } from "@opencode-ai/ui/list"
-import { iife } from "@opencode-ai/util/iife"
-import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
-import { IconName } from "@opencode-ai/ui/icons/provider"
+import { DialogModel } from "@/components/dialog-model"
 
 interface PromptInputProps {
   class?: string
@@ -65,7 +58,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
   const local = useLocal()
   const session = useSession()
   const layout = useLayout()
-  const providers = useProviders()
   let editorRef!: HTMLDivElement
 
   const [store, setStore] = createStore<{
@@ -624,201 +616,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
               <Icon name="chevron-down" size="small" />
             </Button>
             <Show when={layout.dialog.opened() === "model"}>
-              <Switch>
-                <Match when={providers.paid().length > 0}>
-                  {iife(() => {
-                    const models = createMemo(() =>
-                      local.model
-                        .list()
-                        .filter((m) =>
-                          layout.connect.state() === "complete" ? m.provider.id === layout.connect.provider() : true,
-                        ),
-                    )
-                    return (
-                      <SelectDialog
-                        defaultOpen
-                        onOpenChange={(open) => {
-                          if (open) {
-                            layout.dialog.open("model")
-                          } else {
-                            layout.dialog.close("model")
-                          }
-                        }}
-                        title="Select model"
-                        placeholder="Search models"
-                        emptyMessage="No model results"
-                        key={(x) => `${x.provider.id}:${x.id}`}
-                        items={models}
-                        current={local.model.current()}
-                        filterKeys={["provider.name", "name", "id"]}
-                        sortBy={(a, b) => a.name.localeCompare(b.name)}
-                        // groupBy={(x) => (local.model.recent().includes(x) ? "Recent" : x.provider.name)}
-                        groupBy={(x) => x.provider.name}
-                        sortGroupsBy={(a, b) => {
-                          if (a.category === "Recent" && b.category !== "Recent") return -1
-                          if (b.category === "Recent" && a.category !== "Recent") return 1
-                          const aProvider = a.items[0].provider.id
-                          const bProvider = b.items[0].provider.id
-                          if (popularProviders.includes(aProvider) && !popularProviders.includes(bProvider)) return -1
-                          if (!popularProviders.includes(aProvider) && popularProviders.includes(bProvider)) return 1
-                          return popularProviders.indexOf(aProvider) - popularProviders.indexOf(bProvider)
-                        }}
-                        onSelect={(x) =>
-                          local.model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
-                            recent: true,
-                          })
-                        }
-                        actions={
-                          <Button
-                            class="h-7 -my-1 text-14-medium"
-                            icon="plus-small"
-                            tabIndex={-1}
-                            onClick={() => layout.dialog.open("provider")}
-                          >
-                            Connect provider
-                          </Button>
-                        }
-                      >
-                        {(i) => (
-                          <div class="w-full flex items-center gap-x-2.5">
-                            <span>{i.name}</span>
-                            <Show when={i.provider.id === "opencode" && (!i.cost || i.cost?.input === 0)}>
-                              <Tag>Free</Tag>
-                            </Show>
-                            <Show when={i.latest}>
-                              <Tag>Latest</Tag>
-                            </Show>
-                          </div>
-                        )}
-                      </SelectDialog>
-                    )
-                  })}
-                </Match>
-                <Match when={true}>
-                  {iife(() => {
-                    let listRef: ListRef | undefined
-                    const handleKey = (e: KeyboardEvent) => {
-                      if (e.key === "Escape") return
-                      listRef?.onKeyDown(e)
-                    }
-
-                    onMount(() => {
-                      document.addEventListener("keydown", handleKey)
-                      onCleanup(() => {
-                        document.removeEventListener("keydown", handleKey)
-                      })
-                    })
-
-                    return (
-                      <Dialog
-                        modal
-                        defaultOpen
-                        onOpenChange={(open) => {
-                          if (open) {
-                            layout.dialog.open("model")
-                          } else {
-                            layout.dialog.close("model")
-                          }
-                        }}
-                      >
-                        <Dialog.Header>
-                          <Dialog.Title>Select model</Dialog.Title>
-                          <Dialog.CloseButton tabIndex={-1} />
-                        </Dialog.Header>
-                        <Dialog.Body>
-                          <div class="flex flex-col gap-3 px-2.5">
-                            <div class="text-14-medium text-text-base px-2.5">Free models provided by OpenCode</div>
-                            <List
-                              ref={(ref) => (listRef = ref)}
-                              items={local.model.list}
-                              current={local.model.current()}
-                              key={(x) => `${x.provider.id}:${x.id}`}
-                              onSelect={(x) => {
-                                local.model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
-                                  recent: true,
-                                })
-                                layout.dialog.close("model")
-                              }}
-                            >
-                              {(i) => (
-                                <div class="w-full flex items-center gap-x-2.5">
-                                  <span>{i.name}</span>
-                                  <Tag>Free</Tag>
-                                  <Show when={i.latest}>
-                                    <Tag>Latest</Tag>
-                                  </Show>
-                                </div>
-                              )}
-                            </List>
-                            <div />
-                            <div />
-                          </div>
-                          <div class="px-1.5 pb-1.5">
-                            <div class="w-full rounded-sm border border-border-weak-base bg-surface-raised-base">
-                              <div class="w-full flex flex-col items-start gap-4 px-1.5 pt-4 pb-4">
-                                <div class="px-2 text-14-medium text-text-base">
-                                  Add more models from popular providers
-                                </div>
-                                <div class="w-full">
-                                  <List
-                                    class="w-full"
-                                    key={(x) => x?.id}
-                                    items={providers.popular}
-                                    activeIcon="plus-small"
-                                    sortBy={(a, b) => {
-                                      if (popularProviders.includes(a.id) && popularProviders.includes(b.id))
-                                        return popularProviders.indexOf(a.id) - popularProviders.indexOf(b.id)
-                                      return a.name.localeCompare(b.name)
-                                    }}
-                                    onSelect={(x) => {
-                                      if (!x) return
-                                      layout.dialog.connect(x.id)
-                                    }}
-                                  >
-                                    {(i) => (
-                                      <div class="w-full flex items-center gap-x-4">
-                                        <ProviderIcon
-                                          data-slot="list-item-extra-icon"
-                                          id={i.id as IconName}
-                                          // TODO: clean this up after we update icon in models.dev
-                                          classList={{
-                                            "text-icon-weak-base": true,
-                                            "size-4 mx-0.5": i.id === "opencode",
-                                            "size-5": i.id !== "opencode",
-                                          }}
-                                        />
-                                        <span>{i.name}</span>
-                                        <Show when={i.id === "opencode"}>
-                                          <Tag>Recommended</Tag>
-                                        </Show>
-                                        <Show when={i.id === "anthropic"}>
-                                          <div class="text-14-regular text-text-weak">
-                                            Connect with Claude Pro/Max or API key
-                                          </div>
-                                        </Show>
-                                      </div>
-                                    )}
-                                  </List>
-                                  <Button
-                                    variant="ghost"
-                                    class="w-full justify-start px-[11px] py-3.5 gap-4.5 text-14-medium"
-                                    icon="dot-grid"
-                                    onClick={() => {
-                                      layout.dialog.open("provider")
-                                    }}
-                                  >
-                                    View all providers
-                                  </Button>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </Dialog.Body>
-                      </Dialog>
-                    )
-                  })}
-                </Match>
-              </Switch>
+              <DialogModel />
             </Show>
           </div>
           <Tooltip