AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
feat(settings): optimize AI integration layout, presets, and token copy
tianma-if0e383881f3af
diff --git a/apps/mobile/app.json b/apps/mobile/app.jsonindex 887ccc4a..ac8ed714 100644--- a/apps/mobile/app.json+++ b/apps/mobile/app.json@@ -28,7 +28,7 @@"infoPlist": {"UIRequiresFullScreen": true,"NSMicrophoneUsageDescription": "EdgeEver only uses the microphone if web content inside a note explicitly requests it.",- "NSCameraUsageDescription": "EdgeEver only uses the camera if web content inside a note explicitly requests it."+ "NSCameraUsageDescription": "Allow EdgeEver to use your camera to take photos and insert them into your notes."}},"android": {@@ -43,6 +43,14 @@"plugins": ["expo-router","expo-secure-store",+ [+ "expo-image-picker",+ {+ "cameraPermission": "Allow EdgeEver to take photos and insert them into your notes.",+ "microphonePermission": false,+ "photosPermission": "Allow EdgeEver to choose photos to insert into your notes."+ }+ ],["expo-splash-screen",{diff --git a/apps/mobile/package.json b/apps/mobile/package.jsonindex f3650f50..ea4f25a0 100644--- a/apps/mobile/package.json+++ b/apps/mobile/package.json@@ -34,6 +34,7 @@"expo-document-picker": "~57.0.1","expo-file-system": "~57.0.1","expo-image-manipulator": "~57.0.5",+ "expo-image-picker": "~57.0.5","expo-router": "latest","expo-secure-store": "latest","expo-sharing": "~57.0.8",diff --git a/apps/mobile/src/components/icons.tsx b/apps/mobile/src/components/icons.tsxindex d60486f4..ea9f5f08 100644--- a/apps/mobile/src/components/icons.tsx+++ b/apps/mobile/src/components/icons.tsx@@ -25,6 +25,7 @@ export const AlertTriangle = createIcon("alert-triangle");export const ArrowUpCircle = createIcon("arrow-up-circle");export const BookOpen = createIcon("book-open");export const Bold = createIcon("bold");+export const Camera = createIcon("camera");export const Check = createIcon("check");export const CheckSquare = createIcon("check-square");export const ChevronDown = createIcon("chevron-down");diff --git a/apps/mobile/src/hooks/useMobileEditorUploadAsset.tsx b/apps/mobile/src/hooks/useMobileEditorUploadAsset.tsxnew file mode 100644index 00000000..f8762339--- /dev/null+++ b/apps/mobile/src/hooks/useMobileEditorUploadAsset.tsx@@ -0,0 +1,279 @@+import * as DocumentPicker from "expo-document-picker";+import * as ImagePicker from "expo-image-picker";+import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";+import { Linking, Modal, Platform, StyleSheet, View } from "react-native";+import { useSafeAreaInsets } from "react-native-safe-area-context";+import { Camera, FileText, Image as ImageIcon, X } from "../components/icons";+import { Alert, Pressable, Text } from "../components/LocalizedText";+import type { MobileImageUploadAsset } from "../lib/mobile-image-upload";+import { normalizeMobileImagePickerAsset } from "../lib/mobile-image-picker";+import { resolveMobileThemeStyles, useMobileTheme } from "../lib/mobile-theme";++type MobileEditorUploadSource = "camera" | "file" | "library";+type SourceResolver = (source: MobileEditorUploadSource | null) => void;+const NATIVE_PICKER_PRESENTATION_DELAY_MS = 120;++const getImagePickerAsset = (result: ImagePicker.ImagePickerResult): MobileImageUploadAsset | null => {+ if (result.canceled || !result.assets[0]) {+ return null;+ }+ return normalizeMobileImagePickerAsset(result.assets[0]);+};++const requestCameraAccess = async () => {+ const current = await ImagePicker.getCameraPermissionsAsync();+ const permission = current.granted ? current : await ImagePicker.requestCameraPermissionsAsync();+ if (permission.granted) {+ return true;+ }++ Alert.alert(+ "需要相机权限",+ permission.canAskAgain+ ? "允许 EdgeEver 使用相机后,才能直接拍照插入笔记。"+ : "相机权限已被关闭。请前往系统设置允许 EdgeEver 使用相机。",+ permission.canAskAgain+ ? [{ text: "确定", style: "cancel" }]+ : [+ { text: "取消", style: "cancel" },+ { text: "前往设置", onPress: () => void Linking.openSettings() },+ ]+ );+ return false;+};++const pickWithImagePicker = async (source: "camera" | "library") => {+ if (source === "camera" && !(await requestCameraAccess())) {+ return null;+ }+ const options: ImagePicker.ImagePickerOptions = {+ allowsEditing: false,+ mediaTypes: ["images"],+ quality: 1,+ };+ const result = source === "camera"+ ? await ImagePicker.launchCameraAsync(options)+ : await ImagePicker.launchImageLibraryAsync(options);+ return getImagePickerAsset(result);+};++const pickWithDocumentPicker = async (): Promise<MobileImageUploadAsset | null> => {+ const result = await DocumentPicker.getDocumentAsync({+ copyToCacheDirectory: true,+ multiple: false,+ type: "*/*",+ });+ const asset = result.canceled ? null : result.assets[0];+ if (!asset) {+ return null;+ }+ return {+ uri: asset.uri,+ name: asset.name,+ mimeType: asset.mimeType,+ };+};++const getPendingAndroidImage = async () => {+ if (Platform.OS !== "android") {+ return null;+ }+ const pending = await ImagePicker.getPendingResultAsync();+ if (!pending) {+ return null;+ }+ if ("canceled" in pending) {+ return getImagePickerAsset(pending);+ }+ throw new Error(pending.message || "系统未能恢复上次选择的图片,请重试");+};++const SourceRow = ({+ icon,+ label,+ onPress,+}: {+ icon: ReactNode;+ label: string;+ onPress: () => void;+}) => {+ const { resolvedTheme } = useMobileTheme();+ const styles = useMemo(() => resolveMobileThemeStyles(baseStyles, resolvedTheme), [resolvedTheme]);+ return (+ <Pressable accessibilityRole="button" onPress={onPress} style={styles.sourceRow}>+ <View style={styles.sourceIcon}>{icon}</View>+ <Text style={styles.sourceLabel}>{label}</Text>+ </Pressable>+ );+};++const MobileEditorUploadSourcePicker = ({+ onClose,+ onSelect,+ visible,+}: {+ onClose: () => void;+ onSelect: (source: MobileEditorUploadSource) => void;+ visible: boolean;+}) => {+ const { resolvedTheme } = useMobileTheme();+ const insets = useSafeAreaInsets();+ const styles = useMemo(() => resolveMobileThemeStyles(baseStyles, resolvedTheme), [resolvedTheme]);+ return (+ <Modal animationType="fade" onRequestClose={onClose} transparent visible={visible}>+ <Pressable accessibilityLabel="关闭图片来源选择" onPress={onClose} style={styles.backdrop}>+ <Pressable+ accessibilityRole="none"+ onPress={(event) => event.stopPropagation()}+ style={[styles.sheet, { paddingBottom: Math.max(24, insets.bottom + 12) }]}+ >+ <View style={styles.handle} />+ <View style={styles.header}>+ <View>+ <Text accessibilityRole="header" style={styles.title}>添加图片或附件</Text>+ <Text style={styles.subtitle}>选择拍照、相册或设备文件</Text>+ </View>+ <Pressable accessibilityLabel="关闭" accessibilityRole="button" onPress={onClose} style={styles.closeButton}>+ <X color="#64748b" size={19} />+ </Pressable>+ </View>+ <View style={styles.content}>+ <SourceRow icon={<Camera color="#0f172a" size={20} />} label="拍照" onPress={() => onSelect("camera")} />+ <SourceRow icon={<ImageIcon color="#0f172a" size={20} />} label="从相册选择" onPress={() => onSelect("library")} />+ <SourceRow icon={<FileText color="#0f172a" size={20} />} label="选择文件" onPress={() => onSelect("file")} />+ </View>+ </Pressable>+ </Pressable>+ </Modal>+ );+};++export const useMobileEditorUploadAsset = () => {+ const [sourcePickerVisible, setSourcePickerVisible] = useState(false);+ const sourceResolverRef = useRef<SourceResolver | null>(null);++ const settleSource = useCallback((source: MobileEditorUploadSource | null) => {+ const resolve = sourceResolverRef.current;+ sourceResolverRef.current = null;+ setSourcePickerVisible(false);+ resolve?.(source);+ }, []);++ useEffect(() => () => {+ sourceResolverRef.current?.(null);+ sourceResolverRef.current = null;+ }, []);++ const chooseSource = useCallback(() => new Promise<MobileEditorUploadSource | null>((resolve) => {+ sourceResolverRef.current?.(null);+ sourceResolverRef.current = resolve;+ setSourcePickerVisible(true);+ }), []);++ const pickUploadAsset = useCallback(async (): Promise<MobileImageUploadAsset | null> => {+ const pendingImage = await getPendingAndroidImage();+ if (pendingImage) {+ return pendingImage;+ }+ const source = await chooseSource();+ if (!source) {+ return null;+ }+ // Let the native source sheet finish dismissing before presenting another+ // native controller. This avoids intermittent "already presenting" errors.+ await new Promise((resolve) => setTimeout(resolve, NATIVE_PICKER_PRESENTATION_DELAY_MS));+ return source === "file" ? pickWithDocumentPicker() : pickWithImagePicker(source);+ }, [chooseSource]);++ return {+ pickUploadAsset,+ uploadSourcePicker: (+ <MobileEditorUploadSourcePicker+ onClose={() => settleSource(null)}+ onSelect={settleSource}+ visible={sourcePickerVisible}+ />+ ),+ };+};++const baseStyles = StyleSheet.create({+ backdrop: {+ backgroundColor: "rgba(15, 23, 42, 0.42)",+ flex: 1,+ justifyContent: "flex-end",+ },+ sheet: {+ backgroundColor: "#ffffff",+ borderColor: "#e2e8f0",+ borderTopLeftRadius: 18,+ borderTopRightRadius: 18,+ borderWidth: 1,+ paddingBottom: 24,+ },+ handle: {+ alignSelf: "center",+ backgroundColor: "#cbd5e1",+ borderRadius: 999,+ height: 4,+ marginTop: 8,+ width: 42,+ },+ header: {+ alignItems: "center",+ borderBottomColor: "#e2e8f0",+ borderBottomWidth: 1,+ flexDirection: "row",+ justifyContent: "space-between",+ paddingHorizontal: 20,+ paddingVertical: 16,+ },+ title: {+ color: "#0f172a",+ fontSize: 17,+ fontWeight: "700",+ lineHeight: 23,+ },+ subtitle: {+ color: "#64748b",+ fontSize: 13,+ lineHeight: 18,+ marginTop: 2,+ },+ closeButton: {+ alignItems: "center",+ borderRadius: 8,+ height: 38,+ justifyContent: "center",+ width: 38,+ },+ content: {+ gap: 8,+ paddingHorizontal: 16,+ paddingTop: 14,+ },+ sourceRow: {+ alignItems: "center",+ backgroundColor: "#f8fafc",+ borderColor: "#e2e8f0",+ borderRadius: 10,+ borderWidth: 1,+ flexDirection: "row",+ gap: 12,+ minHeight: 54,+ paddingHorizontal: 14,+ },+ sourceIcon: {+ alignItems: "center",+ backgroundColor: "#ecfdf5",+ borderRadius: 8,+ height: 34,+ justifyContent: "center",+ width: 34,+ },+ sourceLabel: {+ color: "#0f172a",+ fontSize: 15,+ fontWeight: "600",+ },+});diff --git a/apps/mobile/src/lib/mobile-image-picker.test.ts b/apps/mobile/src/lib/mobile-image-picker.test.tsnew file mode 100644index 00000000..f45b9636--- /dev/null+++ b/apps/mobile/src/lib/mobile-image-picker.test.ts@@ -0,0 +1,36 @@+import { expect, test } from "bun:test";+import { normalizeMobileImagePickerAsset } from "./mobile-image-picker";++test("normalizes an image-picker asset for the existing upload pipeline", () => {+ expect(normalizeMobileImagePickerAsset({+ fileName: "IMG_207.PNG",+ mimeType: "image/png",+ uri: "file:///cache/IMG_207.PNG",+ })).toEqual({+ uri: "file:///cache/IMG_207.PNG",+ name: "IMG_207.PNG",+ mimeType: "image/png",+ });+});++test("creates a stable JPEG filename when the camera omits metadata", () => {+ expect(normalizeMobileImagePickerAsset(+ { uri: "file:///cache/camera-result" },+ Date.parse("2026-08-10T08:09:10.123Z")+ )).toEqual({+ uri: "file:///cache/camera-result",+ name: "photo-20260810T080910Z.jpg",+ mimeType: "image/jpeg",+ });+});++test("infers the MIME type from the filename when needed", () => {+ expect(normalizeMobileImagePickerAsset({+ fileName: "picked-image.webp",+ uri: "file:///cache/picked-image.webp",+ })).toEqual({+ uri: "file:///cache/picked-image.webp",+ name: "picked-image.webp",+ mimeType: "image/webp",+ });+});diff --git a/apps/mobile/src/lib/mobile-image-picker.ts b/apps/mobile/src/lib/mobile-image-picker.tsnew file mode 100644index 00000000..54522f12--- /dev/null+++ b/apps/mobile/src/lib/mobile-image-picker.ts@@ -0,0 +1,39 @@+import type { MobileImageUploadAsset } from "./mobile-image-upload";++export type MobileImagePickerAsset = {+ fileName?: string | null;+ mimeType?: string | null;+ uri: string;+};++const MIME_BY_EXTENSION: Record<string, string> = {+ avif: "image/avif",+ gif: "image/gif",+ heic: "image/heic",+ heif: "image/heif",+ jpeg: "image/jpeg",+ jpg: "image/jpeg",+ png: "image/png",+ webp: "image/webp",+};++const getFilenameExtension = (filename?: string | null) => {+ const match = filename?.trim().toLowerCase().match(/\.([a-z0-9]+)$/);+ return match?.[1] ?? null;+};++const getTimestampedPhotoFilename = (timestamp: number) =>+ `photo-${new Date(timestamp).toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z")}.jpg`;++export const normalizeMobileImagePickerAsset = (+ asset: MobileImagePickerAsset,+ timestamp = Date.now()+): MobileImageUploadAsset => {+ const fileName = asset.fileName?.trim() || getTimestampedPhotoFilename(timestamp);+ const extension = getFilenameExtension(fileName);+ return {+ uri: asset.uri,+ name: fileName,+ mimeType: asset.mimeType?.trim() || (extension ? MIME_BY_EXTENSION[extension] : null) || "image/jpeg",+ };+};diff --git a/apps/mobile/src/lib/mobile-locale.test.mjs b/apps/mobile/src/lib/mobile-locale.test.mjsindex 0df0d40a..0316b571 100644--- a/apps/mobile/src/lib/mobile-locale.test.mjs+++ b/apps/mobile/src/lib/mobile-locale.test.mjs@@ -8,6 +8,7 @@ describe("mobile locale translation", () => {test("translates mobile-only static copy", () => {expect(translateMobileText("正在同步笔记", "en-US")).toBe("Syncing your notes");+ expect(translateMobileText("从相册选择", "en-US")).toBe("Choose from library");});test("interpolates mobile-only template copy", () => {diff --git a/apps/mobile/src/lib/mobile-locale.tsx b/apps/mobile/src/lib/mobile-locale.tsxindex 7c996200..43b2812b 100644--- a/apps/mobile/src/lib/mobile-locale.tsx+++ b/apps/mobile/src/lib/mobile-locale.tsx@@ -67,6 +67,17 @@ const mobileOnlyTranslations = new Map<string, string>([["重试", "Retry"],["图片上传失败", "Image upload failed"],["请检查网络连接后重试", "Check your connection and try again"],+ ["添加图片或附件", "Add image or attachment"],+ ["选择拍照、相册或设备文件", "Take a photo or choose from your library or device"],+ ["关闭图片来源选择", "Close image source picker"],+ ["拍照", "Take photo"],+ ["从相册选择", "Choose from library"],+ ["选择文件", "Choose file"],+ ["需要相机权限", "Camera access required"],+ ["允许 EdgeEver 使用相机后,才能直接拍照插入笔记。", "Allow EdgeEver to use the camera to take photos and insert them into notes."],+ ["相机权限已被关闭。请前往系统设置允许 EdgeEver 使用相机。", "Camera access is disabled. Open system settings and allow EdgeEver to use the camera."],+ ["前往设置", "Open settings"],+ ["系统未能恢复上次选择的图片,请重试", "The system could not restore the previously selected image. Please try again."],["退出新建笔记?", "Exit the new note?"],["内容已自动保存为本地草稿,下次新建时会继续恢复。", "The content is saved as a local draft and will be restored the next time you create a note."],["继续编辑", "Keep editing"],diff --git a/apps/mobile/src/screens/WorkspaceScreen.tsx b/apps/mobile/src/screens/WorkspaceScreen.tsxindex 07899d41..19e108cb 100644--- a/apps/mobile/src/screens/WorkspaceScreen.tsx+++ b/apps/mobile/src/screens/WorkspaceScreen.tsx@@ -137,6 +137,7 @@ import { useDebouncedValue } from "../hooks/useDebouncedValue";import { useMobileAutomaticSync } from "../hooks/useMobileAutomaticSync";import { useMobileLocalMirrorSync } from "../hooks/useMobileLocalMirrorSync";import { useMobileEditorResourceActions } from "../hooks/useMobileEditorResourceActions";+import { useMobileEditorUploadAsset } from "../hooks/useMobileEditorUploadAsset";import {filterCollapsedNotebookOptions,filterNotebookOptions,@@ -1733,6 +1734,7 @@ const CreateMemoModal = ({const imageOperationRef = useRef(imageOperation);const createPendingRef = useRef(false);const [resourceTarget, setResourceTarget] = useState<MobileResourceTarget | null>(null);+ const { pickUploadAsset, uploadSourcePicker } = useMobileEditorUploadAsset();const targetNotebookId = notebookId || fallbackNotebookId;const selectedNotebookName = notebooks.find((notebook) => notebook.id === targetNotebookId)?.name ?? "选择笔记本";const titleRef = useRef(title);@@ -2030,13 +2032,7 @@ const CreateMemoModal = ({const pickAndUploadImage = async () => {let uploadId: string | null = null;try {- const DocumentPicker = await import("expo-document-picker");- const result = await DocumentPicker.getDocumentAsync({- copyToCacheDirectory: true,- multiple: false,- type: "*/*",- });- const asset = result.canceled ? null : result.assets[0];+ const asset = await pickUploadAsset();if (!asset) {return;}@@ -2247,6 +2243,7 @@ const CreateMemoModal = ({presentation="overlay"visible={templatePickerOpen}/>+ {uploadSourcePicker}</SafeAreaView>);};@@ -2459,6 +2456,7 @@ const RichEditorModal = ({const [error, setError] = useState<string | null>(null);const [startupMs, setStartupMs] = useState<number | null>(null);const [resourceTarget, setResourceTarget] = useState<MobileResourceTarget | null>(null);+ const { pickUploadAsset, uploadSourcePicker } = useMobileEditorUploadAsset();const notebookLabel = notebooks.find((notebook) => notebook.id === notebookId)?.name ?? "未分类";const saveLabel = error ? "保存失败" : saving ? "保存中" : uploading ? "上传中" : dirty ? (draftRestored ? "本地草稿" : "未保存") : ready ? "已保存" : "加载中";const titleRef = useRef(title);@@ -2585,13 +2583,7 @@ const RichEditorModal = ({Alert.alert("正在同步新笔记", "首次同步完成后即可上传本地图片;图片链接现在就可以直接粘贴到正文。");return;}- const DocumentPicker = await import("expo-document-picker");- const result = await DocumentPicker.getDocumentAsync({- copyToCacheDirectory: true,- multiple: false,- type: "*/*",- });- const asset = result.canceled ? null : result.assets[0];+ const asset = await pickUploadAsset();if (!asset) {return;}@@ -2798,6 +2790,7 @@ const RichEditorModal = ({onSaveAs={saveResourceAs}target={resourceTarget}/>+ {uploadSourcePicker}</SafeAreaView>);};diff --git a/apps/web/src/components/SettingsPane.tsx b/apps/web/src/components/SettingsPane.tsxindex ff09feb5..87ed0f85 100644--- a/apps/web/src/components/SettingsPane.tsx+++ b/apps/web/src/components/SettingsPane.tsx@@ -222,8 +222,8 @@ export const SettingsPane = ({return (<SettingsGroup><AiModelCard demoMode={demoMode} />- <AdvancedPlayCard /><McpConfigCard />+ <AdvancedPlayCard /></SettingsGroup>);case "advanced":diff --git a/apps/web/src/components/settings/AiModelCard.tsx b/apps/web/src/components/settings/AiModelCard.tsxindex aec85e77..131e256b 100644--- a/apps/web/src/components/settings/AiModelCard.tsx+++ b/apps/web/src/components/settings/AiModelCard.tsx@@ -12,23 +12,37 @@ import { Switch } from "@/components/ui/switch";import { ApiRequestError, api } from "@/lib/api";import { cn } from "@/lib/utils";-const providerDefaults: Record<AiProvider, { displayName: string; baseUrl: string; modelId: string }> = {- "openai-compatible": { displayName: "OpenAI-compatible", baseUrl: "https://api.openai.com/v1", modelId: "gpt-4.1-mini" },- anthropic: { displayName: "Anthropic", baseUrl: "https://api.anthropic.com/v1", modelId: "claude-sonnet-4-5" },- google: { displayName: "Google Gemini", baseUrl: "https://generativelanguage.googleapis.com/v1beta", modelId: "gemini-2.5-flash" },+type PresetKey = "deepseek" | "openai" | "anthropic" | "google" | "ollama" | "custom";++const PRESET_CONFIGS: Record<Exclude<PresetKey, "custom">, { provider: AiProvider; displayName: string; baseUrl: string; modelId: string }> = {+ deepseek: { provider: "openai-compatible", displayName: "DeepSeek", baseUrl: "https://api.deepseek.com", modelId: "deepseek-chat" },+ openai: { provider: "openai-compatible", displayName: "OpenAI", baseUrl: "https://api.openai.com/v1", modelId: "gpt-4.1-mini" },+ anthropic: { provider: "anthropic", displayName: "Anthropic Claude", baseUrl: "https://api.anthropic.com/v1", modelId: "claude-sonnet-4-5" },+ google: { provider: "google", displayName: "Google Gemini", baseUrl: "https://generativelanguage.googleapis.com/v1beta", modelId: "gemini-2.5-flash" },+ ollama: { provider: "openai-compatible", displayName: "Ollama", baseUrl: "http://localhost:11434/v1", modelId: "llama3.2" },+};++const inferPreset = (provider: AiProvider, baseUrl: string): PresetKey => {+ if (baseUrl.includes("deepseek.com")) return "deepseek";+ if (baseUrl.includes("openai.com")) return "openai";+ if (provider === "anthropic" || baseUrl.includes("anthropic.com")) return "anthropic";+ if (provider === "google" || baseUrl.includes("googleapis.com")) return "google";+ if (baseUrl.includes("11434") || baseUrl.includes("ollama")) return "ollama";+ return "custom";};export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {const { t } = useTranslation();const queryClient = useQueryClient();const settingsQuery = useQuery({ queryKey: ["ai-settings"], queryFn: api.getAiSettings });+ const [preset, setPreset] = useState<PresetKey>("deepseek");const [provider, setProvider] = useState<AiProvider>("openai-compatible");- const [displayName, setDisplayName] = useState(providerDefaults["openai-compatible"].displayName);- const [baseUrl, setBaseUrl] = useState(providerDefaults["openai-compatible"].baseUrl);- const [modelId, setModelId] = useState(providerDefaults["openai-compatible"].modelId);+ const [displayName, setDisplayName] = useState(PRESET_CONFIGS.deepseek.displayName);+ const [baseUrl, setBaseUrl] = useState(PRESET_CONFIGS.deepseek.baseUrl);+ const [modelId, setModelId] = useState(PRESET_CONFIGS.deepseek.modelId);const [apiKey, setApiKey] = useState("");const [isEnabled, setIsEnabled] = useState(true);- const [expanded, setExpanded] = useState(false);+ const [expanded, setExpanded] = useState(true);useEffect(() => {const settings = settingsQuery.data?.settings;@@ -38,15 +52,17 @@ export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {setBaseUrl(settings.baseUrl);setModelId(settings.modelId);setIsEnabled(settings.isEnabled);+ setPreset(inferPreset(settings.provider, settings.baseUrl));}, [settingsQuery.data]);const payload = () => ({provider,- displayName,- baseUrl,- modelId,+ displayName: displayName.trim() || (preset !== "custom" ? PRESET_CONFIGS[preset].displayName : "External AI"),+ baseUrl: baseUrl.trim(),+ modelId: modelId.trim(),...(apiKey ? { apiKey } : {}),});+const testMutation = useMutation({ mutationFn: () => api.testAiConnection(payload()) });const saveMutation = useMutation({mutationFn: () => api.updateAiSettings({ ...payload(), isEnabled }),@@ -56,13 +72,22 @@ export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {},});+ const handlePresetChange = (nextPreset: PresetKey) => {+ setPreset(nextPreset);+ if (nextPreset !== "custom") {+ const config = PRESET_CONFIGS[nextPreset];+ setProvider(config.provider);+ setDisplayName(config.displayName);+ setBaseUrl(config.baseUrl);+ setModelId(config.modelId);+ }+ testMutation.reset();+ saveMutation.reset();+ };+const handleProviderChange = (next: AiProvider) => {- const previousDefaults = providerDefaults[provider];- const nextDefaults = providerDefaults[next];setProvider(next);- if (!displayName || displayName === previousDefaults.displayName) setDisplayName(nextDefaults.displayName);- if (!baseUrl || baseUrl === previousDefaults.baseUrl) setBaseUrl(nextDefaults.baseUrl);- if (!modelId || modelId === previousDefaults.modelId) setModelId(nextDefaults.modelId);+ setPreset("custom");testMutation.reset();saveMutation.reset();};@@ -73,6 +98,7 @@ export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {}return error instanceof Error ? error.message : t("aiModel.failed");};+const encryptionConfigured = settingsQuery.data?.encryptionConfigured ?? false;const hasSavedKey = settingsQuery.data?.settings?.hasApiKey ?? false;@@ -88,28 +114,57 @@ export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {<CollapsibleTrigger asChild><button className="flex w-full min-w-0 items-start justify-between gap-3 text-left" type="button"><span className="min-w-0">- <CardTitle className="flex items-center gap-2 text-sm"><Sparkles className="h-4 w-4 text-emerald-700" />{t("aiModel.title")}</CardTitle>+ <CardTitle className="flex items-center gap-2 text-sm">+ <Sparkles className="h-4 w-4 text-emerald-700" />+ {t("aiModel.title")}+ </CardTitle><CardDescription className="mt-1">{t("aiModel.description")}</CardDescription></span>- <ChevronDown className={cn("mt-0.5 h-4 w-4 shrink-0 text-slate-400 transition-transform", expanded ? "rotate-180" : "rotate-0")} />+ <ChevronDown+ className={cn(+ "mt-0.5 h-4 w-4 shrink-0 text-slate-400 transition-transform",+ expanded ? "rotate-180" : "rotate-0"+ )}+ /></button></CollapsibleTrigger></CardHeader><CollapsibleContent asChild><CardContent className="p-4 pt-0 sm:px-5 sm:pb-5">{settingsQuery.isLoading ? (- <p className="flex items-center gap-2 text-sm text-slate-500"><Loader2 className="h-4 w-4 animate-spin" />{t("common.loading")}</p>+ <p className="flex items-center gap-2 text-sm text-slate-500">+ <Loader2 className="h-4 w-4 animate-spin" />+ {t("common.loading")}+ </p>) : (<form className="grid gap-4" onSubmit={submit}>{!encryptionConfigured ? (<p className="flex items-start gap-2 rounded-lg border border-amber-200 bg-amber-50 p-3 text-xs leading-5 text-amber-800">- <TriangleAlert className="mt-0.5 h-4 w-4 shrink-0" />{t("aiModel.encryptionKeyMissing")}+ <TriangleAlert className="mt-0.5 h-4 w-4 shrink-0" />+ {t("aiModel.encryptionKeyMissing")}</p>) : null}<div className="grid gap-4 sm:grid-cols-2">+ <Field label={t("aiModel.preset")}>+ <Select value={preset} onValueChange={(value) => handlePresetChange(value as PresetKey)}>+ <SelectTrigger>+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="deepseek">{t("aiModel.presets.deepseek")}</SelectItem>+ <SelectItem value="openai">{t("aiModel.presets.openai")}</SelectItem>+ <SelectItem value="anthropic">{t("aiModel.presets.anthropic")}</SelectItem>+ <SelectItem value="google">{t("aiModel.presets.google")}</SelectItem>+ <SelectItem value="ollama">{t("aiModel.presets.ollama")}</SelectItem>+ <SelectItem value="custom">{t("aiModel.presets.custom")}</SelectItem>+ </SelectContent>+ </Select>+ </Field><Field label={t("aiModel.provider")}><Select value={provider} onValueChange={(value) => handleProviderChange(value as AiProvider)}>- <SelectTrigger><SelectValue /></SelectTrigger>+ <SelectTrigger>+ <SelectValue />+ </SelectTrigger><SelectContent><SelectItem value="openai-compatible">{t("aiModel.providers.openai-compatible")}</SelectItem><SelectItem value="anthropic">{t("aiModel.providers.anthropic")}</SelectItem>@@ -117,24 +172,84 @@ export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {</SelectContent></Select></Field>- <Field label={t("aiModel.displayName")}><Input value={displayName} onChange={(event) => setDisplayName(event.target.value)} required maxLength={80} /></Field>- <Field label={t("aiModel.baseUrl")}><Input value={baseUrl} onChange={(event) => setBaseUrl(event.target.value)} required inputMode="url" /></Field>- <Field label={t("aiModel.modelId")}><Input value={modelId} onChange={(event) => setModelId(event.target.value)} required /></Field>+ <Field label={t("aiModel.baseUrl")}>+ <Input+ value={baseUrl}+ onChange={(event) => {+ setBaseUrl(event.target.value);+ setPreset("custom");+ }}+ required+ inputMode="url"+ />+ </Field>+ <Field label={t("aiModel.modelId")}>+ <Input+ value={modelId}+ onChange={(event) => {+ setModelId(event.target.value);+ setPreset("custom");+ }}+ required+ />+ </Field><Field label={t("aiModel.apiKey")} hint={hasSavedKey ? t("aiModel.apiKeySavedHint") : undefined}>- <Input type="password" value={apiKey} onChange={(event) => setApiKey(event.target.value)} required={!hasSavedKey} autoComplete="new-password" placeholder={hasSavedKey ? "••••••••••••" : ""} />+ <Input+ type="password"+ value={apiKey}+ onChange={(event) => setApiKey(event.target.value)}+ required={!hasSavedKey}+ autoComplete="new-password"+ placeholder={hasSavedKey ? "••••••••••••" : ""}+ /></Field><label className="flex items-center justify-between gap-3 rounded-lg border border-slate-200 bg-white px-3 py-2.5 text-sm font-medium text-slate-700">- <span><span className="block">{t("aiModel.enabled")}</span><span className="mt-0.5 block text-xs font-normal text-slate-500">{t("aiModel.enabledHint")}</span></span>+ <span>+ <span className="block">{t("aiModel.enabled")}</span>+ <span className="mt-0.5 block text-xs font-normal text-slate-500">{t("aiModel.enabledHint")}</span>+ </span><Switch checked={isEnabled} onCheckedChange={setIsEnabled} /></label></div>- {testMutation.isSuccess ? <p className="flex items-center gap-1.5 text-xs font-medium text-emerald-700"><CheckCircle2 className="h-4 w-4" />{t("aiModel.testSucceeded")}</p> : null}- {saveMutation.isSuccess ? <p className="flex items-center gap-1.5 text-xs font-medium text-emerald-700"><CheckCircle2 className="h-4 w-4" />{t("aiModel.saved")}</p> : null}- {testMutation.isError ? <p className="text-xs font-medium text-rose-600" role="alert">{errorMessage(testMutation.error)}</p> : null}- {saveMutation.isError ? <p className="text-xs font-medium text-rose-600" role="alert">{errorMessage(saveMutation.error)}</p> : null}+ {testMutation.isSuccess ? (+ <p className="flex items-center gap-1.5 text-xs font-medium text-emerald-700">+ <CheckCircle2 className="h-4 w-4" />+ {t("aiModel.testSucceeded")}+ </p>+ ) : null}+ {saveMutation.isSuccess ? (+ <p className="flex items-center gap-1.5 text-xs font-medium text-emerald-700">+ <CheckCircle2 className="h-4 w-4" />+ {t("aiModel.saved")}+ </p>+ ) : null}+ {testMutation.isError ? (+ <p className="text-xs font-medium text-rose-600" role="alert">+ {errorMessage(testMutation.error)}+ </p>+ ) : null}+ {saveMutation.isError ? (+ <p className="text-xs font-medium text-rose-600" role="alert">+ {errorMessage(saveMutation.error)}+ </p>+ ) : null}<div className="flex flex-wrap justify-end gap-2">- <Button type="button" variant="outline" disabled={testMutation.isPending || saveMutation.isPending || (!apiKey && !hasSavedKey)} onClick={() => testMutation.mutate()}>{testMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("aiModel.test")}</Button>- <Button type="submit" disabled={demoMode || saveMutation.isPending || !encryptionConfigured || (!apiKey && !hasSavedKey)}>{saveMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("common.save")}</Button>+ <Button+ type="button"+ variant="outline"+ disabled={testMutation.isPending || saveMutation.isPending || (!apiKey && !hasSavedKey)}+ onClick={() => testMutation.mutate()}+ >+ {testMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}+ {t("aiModel.test")}+ </Button>+ <Button+ type="submit"+ disabled={demoMode || saveMutation.isPending || !encryptionConfigured || (!apiKey && !hasSavedKey)}+ >+ {saveMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}+ {t("common.save")}+ </Button></div></form>)}@@ -146,5 +261,10 @@ export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {};const Field = ({ label, hint, children }: { label: string; hint?: string; children: ReactNode }) => (- <label className="grid gap-1.5 text-sm font-medium text-slate-700">{label}{children}{hint ? <span className="text-xs font-normal leading-4 text-slate-500">{hint}</span> : null}</label>+ <label className="grid gap-1.5 text-sm font-medium text-slate-700">+ {label}+ {children}+ {hint ? <span className="text-xs font-normal leading-4 text-slate-500">{hint}</span> : null}+ </label>);+diff --git a/apps/web/src/components/settings/McpConfigCard.tsx b/apps/web/src/components/settings/McpConfigCard.tsxindex 01053a9e..e87f8115 100644--- a/apps/web/src/components/settings/McpConfigCard.tsx+++ b/apps/web/src/components/settings/McpConfigCard.tsx@@ -154,9 +154,17 @@ interface ScopePickerProps {availableScopes: string[];selectedScopes: Set<string>;onToggleScope: (scope: string) => void;+ onSelectAll: () => void;+ onClearAll: () => void;}-const ScopePicker = ({ availableScopes, selectedScopes, onToggleScope }: ScopePickerProps) => {+const ScopePicker = ({+ availableScopes,+ selectedScopes,+ onToggleScope,+ onSelectAll,+ onClearAll,+}: ScopePickerProps) => {const { t } = useTranslation();const [expanded, setExpanded] = useState(false);@@ -178,34 +186,58 @@ const ScopePicker = ({ availableScopes, selectedScopes, onToggleScope }: ScopePi/></button></CollapsibleTrigger>- <CollapsibleContent className="grid gap-1 border-t border-slate-100 py-2 sm:grid-cols-2">- {availableScopes.map((scope) => {- const checked = selectedScopes.has(scope);- const checkboxId = `token-scope-${scope.replace(/[^a-z0-9]+/gi, "-")}`;-- return (- <label- key={scope}- htmlFor={checkboxId}- className={cn(- "flex min-h-10 cursor-pointer items-center gap-3 rounded-md px-3 py-2 transition-colors",- checked- ? "bg-emerald-50/70 text-emerald-800"- : "text-slate-600 hover:bg-slate-50"- )}+ <CollapsibleContent className="space-y-2 border-t border-slate-100 py-2">+ <div className="flex items-center justify-between px-1">+ <span className="text-[11px] text-slate-400">+ {t("mcp.selectedScopes", { selected: selectedScopes.size, total: availableScopes.length })}+ </span>+ <div className="flex items-center gap-2">+ <button+ type="button"+ className="text-[11px] font-medium text-emerald-600 hover:text-emerald-700 hover:underline"+ onClick={onSelectAll}>- <Checkbox- id={checkboxId}- checked={checked}- onCheckedChange={() => onToggleScope(scope)}- className="border-emerald-300"- />- <span className="min-w-0 truncate text-xs font-semibold" title={scope}>- {getTokenScopeLabel(scope, t)}- </span>- </label>- );- })}+ {t("mcp.selectAllScopes")}+ </button>+ <span className="text-slate-300">|</span>+ <button+ type="button"+ className="text-[11px] font-medium text-slate-500 hover:text-slate-700 hover:underline"+ onClick={onClearAll}+ >+ {t("mcp.clearScopes")}+ </button>+ </div>+ </div>+ <div className="grid gap-1 sm:grid-cols-2">+ {availableScopes.map((scope) => {+ const checked = selectedScopes.has(scope);+ const checkboxId = `token-scope-${scope.replace(/[^a-z0-9]+/gi, "-")}`;++ return (+ <label+ key={scope}+ htmlFor={checkboxId}+ className={cn(+ "flex min-h-10 cursor-pointer items-center gap-3 rounded-md px-3 py-2 transition-colors",+ checked+ ? "bg-emerald-50/70 text-emerald-800"+ : "text-slate-600 hover:bg-slate-50"+ )}+ >+ <Checkbox+ id={checkboxId}+ checked={checked}+ onCheckedChange={() => onToggleScope(scope)}+ className="border-emerald-300"+ />+ <span className="min-w-0 truncate text-xs font-semibold" title={scope}>+ {getTokenScopeLabel(scope, t)}+ </span>+ </label>+ );+ })}+ </div></CollapsibleContent></Collapsible>);@@ -435,6 +467,8 @@ export const McpConfigCard = () => {availableScopes={availableScopes}selectedScopes={selectedScopes}onToggleScope={toggleScope}+ onSelectAll={() => setSelectedScopes(new Set(availableScopes))}+ onClearAll={() => setSelectedScopes(new Set())}/></form>diff --git a/bun.lock b/bun.lockindex 0ec94dbb..23364d3f 100644--- a/bun.lock+++ b/bun.lock@@ -130,6 +130,7 @@"expo-document-picker": "~57.0.1","expo-file-system": "~57.0.1","expo-image-manipulator": "~57.0.5",+ "expo-image-picker": "~57.0.5","expo-router": "latest","expo-secure-store": "latest","expo-sharing": "~57.0.8",@@ -2140,6 +2141,8 @@"expo-image-manipulator": ["[email protected]", "", { "dependencies": { "expo-image-loader": "~57.0.1" }, "peerDependencies": { "expo": "*" } }, "sha512-gEZ6tEsLwtz+dRXPC2QDObcQhAW7c9J6WW4W+5qQ4T6DlgkjtunLpHijM79W8fc99ER2X2IQS1ogJ8u9VAF7qA=="],+ "expo-image-picker": ["[email protected]", "", { "dependencies": { "expo-image-loader": "~57.0.1" }, "peerDependencies": { "expo": "*" } }, "sha512-LXJCGxunnQ4beqk+TW3+llRyss/XITOKWdIjqgF1H9mL3CgKN+hvABWAqLVWapGz7RoJBf+r53FO9i48yicbbw=="],+"expo-json-utils": ["[email protected]", "", {}, "sha512-cgTe1NqzQdYs/WN+3nIY5IZg8s0pb0xaTUbhYvxQDn137GbwRfHoGM2se3m3Vsl4Qu+B9G4RPEK5WJDEU2Do7g=="],"expo-keep-awake": ["[email protected]", "", { "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-28lkFImeXTS+bhAjuCFV7w7tW5bXg27BJVrxv+nC/nyYa86qEa0oFeHwqol6ha5k4pdVDQgBF09GM4A1k76Ssg=="],diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex 21d3ef16..e00541e6 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -270,8 +270,17 @@ export const enUS = {demoDisabled: "Object storage cannot be changed on the demo instance.",},aiModel: {- title: "AI model",+ title: "External AI configuration",description: "Connect your own cloud model endpoint. Credentials are encrypted on the EdgeEver server and isolated to your workspace.",+ preset: "Provider preset",+ presets: {+ deepseek: "DeepSeek",+ openai: "OpenAI",+ anthropic: "Anthropic Claude",+ google: "Google Gemini",+ ollama: "Ollama (Local)",+ custom: "Custom / Other compatible",+ },provider: "API protocol",providers: {"openai-compatible": "OpenAI-compatible",@@ -1010,13 +1019,15 @@ export const enUS = {copyConfig: "Copy full MCP config",securityWarning: "Security reminder: this token is a sensitive credential. Do not share it publicly.",bearerPlaceholder: "Bearer my-created-token",- title: "Generate MCP config",+ title: "API tokens & MCP configuration",example: "Example",exampleTitle: "Remote MCP example",copyExample: "Copy example",scopeTitle: "Token scopes",selectedScopes: "{{selected}}/{{total}} selected",- loadingTokens: "Loading token list...",+ selectAllScopes: "Select all",+ clearScopes: "Clear",+ loadingTokens: "Loading tokens...",emptyTokens: "No API tokens",noScope: "No scopes",lastUsedAt: "Last used: {{time}}",@@ -1025,8 +1036,8 @@ export const enUS = {legacyTokenCannotCopy: "Old token cannot be copied",legacyConfigCannotCopy: "MCP config cannot be copied for old tokens",deleteToken: "Delete token",- description: "Allow AI Agents to read and organize your notes.",- namePlaceholder: "Token name, e.g. Codex or Claude Code",+ description: "Used for the web clipper extension, MCP services, and AI Agent workflows to access and manage your notes.",+ namePlaceholder: "Token name, e.g. Chrome Clipper or Claude Desktop",createToken: "Generate token",activeTokens: "Token list",deleteConfirmTitle: "Delete token “{{name}}”?",diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex 89aabf76..af268c5e 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -270,8 +270,17 @@ export const zhCN = {demoDisabled: "演示实例不允许修改对象存储。",},aiModel: {- title: "AI 模型",+ title: "外部 AI 配置",description: "连接你自己的云端模型服务。凭据由 EdgeEver 服务端加密保存,并按个人工作区隔离。",+ preset: "服务商预设",+ presets: {+ deepseek: "DeepSeek",+ openai: "OpenAI",+ anthropic: "Anthropic Claude",+ google: "Google Gemini",+ ollama: "Ollama (本地运行)",+ custom: "自定义 / 其他兼容协议",+ },provider: "API 协议",providers: {"openai-compatible": "OpenAI 兼容协议",@@ -1010,12 +1019,14 @@ export const zhCN = {copyConfig: "复制完整 MCP 配置",securityWarning: "安全提醒:此 Token 属于高危凭证,请勿对外泄露。",bearerPlaceholder: "Bearer 我创建的token",- title: "生成 MCP 配置",+ title: "API Token 与 MCP 配置",example: "使用示例",exampleTitle: "Remote MCP 示例",copyExample: "复制示例",scopeTitle: "Token 权限范围",selectedScopes: "已选择 {{selected}}/{{total}}",+ selectAllScopes: "全选",+ clearScopes: "清空",loadingTokens: "正在加载 Token 列表...",emptyTokens: "暂无 API Token",noScope: "无权限",@@ -1025,8 +1036,8 @@ export const zhCN = {legacyTokenCannotCopy: "旧 Token 无法复制",legacyConfigCannotCopy: "旧 Token 无法复制 MCP 配置",deleteToken: "删除 Token",- description: "让 AI Agent 可以读取和整理你的笔记。",- namePlaceholder: "Token 名称,例如:Codex 或 Claude Code",+ description: "用于网页剪藏插件、MCP 服务及 AI Agent 联动,授权读取和管理你的笔记。",+ namePlaceholder: "Token 名称,例如:Chrome 剪藏插件 或 Claude Desktop",createToken: "生成 Token",activeTokens: "Token 列表",deleteConfirmTitle: "确定要删除 Token「{{name}}」吗?",