@jeffusion/bungee-core 5.10.0 → 5.12.0

package/dist/plugins/chatgpt-oauth/manifest.json

@@ -41,6 +41,25 @@
       }
     ]
   },
+  "services": {
+    "provides": [
+      {
+        "id": "chatgpt-oauth.credentials.v1",
+        "version": 1,
+        "process": "control",
+        "kind": "rpc"
+      }
+    ],
+    "consumes": [
+      {
+        "id": "chatgpt-oauth.credentials.v1",
+        "version": 1,
+        "process": "worker",
+        "plugin": "chatgpt-oauth",
+        "kind": "rpc"
+      }
+    ]
+  },
   "contributes": {
     "nativeWidgets": [
       {
@@ -60,6 +79,42 @@
         "execution": "control",
         "capability": "config.read"
       },
+      {
+        "path": "/accounts/codex",
+        "methods": [
+          "GET"
+        ],
+        "handler": "listCodexAccounts",
+        "execution": "control",
+        "capability": "config.read"
+      },
+      {
+        "path": "/accounts/siwc",
+        "methods": [
+          "GET"
+        ],
+        "handler": "listSiwcAccounts",
+        "execution": "control",
+        "capability": "config.read"
+      },
+      {
+        "path": "/accounts/siwc/draft",
+        "methods": [
+          "POST"
+        ],
+        "handler": "createSiwcDraft",
+        "execution": "control",
+        "capability": "config.write"
+      },
+      {
+        "path": "/login/siwc",
+        "methods": [
+          "POST"
+        ],
+        "handler": "startSiwcLogin",
+        "execution": "control",
+        "capability": "config.write"
+      },
       {
         "path": "/accounts/usage",
         "methods": [
@@ -191,7 +246,7 @@
       {
         "id": "chatgpt",
         "label": "ChatGPT OAuth",
-        "listAccounts": "listAccounts",
+        "listAccounts": "listCodexAccounts",
         "createDraft": "createDraft",
         "credentialPolicy": {
           "allowedOrigins": [
@@ -243,6 +298,51 @@
             "Chatgpt-Account-Id"
           ]
         }
+      },
+      {
+        "id": "chatgpt-siwc",
+        "label": "Sign in with ChatGPT",
+        "listAccounts": "listSiwcAccounts",
+        "createDraft": "createSiwcDraft",
+        "credentialPolicy": {
+          "allowedOrigins": [
+            "https://api.openai.com"
+          ],
+          "allowedRequests": [
+            {
+              "pathname": "/v1/responses",
+              "methods": [
+                "POST"
+              ],
+              "outboundHeaders": {
+                "passthrough": [],
+                "set": {
+                  "Accept": "text/event-stream",
+                  "Content-Type": "application/json",
+                  "User-Agent": "Bungee/5.11.0",
+                  "Originator": "Bungee"
+                }
+              }
+            },
+            {
+              "pathname": "/v1/models",
+              "methods": [
+                "GET"
+              ],
+              "outboundHeaders": {
+                "passthrough": [],
+                "set": {
+                  "Accept": "application/json",
+                  "User-Agent": "Bungee/5.11.0",
+                  "Originator": "Bungee"
+                }
+              }
+            }
+          ],
+          "allowedHeaderNames": [
+            "Authorization"
+          ]
+        }
       }
     ],
     "settings": "/accounts",
@@ -397,8 +497,13 @@
       "ui.accountIdentity": "Account: {label}",
       "ui.credentialsHelp": "The plugin keeps credentials; they are not written to service configuration.",
       "ui.loginMethod": "Sign-in method",
-      "ui.device": "Device code",
-      "ui.pkce": "Browser sign-in (alternative)",
+      "ui.device": "Codex device code",
+      "ui.pkce": "Codex browser sign-in",
+      "ui.siwc": "Sign in with ChatGPT",
+      "ui.siwcHelp": "Open the authorization URL, sign in, then paste the complete callback URL from the browser address bar. The final loopback page may fail to load; you can still copy its URL.",
+      "ui.siwcUsage": "Check usage in ChatGPT settings",
+      "ui.siwcUsageHelp": "This sign-in method has no public usage or reset-credit query. Open ChatGPT settings to check usage.",
+      "ui.authMethod": "Sign-in: {method}",
       "ui.deviceHelp": "Enter the device code on the verification page. This window updates automatically after authorization.",
       "ui.pkceHelp": "Sign in in your browser, then paste the complete final localhost callback URL here.",
       "ui.statusLoading": "Checking login status",
@@ -472,7 +577,7 @@
       "errors.request_cancelled": "The request was cancelled.",
       "errors.unknown": "The operation did not complete. Refresh the status before retrying; do not resubmit authorization.",
       "metadata.name": "ChatGPT OAuth",
-      "plugin.description": "Use ChatGPT OAuth accounts as managed Codex upstreams",
+      "plugin.description": "Use ChatGPT sign-in and Codex accounts as separate managed upstreams",
       "config.accountRef.label": "Account reference",
       "config.accountRef.description": "The managed ChatGPT account reference; leading and trailing whitespace is not allowed. Codex compatibility is managed automatically by the plugin."
     },
@@ -604,8 +709,13 @@
       "ui.accountIdentity": "账号：{label}",
       "ui.credentialsHelp": "凭据由插件保管，不会写入服务配置。",
       "ui.loginMethod": "登录方式",
-      "ui.device": "设备码登录",
-      "ui.pkce": "浏览器登录（备用）",
+      "ui.device": "Codex 设备码登录",
+      "ui.pkce": "Codex 浏览器登录",
+      "ui.siwc": "使用 ChatGPT 登录",
+      "ui.siwcHelp": "打开授权地址完成登录，再从浏览器地址栏复制完整回调地址并粘贴到此处。最后的本地回调页面可能无法打开，仍可复制其地址。",
+      "ui.siwcUsage": "去 ChatGPT 设置查看用量",
+      "ui.siwcUsageHelp": "此登录方式没有公开的用量或重置额度查询。请在 ChatGPT 设置中查看用量。",
+      "ui.authMethod": "登录方式：{method}",
       "ui.deviceHelp": "在验证页面输入设备码，完成后这里会自动更新。",
       "ui.pkceHelp": "打开浏览器登录，将最终跳转的完整 localhost 回调地址粘贴到此处。",
       "ui.statusLoading": "正在查询登录状态",
@@ -679,7 +789,7 @@
       "errors.request_cancelled": "请求已取消。",
       "errors.unknown": "操作未完成，请刷新状态后重试。请勿重复提交授权。",
       "metadata.name": "ChatGPT OAuth",
-      "plugin.description": "将 ChatGPT OAuth 账号用作受管理的 Codex 上游",
+      "plugin.description": "将 ChatGPT 登录和 Codex 账号用作独立的受管理上游",
       "config.accountRef.label": "账号引用",
       "config.accountRef.description": "受管理的 ChatGPT 账号引用；首尾不允许有空白字符。Codex 兼容版本由插件自动管理。"
     }

package/dist/plugins/chatgpt-oauth/ui/AccountsPage.svelte

@@ -34,7 +34,7 @@
   import { Input } from '$components/ui/input';
   import * as DropdownMenu from '$components/ui/dropdown-menu';
   import { Close as ResetClose } from '$components/ui/dialog';
-  import { loginStates, accountStates, terminal, verificationUrl, loginStatus, parseLoginStart, accountSummary, accountUsage, resetOutcome, errorText, errorCode } from './account-model.js';
+  import { loginStates, accountStates, terminal, verificationUrl, loginStatus, parseLoginStart, accountSummary, accountUsage, resetOutcome, errorText, errorCode, accountSourceId, canQueryUsage, loginMethods } from './account-model.js';
 
   type Account = ReturnType<typeof accountSummary>;
   type AccountUsage = ReturnType<typeof accountUsage>;
@@ -50,12 +50,13 @@
   const control = <T,>(method: 'GET' | 'POST', path: string, body?: unknown) => requestPluginControl<T>(pluginName, path, method, body, lifetime.signal);
   let accounts = $state<Account[]>([]), refreshing = $state(false), notice = $state('');
   let accountRefreshGeneration = 0;
-  let loginOpen = $state(false), kind = $state('device'), reauthRef = $state<string | undefined>();
+  let loginOpen = $state(false), kind = $state('siwc'), reauthRef = $state<string | undefined>();
   let session = $state.raw<Session | null>(null), status = $state(''), callback = $state(''), loginNotice = $state('');
   let starting = $state(false), submitting = $state(false), cancelling = $state(false), polling = $state(false);
   let pollGeneration = 0, pollingGeneration: number | undefined;
   let timer: ReturnType<typeof setTimeout> | undefined;
   let active = $derived(session !== null && !terminal(status));
+  let methods = $derived(loginMethods(reauthRef ? accounts.find(account => account.id === reauthRef) : undefined));
   let url = $derived(active ? verificationUrl(session?.verificationUri ?? session?.authorizationUrl, kind) : null);
   let action = $state(''), actionAccount = $state<Account | null>(null), actionOpen = $state(false);
   let actionBusy = $state(false), label = $state(''), actionNotice = $state(''), referenceNotice = $state('');
@@ -82,7 +83,7 @@
   let pendingResetByAccount = $state<Record<string, PendingReset>>({});
 
   function eligibleForUsage(account: Account) {
-    return account.status === 'active';
+    return canQueryUsage(account);
   }
   function usageFor(account: Account): UsageSnapshot {
     return usageByAccount[account.id] ?? { state: 'loading' };
@@ -144,7 +145,7 @@
   }
   function canReset(account: Account, credit: Credit) {
     const snapshot = usageFor(account);
-    return account.available && 'usage' in snapshot && snapshot.resetCredits.state === 'fresh'
+    return eligibleForUsage(account) && account.available && 'usage' in snapshot && snapshot.resetCredits.state === 'fresh'
       && !!snapshot.resetCredits.value && snapshot.resetCredits.value.availableCount > 0 && credit.status === 'available';
   }
   function resetTypeLabel(resetType: unknown) {
@@ -187,6 +188,7 @@
     }
   }
   async function refreshUsage(account: Account) {
+    if (!eligibleForUsage(account)) return;
     const generation = nextUsageGeneration(account.id);
     usageRefreshing[account.id] = true;
     usageErrors[account.id] = false;
@@ -237,7 +239,7 @@
       if (reauthRef !== accountRef) loginNotice = 'ui.otherSession';
       return;
     }
-    invalidatePolling(); session = null; status = ''; callback = ''; loginNotice = ''; kind = 'device'; reauthRef = accountRef;
+    invalidatePolling(); session = null; status = ''; callback = ''; loginNotice = ''; reauthRef = accountRef; kind = loginMethods(accountRef ? accounts.find(account => account.id === accountRef) : undefined)[0];
   }
   function clearSecrets() {
     callback = '';
@@ -249,7 +251,7 @@
     if (pollingGeneration === generation) return;
     clearTimeout(timer); timer = undefined; const current = session.sessionId; pollingGeneration = generation; polling = true;
     try {
-      const next = loginStatus(await control('GET', `/login/status?sessionId=${encodeURIComponent(current)}`), current);
+      const next = loginStatus(await control('GET', `/login/status?sessionId=${encodeURIComponent(current)}`), current, kind);
       if (generation !== pollGeneration || session?.sessionId !== current || lifetime.signal.aborted) return;
       const firstSuccess = status !== 'success' && next.state === 'success';
       status = String(next.state); loginNotice = '';
@@ -335,7 +337,7 @@
   }
   async function confirmReset(event: SubmitEvent) {
     event.preventDefault();
-    if (!resetAccount || !resetCredit || resetBusy || !resetRequestId) return;
+    if (!resetAccount || !eligibleForUsage(resetAccount) || !resetCredit || resetBusy || !resetRequestId) return;
     resetBusy = true; resetNotice = '';
     try {
       const result = resetOutcome(await control('POST', '/accounts/usage/reset', {
@@ -356,7 +358,7 @@
   }
   async function confirmAction(event: SubmitEvent) {
     event.preventDefault();
-    if (!actionAccount || actionBusy || action === 'references') return;
+    if (!actionAccount || actionBusy || action === 'references' || (action === 'auto-reset' && actionAccount.authType === 'siwc')) return;
     if (action === 'rename' && !label.trim()) { actionNotice = 'ui.nameRequired'; return; }
     actionBusy = true;
     const generation = referenceGeneration;
@@ -383,7 +385,7 @@
     if (!useAccount?.available || servicesLoading || serviceError) return;
     const existing = services.find(service => service._uid === serviceChoice);
     if (serviceChoice !== 'new' && !existing) { serviceError = 'ui.serviceMissing'; return; }
-    const handoff = { sourcePlugin: pluginName, sourceId: 'chatgpt', accountRef: useAccount.id,
+    const handoff = { sourcePlugin: pluginName, sourceId: accountSourceId(useAccount), accountRef: useAccount.id,
       mode: existing ? 'existing' as const : 'new' as const, ...(existing ? { serviceId: existing._uid } : {}) };
     useOpen = false; loginOpen = false; clearSecrets();
     await tick(); // Flush the dialog close before navigation unmounts the account page.
@@ -405,7 +407,7 @@
   async function continueToRoute() {
     if (!routeAccount?.available || routesLoading || routeError || selectedRoute?.service) return;
     if (routeChoice !== 'new' && !selectedRoute?._uid) { routeError = 'ui.routeMissing'; return; }
-    const handoff = { sourcePlugin: pluginName, sourceId: 'chatgpt', accountRef: routeAccount.id,
+    const handoff = { sourcePlugin: pluginName, sourceId: accountSourceId(routeAccount), accountRef: routeAccount.id,
       mode: selectedRoute ? 'existing' as const : 'new' as const,
       ...(selectedRoute ? { routeId: selectedRoute._uid } : {}) };
     routeOpen = false; loginOpen = false; clearSecrets();
@@ -457,8 +459,15 @@
               {#if !account.email}<p class="text-sm text-zinc-400">{t('ui.noEmail')}</p>{/if}
               {#if account.plan}<p class="text-sm text-zinc-300" data-testid="account-type">{t('ui.accountType', { plan: account.plan })}</p>{/if}
               {#if typeof account.expiresAt === 'number'}<p class="tabular-nums text-xs text-zinc-400">{t('ui.credentialExpiry', { date: dateText(account.expiresAt) })}</p>{/if}
-              <p class="text-xs text-zinc-400" data-testid="auto-reset-status">{t(account.autoResetCredits ? 'ui.autoResetEnabled' : 'ui.autoResetDisabled')}</p>
+              <p class="text-xs text-zinc-400">{t('ui.authMethod', { method: account.authType === 'siwc' ? t('ui.siwc') : 'Codex' })}</p>
+              {#if account.authType !== 'siwc'}<p class="text-xs text-zinc-400" data-testid="auto-reset-status">{t(account.autoResetCredits ? 'ui.autoResetEnabled' : 'ui.autoResetDisabled')}</p>{/if}
             </div>
+            {#if account.authType === 'siwc'}
+              <div class="space-y-2" data-testid="siwc-usage">
+                <p class="text-sm text-zinc-400">{t('ui.siwcUsageHelp')}</p>
+                <Button href="https://chatgpt.com" target="_blank" rel="noopener noreferrer" variant="outline" size="sm">{@render actionIcon(ExternalLink)}{t('ui.siwcUsage')}</Button>
+              </div>
+            {:else}
             <div class="flex flex-wrap items-center gap-2"><span class="nx-field-label">{t('ui.usageLabel')}</span><Button variant="ghost" size="sm" class="aspect-square px-0 [&>span]:mr-0" disabled={!eligibleForUsage(account) || usageRefreshing[account.id]} aria-busy={!!usageRefreshing[account.id]} aria-label={t('ui.refreshUsage')} title={t('ui.refreshUsage')} onclick={() => { if (!usageRefreshing[account.id]) void refreshUsage(account); }}>{@render actionIcon(RefreshCw, usageRefreshing[account.id])}</Button>{#if status !== 'fresh'}<span role="status" class={`text-xs ${status === 'stale' || status === 'partial' ? 'text-amber-300' : 'text-zinc-400'}`}>{t(`ui.usage.${status}`)}</span>{/if}</div>
             {#if 'usage' in snapshot}
               {#if usageErrors[account.id]}<p role="status" class="text-sm text-amber-300">{t('ui.usageFailed')}</p>{/if}
@@ -500,6 +509,7 @@
                   </div>
               {:else}<p class="text-sm text-zinc-400">{t('ui.creditDetailsUnavailable')}</p>{/if}
             </div>
+            {/if}
             <div class="flex flex-wrap items-center justify-end gap-2" data-testid="account-actions">
               <Button variant="secondary" size="sm" disabled={!account.available} onclick={() => openUse(account)}>{@render actionIcon(Server)}{t('ui.useService')}</Button>
               <Button variant="secondary" size="sm" disabled={!account.available} onclick={() => openRoute(account)}>{@render actionIcon(RouteIcon)}{t('ui.useRoute')}</Button>
@@ -552,9 +562,9 @@
   {#snippet body()}
     {#if !active && !starting}
       <RadioGroup.Root bind:value={kind} aria-label={t('ui.loginMethod')} class="flex flex-wrap gap-4">
-        {#each ['device', 'pkce'] as method}<div class="flex items-center gap-2"><RadioGroup.Item id={`${id}-${method}`} value={method} /><label for={`${id}-${method}`} class="nx-field-label">{t(`ui.${method}`)}</label></div>{/each}
+        {#each methods as method}<div class="flex items-center gap-2"><RadioGroup.Item id={`${id}-${method}`} value={method} /><label for={`${id}-${method}`} class="nx-field-label">{t(`ui.${method}`)}</label></div>{/each}
       </RadioGroup.Root>
-      <p class="text-sm text-zinc-400">{t(kind === 'device' ? 'ui.deviceHelp' : 'ui.pkceHelp')}</p>
+      <p class="text-sm text-zinc-400">{t(kind === 'device' ? 'ui.deviceHelp' : kind === 'siwc' ? 'ui.siwcHelp' : 'ui.pkceHelp')}</p>
     {/if}
     {#if session}
       <div class="flex flex-wrap items-center justify-between gap-2"><StatusBadge variant={status === 'success' ? 'active' : ['failed', 'expired'].includes(status) ? 'fault' : 'standby'}>{t(loginStates[status as keyof typeof loginStates] ?? 'ui.statusLoading')}</StatusBadge><span class="text-sm text-zinc-400">{t('ui.sessionExpiry', { date: dateText(session.expiresAt) })}</span></div>
@@ -565,9 +575,9 @@
         <label class="space-y-1.5"><span class="nx-field-label">{t('ui.verificationUrl')}</span><Input readonly value={url} /></label>
         <div class="flex flex-wrap gap-2"><Button href={url} target="_blank" rel="noopener noreferrer" variant="outline">{@render actionIcon(ExternalLink)}{t('ui.openVerification')}</Button><Button variant="ghost" onclick={() => copy(url ?? '')}>{@render actionIcon(Copy)}{t('ui.copyUrl')}</Button></div>
       {/if}
-      {#if kind === 'pkce' && status === 'pending'}
+      {#if (kind === 'pkce' || kind === 'siwc') && status === 'pending'}
         <form onsubmit={submitCallback} class="space-y-3">
-          <label class="block space-y-1.5"><span class="nx-field-label">{t('ui.callbackUrl')}</span><Input bind:value={callback} autocomplete="off" spellcheck={false} placeholder="http://localhost:…/auth/callback?…" /></label>
+          <label class="block space-y-1.5"><span class="nx-field-label">{t('ui.callbackUrl')}</span><Input bind:value={callback} autocomplete="off" spellcheck={false} placeholder={kind === 'siwc' ? 'http://127.0.0.1:1455/auth/callback?…' : 'http://localhost:…/auth/callback?…'} /></label>
           <p class="text-sm text-zinc-400">{t('ui.callbackHelp')}</p>
           <Button type="submit" disabled={submitting || !callback.trim()} aria-busy={submitting}>{@render actionIcon(Send, submitting)}{t('ui.submitCallback')}</Button>
         </form>

package/dist/plugins/chatgpt-oauth/ui/ChatgptQuotaWidget.svelte

@@ -6,7 +6,7 @@
   import { getPluginText } from '$utils/plugin-i18n';
   import type { NativeWidgetHeaderChange } from '$components/native-widgets/widget-header';
   import { BCarouselList, LoadingIndicator, MetricBar, StatusBadge } from '$components/industrial';
-  import { accountSummary, accountUsage, errorText } from './account-model.js';
+  import { accountSummary, accountUsage, errorText, canQueryUsage } from './account-model.js';
 
   let { pluginName = 'chatgpt-oauth', onHeaderChange }: { pluginName?: string; selectedRange?: string; onHeaderChange?: NativeWidgetHeaderChange } = $props();
   type Row = { account: ReturnType<typeof accountSummary>; usage?: ReturnType<typeof accountUsage>; error?: string };
@@ -73,7 +73,7 @@
           const account = accountSummary(value);
           if (!account.id || seen.has(account.id)) throw new Error('invalid_response');
           seen.add(account.id);
-          next.push({ account, usage: account.status === 'active' ? rows.find(row => row.account.id === account.id)?.usage : undefined });
+          next.push({ account, usage: canQueryUsage(account) ? rows.find(row => row.account.id === account.id)?.usage : undefined });
         } catch { notice = 'ui.widgetPartialAccounts'; }
       }
       rows = next; loaded = true;
@@ -81,7 +81,7 @@
       const worker = async () => {
         while (latest() && cursor < next.length) {
           const index = cursor++, row = next[index];
-          if (row.account.status !== 'active') continue;
+          if (!canQueryUsage(row.account)) continue;
           try {
             const usage = accountUsage(await get(`/accounts/usage?accountRef=${encodeURIComponent(row.account.id)}`));
             if (latest()) rows[index] = { account: row.account, usage };
@@ -121,11 +121,14 @@
     </div>
     {#if account.email && account.email !== account.label}<p class="break-all text-xs text-zinc-400">{account.email}</p>{/if}
     {#if account.plan}<p class="text-xs text-zinc-400">{t('ui.accountType', { plan: account.plan })}</p>{/if}
+    {#if account.authType !== 'siwc'}
     <div class="flex flex-wrap items-baseline gap-x-2 text-xs text-zinc-400"><span>{t('ui.resetCredits')} · <span class="nx-display tabular-nums text-zinc-100" data-testid="quota-count">{creditCount(row) ?? '—'}</span></span>{#if state !== 'fresh'}<span data-testid="quota-state" class={state === 'stale' || state === 'partial' ? 'text-amber-300' : 'text-zinc-400'}>{t(`ui.usage.${state}`)}</span>{/if}</div>
     {#if row.error}<p class="text-xs text-amber-300">{t(row.error)}</p>{/if}
+    {/if}
     </div>
     <div class="min-w-0 space-y-1.5">
-    {#if account.status !== 'active'}<p class="text-xs text-zinc-400">{t('ui.usageSkipped')}</p>
+    {#if account.authType === 'siwc'}<a href="https://chatgpt.com" target="_blank" rel="noopener noreferrer" class="text-xs text-nexus-400 underline underline-offset-4" data-testid="siwc-usage-link">{t('ui.siwcUsage')}</a>
+    {:else if account.status !== 'active'}<p class="text-xs text-zinc-400">{t('ui.usageSkipped')}</p>
     {:else if !row.usage && busy && !row.error}<LoadingIndicator size="xs" centered={false} height="none" label={t('ui.usageLoading')} />
     {:else}
       {#each [row.usage?.usage.value?.primary, row.usage?.usage.value?.secondary].filter(Boolean) as window}

package/dist/plugins/chatgpt-oauth/ui/account-model.js

@@ -8,7 +8,7 @@ export function verificationUrl(value, kind) {
   if (typeof value !== 'string' || value !== value.trim() || value.length > 8192 || /[\u0000-\u001f\u007f]/.test(value)) return null;
   try {
     const url = new URL(value);
-    const path = kind === 'device' ? '/codex/device' : '/oauth/authorize';
+    const path = kind === 'device' ? '/codex/device' : kind === 'pkce' ? '/oauth/authorize' : kind === 'siwc' ? '/api/accounts/authorize' : null;
     if (url.origin !== 'https://auth.openai.com' || url.pathname !== path || url.username || url.password || url.hash) return null;
     return url.href;
   } catch { return null; }
@@ -17,7 +17,7 @@ export function verificationUrl(value, kind) {
  * @param {unknown} input @param {string} kind @param {number} [now] */
 export function parseLoginStart(input, kind, now = Date.now()) {
   const value = record(input);
-  if (!['device', 'pkce'].includes(kind) || typeof value.sessionId !== 'string' || !value.sessionId
+  if (!['device', 'pkce', 'siwc'].includes(kind) || typeof value.sessionId !== 'string' || !value.sessionId
     || value.sessionId !== value.sessionId.trim() || value.sessionId.length > 128 || /[\u0000-\u001f\u007f]/.test(value.sessionId)
     || typeof value.expiresAt !== 'number' || !Number.isFinite(value.expiresAt) || value.expiresAt <= now
     || value.expiresAt > now + 30 * 60 * 1000) throw new Error('invalid_response');
@@ -38,11 +38,11 @@ function record(value) {
   if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('invalid_response');
   return /** @type {Record<string, unknown>} */ (value);
 }
-/** @param {unknown} input @param {string} sessionId */
-export function loginStatus(input, sessionId) {
+/** @param {unknown} input @param {string} sessionId @param {string} [expectedKind] */
+export function loginStatus(input, sessionId, expectedKind) {
   const value = record(input);
   if (value.sessionId !== sessionId || typeof value.state !== 'string' || !Object.hasOwn(loginStates, value.state)
-    || typeof value.kind !== 'string' || !['device', 'pkce'].includes(value.kind) || !Number.isFinite(value.expiresAt)) throw new Error('invalid_response');
+    || typeof value.kind !== 'string' || !['device', 'pkce', 'siwc'].includes(value.kind) || (expectedKind !== undefined && value.kind !== expectedKind) || !Number.isFinite(value.expiresAt)) throw new Error('invalid_response');
   return value;
 }
 /** @param {unknown} input */
@@ -51,6 +51,8 @@ export function accountSummary(input) {
   if (typeof value.id !== 'string' || typeof value.label !== 'string' || typeof value.status !== 'string' || !Object.hasOwn(accountStates, value.status)
     || typeof value.available !== 'boolean') throw new Error('invalid_response');
   const identity = value.identity === undefined ? {} : record(value.identity);
+  const authType = value.authType === undefined ? 'codex' : value.authType;
+  if (authType !== 'codex' && authType !== 'siwc') throw new Error('invalid_response');
   if (value.autoResetCredits !== undefined && typeof value.autoResetCredits !== 'boolean') throw new Error('invalid_response');
   let pendingAutoReset;
   if (value.pendingAutoReset !== undefined) {
@@ -62,12 +64,19 @@ export function accountSummary(input) {
       || pending.completed !== false) throw new Error('invalid_response');
     pendingAutoReset = { creditId, redeemRequestId, expiresAt };
   }
-  return { id: value.id, label: value.label, status: value.status, available: value.available,
-    autoResetCredits: value.autoResetCredits === true, pendingAutoReset,
+  return { id: value.id, label: value.label, status: value.status, available: value.available, authType,
+    autoResetCredits: authType === 'codex' && value.autoResetCredits === true, pendingAutoReset: authType === 'codex' ? pendingAutoReset : undefined,
     expiresAt: Number.isFinite(value.expiresAt) ? value.expiresAt : undefined,
     email: typeof identity.email === 'string' ? identity.email : undefined,
     plan: typeof identity.planType === 'string' ? identity.planType : undefined };
 }
+/** @param {{authType?: string}} account */
+export const accountSourceId = account => account.authType === 'siwc' ? 'chatgpt-siwc' : 'chatgpt';
+/** @param {{authType?: string, status: string}} account */
+export const canQueryUsage = account => account.authType !== 'siwc' && account.status === 'active';
+/** New accounts default to SIWC; reauthentication stays in its original family.
+ * @param {{authType?: string}|undefined} [account] */
+export const loginMethods = account => account === undefined ? ['siwc', 'device', 'pkce'] : account.authType === 'siwc' ? ['siwc'] : ['device', 'pkce'];
 /** @param {unknown} input */
 function usageWindow(input) {
   if (input === undefined || input === null) return undefined;