Skip to content

Commit 33c3d95

Browse files
committed
fix(gui): add Pool/Direct account mode switch to OpenAI provider settings
The Providers workspace Settings tab for the canonical openai provider now renders a Pool/Direct selector backed by the existing dedicated PATCH (/api/providers?name=openai with codexAccountMode alone). The control applies immediately, shows per-mode descriptions and save state, and refreshes the config so the badge and banner stay in sync.
1 parent d74b73f commit 33c3d95

10 files changed

Lines changed: 63 additions & 1 deletion

File tree

‎gui/src/components/provider-workspace/ProviderSettings.tsx‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { readJsonIfOk } from "../../fetch-json";
1313
import { useT } from "../../i18n/shared";
1414
import { IconLock } from "../../icons";
1515
import { isCatalogProviderId } from "../../provider-icons";
16+
import { openAiAccountProviderState } from "../../provider-payload";
1617
import type { CatalogPreset } from "../provider-catalog/provider-presets";
1718
import { authModeLabel } from "./ProviderRail";
1819
import type { WorkspaceItem, ProviderUpdatePatch } from "./types";
@@ -46,6 +47,9 @@ export default function ProviderSettings({
4647
const [liveModels, setLiveModels] = useState(item.liveModels !== false);
4748
const [saving, setSaving] = useState(false);
4849
const [msg, setMsg] = useState<{ ok: boolean; text: string } | null>(null);
50+
const [accountMode, setAccountMode] = useState<"pool" | "direct">(item.codexAccountMode ?? "pool");
51+
const [modeSaving, setModeSaving] = useState(false);
52+
const [modeMsg, setModeMsg] = useState<{ ok: boolean; text: string } | null>(null);
4953
const [baseUrlChoices, setBaseUrlChoices] = useState<CatalogPreset["baseUrlChoices"]>();
5054
const [choicesStatus, setChoicesStatus] = useState<ChoicesStatus>(apiBase ? "loading" : "idle");
5155
const [endpointChoice, setEndpointChoice] = useState(() => "custom");
@@ -60,9 +64,10 @@ export default function ProviderSettings({
6064
setNote(item.note ?? "");
6165
setAllowPrivateNetwork(item.allowPrivateNetwork ?? false);
6266
setLiveModels(item.liveModels !== false);
67+
setAccountMode(item.codexAccountMode ?? "pool");
6368
setMsg(null);
6469
queueMicrotask(() => setEndpointChoice(matchChoiceId(baseUrlChoices, item.baseUrl)));
65-
}, [item.adapter, item.baseUrl, item.defaultModel, item.authMode, item.apiKeyTransport, item.keyOptional, item.note, item.allowPrivateNetwork, item.liveModels, baseUrlChoices]);
70+
}, [item.adapter, item.baseUrl, item.defaultModel, item.authMode, item.apiKeyTransport, item.keyOptional, item.note, item.allowPrivateNetwork, item.liveModels, item.codexAccountMode, baseUrlChoices]);
6671
/* eslint-enable react-hooks/set-state-in-effect */
6772

6873
useEffect(() => {
@@ -122,6 +127,8 @@ export default function ProviderSettings({
122127
const isPreset = isCatalogProviderId(item.name);
123128
const hasEndpointPicker = choicesStatus === "ready" && !!(baseUrlChoices && baseUrlChoices.length > 0);
124129
const supportsApiKeyTransport = adapter.trim() === "anthropic" && authMode === "key";
130+
const openAiState = item.name === "openai" ? openAiAccountProviderState(item) : "invalid";
131+
const isCanonicalOpenAi = openAiState === "ready" || openAiState === "disabled";
125132
// Lock plain baseUrl for presets while loading or when there is no picker.
126133
// On fetch error, keep it editable so allowBaseUrlOverride providers are not trapped.
127134
const plainBaseUrlLocked = isPreset && choicesStatus !== "error";
@@ -159,6 +166,19 @@ export default function ProviderSettings({
159166
return () => onRegisterSave(null);
160167
}, [onRegisterSave]);
161168

169+
const applyAccountMode = async (next: "pool" | "direct") => {
170+
if (modeSaving || next === accountMode) return;
171+
if (!onUpdateProvider) { setModeMsg({ ok: false, text: t("pws.updatesUnavailable") }); return; }
172+
setModeSaving(true);
173+
setModeMsg(null);
174+
try {
175+
const res = await onUpdateProvider("openai", { codexAccountMode: next });
176+
setModeMsg(res.ok ? { ok: true, text: t("pws.accountModeSaved") } : { ok: false, text: res.error || t("pws.accountModeFailed") });
177+
} finally {
178+
setModeSaving(false);
179+
}
180+
};
181+
162182
const discard = () => {
163183
setAdapter(item.adapter); setBaseUrl(item.baseUrl);
164184
setDefaultModel(item.defaultModel ?? ""); setAuthMode(initialAuth);
@@ -243,6 +263,29 @@ export default function ProviderSettings({
243263
</select>
244264
)}
245265
</label>
266+
{isCanonicalOpenAi && (
267+
<label className="pwi-settings-field">
268+
<span className="pwi-settings-label">{t("codexAuth.accountModeTitle")}</span>
269+
<select
270+
className="input"
271+
value={accountMode}
272+
disabled={modeSaving}
273+
onChange={e => void applyAccountMode(e.target.value as "pool" | "direct")}
274+
>
275+
<option value="pool">{t("codexAuth.accountModePool")}</option>
276+
<option value="direct">{t("codexAuth.accountModeDirect")}</option>
277+
</select>
278+
<span className="pwi-settings-hint">
279+
{accountMode === "direct" ? t("codexAuth.accountModeDirectDesc") : t("codexAuth.accountModePoolDesc")}
280+
</span>
281+
{modeSaving && <span className="muted text-label">{t("pws.accountSwitching")}</span>}
282+
{modeMsg && (
283+
<span className={modeMsg.ok ? "pwi-settings-mode-msg pwi-settings-mode-msg--ok" : "pwi-settings-mode-msg pwi-settings-mode-msg--err"}>
284+
{modeMsg.text}
285+
</span>
286+
)}
287+
</label>
288+
)}
246289
{supportsApiKeyTransport && (
247290
<label className="pwi-settings-field">
248291
<span className="pwi-settings-label">{t("modal.apiKeyTransport")}</span>

‎gui/src/components/provider-workspace/types.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,6 @@ export type ProviderUpdatePatch = {
9898
disabled?: boolean;
9999
allowPrivateNetwork?: boolean;
100100
liveModels?: boolean;
101+
/** Dedicated field: the API PATCHes it alone for the canonical `openai` provider. */
102+
codexAccountMode?: "direct" | "pool";
101103
};

‎gui/src/i18n/de.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,6 +1464,8 @@ export const de: Record<TKey, string> = {
14641464
"pws.saveSettings": "Speichern",
14651465
"pws.saving": "Wird gespeichert…",
14661466
"pws.settingsSaved": "Einstellungen gespeichert.",
1467+
"pws.accountModeSaved": "Kontomodus gespeichert.",
1468+
"pws.accountModeFailed": "Kontomodus konnte nicht gewechselt werden.",
14671469
"pws.settingsUnsavedBar": "Es gibt ungespeicherte Änderungen.",
14681470
"pws.unsavedLeaveBody": "Es gibt ungespeicherte Änderungen. Vor dem Verlassen speichern?",
14691471
"pws.unsavedLeaveTitle": "Ungespeicherte Änderungen",

‎gui/src/i18n/en.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,8 @@ export const en = {
10401040
"pws.saveSettings": "Save",
10411041
"pws.saving": "Saving…",
10421042
"pws.settingsSaved": "Settings saved.",
1043+
"pws.accountModeSaved": "Account mode saved.",
1044+
"pws.accountModeFailed": "Could not switch the account mode.",
10431045
"pws.settingsUnsavedBar": "You have unsaved changes.",
10441046
"pws.unsavedLeaveBody": "You have unsaved changes. Save them before leaving?",
10451047
"pws.unsavedLeaveTitle": "Unsaved changes",

‎gui/src/i18n/ja.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,8 @@ export const ja: Record<TKey, string> = {
990990
"pws.saveSettings": "保存",
991991
"pws.saving": "保存中…",
992992
"pws.settingsSaved": "設定を保存しました。",
993+
"pws.accountModeSaved": "アカウントモードを保存しました。",
994+
"pws.accountModeFailed": "アカウントモードを切り替えられませんでした。",
993995
"pws.settingsUnsavedBar": "未保存の変更があります。",
994996
"pws.unsavedLeaveBody": "未保存の変更があります。保存してから移動しますか?",
995997
"pws.unsavedLeaveTitle": "未保存の変更",

‎gui/src/i18n/ko.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,6 +1491,8 @@ export const ko: Record<TKey, string> = {
14911491
"pws.saveSettings": "저장",
14921492
"pws.saving": "저장 중…",
14931493
"pws.settingsSaved": "설정이 저장되었습니다.",
1494+
"pws.accountModeSaved": "계정 모드가 저장되었습니다.",
1495+
"pws.accountModeFailed": "계정 모드를 전환할 수 없습니다.",
14941496
"pws.settingsUnsavedBar": "저장하지 않은 변경사항이 있습니다.",
14951497
"pws.unsavedLeaveBody": "저장하지 않은 변경사항이 있습니다. 나가기 전에 저장하시겠습니까?",
14961498
"pws.unsavedLeaveTitle": "미저장 변경사항",

‎gui/src/i18n/ru.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,6 +1032,8 @@ export const ru: Record<TKey, string> = {
10321032
"pws.saveSettings": "Сохранить",
10331033
"pws.saving": "Сохранение…",
10341034
"pws.settingsSaved": "Настройки сохранены.",
1035+
"pws.accountModeSaved": "Режим аккаунта сохранён.",
1036+
"pws.accountModeFailed": "Не удалось переключить режим аккаунта.",
10351037
"pws.settingsUnsavedBar": "Есть несохранённые изменения.",
10361038
"pws.unsavedLeaveBody": "Есть несохранённые изменения. Сохранить их перед переходом?",
10371039
"pws.unsavedLeaveTitle": "Несохранённые изменения",

‎gui/src/i18n/zh.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,6 +1484,8 @@ export const zh: Record<TKey, string> = {
14841484
"pws.saveSettings": "保存",
14851485
"pws.saving": "保存中…",
14861486
"pws.settingsSaved": "设置已保存。",
1487+
"pws.accountModeSaved": "账户模式已保存。",
1488+
"pws.accountModeFailed": "无法切换账户模式。",
14871489
"pws.settingsUnsavedBar": "有未保存的更改。",
14881490
"pws.unsavedLeaveBody": "有未保存的更改。离开前保存吗?",
14891491
"pws.unsavedLeaveTitle": "未保存的更改",

‎gui/src/provider-workspace/catalog.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ export interface WorkspaceProvider {
4545
disabled?: boolean;
4646
note?: string;
4747
allowPrivateNetwork?: boolean;
48+
/** Codex account routing mode for the canonical `openai` forward provider. */
49+
codexAccountMode?: "direct" | "pool";
4850
}
4951

5052
/** Three-way pricing/ownership tier for a ready provider row. */

‎gui/src/styles/provider-workspace-settings.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@
9696
}
9797
.pwi-settings-textarea:focus { border-color: var(--accent-ring); outline: none; }
9898
.pwi-settings-hint { font-size: var(--text-caption); color: var(--muted); line-height: 1.4; }
99+
.pwi-settings-mode-msg { font-size: var(--text-caption); line-height: 1.4; }
100+
.pwi-settings-mode-msg--ok { color: var(--green); }
101+
.pwi-settings-mode-msg--err { color: var(--red); }
99102

100103
.pwi-settings-sticky-bar {
101104
position: sticky; bottom: 0; z-index: 2;

0 commit comments

Comments
 (0)