revert: CPA preset commits for PR-based bot review

hqhq1025 · hqhq1025 · commit 803efab30575 · 2026-04-23T10:12:56.000+08:00
Reverts 9aa8c1e, d6e4199, 7e75226. Reason: direct-merged to main but need Codex bot review before landing. Feature will be restored via PR #<tbd> once approved.
diff --git a/.changeset/cpa-modal-autodiscover.md b/.changeset/cpa-modal-autodiscover.md
diff --git a/.changeset/cpa-preset.md b/.changeset/cpa-preset.md
diff --git a/apps/desktop/src/renderer/src/components/AddCustomProviderModal.tsx b/apps/desktop/src/renderer/src/components/AddCustomProviderModal.tsx
@@ -1,8 +1,8 @@
 import { useT } from '@open-codesign/i18n';
 import { type WireApi, canonicalBaseUrl, detectWireFromBaseUrl } from '@open-codesign/shared';
 import { Button } from '@open-codesign/ui';
-import { AlertCircle, Check, CheckCircle, Loader2, X } from 'lucide-react';
-import { useRef, useState } from 'react';
+import { AlertCircle, CheckCircle, Loader2, X } from 'lucide-react';
+import { useState } from 'react';
 
 interface Props {
   onSave: () => void;
@@ -48,28 +48,6 @@ type TestState =
   | { kind: 'ok'; modelCount: number }
   | { kind: 'error'; message: string };
 
-type DiscoveryState =
-  | { kind: 'idle' }
-  | { kind: 'discovering' }
-  | { kind: 'found'; models: string[] }
-  | { kind: 'failed' };
-
-/** Priority-ordered model selection after a successful discovery. */
-function pickBestModel(models: string[]): string {
-  const priorities: RegExp[] = [
-    /^claude-sonnet-4-5/,
-    /^claude-opus/,
-    /^claude-sonnet/,
-    /^gemini-2\.5-pro$|^gemini-3.*pro/,
-    /^gpt-5/,
-  ];
-  for (const pattern of priorities) {
-    const match = models.find((m) => pattern.test(m));
-    if (match !== undefined) return match;
-  }
-  return models[0] ?? '';
-}
-
 /**
  * Minimal Custom Provider form — wire-agnostic endpoint onboarding.
  * Deliberately barebones (native form + FormData-ish accessors, no schema),
@@ -101,74 +79,15 @@ export function AddCustomProviderModal({
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  const [discovery, setDiscovery] = useState<DiscoveryState>({ kind: 'idle' });
-  // When true, user explicitly chose to type a model name instead of picking from the dropdown.
-  const [manualModel, setManualModel] = useState(false);
-  // Track whether user has explicitly typed/picked a model so auto-pick doesn't override it.
-  const userPickedModel = useRef(false);
-
-  const debounceTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  function scheduleDiscovery(currentBaseUrl: string, currentApiKey: string, currentWire: WireApi) {
-    if (debounceTimer.current !== null) clearTimeout(debounceTimer.current);
-    if (!currentBaseUrl.trim().match(/^https?:\/\//)) {
-      setDiscovery({ kind: 'idle' });
-      return;
-    }
-    debounceTimer.current = setTimeout(() => {
-      void runDiscovery(currentBaseUrl, currentApiKey, currentWire);
-    }, 500);
-  }
-
-  async function runDiscovery(currentBaseUrl: string, currentApiKey: string, currentWire: WireApi) {
-    if (!window.codesign?.config) return;
-    setDiscovery({ kind: 'discovering' });
-    try {
-      const res = await window.codesign.config.testEndpoint({
-        wire: currentWire,
-        baseUrl: currentBaseUrl.trim(),
-        apiKey: currentApiKey.trim(),
-      });
-      if (res.ok && res.models.length > 0) {
-        setDiscovery({ kind: 'found', models: res.models });
-        if (!userPickedModel.current) {
-          const best = pickBestModel(res.models);
-          setDefaultModel(best);
-        }
-      } else {
-        setDiscovery({ kind: 'failed' });
-      }
-    } catch {
-      setDiscovery({ kind: 'failed' });
-    }
-  }
-
   function handleBaseUrlChange(v: string) {
     setBaseUrl(v);
     if (wireAuto) setWire(detectWireFromBaseUrl(v));
     setTest({ kind: 'idle' });
-    scheduleDiscovery(v, apiKey, wireAuto ? detectWireFromBaseUrl(v) : wire);
-  }
-
-  function handleApiKeyChange(v: string) {
-    setApiKey(v);
-    scheduleDiscovery(baseUrl, v, wire);
   }
 
   function handleWireChange(v: WireApi) {
     setWire(v);
     setWireAuto(false);
-    scheduleDiscovery(baseUrl, apiKey, v);
-  }
-
-  function handleModelSelect(v: string) {
-    setDefaultModel(v);
-    userPickedModel.current = true;
-  }
-
-  function handleModelTextChange(v: string) {
-    setDefaultModel(v);
-    userPickedModel.current = v.length > 0;
   }
 
   async function handleTest() {
@@ -249,10 +168,6 @@ export function AddCustomProviderModal({
     ? t('settings.providers.custom.editTitle')
     : t('settings.providers.custom.title');
 
-  // Show the model dropdown when discovery found models AND user hasn't switched to manual entry.
-  const showModelDropdown =
-    !manualModel && discovery.kind === 'found' && discovery.models.length > 0;
-
   return (
     <div
       role="dialog"
@@ -328,7 +243,7 @@ export function AddCustomProviderModal({
         <Field label={t('settings.providers.custom.apiKey')}>
           <TextInput
             value={apiKey}
-            onChange={handleApiKeyChange}
+            onChange={setApiKey}
             type="password"
             placeholder={
               isEdit && editTarget?.keyMask !== undefined && editTarget.keyMask.length > 0
@@ -340,68 +255,8 @@ export function AddCustomProviderModal({
           />
         </Field>
 
-        <Field
-          label={t('settings.providers.custom.defaultModel')}
-          inline={
-            discovery.kind === 'discovering' ? (
-              <span className="inline-flex items-center gap-1 text-[var(--text-xs)] text-[var(--color-text-muted)]">
-                <Loader2 className="w-3 h-3 animate-spin" />
-                {t('settings.providers.cliProxyApi.discoveringModels')}
-              </span>
-            ) : discovery.kind === 'found' ? (
-              <span className="inline-flex items-center gap-1 text-[var(--text-xs)] text-[var(--color-success)]">
-                <Check className="w-3 h-3" />
-                {t('settings.providers.cliProxyApi.discoveredModels', {
-                  count: discovery.models.length,
-                })}
-              </span>
-            ) : discovery.kind === 'failed' ? (
-              <span className="inline-flex items-center gap-1 text-[var(--text-xs)] text-[var(--color-text-muted)]">
-                <AlertCircle className="w-3 h-3" />
-                {t('settings.providers.cliProxyApi.discoveryFailed')}
-              </span>
-            ) : null
-          }
-        >
-          {showModelDropdown ? (
-            <div className="flex items-center gap-2">
-              <select
-                value={defaultModel}
-                onChange={(e) => handleModelSelect(e.target.value)}
-                className="flex-1 h-8 px-3 rounded-[var(--radius-md)] bg-[var(--color-surface)] border border-[var(--color-border)] text-[var(--text-sm)] text-[var(--color-text-primary)] focus:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-focus-ring)]"
-              >
-                {discovery.models.map((m) => (
-                  <option key={m} value={m}>
-                    {m}
-                  </option>
-                ))}
-              </select>
-              <button
-                type="button"
-                onClick={() => setManualModel(true)}
-                className="shrink-0 text-[var(--text-xs)] text-[var(--color-text-muted)] hover:text-[var(--color-text-primary)] underline"
-              >
-                {t('settings.providers.custom.switchToManual')}
-              </button>
-            </div>
-          ) : (
-            <div className="flex items-center gap-2">
-              <TextInput
-                value={defaultModel}
-                onChange={handleModelTextChange}
-                placeholder="model-name"
-              />
-              {manualModel && discovery.kind === 'found' && discovery.models.length > 0 && (
-                <button
-                  type="button"
-                  onClick={() => setManualModel(false)}
-                  className="shrink-0 text-[var(--text-xs)] text-[var(--color-text-muted)] hover:text-[var(--color-text-primary)] underline"
-                >
-                  {t('settings.providers.custom.switchToDropdown')}
-                </button>
-              )}
-            </div>
-          )}
+        <Field label={t('settings.providers.custom.defaultModel')}>
+          <TextInput value={defaultModel} onChange={setDefaultModel} placeholder="model-name" />
         </Field>
 
         <div className="flex items-center gap-2">
@@ -449,23 +304,12 @@ export function AddCustomProviderModal({
   );
 }
 
-function Field({
-  label,
-  inline,
-  children,
-}: {
-  label: string;
-  inline?: React.ReactNode;
-  children: React.ReactNode;
-}) {
+function Field({ label, children }: { label: string; children: React.ReactNode }) {
   return (
     <div>
-      <div className="flex items-center justify-between mb-1.5">
-        <p className="block text-[var(--text-xs)] font-medium text-[var(--color-text-secondary)]">
-          {label}
-        </p>
-        {inline !== undefined && <span>{inline}</span>}
-      </div>
+      <p className="block text-[var(--text-xs)] font-medium text-[var(--color-text-secondary)] mb-1.5">
+        {label}
+      </p>
       {children}
     </div>
   );
diff --git a/apps/desktop/src/renderer/src/components/Settings.tsx b/apps/desktop/src/renderer/src/components/Settings.tsx
@@ -1550,16 +1550,6 @@ function ModelsTab() {
               setShowAddMenu(false);
               setShowAddCustom(true);
             }}
-            onAddCliProxyApi={() => {
-              setShowAddMenu(false);
-              setCustomProviderPreset({
-                name: 'CLIProxyAPI',
-                baseUrl: 'http://127.0.0.1:8317',
-                wire: 'anthropic',
-                defaultModel: '',
-              });
-              setShowAddCustom(true);
-            }}
           />
         </div>
 
@@ -2169,7 +2159,6 @@ interface AddProviderMenuProps {
   onImportClaudeCode: () => void;
   onAddOllama: () => void;
   onAddCustom: () => void;
-  onAddCliProxyApi: () => void;
 }
 
 function AddProviderMenu({
@@ -2181,7 +2170,6 @@ function AddProviderMenu({
   onImportClaudeCode,
   onAddOllama,
   onAddCustom,
-  onAddCliProxyApi,
 }: AddProviderMenuProps) {
   const t = useT();
   const rootRef = useRef<HTMLDivElement>(null);
@@ -2245,15 +2233,6 @@ function AddProviderMenu({
       disabled: false,
       onClick: onAddCustom,
     },
-    {
-      key: 'cli-proxy-api',
-      label: t('settings.providers.cliProxyApi.presetName', { defaultValue: 'CLIProxyAPI' }),
-      desc: t('settings.providers.cliProxyApi.presetDescription', {
-        defaultValue: 'Local proxy that wraps Claude/Codex/Gemini OAuth subscriptions',
-      }),
-      disabled: false,
-      onClick: onAddCliProxyApi,
-    },
   ];
 
   return (
diff --git a/packages/i18n/src/locales/en.json b/packages/i18n/src/locales/en.json
@@ -215,8 +215,6 @@
         "apiKey": "API Key",
         "apiKeyEditPlaceholder": "Leave empty to keep {{mask}}",
         "defaultModel": "Default model",
-        "switchToManual": "Enter manually",
-        "switchToDropdown": "Pick from list",
         "test": "Test connection",
         "testOk": "OK — {{count}} models available",
         "save": "Save & continue",
@@ -303,15 +301,6 @@
         "connectionOk": "Connection OK",
         "connectionFailed": "Connection failed"
       },
-      "cliProxyApi": {
-        "presetName": "CLIProxyAPI",
-        "presetDescription": "Local proxy that wraps Claude/Codex/Gemini OAuth subscriptions",
-        "apiKeyOptional": "API key only required if you configured `api-keys` in CPA config.yaml",
-        "thinkingHint": "Tip: append `(high)` / `(xhigh)` / `(8192)` to model name to control thinking budget",
-        "discoveringModels": "Discovering models...",
-        "discoveredModels": "Found {{count}} models",
-        "discoveryFailed": "Could not connect to CPA"
-      },
       "reasoning": {
         "label": "Reasoning depth",
         "default": "Default (auto)",
diff --git a/packages/i18n/src/locales/zh-CN.json b/packages/i18n/src/locales/zh-CN.json
@@ -215,8 +215,6 @@
         "apiKey": "API Key",
         "apiKeyEditPlaceholder": "留空则保留 {{mask}}",
         "defaultModel": "默认模型",
-        "switchToManual": "手动输入",
-        "switchToDropdown": "从列表选择",
         "test": "测试连接",
         "testOk": "正常 — 共 {{count}} 个模型",
         "save": "保存并继续",
@@ -303,15 +301,6 @@
         "connectionOk": "连接正常",
         "connectionFailed": "连接失败"
       },
-      "cliProxyApi": {
-        "presetName": "CLIProxyAPI",
-        "presetDescription": "本地反代，将 Claude/Codex/Gemini 的订阅账号包装成统一 API",
-        "apiKeyOptional": "仅当你在 CPA config.yaml 里配置了 api-keys 才需要填",
-        "thinkingHint": "提示：在 model 名后加 `(high)` / `(xhigh)` / `(8192)` 可控制思考力度",
-        "discoveringModels": "正在发现模型…",
-        "discoveredModels": "发现 {{count}} 个模型",
-        "discoveryFailed": "连接 CPA 失败"
-      },
       "reasoning": {
         "label": "推理深度",
         "default": "默认（自动）",
diff --git a/packages/shared/src/proxy-presets.ts b/packages/shared/src/proxy-presets.ts
@@ -52,13 +52,6 @@ export const PROXY_PRESETS = [
     baseUrl: 'http://localhost:3000/v1',
     notes: 'Edit URL to your deployment',
   },
-  {
-    id: 'cli-proxy-api',
-    label: 'CLIProxyAPI',
-    provider: 'anthropic',
-    baseUrl: 'http://127.0.0.1:8317',
-    notes: '',
-  },
   {
     id: 'custom',
     label: 'Custom...',
