Merge origin/main into main

Resolved conflict in src-tauri/src/commands/misc.rs by combining imports from both sides.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
w0x7ce
2026-01-04 09:12:12 +08:00
70 changed files with 4593 additions and 1283 deletions
@@ -222,9 +222,7 @@ export function ClaudeFormFields({
{/* 推理模型 */}
<div className="space-y-2">
<FormLabel htmlFor="reasoningModel">
{t("providerForm.anthropicReasoningModel", {
defaultValue: "推理模型 (Thinking)",
})}
{t("providerForm.anthropicReasoningModel")}
</FormLabel>
<Input
id="reasoningModel"
@@ -233,9 +231,6 @@ export function ClaudeFormFields({
onChange={(e) =>
onModelChange("ANTHROPIC_REASONING_MODEL", e.target.value)
}
placeholder={t("providerForm.reasoningModelPlaceholder", {
defaultValue: "",
})}
autoComplete="off"
/>
</div>