@cortexkit/opencode-openai-auth 0.5.2 → 0.6.0

package/src/tui/command-dialogs.tsx

@@ -1,5 +1,6 @@
 /** @jsxImportSource @opentui/solid */
 import type { TuiPluginApi } from '@opencode-ai/plugin/tui'
+import { createLogger } from '../logger'
 import type { OpenDialogPayload } from '../rpc/protocol.js'
 import {
   type AccountQuota,
@@ -8,8 +9,11 @@ import {
   resolveSessionSidebarRouting,
   type SidebarState,
 } from '../sidebar-state.js'
+import { errorMessage } from '../util/error'
 import { openUrl } from '../util/open-url'
 
+const log = createLogger('rpc-tui')
+
 type ApplyFn = (
   command: OpenDialogPayload['command'],
   args: string,
@@ -104,6 +108,242 @@ export function buildCachekeepDialogOptions(payload: OpenDialogPayload) {
   ]
 }
 
+type ResetAccountKnob = {
+  accountKey: string
+  label: string
+  usedPercent?: number
+  availableCount?: number
+  applicableAvailableCount?: number
+  eligible: boolean
+  reason?: string
+  selectedCreditId?: string
+  selectedCreditExpiresAt?: string
+}
+
+type ResetPreviewKnob = ResetAccountKnob & {
+  chatgptAccountId?: string
+  resetTime?: string
+}
+
+type ResetDialogOption = {
+  title: string
+  value: string
+  description: string
+  disabled?: boolean
+}
+
+function resetAccountOptions(payload: OpenDialogPayload): ResetDialogOption[] {
+  const accounts = Array.isArray(payload.knobs.accounts)
+    ? (payload.knobs.accounts as ResetAccountKnob[])
+    : []
+  return [
+    ...accounts.map((account) => {
+      const used =
+        account.usedPercent === undefined
+          ? 'quota unavailable'
+          : `${account.usedPercent}%`
+      const counts = `${account.applicableAvailableCount ?? 0}/${account.availableCount ?? 0}`
+      const status = account.eligible
+        ? 'eligible'
+        : (account.reason ?? 'unavailable')
+      const details = `${used} · ${counts}`
+      const shortDate =
+        account.selectedCreditExpiresAt?.slice(0, 10) ?? 'unknown'
+      return {
+        title: `${account.label} — ${status}`,
+        value: `account:${account.accountKey}`,
+        description: account.eligible
+          ? `${details} · exp ${shortDate}`
+          : details,
+      }
+    }),
+    {
+      title: 'Refresh',
+      value: 'refresh',
+      description: 'Re-check account quota and reset credits',
+    },
+    {
+      title: 'Close',
+      value: 'close',
+      description: 'Close this dialog',
+    },
+  ]
+}
+
+function resetResultOptions(payload: OpenDialogPayload): ResetDialogOption[] {
+  const accountKey =
+    typeof payload.knobs.accountKey === 'string'
+      ? payload.knobs.accountKey
+      : undefined
+  const chatgptAccountId =
+    typeof payload.knobs.chatgptAccountId === 'string'
+      ? payload.knobs.chatgptAccountId
+      : undefined
+  const code = typeof payload.knobs.code === 'string' ? payload.knobs.code : ''
+  const retrySafe =
+    (code === 'ambiguous' ||
+      code === 'http_error' ||
+      code === 'expired_unreconciled' ||
+      payload.knobs.stateWriteFailed === true) &&
+    typeof payload.knobs.retryGuidance === 'string' &&
+    accountKey !== undefined &&
+    chatgptAccountId !== undefined
+  return [
+    {
+      title: payload.text,
+      value: 'result',
+      description: 'Command result',
+    },
+    ...(retrySafe
+      ? [
+          {
+            title: 'Retry',
+            value: 'retry',
+            description:
+              'Reuse the bound request and credit identifiers for this uncertain outcome',
+          },
+        ]
+      : []),
+    {
+      title: 'Refresh',
+      value: 'refresh',
+      description: 'Re-check account quota and reset credits',
+    },
+    {
+      title: 'Close',
+      value: 'close',
+      description: 'Close this dialog',
+    },
+  ]
+}
+
+function openResetDialog(
+  api: TuiPluginApi,
+  payload: OpenDialogPayload,
+  apply: ApplyFn,
+) {
+  let applyGeneration = 0
+  const render = (state: OpenDialogPayload) => {
+    const applyAndRender = (args: string) => {
+      const generation = ++applyGeneration
+      log.debug('reset dialog apply', { args, generation })
+      void apply('openai-reset', args)
+        .then((result) => {
+          log.debug('reset dialog apply result', {
+            generation,
+            currentGeneration: applyGeneration,
+            stage: result.knobs?.stage,
+            accountRows: Array.isArray(result.knobs?.accounts)
+              ? (result.knobs.accounts as unknown[]).length
+              : undefined,
+          })
+          if (generation !== applyGeneration) return
+          if (typeof result.knobs?.stage !== 'string') {
+            render({
+              command: 'openai-reset',
+              text: 'The reset request is still completing or returned no result. Choose Refresh to check the current state — do NOT re-confirm.',
+              knobs: { stage: 'result', code: 'unknown' },
+            })
+            return
+          }
+          render({
+            command: 'openai-reset',
+            text: result.text,
+            knobs: result.knobs,
+          })
+        })
+        .catch((error) => {
+          if (generation !== applyGeneration) return
+          log.warn('reset dialog apply rejected', {
+            error: errorMessage(error),
+          })
+          render({
+            command: 'openai-reset',
+            text: 'Command failed — the plugin could not complete the request; the plugin log has details.',
+            knobs: { stage: 'result', code: 'error' },
+          })
+        })
+    }
+    const stage = state.knobs.stage
+    log.debug('reset dialog render', {
+      stage,
+      accountRows: Array.isArray(state.knobs.accounts)
+        ? (state.knobs.accounts as unknown[]).length
+        : undefined,
+      knobKeys: Object.keys(state.knobs),
+    })
+    api.ui.dialog.setSize('xlarge')
+
+    if (stage === 'confirm') {
+      const preview = state.knobs.preview as ResetPreviewKnob | undefined
+      const accountKey = preview?.accountKey
+      const chatgptAccountId = preview?.chatgptAccountId
+      const applicableCount = preview?.applicableAvailableCount ?? 0
+      const DialogConfirm = api.ui.DialogConfirm
+      api.ui.dialog.replace(() => (
+        <DialogConfirm
+          title='Reset quota window'
+          message={`${state.text}\n\nThis SPENDS 1 of ${applicableCount} reset credits — irreversible.\n\nChoose Reset to continue or Cancel to return.\n\nEnter = Cancel (host default). Press Tab then Enter to Reset.`}
+          onConfirm={() => {
+            if (!accountKey || !chatgptAccountId) return
+            applyAndRender(
+              `confirm ${encodeURIComponent(accountKey)} ${encodeURIComponent(chatgptAccountId)}`,
+            )
+          }}
+          onCancel={() => applyAndRender('refresh')}
+        />
+      ))
+      return
+    }
+
+    const DialogSelect = api.ui.DialogSelect<string>
+    const options =
+      stage === 'result'
+        ? resetResultOptions(state)
+        : resetAccountOptions(state)
+    api.ui.dialog.replace(() => (
+      <DialogSelect
+        title={
+          stage === 'result' ? 'OpenAI reset result' : 'OpenAI reset credits'
+        }
+        options={options}
+        onSelect={(option) => {
+          if (option.disabled) return
+          if (option.value === 'result') return
+          if (option.value === 'close') {
+            applyGeneration += 1
+            api.ui.dialog.clear()
+            return
+          }
+          if (option.value === 'refresh') {
+            applyAndRender('refresh')
+            return
+          }
+          if (option.value === 'retry') {
+            const accountKey = state.knobs.accountKey
+            const chatgptAccountId = state.knobs.chatgptAccountId
+            if (
+              typeof accountKey !== 'string' ||
+              typeof chatgptAccountId !== 'string'
+            ) {
+              return
+            }
+            applyAndRender(
+              `retry ${encodeURIComponent(accountKey)} ${encodeURIComponent(chatgptAccountId)}`,
+            )
+            return
+          }
+          if (!option.value.startsWith('account:')) return
+          const accountKey = option.value.slice('account:'.length)
+          applyAndRender(`select ${encodeURIComponent(accountKey)}`)
+        }}
+      />
+    ))
+  }
+
+  render(payload)
+}
+
 function showText(api: TuiPluginApi, text: string) {
   api.ui.dialog.setSize('xlarge')
   api.ui.dialog.replace(() => (
@@ -157,6 +397,11 @@ export function openCommandDialog(
   apply: ApplyFn,
   sessionId?: string,
 ) {
+  if (payload.command === 'openai-reset') {
+    openResetDialog(api, payload, apply)
+    return
+  }
+
   if (payload.command === 'openai-routing') {
     const current = (payload.knobs.mode as string) ?? 'main-first'
     const DialogSelect = api.ui.DialogSelect<string>

package/src/tui-compiled/rpc/protocol.ts

@@ -6,6 +6,7 @@ export type CommandModalName =
   | 'openai-dump'
   | 'openai-logging'
   | 'openai-cachekeep'
+  | 'openai-reset'
 
 export interface OpenDialogPayload {
   command: CommandModalName

package/src/tui-compiled/rpc/rpc-client.ts

@@ -6,21 +6,24 @@ export interface RpcClient {
     lastReceivedId: number,
     sessionId?: string,
   ) => Promise<RpcNotification[]>
-  apply: (request: ApplyRequest) => Promise<ApplyResult>
+  apply: (request: ApplyRequest, timeoutMs?: number) => Promise<ApplyResult>
 }
 
+export const DEFAULT_RPC_TIMEOUT_MS = 2_000
+
 async function call<T>(
   dir: string,
   expectedPid: number | undefined,
   onSelected: ((entry: PortFileEntry | null) => void) | undefined,
   method: string,
   params: Record<string, unknown>,
+  timeoutMs = DEFAULT_RPC_TIMEOUT_MS,
 ): Promise<T | null> {
   const entry = await discoverPortFile(dir, expectedPid)
   onSelected?.(entry)
   if (!entry) return null
   const controller = new AbortController()
-  const timer = setTimeout(() => controller.abort(), 2_000)
+  const timer = setTimeout(() => controller.abort(), timeoutMs)
   try {
     const res = await fetch(`http://127.0.0.1:${entry.port}/rpc/${method}`, {
       method: 'POST',
@@ -62,7 +65,7 @@ export function createRpcClient(
       )
       return out?.messages ?? []
     },
-    async apply(request) {
+    async apply(request, timeoutMs) {
       const out = await call<ApplyResult>(
         dir,
         expectedPid,
@@ -71,6 +74,7 @@ export function createRpcClient(
         {
           ...request,
         },
+        timeoutMs,
       )
       return out ?? { text: 'apply failed', knobs: {} }
     },

package/src/tui-compiled/sidebar-state.ts

@@ -100,6 +100,7 @@ export type ActiveRoutingMap = Record<string, ActiveRoutingEntry>
 
 export interface StickyAssignment {
   accountId: string
+  wireAccountId?: string
   assignedAt: number
   lastSeenAt: number
   inputBytes: number
@@ -120,6 +121,7 @@ export interface ResolveStickyAssignmentInput {
   validPinnedAccountIds: readonly string[]
   excludeAccountIds?: readonly string[]
   quotaCheckedAtByAccount: Readonly<Record<string, number | undefined>>
+  wireAccountIdByAccount?: Readonly<Record<string, string | undefined>>
   choose: (
     pendingBytes: ReadonlyMap<string, number>,
   ) => StickyAssignmentChoice | undefined
@@ -256,12 +258,14 @@ function normalizeStickyAssignments(
     ) {
       continue
     }
+    const wireAccountId = assignment.wireAccountId
     normalized[sessionHash] = {
       accountId: assignment.accountId,
       assignedAt: assignment.assignedAt,
       lastSeenAt: assignment.lastSeenAt,
       inputBytes: assignment.inputBytes,
       ...(quotaCheckedAt === undefined ? {} : { quotaCheckedAt }),
+      ...(typeof wireAccountId === 'string' ? { wireAccountId } : {}),
     }
   }
 
@@ -652,10 +656,32 @@ function stickyAssignmentNeedsMetadataUpdate(
   assignment: StickyAssignment,
   requestBytes: number,
   now: number,
+  wireAccountId: string | undefined,
 ): boolean {
   return (
     requestBytes > assignment.inputBytes ||
-    now - assignment.lastSeenAt >= STICKY_ASSIGNMENT_LAST_SEEN_TOUCH_MS
+    now - assignment.lastSeenAt >= STICKY_ASSIGNMENT_LAST_SEEN_TOUCH_MS ||
+    (assignment.wireAccountId === undefined && wireAccountId !== undefined)
+  )
+}
+
+function hasStickyIdentityMismatch(
+  assignment: StickyAssignment,
+  wireAccountId: string | undefined,
+): boolean {
+  // True only when both sides know their ChatGPT account and those accounts
+  // differ, which means the slot this session was placed on now holds a
+  // different account than it did at placement.
+  //
+  // An unknown on either side deliberately reports no mismatch. A session is
+  // pinned to keep its prompt cache warm, and treating missing data as a
+  // change would place sessions again for no reason and throw those caches
+  // away — worse than leaving a rare wrong pin in place until real evidence
+  // arrives.
+  return (
+    typeof assignment.wireAccountId === 'string' &&
+    typeof wireAccountId === 'string' &&
+    assignment.wireAccountId !== wireAccountId
   )
 }
 
@@ -692,9 +718,11 @@ function readonlyPendingBytes(
 function pendingBytesForAssignments(
   assignments: StickyAssignmentMap | undefined,
   quotaCheckedAtByAccount: Readonly<Record<string, number | undefined>>,
+  excludedSessionHash?: string,
 ): ReadonlyMap<string, number> {
   const pendingBytes = new Map<string, number>()
-  for (const assignment of Object.values(assignments ?? {})) {
+  for (const [sessionHash, assignment] of Object.entries(assignments ?? {})) {
+    if (sessionHash === excludedSessionHash) continue
     if (
       assignment.quotaCheckedAt !==
       quotaCheckedAtByAccount[assignment.accountId]
@@ -1178,10 +1206,15 @@ export async function resolveSidebarStickyAssignment(
       excludedAccountIds,
       input.now,
     ) &&
+    !hasStickyIdentityMismatch(
+      existing,
+      input.wireAccountIdByAccount?.[existing.accountId],
+    ) &&
     !stickyAssignmentNeedsMetadataUpdate(
       existing,
       input.requestBytes,
       input.now,
+      input.wireAccountIdByAccount?.[existing.accountId],
     )
   ) {
     return existing
@@ -1202,23 +1235,38 @@ export async function resolveSidebarStickyAssignment(
           stickyAssignments,
         )
         const current = stickyAssignments?.[sessionHash]
+        const currentIdentityMismatch =
+          current !== undefined &&
+          hasStickyIdentityMismatch(
+            current,
+            input.wireAccountIdByAccount?.[current.accountId],
+          )
         if (
           isValidStickyAssignment(
             current,
             validPinnedAccountIds,
             excludedAccountIds,
             input.now,
-          )
+          ) &&
+          !currentIdentityMismatch
         ) {
           const metadataNeedsUpdate = stickyAssignmentNeedsMetadataUpdate(
             current,
             input.requestBytes,
             input.now,
+            input.wireAccountIdByAccount?.[current.accountId],
           )
           const assignment = metadataNeedsUpdate
             ? {
                 ...current,
                 inputBytes: Math.max(current.inputBytes, input.requestBytes),
+                ...(current.wireAccountId === undefined &&
+                input.wireAccountIdByAccount?.[current.accountId] !== undefined
+                  ? {
+                      wireAccountId:
+                        input.wireAccountIdByAccount?.[current.accountId],
+                    }
+                  : {}),
                 ...(input.now - current.lastSeenAt >=
                 STICKY_ASSIGNMENT_LAST_SEEN_TOUCH_MS
                   ? { lastSeenAt: input.now }
@@ -1241,6 +1289,12 @@ export async function resolveSidebarStickyAssignment(
           pendingBytesForAssignments(
             stickyAssignments,
             input.quotaCheckedAtByAccount,
+            // Pending bytes weigh how much traffic each account is already
+            // committed to, so the session being placed must not weigh its own
+            // stale entry: that entry belongs to the account it is moving off,
+            // and counting it would bias placement away from a perfectly good
+            // destination. Other sessions' entries still count.
+            currentIdentityMismatch ? sessionHash : undefined,
           ),
         )
         if (!choice) {
@@ -1261,6 +1315,11 @@ export async function resolveSidebarStickyAssignment(
           ...(choice.quotaCheckedAt === undefined
             ? {}
             : { quotaCheckedAt: choice.quotaCheckedAt }),
+          ...(input.wireAccountIdByAccount?.[choice.accountId] === undefined
+            ? {}
+            : {
+                wireAccountId: input.wireAccountIdByAccount?.[choice.accountId],
+              }),
         }
         return {
           ...latest,

package/src/tui-compiled/tui/command-dialogs.tsx

@@ -1,14 +1,17 @@
 import { createTextNode as _$createTextNode } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { memo as _$memo } from "opentui:runtime-module:%40opentui%2Fsolid";
-import { createComponent as _$createComponent } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { insertNode as _$insertNode } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { insert as _$insert } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { setProp as _$setProp } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { createElement as _$createElement } from "opentui:runtime-module:%40opentui%2Fsolid";
+import { createComponent as _$createComponent } from "opentui:runtime-module:%40opentui%2Fsolid";
 /** @jsxImportSource @opentui/solid */
 
+import { createLogger } from "../logger";
 import { getCollapsedQuotaSummary, getSidebarState, resolveSessionSidebarRouting } from "../sidebar-state.js";
+import { errorMessage } from "../util/error";
 import { openUrl } from "../util/open-url";
+const log = createLogger('rpc-tui');
 export function buildCachekeepDialogOptions(payload) {
   const enabled = payload.knobs.enabled === true;
   const subagents = payload.knobs.subagents === true;
@@ -59,6 +62,160 @@ export function buildCachekeepDialogOptions(payload) {
     description: 'Close this dialog'
   }];
 }
+function resetAccountOptions(payload) {
+  const accounts = Array.isArray(payload.knobs.accounts) ? payload.knobs.accounts : [];
+  return [...accounts.map(account => {
+    const used = account.usedPercent === undefined ? 'quota unavailable' : `${account.usedPercent}%`;
+    const counts = `${account.applicableAvailableCount ?? 0}/${account.availableCount ?? 0}`;
+    const status = account.eligible ? 'eligible' : account.reason ?? 'unavailable';
+    const details = `${used} · ${counts}`;
+    const shortDate = account.selectedCreditExpiresAt?.slice(0, 10) ?? 'unknown';
+    return {
+      title: `${account.label} — ${status}`,
+      value: `account:${account.accountKey}`,
+      description: account.eligible ? `${details} · exp ${shortDate}` : details
+    };
+  }), {
+    title: 'Refresh',
+    value: 'refresh',
+    description: 'Re-check account quota and reset credits'
+  }, {
+    title: 'Close',
+    value: 'close',
+    description: 'Close this dialog'
+  }];
+}
+function resetResultOptions(payload) {
+  const accountKey = typeof payload.knobs.accountKey === 'string' ? payload.knobs.accountKey : undefined;
+  const chatgptAccountId = typeof payload.knobs.chatgptAccountId === 'string' ? payload.knobs.chatgptAccountId : undefined;
+  const code = typeof payload.knobs.code === 'string' ? payload.knobs.code : '';
+  const retrySafe = (code === 'ambiguous' || code === 'http_error' || code === 'expired_unreconciled' || payload.knobs.stateWriteFailed === true) && typeof payload.knobs.retryGuidance === 'string' && accountKey !== undefined && chatgptAccountId !== undefined;
+  return [{
+    title: payload.text,
+    value: 'result',
+    description: 'Command result'
+  }, ...(retrySafe ? [{
+    title: 'Retry',
+    value: 'retry',
+    description: 'Reuse the bound request and credit identifiers for this uncertain outcome'
+  }] : []), {
+    title: 'Refresh',
+    value: 'refresh',
+    description: 'Re-check account quota and reset credits'
+  }, {
+    title: 'Close',
+    value: 'close',
+    description: 'Close this dialog'
+  }];
+}
+function openResetDialog(api, payload, apply) {
+  let applyGeneration = 0;
+  const render = state => {
+    const applyAndRender = args => {
+      const generation = ++applyGeneration;
+      log.debug('reset dialog apply', {
+        args,
+        generation
+      });
+      void apply('openai-reset', args).then(result => {
+        log.debug('reset dialog apply result', {
+          generation,
+          currentGeneration: applyGeneration,
+          stage: result.knobs?.stage,
+          accountRows: Array.isArray(result.knobs?.accounts) ? result.knobs.accounts.length : undefined
+        });
+        if (generation !== applyGeneration) return;
+        if (typeof result.knobs?.stage !== 'string') {
+          render({
+            command: 'openai-reset',
+            text: 'The reset request is still completing or returned no result. Choose Refresh to check the current state — do NOT re-confirm.',
+            knobs: {
+              stage: 'result',
+              code: 'unknown'
+            }
+          });
+          return;
+        }
+        render({
+          command: 'openai-reset',
+          text: result.text,
+          knobs: result.knobs
+        });
+      }).catch(error => {
+        if (generation !== applyGeneration) return;
+        log.warn('reset dialog apply rejected', {
+          error: errorMessage(error)
+        });
+        render({
+          command: 'openai-reset',
+          text: 'Command failed — the plugin could not complete the request; the plugin log has details.',
+          knobs: {
+            stage: 'result',
+            code: 'error'
+          }
+        });
+      });
+    };
+    const stage = state.knobs.stage;
+    log.debug('reset dialog render', {
+      stage,
+      accountRows: Array.isArray(state.knobs.accounts) ? state.knobs.accounts.length : undefined,
+      knobKeys: Object.keys(state.knobs)
+    });
+    api.ui.dialog.setSize('xlarge');
+    if (stage === 'confirm') {
+      const preview = state.knobs.preview;
+      const accountKey = preview?.accountKey;
+      const chatgptAccountId = preview?.chatgptAccountId;
+      const applicableCount = preview?.applicableAvailableCount ?? 0;
+      const DialogConfirm = api.ui.DialogConfirm;
+      api.ui.dialog.replace(() => _$createComponent(DialogConfirm, {
+        title: "Reset quota window",
+        get message() {
+          return `${state.text}\n\nThis SPENDS 1 of ${applicableCount} reset credits — irreversible.\n\nChoose Reset to continue or Cancel to return.\n\nEnter = Cancel (host default). Press Tab then Enter to Reset.`;
+        },
+        onConfirm: () => {
+          if (!accountKey || !chatgptAccountId) return;
+          applyAndRender(`confirm ${encodeURIComponent(accountKey)} ${encodeURIComponent(chatgptAccountId)}`);
+        },
+        onCancel: () => applyAndRender('refresh')
+      }));
+      return;
+    }
+    const DialogSelect = api.ui.DialogSelect;
+    const options = stage === 'result' ? resetResultOptions(state) : resetAccountOptions(state);
+    api.ui.dialog.replace(() => _$createComponent(DialogSelect, {
+      title: stage === 'result' ? 'OpenAI reset result' : 'OpenAI reset credits',
+      options: options,
+      onSelect: option => {
+        if (option.disabled) return;
+        if (option.value === 'result') return;
+        if (option.value === 'close') {
+          applyGeneration += 1;
+          api.ui.dialog.clear();
+          return;
+        }
+        if (option.value === 'refresh') {
+          applyAndRender('refresh');
+          return;
+        }
+        if (option.value === 'retry') {
+          const accountKey = state.knobs.accountKey;
+          const chatgptAccountId = state.knobs.chatgptAccountId;
+          if (typeof accountKey !== 'string' || typeof chatgptAccountId !== 'string') {
+            return;
+          }
+          applyAndRender(`retry ${encodeURIComponent(accountKey)} ${encodeURIComponent(chatgptAccountId)}`);
+          return;
+        }
+        if (!option.value.startsWith('account:')) return;
+        const accountKey = option.value.slice('account:'.length);
+        applyAndRender(`select ${encodeURIComponent(accountKey)}`);
+      }
+    }));
+  };
+  render(payload);
+}
 function showText(api, text) {
   api.ui.dialog.setSize('xlarge');
   api.ui.dialog.replace(() => (() => {
@@ -107,6 +264,10 @@ function showSetCachekeepWindowPrompt(api, apply, state, render) {
   }));
 }
 export function openCommandDialog(api, payload, apply, sessionId) {
+  if (payload.command === 'openai-reset') {
+    openResetDialog(api, payload, apply);
+    return;
+  }
   if (payload.command === 'openai-routing') {
     const current = payload.knobs.mode ?? 'main-first';
     const DialogSelect = api.ui.DialogSelect;

package/src/tui-compiled/tui.tsx

@@ -1118,7 +1118,7 @@ const tui = async api => {
             }));
             continue;
           }
-          openCommandDialog(api, message.payload, (command, args) => rpcClient.apply(buildApplyRequest(command, args, sessionId)), sessionId);
+          openCommandDialog(api, message.payload, (command, args) => rpcClient.apply(buildApplyRequest(command, args, sessionId), command === 'openai-reset' ? 90_000 : undefined), sessionId);
         }
       }).catch(() => {}).finally(() => {
         rpcInFlight = false;

package/src/tui-compiled/util/error.ts

@@ -0,0 +1,9 @@
+export function errorMessage(error: unknown) {
+  if (error instanceof Error) return error.message
+  if (typeof error === 'string') return error
+  try {
+    return JSON.stringify(error)
+  } catch {
+    return String(error)
+  }
+}