Merge branch 'main' into feat/thinking-signature-rectifier

src/components/usage/ModelTestConfigPanel.tsx

@@ -2,6 +2,7 @@ import { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
 import { Label } from "@/components/ui/label";
 import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Save, Loader2 } from "lucide-react";
@@ -25,6 +26,7 @@ export function ModelTestConfigPanel() {
     claudeModel: "claude-haiku-4-5-20251001",
     codexModel: "gpt-5.1-codex@low",
     geminiModel: "gemini-3-pro-preview",
+    testPrompt: "Who are you?",
   });
 
   useEffect(() => {
@@ -43,6 +45,7 @@ export function ModelTestConfigPanel() {
         claudeModel: data.claudeModel,
         codexModel: data.codexModel,
         geminiModel: data.geminiModel,
+        testPrompt: data.testPrompt || "Who are you?",
       });
     } catch (e) {
       setError(String(e));
@@ -66,6 +69,7 @@ export function ModelTestConfigPanel() {
         claudeModel: config.claudeModel,
         codexModel: config.codexModel,
         geminiModel: config.geminiModel,
+        testPrompt: config.testPrompt || "Who are you?",
       };
       await saveStreamCheckConfig(parsed);
       toast.success(t("streamCheck.configSaved"), {
@@ -189,6 +193,21 @@ export function ModelTestConfigPanel() {
             />
           </div>
         </div>
+
+        {/* 检查提示词配置 */}
+        <div className="space-y-2">
+          <Label htmlFor="testPrompt">{t("streamCheck.testPrompt")}</Label>
+          <Textarea
+            id="testPrompt"
+            value={config.testPrompt}
+            onChange={(e) =>
+              setConfig({ ...config, testPrompt: e.target.value })
+            }
+            placeholder="Who are you?"
+            rows={2}
+            className="min-h-[60px]"
+          />
+        </div>
       </div>
 
       <div className="flex justify-end">

src/components/usage/PricingConfigPanel.tsx

@@ -202,6 +202,7 @@ export function PricingConfigPanel() {
 
       {editingModel && (
         <PricingEditModal
+          open={!!editingModel}
           model={editingModel}
           isNew={isAddingNew}
           onClose={() => {

src/components/usage/PricingEditModal.tsx

@@ -1,13 +1,8 @@
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogFooter,
-} from "@/components/ui/dialog";
+import { Save, Plus } from "lucide-react";
+import { FullScreenPanel } from "@/components/common/FullScreenPanel";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
@@ -15,12 +10,14 @@ import { useUpdateModelPricing } from "@/lib/query/usage";
 import type { ModelPricing } from "@/types/usage";
 
 interface PricingEditModalProps {
+  open: boolean;
   model: ModelPricing;
   isNew?: boolean;
   onClose: () => void;
 }
 
 export function PricingEditModal({
+  open,
   model,
   isNew = false,
   onClose,
@@ -86,139 +83,142 @@ export function PricingEditModal({
   };
 
   return (
-    <Dialog open onOpenChange={onClose}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            {isNew
-              ? t("usage.addPricing", "新增定价")
-              : `${t("usage.editPricing", "编辑定价")} - ${model.modelId}`}
-          </DialogTitle>
-        </DialogHeader>
-
-        <form onSubmit={handleSubmit} className="space-y-4">
-          {isNew && (
-            <div className="space-y-2">
-              <Label htmlFor="modelId">{t("usage.modelId", "模型 ID")}</Label>
-              <Input
-                id="modelId"
-                value={formData.modelId}
-                onChange={(e) =>
-                  setFormData({ ...formData, modelId: e.target.value })
-                }
-                placeholder={t("usage.modelIdPlaceholder", {
-                  defaultValue: "例如: claude-3-5-sonnet-20241022",
-                })}
-                required
-              />
-            </div>
+    <FullScreenPanel
+      isOpen={open}
+      title={
+        isNew
+          ? t("usage.addPricing", "新增定价")
+          : `${t("usage.editPricing", "编辑定价")} - ${model.modelId}`
+      }
+      onClose={onClose}
+      footer={
+        <Button
+          type="submit"
+          form="pricing-form"
+          disabled={updatePricing.isPending}
+        >
+          {isNew ? (
+            <Plus className="h-4 w-4 mr-2" />
+          ) : (
+            <Save className="h-4 w-4 mr-2" />
           )}
-
+          {updatePricing.isPending
+            ? t("common.saving", "保存中...")
+            : isNew
+              ? t("common.add", "新增")
+              : t("common.save", "保存")}
+        </Button>
+      }
+    >
+      <form id="pricing-form" onSubmit={handleSubmit} className="space-y-6">
+        {isNew && (
           <div className="space-y-2">
-            <Label htmlFor="displayName">
-              {t("usage.displayName", "显示名称")}
-            </Label>
+            <Label htmlFor="modelId">{t("usage.modelId", "模型 ID")}</Label>
             <Input
-              id="displayName"
-              value={formData.displayName}
+              id="modelId"
+              value={formData.modelId}
               onChange={(e) =>
-                setFormData({ ...formData, displayName: e.target.value })
+                setFormData({ ...formData, modelId: e.target.value })
               }
-              placeholder={t("usage.displayNamePlaceholder", {
-                defaultValue: "例如: Claude 3.5 Sonnet",
+              placeholder={t("usage.modelIdPlaceholder", {
+                defaultValue: "例如: claude-3-5-sonnet-20241022",
               })}
               required
             />
           </div>
+        )}
 
-          <div className="space-y-2">
-            <Label htmlFor="inputCost">
-              {t("usage.inputCostPerMillion", "输入成本 (每百万 tokens, USD)")}
-            </Label>
-            <Input
-              id="inputCost"
-              type="number"
-              step="0.01"
-              min="0"
-              value={formData.inputCost}
-              onChange={(e) =>
-                setFormData({ ...formData, inputCost: e.target.value })
-              }
-              required
-            />
-          </div>
+        <div className="space-y-2">
+          <Label htmlFor="displayName">
+            {t("usage.displayName", "显示名称")}
+          </Label>
+          <Input
+            id="displayName"
+            value={formData.displayName}
+            onChange={(e) =>
+              setFormData({ ...formData, displayName: e.target.value })
+            }
+            placeholder={t("usage.displayNamePlaceholder", {
+              defaultValue: "例如: Claude 3.5 Sonnet",
+            })}
+            required
+          />
+        </div>
 
-          <div className="space-y-2">
-            <Label htmlFor="outputCost">
-              {t("usage.outputCostPerMillion", "输出成本 (每百万 tokens, USD)")}
-            </Label>
-            <Input
-              id="outputCost"
-              type="number"
-              step="0.01"
-              min="0"
-              value={formData.outputCost}
-              onChange={(e) =>
-                setFormData({ ...formData, outputCost: e.target.value })
-              }
-              required
-            />
-          </div>
+        <div className="space-y-2">
+          <Label htmlFor="inputCost">
+            {t("usage.inputCostPerMillion", "输入成本 (每百万 tokens, USD)")}
+          </Label>
+          <Input
+            id="inputCost"
+            type="number"
+            step="0.01"
+            min="0"
+            value={formData.inputCost}
+            onChange={(e) =>
+              setFormData({ ...formData, inputCost: e.target.value })
+            }
+            required
+          />
+        </div>
 
-          <div className="space-y-2">
-            <Label htmlFor="cacheReadCost">
-              {t(
-                "usage.cacheReadCostPerMillion",
-                "缓存读取成本 (每百万 tokens, USD)",
-              )}
-            </Label>
-            <Input
-              id="cacheReadCost"
-              type="number"
-              step="0.01"
-              min="0"
-              value={formData.cacheReadCost}
-              onChange={(e) =>
-                setFormData({ ...formData, cacheReadCost: e.target.value })
-              }
-              required
-            />
-          </div>
+        <div className="space-y-2">
+          <Label htmlFor="outputCost">
+            {t("usage.outputCostPerMillion", "输出成本 (每百万 tokens, USD)")}
+          </Label>
+          <Input
+            id="outputCost"
+            type="number"
+            step="0.01"
+            min="0"
+            value={formData.outputCost}
+            onChange={(e) =>
+              setFormData({ ...formData, outputCost: e.target.value })
+            }
+            required
+          />
+        </div>
 
-          <div className="space-y-2">
-            <Label htmlFor="cacheCreationCost">
-              {t(
-                "usage.cacheCreationCostPerMillion",
-                "缓存写入成本 (每百万 tokens, USD)",
-              )}
-            </Label>
-            <Input
-              id="cacheCreationCost"
-              type="number"
-              step="0.01"
-              min="0"
-              value={formData.cacheCreationCost}
-              onChange={(e) =>
-                setFormData({ ...formData, cacheCreationCost: e.target.value })
-              }
-              required
-            />
-          </div>
+        <div className="space-y-2">
+          <Label htmlFor="cacheReadCost">
+            {t(
+              "usage.cacheReadCostPerMillion",
+              "缓存读取成本 (每百万 tokens, USD)",
+            )}
+          </Label>
+          <Input
+            id="cacheReadCost"
+            type="number"
+            step="0.01"
+            min="0"
+            value={formData.cacheReadCost}
+            onChange={(e) =>
+              setFormData({ ...formData, cacheReadCost: e.target.value })
+            }
+            required
+          />
+        </div>
 
-          <DialogFooter>
-            <Button type="button" variant="outline" onClick={onClose}>
-              {t("common.cancel", "取消")}
-            </Button>
-            <Button type="submit" disabled={updatePricing.isPending}>
-              {updatePricing.isPending
-                ? t("common.saving", "保存中...")
-                : isNew
-                  ? t("common.add", "新增")
-                  : t("common.save", "保存")}
-            </Button>
-          </DialogFooter>
-        </form>
-      </DialogContent>
-    </Dialog>
+        <div className="space-y-2">
+          <Label htmlFor="cacheCreationCost">
+            {t(
+              "usage.cacheCreationCostPerMillion",
+              "缓存写入成本 (每百万 tokens, USD)",
+            )}
+          </Label>
+          <Input
+            id="cacheCreationCost"
+            type="number"
+            step="0.01"
+            min="0"
+            value={formData.cacheCreationCost}
+            onChange={(e) =>
+              setFormData({ ...formData, cacheCreationCost: e.target.value })
+            }
+            required
+          />
+        </div>
+      </form>
+    </FullScreenPanel>
   );
 }