diff --git a/apps/desktop/src/renderer/settings/provider-connection-detail.tsx b/apps/desktop/src/renderer/settings/provider-connection-detail.tsx
index a004f541f0..d54149911e 100644
--- a/apps/desktop/src/renderer/settings/provider-connection-detail.tsx
+++ b/apps/desktop/src/renderer/settings/provider-connection-detail.tsx
@@ -1101,7 +1101,8 @@ function OAuthReloginNoticeForCurrentGeneration(props: {
   hasSecret: CredentialPresenceStatus;
   onRelogin(): Promise<void>;
 }) {
-  const copy = getProviderSettingsCopy(useUiLocale()).detail;
+  const providerCopy = getProviderSettingsCopy(useUiLocale());
+  const copy = providerCopy.detail;
   const flow = useOAuthLoginFlow({
     bridge: props.service.bridge,
     display: props.service.display,
@@ -1125,11 +1126,18 @@ function OAuthReloginNoticeForCurrentGeneration(props: {
       : errored
         ? copy.oauthUnknownDetail
         : copy.oauthStartDetail;
+  // Codex's device page has no code in its URL — the user must type the
+  // code shown here, so hiding it makes the re-login impossible to finish.
+  const deviceCode = props.service.showsDeviceCode ? flow.stateHint : null;
   return (
     <Banner
       status="info"
       title={title}
-      description={detail}
+      description={deviceCode ? (
+        <>
+          {detail} {providerCopy.oauthSection.deviceCode} <code>{deviceCode}</code>
+        </>
+      ) : detail}
       endContent={!loading ? (
           <Button
             variant="primary"
diff --git a/apps/desktop/src/renderer/settings/use-connection-detail.ts b/apps/desktop/src/renderer/settings/use-connection-detail.ts
index 956bcd8e23..f6ed6cd76d 100644
--- a/apps/desktop/src/renderer/settings/use-connection-detail.ts
+++ b/apps/desktop/src/renderer/settings/use-connection-detail.ts
@@ -72,6 +72,11 @@ import { runtimeHostOAuthLoginBridge } from './runtime-host-settings-bridge.js';
 export interface OAuthLoginService {
   bridge: OAuthLoginFlowBridge;
   display: { name: string; shortName: string };
+  // Codex's device-authorization page requires the user to type the code the
+  // flow surfaces as `stateHint` — the verification URL does not embed it, so
+  // the notice must show it or the login cannot be completed. xAI's page
+  // needs no manual code, mirroring the catalog panel's `!isXai` guard.
+  showsDeviceCode: boolean;
 }
 
 export function oauthLoginServiceFor(
@@ -83,11 +88,13 @@ export function oauthLoginServiceFor(
       return {
         bridge: runtimeHostOAuthLoginBridge(window.maka.openAiCodex, host),
         display: { name: 'OpenAI Codex', shortName: 'Codex' },
+        showsDeviceCode: true,
       };
     case 'xai-oauth':
       return {
         bridge: runtimeHostOAuthLoginBridge(window.maka.xaiOAuth, host),
         display: { name: 'xAI Grok', shortName: 'SuperGrok / X Premium' },
+        showsDeviceCode: false,
       };
     default:
       return null;
diff --git a/package-lock.json b/package-lock.json
index c0c1f26999..a13ec2c3b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1224,8 +1224,8 @@
     },
     "node_modules/@dnd-kit/accessibility": {
       "version": "3.1.1",
-      "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
-      "integrity": "sha1-O0ICvWuzcKBzD2c0hneFkZvqxq8=",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
+      "integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1237,8 +1237,8 @@
     },
     "node_modules/@dnd-kit/core": {
       "version": "6.3.1",
-      "resolved": "https://ms-feed-12.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@dnd-kit/core/-/core-6.3.1.tgz",
-      "integrity": "sha1-TDZAamLHuqxJlyb4mZNfk/Dm0AM=",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
+      "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1253,8 +1253,8 @@
     },
     "node_modules/@dnd-kit/sortable": {
       "version": "10.0.0",
-      "resolved": "https://ms-feed-12.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
-      "integrity": "sha1-H5OCuQ2DXNXGXZKCT6na+3jEw+g=",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
+      "integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1268,8 +1268,8 @@
     },
     "node_modules/@dnd-kit/utilities": {
       "version": "3.2.2",
-      "resolved": "https://ms-feed-17.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
-      "integrity": "sha1-WjK2rzVtxfdNYbN9b3EppAQM7Xs=",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
+      "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5080,8 +5080,8 @@
     },
     "node_modules/@xterm/addon-fit": {
       "version": "0.11.0",
-      "resolved": "https://ms-feed-2.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@xterm/addon-fit/-/addon-fit-0.11.0.tgz",
-      "integrity": "sha1-ukd4tp/MkESgYMIXa74HdlfXs34=",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.11.0.tgz",
+      "integrity": "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==",
       "dev": true,
       "license": "MIT"
     },
@@ -5102,8 +5102,8 @@
     },
     "node_modules/@xterm/xterm": {
       "version": "6.0.0",
-      "resolved": "https://ms-feed-2.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@xterm/xterm/-/xterm-6.0.0.tgz",
-      "integrity": "sha1-k2N7Dy7jpwcYtXRqJ8nFBq8WdFs=",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
+      "integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
       "dev": true,
       "license": "MIT",
       "workspaces": [