2025-10-16 10:00:22 +08:00
|
|
|
|
import { z } from "zod";
|
|
|
|
|
|
|
2025-11-09 20:42:25 +08:00
|
|
|
|
/**
|
|
|
|
|
|
* 解析 JSON 语法错误,提取位置信息
|
|
|
|
|
|
*/
|
|
|
|
|
|
function parseJsonError(error: unknown): string {
|
|
|
|
|
|
if (!(error instanceof SyntaxError)) {
|
|
|
|
|
|
return "配置 JSON 格式错误";
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const message = error.message;
|
|
|
|
|
|
|
|
|
|
|
|
// 提取位置信息:Chrome/V8: "Unexpected token ... in JSON at position 123"
|
|
|
|
|
|
const positionMatch = message.match(/at position (\d+)/i);
|
|
|
|
|
|
if (positionMatch) {
|
|
|
|
|
|
const position = parseInt(positionMatch[1], 10);
|
|
|
|
|
|
return `JSON 格式错误:${message.split(" in JSON")[0]}(位置:${position})`;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Firefox: "JSON.parse: unexpected character at line 1 column 23"
|
|
|
|
|
|
const lineColumnMatch = message.match(/line (\d+) column (\d+)/i);
|
|
|
|
|
|
if (lineColumnMatch) {
|
|
|
|
|
|
const line = lineColumnMatch[1];
|
|
|
|
|
|
const column = lineColumnMatch[2];
|
|
|
|
|
|
return `JSON 格式错误:第 ${line} 行,第 ${column} 列`;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 通用情况:提取关键错误信息
|
|
|
|
|
|
const cleanMessage = message
|
|
|
|
|
|
.replace(/^JSON\.parse:\s*/i, "")
|
|
|
|
|
|
.replace(/^Unexpected\s+/i, "意外的 ")
|
|
|
|
|
|
.replace(/token/gi, "符号")
|
|
|
|
|
|
.replace(/Expected/gi, "预期");
|
|
|
|
|
|
|
|
|
|
|
|
return `JSON 格式错误:${cleanMessage}`;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2025-10-16 10:00:22 +08:00
|
|
|
|
export const providerSchema = z.object({
|
|
|
|
|
|
name: z.string().min(1, "请填写供应商名称"),
|
2025-10-16 12:13:51 +08:00
|
|
|
|
websiteUrl: z.string().url("请输入有效的网址").optional().or(z.literal("")),
|
feat: add model configuration support and fix Gemini deeplink bug (#251)
* feat(providers): add notes field for provider management
- Add notes field to Provider model (backend and frontend)
- Display notes with higher priority than URL in provider card
- Style notes as non-clickable text to differentiate from URLs
- Add notes input field in provider form
- Add i18n support (zh/en) for notes field
* chore: format code and clean up unused props
- Run cargo fmt on Rust backend code
- Format TypeScript imports and code style
- Remove unused appId prop from ProviderPresetSelector
- Clean up unused variables in tests
- Integrate notes field handling in provider dialogs
* feat(deeplink): implement ccswitch:// protocol for provider import
Add deep link support to enable one-click provider configuration import via ccswitch:// URLs.
Backend:
- Implement URL parsing and validation (src-tauri/src/deeplink.rs)
- Add Tauri commands for parse and import (src-tauri/src/commands/deeplink.rs)
- Register ccswitch:// protocol in macOS Info.plist
- Add comprehensive unit tests (src-tauri/tests/deeplink_import.rs)
Frontend:
- Create confirmation dialog with security review UI (src/components/DeepLinkImportDialog.tsx)
- Add API wrapper (src/lib/api/deeplink.ts)
- Integrate event listeners in App.tsx
Configuration:
- Update Tauri config for deep link handling
- Add i18n support for Chinese and English
- Include test page for deep link validation (deeplink-test.html)
Files: 15 changed, 1312 insertions(+)
* chore(deeplink): integrate deep link handling into app lifecycle
Wire up deep link infrastructure with app initialization and event handling.
Backend Integration:
- Register deep link module and commands in mod.rs
- Add URL handling in app setup (src-tauri/src/lib.rs:handle_deeplink_url)
- Handle deep links from single instance callback (Windows/Linux CLI)
- Handle deep links from macOS system events
- Add tauri-plugin-deep-link dependency (Cargo.toml)
Frontend Integration:
- Listen for deeplink-import/deeplink-error events in App.tsx
- Update DeepLinkImportDialog component imports
Configuration:
- Enable deep link plugin in tauri.conf.json
- Update Cargo.lock for new dependencies
Localization:
- Add Chinese translations for deep link UI (zh.json)
- Add English translations for deep link UI (en.json)
Files: 9 changed, 359 insertions(+), 18 deletions(-)
* refactor(deeplink): enhance Codex provider template generation
Align deep link import with UI preset generation logic by:
- Adding complete config.toml template matching frontend defaults
- Generating safe provider name from sanitized input
- Including model_provider, reasoning_effort, and wire_api settings
- Removing minimal template that only contained base_url
- Cleaning up deprecated test file deeplink-test.html
* style: fix clippy uninlined_format_args warnings
Apply clippy --fix to use inline format arguments in:
- src/mcp.rs (8 fixes)
- src/services/env_manager.rs (10 fixes)
* style: apply code formatting and cleanup
- Format TypeScript files with Prettier (App.tsx, EnvWarningBanner.tsx, formatters.ts)
- Organize Rust imports and module order alphabetically
- Add newline at end of JSON files (en.json, zh.json)
- Update Cargo.lock for dependency changes
* feat: add model name configuration support for Codex and fix Gemini model handling
- Add visual model name input field for Codex providers
- Add model name extraction and update utilities in providerConfigUtils
- Implement model name state management in useCodexConfigState hook
- Add conditional model field rendering in CodexFormFields (non-official only)
- Integrate model name sync with TOML config in ProviderForm
- Fix Gemini deeplink model injection bug
- Correct environment variable name from GOOGLE_GEMINI_MODEL to GEMINI_MODEL
- Add test cases for Gemini model injection (with/without model)
- All tests passing (9/9)
- Fix Gemini model field binding in edit mode
- Add geminiModel state to useGeminiConfigState hook
- Extract model value during initialization and reset
- Sync model field with geminiEnv state to prevent data loss on submit
- Fix missing model value display when editing Gemini providers
Changes:
- 6 files changed, 245 insertions(+), 13 deletions(-)
2025-11-19 09:03:18 +08:00
|
|
|
|
notes: z.string().optional(),
|
2025-10-16 10:00:22 +08:00
|
|
|
|
settingsConfig: z
|
|
|
|
|
|
.string()
|
|
|
|
|
|
.min(1, "请填写配置内容")
|
2025-11-09 20:42:25 +08:00
|
|
|
|
.superRefine((value, ctx) => {
|
2025-10-16 10:00:22 +08:00
|
|
|
|
try {
|
|
|
|
|
|
JSON.parse(value);
|
2025-11-09 20:42:25 +08:00
|
|
|
|
} catch (error) {
|
|
|
|
|
|
ctx.addIssue({
|
|
|
|
|
|
code: z.ZodIssueCode.custom,
|
|
|
|
|
|
message: parseJsonError(error),
|
|
|
|
|
|
});
|
2025-10-16 10:00:22 +08:00
|
|
|
|
}
|
2025-11-09 20:42:25 +08:00
|
|
|
|
}),
|
2025-10-16 10:00:22 +08:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
export type ProviderFormData = z.infer<typeof providerSchema>;
|