Merge branch 'dev'

Author: lidge-jun

devlog/_fin/260721_unanswered_issue_triage/000_plan.md

@@ -0,0 +1,43 @@
+# Unanswered issue triage and fixes
+
+This work validates the unanswered issues open on 2026-07-21 before changing code.
+
+## Scope
+
+- #190: Cursor rejects an aggregate Codex tool catalog with `resource_exhausted`.
+- #181: provider deletion hides the server's actionable default-provider guard.
+- #198: usage/log cost estimates can be mistaken for actual billing.
+- #180 and #196: verify fixes already absorbed into `dev` instead of duplicating them.
+- #177 and #178: verify whether the vendors expose a model-inference contract that fits an OpenCodex provider.
+
+[Decision Log]
+- 목적과 의도: Validate each report against current `dev`, fix confirmed defects, and leave evidence-backed issue replies.
+- 기존 구현 및 제약 조건: Cursor registers client tools through a protobuf `McpTools` field with observed count and byte ceilings. The same filtered catalog must drive protobuf advertising and client tool-call recognition. GUI-visible text must be translated in every locale.
+- 검토한 주요 대안: Import the closed #192 heuristic patch; drop whole namespaces by count; stub schemas and move them into prompt text; measure actual serialized definitions and prioritize recoverable tools.
+- 선택한 방식: Measure the real serialized `McpTools` payload, enforce one hard count cap, prioritize explicit and `tool_search`-loaded tools, and skip oversized candidates while continuing to fill the catalog. Surface server delete errors directly and label cost values as non-billing list-price equivalents.
+- 다른 대안 대신 이 방식을 선택한 이유: The closed patch undercounted protobuf bytes, could exceed the count cap through reserved tools, and did not reliably promote searched tools. Exact serialization removes those failure modes without inventing an incompatible schema-stubbing protocol.
+- 장점, 단점 및 영향: The transport stays below both observed Cursor limits and searched tools become usable on the next turn. Some low-priority tools can still be omitted in very large catalogs, so the request includes an explicit recovery note when `tool_search` is available. Serialization adds bounded setup work once per Cursor turn.
+
+## Verification plan
+
+- Focused parser, Cursor request-builder/tool-definition/error tests.
+- GUI lint, i18n lint, TypeScript build, and relevant existing tests.
+- Full repository pre-push gate before pushing `dev`.
+
+## Result
+
+- #180 was already implemented on current `dev` as the complete `ocx account` command family. Its 41-case regression matrix passes; privacy-scan fixture strings were changed from token-shaped literals without changing behavior.
+- #196 was already absorbed on `dev`; the registry and three Qwen 3.8 reasoning replay tests pass.
+- #190 now budgets the exact serialized `McpTools` protobuf to 120,000 bytes and 330 definitions, prioritizes explicit/native and tool-search-loaded definitions, and classifies residual catalog exhaustion as HTTP 400 `tool_catalog_too_large` rather than a quota rate limit.
+- #181 now displays the management API's structured delete error, with a translated fallback for network, empty, or malformed responses.
+- #198 now labels dashboard cost values as API list-price equivalents rather than charges in English, Korean, German, and Chinese, with matching public documentation.
+- #177 and #178 remain feature requests: Warp documents an asynchronous Oz agent-run API, while Factory documents configuring upstream model gateways for its own client. Neither public contract is an OpenAI-compatible model-inference endpoint that can be registered as an OpenCodex provider without a new adapter contract.
+
+## Verification result
+
+- Full repository suite: 3,296 passed, 0 failed before the fixture-only privacy repair.
+- Post-repair focused suite: 94 passed, 0 failed for Cursor error/catalog handling, request logging, and the #180 CLI matrix.
+- Root TypeScript typecheck passed.
+- GUI ESLint, i18n lint, and production build passed.
+- Privacy scan passed.
+- React Doctor full scan completed; it reported the repository's existing baseline (197 diagnostics, including one pre-existing `Models.tsx` state-updater error). No new diagnostic was introduced by these changes.

docs-site/src/content/docs/guides/web-dashboard.md

@@ -39,6 +39,10 @@ bun run dev:gui
 | **Usage / Debug** | Inspect token-usage coverage and trends, or enable opt-in provider transport and usage-extraction diagnostics. |
 | **Stop** | Gracefully stop the proxy and installed background service, restore native Codex, and exit (`POST /api/stop`). |
 
+Cost values in **Logs** and **Usage** are API list-price equivalents calculated from reported tokens.
+They are not billing receipts or evidence of an actual charge; subscription usage or provider credits
+may apply instead.
+
 ## Delegation picker vs spawn routing
 
 The Dashboard's **Sub-agent delegation** picker stores `injectionModel` and, optionally,

docs-site/src/content/docs/ko/guides/web-dashboard.md

@@ -39,6 +39,9 @@ bun run dev:gui
 | **Usage / Debug** | 토큰 사용량의 측정 범위와 추이를 보거나, 선택적 프로바이더 전송/사용량 추출 진단을 켭니다. |
 | **Stop** | 프록시와 설치된 백그라운드 서비스를 정상 종료하고 네이티브 Codex를 복원한 뒤 끝냅니다(`POST /api/stop`). |
 
+**Logs**와 **Usage**의 비용 값은 보고된 토큰으로 계산한 API 정가 환산치입니다. 결제 영수증이나
+실제 청구 증거가 아니며, 구독 사용량 또는 프로바이더 크레딧이 대신 적용될 수 있습니다.
+
 ## 위임 선택기와 스폰 라우팅의 차이
 
 Dashboard의 **Sub-agent delegation** 선택기는 `injectionModel`과 선택적인 `injectionEffort`를

docs-site/src/content/docs/zh-cn/guides/web-dashboard.md

@@ -38,6 +38,9 @@ bun run dev:gui
 | **Usage / Debug** | 查看 token usage 覆盖率与趋势，或启用可选的 provider transport 和 usage 提取诊断。 |
 | **Stop** | 优雅地停止代理和已安装的后台服务，恢复原生 Codex 并退出（`POST /api/stop`）。 |
 
+**Logs** 和 **Usage** 中的费用是根据已报告 token 计算的 API 标价折算值，不是账单，也不能证明
+实际发生了扣费；实际可能计入订阅用量或消耗服务商额度。
+
 ## 委派选择器与生成路由的区别
 
 Dashboard 的 **Sub-agent delegation** 选择器会保存 `injectionModel`，以及可选的

gui/src/App.tsx

@@ -36,6 +36,27 @@ function hashBelongsToPage(rawHash: string, page: Page): boolean {
 
 const API_BASE = import.meta.env.VITE_API_BASE || "";
 const THEME_KEY = "ocx-theme";
+const PROVIDERS_VIEW_KEY = "ocx-providers-view";
+
+function readProvidersViewPreference(): "classic" | "workspace" {
+  try {
+    return localStorage.getItem(PROVIDERS_VIEW_KEY) === "workspace" ? "workspace" : "classic";
+  } catch {
+    return "classic";
+  }
+}
+
+function writeProvidersViewPreference(view: "classic" | "workspace"): void {
+  try {
+    localStorage.setItem(PROVIDERS_VIEW_KEY, view);
+  } catch {
+    /* ignore quota / private-mode failures */
+  }
+}
+
+function providersHashForPage(): string {
+  return readProvidersViewPreference() === "workspace" ? "providers/workspace" : "providers";
+}
 
 const NAV: { id: Page; tkey: TKey; Icon: typeof IconGrid }[] = [
   { id: "dashboard", tkey: "nav.dashboard", Icon: IconGrid },
@@ -86,9 +107,22 @@ export default function App() {
       const rawHash = window.location.hash.replace(/^#\/?/, "");
       setNavOpen(false);
       if (!hashBelongsToPage(rawHash, nextPage)) {
-        window.location.hash = nextPage;
+        window.location.hash = nextPage === "providers" ? providersHashForPage() : nextPage;
         return;
       }
+      // Preference is source of truth for Classic/Workspace. Bare #providers must not
+      // wipe a saved workspace choice (that regressed when leaving Providers and returning).
+      if (nextPage === "providers") {
+        const preferred = readProvidersViewPreference();
+        if (rawHash === "providers/workspace") {
+          writeProvidersViewPreference("workspace");
+        } else if (rawHash === "providers" && preferred === "workspace") {
+          window.location.hash = "providers/workspace";
+          return;
+        } else if (rawHash === "providers") {
+          writeProvidersViewPreference("classic");
+        }
+      }
       setPageState(nextPage);
     };
     window.addEventListener("hashchange", onHash);
@@ -97,6 +131,17 @@ export default function App() {
 
   useEffect(() => {
     const rawHash = window.location.hash.replace(/^#\/?/, "");
+    if (page === "providers") {
+      // Honor an explicit workspace deep link on first load before normalizing
+      // to the saved preference (bookmarks/shared links must not open Classic).
+      if (rawHash === "providers/workspace") {
+        writeProvidersViewPreference("workspace");
+        return;
+      }
+      const wanted = providersHashForPage();
+      if (rawHash !== wanted) window.location.hash = wanted;
+      return;
+    }
     if (!hashBelongsToPage(rawHash, page)) {
       window.location.hash = page;
     }
@@ -226,7 +271,12 @@ export default function App() {
         <nav>
           {NAV.map(({ id, tkey, Icon }) => (
             <button key={id} className={`nav-item${page === id ? " active" : ""}`} data-page={id}
-              onClick={() => { setPageState(id); setNavOpen(false); }}
+              onClick={() => {
+                // Always sync the hash on nav click so Providers restores Classic/Workspace preference.
+                window.location.hash = id === "providers" ? providersHashForPage() : id;
+                setPageState(id);
+                setNavOpen(false);
+              }}
               aria-current={page === id ? "page" : undefined}>
               <Icon /> {t(tkey)}
             </button>

gui/src/api-error.ts

@@ -0,0 +1,10 @@
+/** Prefer a structured local-management API error while keeping a translated fallback. */
+export async function apiErrorMessage(response: Response, fallback: string): Promise<string> {
+  try {
+    const data = await response.json() as { error?: unknown };
+    if (typeof data.error === "string" && data.error.trim()) return data.error.trim();
+  } catch {
+    // The fallback is the stable UI contract for empty/non-JSON failures.
+  }
+  return fallback;
+}

gui/src/components/AddProviderModal.tsx

@@ -11,6 +11,7 @@ import {
 import { oauthTosRisk } from "../oauth-tos-risk";
 import OAuthTosWarningModal from "./OAuthTosWarningModal";
 import ProviderCatalog from "./provider-catalog/ProviderCatalog";
+import type { AccountLoginRow, AccountLoginStatus } from "./provider-catalog/ProviderCatalog";
 import type { CatalogPreset } from "./provider-catalog/provider-presets";
 import { baseUrlForChoice, matchChoiceId, resolvedBaseUrlForChoice } from "../base-url-choice";
 
@@ -23,6 +24,7 @@ type FormState = ProviderPayloadForm;
 
 export default function AddProviderModal({
   apiBase, existingNames, onClose, onAdded, initialTier, initialCustom = false,
+  accountRows, accountStatus, accountBusy, onAccountLogin, onAccountCancelLogin, onAccountLogout, onOpen,
 }: {
   apiBase: string;
   existingNames: string[];
@@ -32,6 +34,13 @@ export default function AddProviderModal({
   initialTier?: "accounts" | "free" | "paid";
   /** Skip the catalog and open the custom-provider form immediately. */
   initialCustom?: boolean;
+  accountRows?: AccountLoginRow[];
+  accountStatus?: Record<string, AccountLoginStatus>;
+  accountBusy?: string | null;
+  onAccountLogin?: (provider: string) => void;
+  onAccountCancelLogin?: (provider: string) => void;
+  onAccountLogout?: (provider: string) => void;
+  onOpen?: () => void;
 }) {
   const t = useT();
   const fallbackPresets = useMemo<Preset[]>(() => [
@@ -65,10 +74,11 @@ export default function AddProviderModal({
   const previousFocusRef = useRef<HTMLElement | null>(null);
   const dialogRef = useRef<HTMLDivElement>(null);
 
-  // Cleanup + focus-trap: save previous focus on mount, restore on unmount.
+  // Refresh OAuth status once when the modal opens (not when fetchOauth identity changes).
   useEffect(() => {
     aliveRef.current = true;
     previousFocusRef.current = document.activeElement as HTMLElement | null;
+    onOpen?.();
     const dialog = dialogRef.current;
     if (dialog) {
       const focusable = dialog.querySelector<HTMLElement>(
@@ -80,6 +90,7 @@ export default function AddProviderModal({
       aliveRef.current = false;
       previousFocusRef.current?.focus();
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- mount-only open hook
   }, []);
   useEffect(() => {
     const onKey = (e: KeyboardEvent) => {
@@ -308,6 +319,12 @@ export default function AddProviderModal({
             initialTier={initialTier}
             onSelectPreset={p => choosePreset(p)}
             onSelectCustom={() => choosePreset(fallbackPresets[0]!)}
+            accountRows={accountRows}
+            accountStatus={accountStatus}
+            busyProvider={accountBusy}
+            onLogin={onAccountLogin}
+            onCancelLogin={onAccountCancelLogin}
+            onLogout={onAccountLogout}
           />
         ) : form && (
           preset.auth === "oauth" && form.authMode === "oauth" ? (

gui/src/components/provider-catalog/ProviderCatalog.tsx

@@ -12,12 +12,14 @@ import {
   type CatalogPreset,
 } from "./provider-presets";
 
-export type AccountLoginStatus = { loggedIn: boolean; email?: string; error?: string };
+export type AccountLoginStatus = { loggedIn: boolean; email?: string; error?: string; needsReauth?: boolean };
 export type AccountLoginRow = {
   id: string;
   label: string;
-  kind: "oauth" | "key";
+  kind: "oauth" | "key" | "codex";
   statusLabel?: string;
+  /** Optional deep-link for codex/account-pool management. */
+  href?: string;
 };
 
 export type CatalogTier = "accounts" | "free" | "paid";
@@ -102,8 +104,7 @@ export default function ProviderCatalog({
 
       {tier === "accounts" && (
         <div className="provider-catalog-accounts-hint muted text-label">
-          {t("modal.accountsHint")}{" "}
-          <a href="#codex-auth">{t("modal.accountsCodexAuthLink")}</a>
+          {t("modal.accountsHint")}
         </div>
       )}
 
@@ -118,7 +119,7 @@ export default function ProviderCatalog({
         {presetsLoading && rows.length === 0 && (
           <div className="muted text-control provider-catalog-empty">{t("modal.catalogLoading")}</div>
         )}
-        {rows.map(p => (
+        {tier !== "accounts" && rows.map(p => (
           <button key={p.id} className="list-row" onClick={() => onSelectPreset(p)}>
             <div>
               <div className="title">{p.label}</div>
@@ -127,25 +128,36 @@ export default function ProviderCatalog({
             <div className="provider-catalog-badges">{badges(p)}</div>
           </button>
         ))}
-        {!presetsLoading && rows.length === 0 && (
+        {tier !== "accounts" && !presetsLoading && rows.length === 0 && (
           <div className="muted text-control provider-catalog-empty">{t("modal.noMatch")}</div>
         )}
 
         {tier === "accounts" && accountRows.map(row => {
           const status = accountStatus[row.id];
           const busy = busyProvider === row.id;
+          const loggedIn = !!status?.loggedIn;
+          const statusText = loggedIn
+            ? (status?.email ?? row.statusLabel ?? t("modal.accountLoggedIn"))
+            : (status?.error ?? row.statusLabel ?? t("modal.accountLoggedOut"));
           return (
             <div key={row.id} className="list-row provider-catalog-account-row">
               <div>
                 <div className="title">{row.label}</div>
-                <div className="sub">
-                  {status?.loggedIn
-                    ? (status.email ?? row.statusLabel ?? t("modal.accountLoggedIn"))
-                    : (status?.error ?? row.statusLabel ?? t("modal.accountLoggedOut"))}
-                </div>
+                <div className="sub">{statusText}</div>
               </div>
               <div className="provider-catalog-badges">
-                {status?.loggedIn ? (
+                {row.kind === "key" ? null : row.kind === "codex" ? (
+                  <>
+                    {loggedIn && (
+                      <a className="btn btn-ghost" href={row.href ?? "#codex-auth"}>{t("modal.accountManage")}</a>
+                    )}
+                    {onLogin && (
+                      <button className={loggedIn ? "btn btn-ghost" : "btn btn-primary"} onClick={() => onLogin(row.id)}>
+                        {loggedIn ? t("modal.accountAdd") : t("modal.accountLogin")}
+                      </button>
+                    )}
+                  </>
+                ) : loggedIn ? (
                   onLogout && <button className="btn btn-ghost" onClick={() => onLogout(row.id)}>{t("modal.accountLogout")}</button>
                 ) : busy ? (
                   onCancelLogin && <button className="btn btn-ghost" onClick={() => onCancelLogin(row.id)}>{t("common.cancel")}</button>
@@ -156,6 +168,9 @@ export default function ProviderCatalog({
             </div>
           );
         })}
+        {tier === "accounts" && accountRows.length === 0 && !presetsLoading && (
+          <div className="muted text-control provider-catalog-empty">{t("modal.noMatch")}</div>
+        )}
       </div>
 
       <div className="provider-catalog-footer">