Resolve rebase conflicts on main

Author: jasnsy

apps/server/src/sme/Layers/SmeChatServiceLive.ts

@@ -192,6 +192,14 @@ const makeSmeChatService = (options: SmeChatServiceLiveOptions = {}) =>
                 new SmeChatError("validateSetup", "Failed to validate Codex setup.", cause),
             });
 
+          case "copilot":
+            return {
+              ok: false,
+              severity: "warning" as const,
+              message: "GitHub Copilot is not available in SME Chat yet.",
+              resolvedAuthMethod: "auto" as const,
+            };
+
           case "openclaw":
             return validateOpenClawSetup({
               authMethod: conversation.authMethod as Extract<
@@ -499,18 +507,25 @@ const makeSmeChatService = (options: SmeChatServiceLiveOptions = {}) =>
                   abortSignal: controller.signal,
                 }).pipe(Effect.ensuring(clearInterrupt(input.conversationId)));
               })
-            : sendSmeViaProviderRuntime({
-                providerService,
-                provider: conv.provider,
-                conversationId: input.conversationId,
-                assistantMessageId,
-                model: conv.model,
-                compiledPrompt,
-                ...(input.providerOptions ? { providerOptions: input.providerOptions } : {}),
-                ...(onEvent ? { onEvent } : {}),
-                setInterruptEffect: (interrupt) => setInterrupt(input.conversationId, interrupt),
-                clearInterruptEffect: clearInterrupt(input.conversationId),
-              });
+            : conv.provider === "codex" || conv.provider === "openclaw"
+              ? sendSmeViaProviderRuntime({
+                  providerService,
+                  provider: conv.provider,
+                  conversationId: input.conversationId,
+                  assistantMessageId,
+                  model: conv.model,
+                  compiledPrompt,
+                  ...(input.providerOptions ? { providerOptions: input.providerOptions } : {}),
+                  ...(onEvent ? { onEvent } : {}),
+                  setInterruptEffect: (interrupt) => setInterrupt(input.conversationId, interrupt),
+                  clearInterruptEffect: clearInterrupt(input.conversationId),
+                })
+              : Effect.fail(
+                  new SmeChatError(
+                    "sendMessage:validate",
+                    "GitHub Copilot is not available in SME Chat yet.",
+                  ),
+                );
 
         const responseText = yield* sendEffect.pipe(
           Effect.mapError((cause) =>

apps/server/src/sme/authValidation.ts

@@ -63,6 +63,8 @@ export function getAllowedSmeAuthMethods(provider: ProviderKind): readonly SmeAu
   switch (provider) {
     case "claudeAgent":
       return ["auto", "apiKey", "authToken"];
+    case "copilot":
+      return ["auto"];
     case "codex":
       return ["auto", "chatgpt", "apiKey", "customProvider"];
     case "openclaw":
@@ -74,6 +76,8 @@ export function getDefaultSmeAuthMethod(provider: ProviderKind): SmeAuthMethod {
   switch (provider) {
     case "claudeAgent":
       return "apiKey";
+    case "copilot":
+      return "auto";
     case "codex":
       return "chatgpt";
     case "openclaw":

apps/web/src/components/sme/SmeConversationDialog.tsx

@@ -83,6 +83,7 @@ export function SmeConversationDialog({
         {
           codex: settings.customCodexModels,
           claudeAgent: settings.customClaudeModels,
+          copilot: settings.customCopilotModels,
           openclaw: settings.customOpenClawModels,
         },
         null,
@@ -97,6 +98,7 @@ export function SmeConversationDialog({
     conversation,
     open,
     settings.customClaudeModels,
+    settings.customCopilotModels,
     settings.customCodexModels,
     settings.customOpenClawModels,
   ]);
@@ -111,6 +113,7 @@ export function SmeConversationDialog({
         {
           codex: settings.customCodexModels,
           claudeAgent: settings.customClaudeModels,
+          copilot: settings.customCopilotModels,
           openclaw: settings.customOpenClawModels,
         },
         nextProvider === "openclaw" ? "default" : null,

apps/web/src/components/sme/smeConversationConfig.ts

@@ -3,13 +3,16 @@ import type { ProviderKind, SmeAuthMethod } from "@okcode/contracts";
 export const SME_PROVIDER_LABELS: Record<ProviderKind, string> = {
   codex: "Codex / ChatGPT",
   claudeAgent: "Anthropic",
+  copilot: "GitHub Copilot",
   openclaw: "OpenClaw",
 };
 
 export function getDefaultSmeAuthMethod(provider: ProviderKind): SmeAuthMethod {
   switch (provider) {
     case "claudeAgent":
       return "apiKey";
+    case "copilot":
+      return "auto";
     case "codex":
       return "chatgpt";
     case "openclaw":
@@ -27,6 +30,8 @@ export function getSmeAuthMethodOptions(
         { value: "authToken", label: "Auth Token" },
         { value: "auto", label: "Auto" },
       ];
+    case "copilot":
+      return [{ value: "auto", label: "Auto" }];
     case "codex":
       return [
         { value: "chatgpt", label: "ChatGPT OAuth" },

apps/web/src/routes/_chat.settings.tsx

@@ -2294,13 +2294,13 @@ function SettingsRouteView() {
                                 : providerSettings.provider === "copilot"
                                   ? settings.copilotBinaryPath !== defaults.copilotBinaryPath ||
                                     settings.copilotConfigDir !== defaults.copilotConfigDir
-                                : settings.claudeBinaryPath !== defaults.claudeBinaryPath;
+                                  : settings.claudeBinaryPath !== defaults.claudeBinaryPath;
                             const binaryPathValue =
                               providerSettings.binaryPathKey === "claudeBinaryPath"
                                 ? claudeBinaryPath
                                 : providerSettings.binaryPathKey === "copilotBinaryPath"
                                   ? copilotBinaryPath
-                                : codexBinaryPath;
+                                  : codexBinaryPath;
 
                             return (
                               <Collapsible