Address Copilot PR review feedback

Author: jasnsy

apps/server/src/provider/Layers/CopilotAdapter.ts

@@ -732,12 +732,71 @@ const makeCopilotAdapter = (options?: CopilotAdapterLiveOptions) =>
             toProcessError(threadId, "Failed to start GitHub Copilot CLI client.", cause),
         });
 
+        const pendingApprovals = new Map<ApprovalRequestId, PendingApproval>();
+        let context: CopilotSessionContext | undefined;
+        const onPermissionRequest = (request: CopilotPermissionRequest) => {
+          if (input.runtimeMode === "full-access") {
+            return { kind: "approved" } satisfies CopilotPermissionRequestResult;
+          }
+          const requestId = ApprovalRequestId.makeUnsafe(
+            `copilot-permission:${crypto.randomUUID()}`,
+          );
+          let resolve!: (decision: ProviderApprovalDecision) => void;
+          const promise = new Promise<ProviderApprovalDecision>((resolvePromise) => {
+            resolve = resolvePromise;
+          });
+          const detail = permissionDetail(request);
+          pendingApprovals.set(requestId, {
+            requestType: inferRequestType(request),
+            ...(detail ? { detail } : {}),
+            promise,
+            resolve,
+          });
+          void Effect.runPromise(
+            emitEvent({
+              ...makeBase(
+                threadId,
+                context?.turnState
+                  ? { turnId: context.turnState.turnId, requestId }
+                  : { requestId },
+              ),
+              type: "request.opened",
+              payload: {
+                requestType: inferRequestType(request),
+                ...(detail ? { detail } : {}),
+                args: request,
+              },
+            }),
+          );
+          return promise.then((decision) => {
+            const result = mapApprovalDecisionToPermissionResult(decision);
+            void Effect.runPromise(
+              emitEvent({
+                ...makeBase(
+                  threadId,
+                  context?.turnState
+                    ? { turnId: context.turnState.turnId, requestId }
+                    : { requestId },
+                ),
+                type: "request.resolved",
+                payload: {
+                  requestType: inferRequestType(request),
+                  decision: result.kind,
+                  resolution: result,
+                },
+              }).pipe(Effect.ensuring(Effect.sync(() => pendingApprovals.delete(requestId)))),
+            );
+            return result;
+          });
+        };
+
         const reasonEffort = input.modelOptions?.copilot?.reasoningEffort;
         const sessionConfig = {
           ...(input.model ? { model: input.model } : {}),
           ...(reasonEffort ? { reasoningEffort: reasonEffort } : {}),
           workingDirectory: resolvedCwd,
           streaming: true,
+          onPermissionRequest,
           ...(providerOptions.configDir ? { configDir: providerOptions.configDir } : {}),
         };
 
@@ -747,11 +806,9 @@ const makeCopilotAdapter = (options?: CopilotAdapterLiveOptions) =>
             resumeCursor
               ? client.resumeSession(resumeCursor.sessionId, {
                   ...sessionConfig,
-                  onPermissionRequest: () => ({ kind: "approved" }),
                 })
               : client.createSession({
                   ...sessionConfig,
-                  onPermissionRequest: () => ({ kind: "approved" }),
                 }),
           catch: (cause) =>
             toProcessError(threadId, "Failed to create GitHub Copilot session.", cause),
@@ -778,11 +835,11 @@ const makeCopilotAdapter = (options?: CopilotAdapterLiveOptions) =>
           resumeCursor: makeResumeCursor(copilotSession.sessionId),
         };
 
-        const context: CopilotSessionContext = {
+        context = {
           session,
           client,
           copilotSession,
-          pendingApprovals: new Map(),
+          pendingApprovals,
           pendingUserInputs: new Map(),
           turns: [],
           turnState: undefined,
@@ -794,62 +851,6 @@ const makeCopilotAdapter = (options?: CopilotAdapterLiveOptions) =>
           void Effect.runPromise(handleSessionEvent(context, event));
         });
 
-        copilotSession.registerPermissionHandler((request) => {
-          if (context.session.runtimeMode === "full-access") {
-            return { kind: "approved" };
-          }
-          const requestId = ApprovalRequestId.makeUnsafe(
-            `copilot-permission:${crypto.randomUUID()}`,
-          );
-          let resolve!: (decision: ProviderApprovalDecision) => void;
-          const promise = new Promise<ProviderApprovalDecision>((resolvePromise) => {
-            resolve = resolvePromise;
-          });
-          const detail = permissionDetail(request);
-          context.pendingApprovals.set(requestId, {
-            requestType: inferRequestType(request),
-            ...(detail ? { detail } : {}),
-            promise,
-            resolve,
-          });
-          void Effect.runPromise(
-            emitEvent({
-              ...makeBase(
-                threadId,
-                context.turnState ? { turnId: context.turnState.turnId, requestId } : { requestId },
-              ),
-              type: "request.opened",
-              payload: {
-                requestType: inferRequestType(request),
-                ...(permissionDetail(request) ? { detail: permissionDetail(request) } : {}),
-                args: request,
-              },
-            }),
-          );
-          return promise.then((decision) => {
-            const result = mapApprovalDecisionToPermissionResult(decision);
-            void Effect.runPromise(
-              emitEvent({
-                ...makeBase(
-                  threadId,
-                  context.turnState
-                    ? { turnId: context.turnState.turnId, requestId }
-                    : { requestId },
-                ),
-                type: "request.resolved",
-                payload: {
-                  requestType: inferRequestType(request),
-                  decision: result.kind,
-                  resolution: result,
-                },
-              }).pipe(
-                Effect.ensuring(Effect.sync(() => context.pendingApprovals.delete(requestId))),
-              ),
-            );
-            return result;
-          });
-        });
-
         copilotSession.registerUserInputHandler((request) => {
           const requestId = ApprovalRequestId.makeUnsafe(
             `copilot-user-input:${crypto.randomUUID()}`,

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

@@ -15,7 +15,7 @@ const MODEL_OPTIONS_BY_PROVIDER = {
     { slug: "gpt-5-codex", name: "GPT-5 Codex" },
     { slug: "gpt-5.3-codex", name: "GPT-5.3 Codex" },
   ],
-  copilot: [{ slug: "claude-sonnet-4.5", name: "Claude Sonnet 4.5" }],
+  copilot: [{ slug: "claude-sonnet-4-5", name: "Claude Sonnet 4.5" }],
   openclaw: [],
 } as const satisfies Record<ProviderKind, ReadonlyArray<{ slug: ModelSlug; name: string }>>;
 

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

@@ -1944,7 +1944,7 @@ function SettingsRouteView() {
 
               <SettingsRow
                 title="Custom models"
-                description="Add custom model slugs for Codex or Anthropic. The chat picker groups models by provider."
+                description="Add custom model slugs for Codex, Anthropic, GitHub Copilot, or OpenClaw. The chat picker groups models by provider."
                 resetAction={
                   totalCustomModels > 0 ? (
                     <SettingResetButton

packages/contracts/src/model.ts

@@ -139,8 +139,8 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Record<ProviderKind, Record<string,
     "gpt-5.4": "gpt-5.4",
     "5.4-mini": "gpt-5.4-mini",
     "gpt-5.4-mini": "gpt-5.4-mini",
-    "claude-sonnet-4.5": "claude-sonnet-4.5",
-    "claude sonnet 4.5": "claude-sonnet-4.5",
+    "claude-sonnet-4.5": "claude-sonnet-4-5",
+    "claude sonnet 4.5": "claude-sonnet-4-5",
     "claude-sonnet-4-5": "claude-sonnet-4-5",
     "claude sonnet 4.6": "claude-sonnet-4-6",
     "claude-sonnet-4.6": "claude-sonnet-4-6",

packages/shared/src/model.ts

@@ -24,7 +24,7 @@ const MODEL_SLUG_SET_BY_PROVIDER: Record<ProviderKind, ReadonlySet<ModelSlug>> =
   claudeAgent: new Set(MODEL_OPTIONS_BY_PROVIDER.claudeAgent.map((option) => option.slug)),
   codex: new Set(MODEL_OPTIONS_BY_PROVIDER.codex.map((option) => option.slug)),
   openclaw: new Set<ModelSlug>(),
-  copilot: new Set<ModelSlug>(),
+  copilot: new Set(MODEL_OPTIONS_BY_PROVIDER.copilot.map((option) => option.slug)),
 };
 
 const CLAUDE_OPUS_4_6_MODEL = "claude-opus-4-6";
@@ -166,6 +166,11 @@ export function inferProviderForModel(
     return "codex";
   }
 
+  const normalizedCopilot = normalizeModelSlug(model, "copilot");
+  if (normalizedCopilot && MODEL_SLUG_SET_BY_PROVIDER.copilot.has(normalizedCopilot)) {
+    return "copilot";
+  }
+
   if (typeof model === "string") {
     const trimmed = model.trim();
     if (trimmed.startsWith("claude-")) return "claudeAgent";