Rebase copilot picker onto new modal

Author: zortos293

apps/web/src/components/chat/ProviderModelPicker.browser.tsx

@@ -188,6 +188,21 @@ function buildCodexProvider(models: ServerProvider["models"]): ServerProvider {
   };
 }
 
+function buildCopilotProvider(models: ServerProvider["models"]): ServerProvider {
+  return {
+    provider: "copilot",
+    enabled: true,
+    installed: true,
+    version: "1.0.0",
+    status: "ready",
+    auth: { status: "authenticated" },
+    checkedAt: new Date().toISOString(),
+    models,
+    slashCommands: [],
+    skills: [],
+  };
+}
+
 function buildOpenCodeProvider(models: ServerProvider["models"]): ServerProvider {
   return {
     provider: "opencode",
@@ -307,9 +322,10 @@ describe("ProviderModelPicker", () => {
       await page.getByRole("button").click();
 
       await vi.waitFor(() => {
-        expect(getSidebarProviderOrder().slice(0, 3)).toEqual([
+        expect(getSidebarProviderOrder().slice(0, 4)).toEqual([
           "favorites",
           "codex",
+          "copilot",
           "claudeAgent",
         ]);
       });
@@ -318,6 +334,65 @@ describe("ProviderModelPicker", () => {
     }
   });
 
+  it("shows the real copilot provider alongside the coming-soon copilot badge item", async () => {
+    const providers: ReadonlyArray<ServerProvider> = [
+      TEST_PROVIDERS[0]!,
+      buildCopilotProvider([
+        {
+          slug: "auto",
+          name: "Auto",
+          isCustom: false,
+          capabilities: {
+            reasoningEffortLevels: [effort("low"), effort("medium", true), effort("high")],
+            supportsFastMode: false,
+            supportsThinkingToggle: false,
+            contextWindowOptions: [],
+            promptInjectedEffortLevels: [],
+          },
+        },
+        {
+          slug: "gpt-4.1",
+          name: "GPT-4.1",
+          isCustom: false,
+          capabilities: {
+            reasoningEffortLevels: [effort("low"), effort("medium", true), effort("high")],
+            supportsFastMode: false,
+            supportsThinkingToggle: false,
+            contextWindowOptions: [],
+            promptInjectedEffortLevels: [],
+          },
+        },
+      ]),
+      TEST_PROVIDERS[1]!,
+    ];
+    const mounted = await mountPicker({
+      provider: "claudeAgent",
+      model: "claude-opus-4-6",
+      lockedProvider: null,
+      providers,
+    });
+
+    try {
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        expect(getSidebarProviderOrder()).toContain("copilot");
+        expect(getSidebarProviderOrder()).toContain("github-copilot-coming-soon");
+      });
+
+      await page.getByRole("button", { name: "Copilot", exact: true }).click();
+
+      await vi.waitFor(() => {
+        const listText = getModelPickerListText();
+        expect(listText).toContain("Auto");
+        expect(listText).toContain("GPT-4.1");
+        expect(listText).not.toContain("Claude Opus 4.6");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
   it("filters models by selected provider in sidebar", async () => {
     const mounted = await mountPicker({
       provider: "claudeAgent",
@@ -426,6 +501,7 @@ describe("ProviderModelPicker", () => {
         { slug: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
       ],
       codex: [{ slug: "gpt-5-codex", name: "GPT-5 Codex" }],
+      copilot: [],
       cursor: [],
       opencode: [],
     } as const;

apps/web/src/components/chat/providerIconUtils.ts

@@ -1,9 +1,10 @@
 import { type ProviderKind, PROVIDER_DISPLAY_NAMES } from "@t3tools/contracts";
-import { ClaudeAI, CursorIcon, Icon, OpenAI, OpenCodeIcon } from "../Icons";
+import { ClaudeAI, CursorIcon, GitHubIcon, Icon, OpenAI, OpenCodeIcon } from "../Icons";
 import { PROVIDER_OPTIONS } from "../../session-logic";
 
 export const PROVIDER_ICON_BY_PROVIDER: Record<ProviderKind, Icon> = {
   codex: OpenAI,
+  copilot: GitHubIcon,
   claudeAgent: ClaudeAI,
   opencode: OpenCodeIcon,
   cursor: CursorIcon,