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(ai): support multiple providers and models
tianma-if0488731acc7a
diff --git a/README.md b/README.mdindex 43efc919..20abd835 100644--- a/README.md+++ b/README.md@@ -36,7 +36,7 @@ The public demo resets every day at 3:00 AM (China Standard Time) and restores s- **Open Data, No Vendor Lock-in**: Built on standard SQLite with complete REST API, MCP, and CLI access. Your knowledge is stored transparently and accessible anytime without being locked to a single app.- **Lossless ZIP Backup & Portability**: Export your complete library as a clean archive containing Markdown, Front Matter, nested folders, relative attachment links, and version histories for instant restoration anywhere.- **Native AI Agent Synergy**: Deep integration with Model Context Protocol (MCP) allows AI tools like Claude Code, Codex, and Antigravity to read, organize, and summarize your notes, or sync seamlessly with Notion and Feishu Bitable.-- **Bring Your Own AI Model**: Connect an OpenAI-compatible, Anthropic, or Gemini cloud endpoint with your own Base URL and API key, then summarize notes, extract key points or tasks, rewrite and proofread, or translate from a reviewable streaming draft.+- **Bring Your Own AI Models**: Add multiple OpenAI-compatible, Anthropic, or Gemini services with your own Base URLs and API keys—including aggregators such as OpenRouter—then attach multiple models to each service and choose the default model for note AI.- **Unlimited Multi-Device Sync**: No commercial device caps or paywalls. Enjoy seamless synchronization across PC, tablet, and mobile via web, PWA, or browser.- **Classic Three-Pane Layout & Focus Mode**: Clean navigation featuring notebook trees, note lists, and an expansive editor, with a desktop focus mode to eliminate distractions.- **Unlimited Nested Notebooks**: Organize your knowledge with arbitrary folder depth.@@ -187,9 +187,11 @@ Create an API token in **Profile** -> **MCP settings**, then give the token or fWith MCP, EdgeEver can also connect to tools such as Notion databases and Feishu Bitable, turning scattered ideas, information, and materials from everyday notes into structured data that is easier to organize, search, and manage.-## Bring Your Own AI Model+## Bring Your Own AI Models-Open **Profile → AI Integrations** to connect an OpenAI-compatible, Anthropic Messages, or Google Gemini cloud endpoint with your own Base URL, API key, and model ID. The first AI release focuses on note processing: summarizing, extracting key points, extracting tasks, rewriting and proofreading, and translating. Results stream into a reviewable draft before you copy, append, or replace content.+Open **Profile → AI Integrations** to add one or more OpenAI-compatible, Anthropic Messages, or Google Gemini services with your own Base URLs and API keys. Each service can contain multiple models: discover them from the provider's model-list endpoint or enter a model ID manually. This supports aggregators such as OpenRouter, where one Base URL exposes models from several vendors. A service-level switch temporarily makes all of its models unavailable, while the workspace default selects the model used for note AI.++Note AI currently focuses on summarizing, extracting key points, extracting tasks, rewriting and proofreading, and translating. Results stream into a reviewable draft before you copy, append, or replace content.AI requests are sent by the EdgeEver server rather than directly by the browser or native client. Model credentials are isolated by personal workspace and encrypted before being stored. Standard deployments automatically derive an AI-specific encryption key from the existing instance authentication secret, so no additional deployment variable is required. The same AI business code runs in Cloudflare Workers and the planned Docker/Bun runtime.diff --git a/README.zh-CN.md b/README.zh-CN.mdindex 03702ee9..a018cc3a 100644--- a/README.zh-CN.md+++ b/README.zh-CN.md@@ -36,7 +36,7 @@ EdgeEver 是一款现代化的开源笔记工作区。它为你找回经典印- **数据开放,不设围墙**:基于标准 SQLite 存储,提供 REST API、MCP 与 CLI 接口。数据随时可读可导,不再担心被任何特定平台绑定。- **无损 ZIP 打包与无缝迁移**:一键打包导出包含 Markdown、Front Matter、嵌套目录及附件的完整档案,同时保留历史版本与结构化数据,方便在不同实例间完整还原。- **原生 AI Agent 智脑联动**:内置 MCP(Model Context Protocol)协议,支持 Claude Code、Codex、Antigravity 等 AI 助手直接读取与整理笔记,也可与 Notion Database、飞书多维表格轻松打通。-- **接入自己的 AI 模型**:使用自己的 Base URL 和 API Key 连接 OpenAI 兼容、Anthropic 或 Gemini 云端服务,对当前笔记进行总结、提炼要点、提取待办、改写与校对或翻译,结果确认后再应用。+- **接入自己的 AI 模型**:可添加多个 OpenAI 兼容、Anthropic 或 Gemini 服务(包括 OpenRouter 等聚合平台),每个 Base URL 下可配置多个模型,并选择笔记 AI 默认使用的模型。- **多端无缝同步,无设备限制**:自托管数据无商业限制,摆脱免费账号仅限 2 台设备的束缚,在 PC、平板与手机上随心同步。- **经典三栏布局与专注模式**:笔记本树、笔记列表与编辑区一目了然;桌面端一键开启专注模式,让思绪尽情铺满屏幕。- **无限层级笔记本**:轻松构建清晰的多级目录结构。@@ -201,7 +201,9 @@ https://你的域名/api/openapi.json## 接入自己的 AI 模型-进入**个人中心 → AI 集成**,可以使用自己的 Base URL、API Key 和模型 ID 连接 OpenAI 兼容协议、Anthropic Messages 或 Google Gemini 云端服务。第一版 AI 功能聚焦笔记内容处理:总结、提炼要点、提取待办、改写与校对以及翻译。模型结果会先作为流式草稿展示,确认后才能复制、追加或替换正文。+进入**个人中心 → AI 集成**,可以使用自己的 Base URL 和 API Key 添加一个或多个 OpenAI 兼容协议、Anthropic Messages 或 Google Gemini 云端服务。每个服务都能配置多个模型:既可以从服务的模型列表接口自动发现,也可以手动输入模型 ID。这也适用于 OpenRouter 等聚合平台——同一个 Base URL 可以同时提供多个厂商的模型。服务级开关会让该服务下的全部模型暂时不可用,工作区默认模型则决定笔记 AI 实际使用哪个模型。++当前 AI 功能聚焦笔记内容处理:总结、提炼要点、提取待办、改写与校对以及翻译。模型结果会先作为流式草稿展示,确认后才能复制、追加或替换正文。AI 请求统一由 EdgeEver 服务端发出,不会由浏览器或原生客户端直接携带模型密钥。模型凭据按个人工作区隔离并加密保存;标准部署会自动从已有的实例认证 Secret 派生 AI 专用加密密钥,不需要增加任何部署变量。Cloudflare Worker 与未来的 Docker/Bun 运行时共用同一套 AI 业务代码。diff --git a/apps/api/src/ai-routes.test.mjs b/apps/api/src/ai-routes.test.mjsindex 9676a3fe..e1c30ded 100644--- a/apps/api/src/ai-routes.test.mjs+++ b/apps/api/src/ai-routes.test.mjs@@ -1,4 +1,6 @@import { describe, expect, test } from "bun:test";+import { globSync, readFileSync } from "node:fs";+import { Database } from "bun:sqlite";import { Hono } from "hono";import { registerAiRoutes } from "./ai-routes.ts";@@ -24,6 +26,62 @@ const environment = {EDGE_EVER_STORAGE_ENCRYPTION_KEY: "x".repeat(32),};+class SqliteD1PreparedStatement {+ constructor(db, sql, bindings = []) {+ this.db = db;+ this.sql = sql;+ this.bindings = bindings;+ }++ bind(...bindings) {+ return new SqliteD1PreparedStatement(this.db, this.sql, bindings);+ }++ async all() {+ return { results: this.db.query(this.sql).all(...this.bindings), success: true, meta: {} };+ }++ async first() {+ return this.db.query(this.sql).get(...this.bindings) ?? null;+ }++ async run() {+ this.db.query(this.sql).run(...this.bindings);+ return { success: true, meta: {} };+ }+}++class SqliteD1Database {+ constructor(db) {+ this.db = db;+ }++ prepare(sql) {+ return new SqliteD1PreparedStatement(this.db, sql);+ }++ async batch(statements) {+ return this.db.transaction(() => statements.map((statement) =>+ this.db.query(statement.sql).run(...statement.bindings)))();+ }+}++const createDatabaseEnvironment = () => {+ const sqlite = new Database(":memory:");+ for (const migration of globSync("migrations/*.sql").sort()) {+ sqlite.exec(readFileSync(migration, "utf8"));+ }+ sqlite.query("INSERT INTO workspaces (id, name, is_personal) VALUES (?, ?, 1)")+ .run("ws_member", "Member workspace");+ return {+ sqlite,+ environment: {+ storage: { db: new SqliteD1Database(sqlite), resources: {} },+ EDGE_EVER_STORAGE_ENCRYPTION_KEY: "x".repeat(32),+ },+ };+};+const createApp = ({ currentAuth = auth, demoMode = false } = {}) => {const app = new Hono();app.use("/api/v1/*", async (context, next) => {@@ -39,8 +97,8 @@ const validSettings = {displayName: "Cloud model",baseUrl: "https://models.example.com/v1",apiKey: "secret",- modelId: "model-a",isEnabled: true,+ initialModelId: "model-a",};describe("AI route contracts", () => {@@ -54,9 +112,9 @@ describe("AI route contracts", () => {test("keeps demo AI settings immutable", async () => {const app = createApp({ demoMode: true });const response = await app.request(- "/api/v1/ai/settings",+ "/api/v1/ai/providers",{- method: "PUT",+ method: "POST",headers: { "content-type": "application/json" },body: JSON.stringify(validSettings),},@@ -69,9 +127,9 @@ describe("AI route contracts", () => {test("rejects credentials embedded in a Base URL", async () => {const app = createApp();const response = await app.request(- "/api/v1/ai/settings",+ "/api/v1/ai/providers",{- method: "PUT",+ method: "POST",headers: { "content-type": "application/json" },body: JSON.stringify({ ...validSettings, baseUrl: "https://user:[email protected]/v1" }),},@@ -107,4 +165,82 @@ describe("AI route contracts", () => {);expect(response.status).toBe(400);});++ test("stores multiple models under one OpenRouter-style provider", async () => {+ const app = createApp();+ const { sqlite, environment: databaseEnvironment } = createDatabaseEnvironment();+ const createResponse = await app.request(+ "/api/v1/ai/providers",+ {+ method: "POST",+ headers: { "content-type": "application/json" },+ body: JSON.stringify({+ ...validSettings,+ displayName: "OpenRouter",+ baseUrl: "https://openrouter.ai/api/v1/",+ initialModelId: "openai/gpt-4.1",+ }),+ },+ databaseEnvironment,+ );+ const created = await createResponse.json();+ expect({ status: createResponse.status, created }).toMatchObject({ status: 201 });+ const provider = created.providers[0];+ expect(provider).toMatchObject({+ displayName: "OpenRouter",+ baseUrl: "https://openrouter.ai/api/v1",+ isEnabled: true,+ });+ expect(created.readOnly).toBe(false);+ expect(provider.models.map((model) => model.modelId)).toEqual(["openai/gpt-4.1"]);+ expect(created.defaultModelId).toBe(provider.models[0].id);++ const addResponse = await app.request(+ `/api/v1/ai/providers/${provider.id}/models`,+ {+ method: "POST",+ headers: { "content-type": "application/json" },+ body: JSON.stringify({+ modelId: "anthropic/claude-sonnet-4",+ displayName: "Claude Sonnet 4",+ }),+ },+ databaseEnvironment,+ );+ expect(addResponse.status).toBe(201);+ const withTwoModels = await addResponse.json();+ expect(withTwoModels.providers[0].models.map((model) => model.modelId)).toEqual([+ "openai/gpt-4.1",+ "anthropic/claude-sonnet-4",+ ]);++ const disableResponse = await app.request(+ `/api/v1/ai/providers/${provider.id}`,+ {+ method: "PUT",+ headers: { "content-type": "application/json" },+ body: JSON.stringify({+ provider: "openai-compatible",+ displayName: "OpenRouter",+ baseUrl: "https://openrouter.ai/api/v1",+ isEnabled: false,+ }),+ },+ databaseEnvironment,+ );+ expect(disableResponse.status).toBe(200);+ expect((await disableResponse.json()).providers[0].isEnabled).toBe(false);++ sqlite.close();+ });++ test("reports public demo AI settings as read-only", async () => {+ const app = createApp({ demoMode: true });+ const { sqlite, environment: databaseEnvironment } = createDatabaseEnvironment();+ const response = await app.request("/api/v1/ai/settings", {}, databaseEnvironment);++ expect(response.status).toBe(200);+ expect(await response.json()).toMatchObject({ readOnly: true });+ sqlite.close();+ });});diff --git a/apps/api/src/ai-routes.ts b/apps/api/src/ai-routes.tsindex 7132a882..5f1cda6b 100644--- a/apps/api/src/ai-routes.ts+++ b/apps/api/src/ai-routes.ts@@ -1,7 +1,10 @@import {- AiConnectionTestSchema,+ AiDefaultModelUpdateSchema,AiGenerateSchema,- AiModelSettingsUpdateSchema,+ AiModelConfigCreateSchema,+ AiProviderConfigCreateSchema,+ AiProviderConfigUpdateSchema,+ AiProviderConnectionTestSchema,} from "@edgeever/shared";import { zValidator } from "@hono/zod-validator";import type { Hono } from "hono";@@ -9,17 +12,20 @@ import type { AppContext, AppEnv, Bindings } from "./api-context";import { AppError } from "./app-error";import { auditStatement } from "./audit";import {- getAiModelConfig,decryptAiCredential,- loadActiveAiModel,- mapAiModelSettings,+ discoverAiModels,+ getAiModelConfig,+ getAiProviderConfig,+ getAiSettings,+ getDefaultAiModelId,+ loadDefaultAiModel,normalizeAiBaseUrl,resolvePrimaryAiCredentialEncryptionKey,streamAiGeneration,testAiModel,} from "./ai-service";-import { isoNow } from "./entity-utils";-import { apiError, forbidden } from "./http-errors";+import { createId, isoNow } from "./entity-utils";+import { apiError, forbidden, notFound } from "./http-errors";import { getWorkspaceId, requireUser } from "./request-auth";import { encryptSecret } from "./secret-encryption";@@ -27,116 +33,402 @@ type AiRouteDependencies = {isDemoMode: (environment: Bindings) => boolean;};-const getSubmittedApiKey = async (context: AppContext, submittedApiKey: string | undefined) => {- if (submittedApiKey) return submittedApiKey;- const row = await getAiModelConfig(context.env.storage.db, getWorkspaceId(context));- if (!row?.api_key_encrypted) {- throw new AppError("ai_api_key_required", "API Key is required.", 400);- }- return decryptAiCredential(row.api_key_encrypted, context.env);-};-const providerErrorMessage = (error: unknown) => {if (error instanceof AppError) return error.message;if (!(error instanceof Error)) return "The AI provider request failed.";return error.message.replace(/Bearer\s+\S+/gi, "Bearer [redacted]").slice(0, 1000);};+const encryptionConfigured = (context: AppContext) =>+ Boolean(resolvePrimaryAiCredentialEncryptionKey(context.env));++const readSettings = (context: AppContext, dependencies: AiRouteDependencies) => getAiSettings(+ context.env.storage.db,+ getWorkspaceId(context),+ encryptionConfigured(context),+ dependencies.isDemoMode(context.env),+);++const denyMutation = (context: AppContext, dependencies: AiRouteDependencies) => {+ const denied = requireUser(context);+ if (denied) return denied;+ if (dependencies.isDemoMode(context.env)) {+ return forbidden(context, "AI settings cannot be changed in demo mode.");+ }+ return null;+};++const requireEncryptionKey = (context: AppContext) => {+ const key = resolvePrimaryAiCredentialEncryptionKey(context.env);+ if (!key) {+ throw new AppError(+ "ai_encryption_key_missing",+ "AI credential encryption requires instance authentication or an optional EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY.",+ 400,+ );+ }+ return key;+};++const getSavedProviderApiKey = async (context: AppContext, providerConfigId: string) => {+ const row = await getAiProviderConfig(+ context.env.storage.db,+ getWorkspaceId(context),+ providerConfigId,+ );+ if (!row) throw new AppError("ai_provider_not_found", "AI provider not found.", 404);+ return {+ row,+ apiKey: await decryptAiCredential(row.api_key_encrypted, context.env),+ };+};++const withAiError = (context: AppContext, error: unknown, fallbackCode: string) => {+ if (error instanceof AppError) {+ return apiError(context, error.code, error.message, error.status);+ }+ return apiError(context, fallbackCode, providerErrorMessage(error), 400);+};+export const registerAiRoutes = (app: Hono<AppEnv>, dependencies: AiRouteDependencies) => {app.get("/api/v1/ai/settings", async (context) => {const denied = requireUser(context);if (denied) return denied;- const row = await getAiModelConfig(context.env.storage.db, getWorkspaceId(context));- return context.json({- settings: row- ? mapAiModelSettings(row, Boolean(resolvePrimaryAiCredentialEncryptionKey(context.env)))- : null,- encryptionConfigured: Boolean(resolvePrimaryAiCredentialEncryptionKey(context.env)),- });+ return context.json(await readSettings(context, dependencies));+ });++ app.post(+ "/api/v1/ai/providers",+ zValidator("json", AiProviderConfigCreateSchema),+ async (context) => {+ const denied = denyMutation(context, dependencies);+ if (denied) return denied;+ try {+ const input = context.req.valid("json");+ const workspaceId = getWorkspaceId(context);+ const providerConfigId = createId("aip");+ const modelConfigId = input.initialModelId ? createId("aim") : null;+ const now = isoNow();+ const statements = [+ context.env.storage.db.prepare(+ `INSERT INTO ai_provider_configs (+ id, workspace_id, provider, display_name, base_url, api_key_encrypted,+ is_enabled, created_at, updated_at+ ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,+ ).bind(+ providerConfigId,+ workspaceId,+ input.provider,+ input.displayName,+ normalizeAiBaseUrl(input.baseUrl),+ await encryptSecret(input.apiKey, requireEncryptionKey(context)),+ input.isEnabled ? 1 : 0,+ now,+ now,+ ),+ ];+ if (modelConfigId && input.initialModelId) {+ statements.push(context.env.storage.db.prepare(+ `INSERT INTO ai_models (+ id, provider_config_id, model_id, display_name, created_at, updated_at+ ) VALUES (?, ?, ?, ?, ?, ?)`,+ ).bind(+ modelConfigId,+ providerConfigId,+ input.initialModelId,+ input.initialModelId,+ now,+ now,+ ));+ if (input.isEnabled && !(await getDefaultAiModelId(context.env.storage.db, workspaceId))) {+ statements.push(context.env.storage.db.prepare(+ `INSERT INTO ai_workspace_settings (+ workspace_id, default_model_id, created_at, updated_at+ ) VALUES (?, ?, ?, ?)+ ON CONFLICT(workspace_id) DO UPDATE SET+ default_model_id = excluded.default_model_id,+ updated_at = excluded.updated_at`,+ ).bind(workspaceId, modelConfigId, now, now));+ }+ }+ statements.push(auditStatement(+ context.env.storage.db,+ "user",+ context.get("auth").actorId,+ "workspace.ai_provider.create",+ "ai_provider_config",+ providerConfigId,+ { provider: input.provider, initialModelId: input.initialModelId ?? null },+ ));+ await context.env.storage.db.batch(statements);+ return context.json(await readSettings(context, dependencies), 201);+ } catch (error) {+ return withAiError(context, error, "ai_provider_create_failed");+ }+ },+ );++ app.put(+ "/api/v1/ai/providers/:providerConfigId",+ zValidator("json", AiProviderConfigUpdateSchema),+ async (context) => {+ const denied = denyMutation(context, dependencies);+ if (denied) return denied;+ try {+ const input = context.req.valid("json");+ const providerConfigId = context.req.param("providerConfigId");+ const workspaceId = getWorkspaceId(context);+ const existing = await getAiProviderConfig(+ context.env.storage.db,+ workspaceId,+ providerConfigId,+ );+ if (!existing) return notFound(context, "AI provider not found.");+ const now = isoNow();+ const apiKeyEncrypted = input.apiKey+ ? await encryptSecret(input.apiKey, requireEncryptionKey(context))+ : existing.api_key_encrypted;+ await context.env.storage.db.batch([+ context.env.storage.db.prepare(+ `UPDATE ai_provider_configs SET+ provider = ?, display_name = ?, base_url = ?, api_key_encrypted = ?,+ is_enabled = ?, updated_at = ?+ WHERE id = ? AND workspace_id = ?`,+ ).bind(+ input.provider,+ input.displayName,+ normalizeAiBaseUrl(input.baseUrl),+ apiKeyEncrypted,+ input.isEnabled ? 1 : 0,+ now,+ providerConfigId,+ workspaceId,+ ),+ auditStatement(+ context.env.storage.db,+ "user",+ context.get("auth").actorId,+ "workspace.ai_provider.update",+ "ai_provider_config",+ providerConfigId,+ { provider: input.provider, isEnabled: input.isEnabled },+ ),+ ]);+ return context.json(await readSettings(context, dependencies));+ } catch (error) {+ return withAiError(context, error, "ai_provider_update_failed");+ }+ },+ );++ app.delete("/api/v1/ai/providers/:providerConfigId", async (context) => {+ const denied = denyMutation(context, dependencies);+ if (denied) return denied;+ const providerConfigId = context.req.param("providerConfigId");+ const workspaceId = getWorkspaceId(context);+ const existing = await getAiProviderConfig(+ context.env.storage.db,+ workspaceId,+ providerConfigId,+ );+ if (!existing) return notFound(context, "AI provider not found.");+ await context.env.storage.db.batch([+ context.env.storage.db.prepare(+ `DELETE FROM ai_provider_configs WHERE id = ? AND workspace_id = ?`,+ ).bind(providerConfigId, workspaceId),+ auditStatement(+ context.env.storage.db,+ "user",+ context.get("auth").actorId,+ "workspace.ai_provider.delete",+ "ai_provider_config",+ providerConfigId,+ { provider: existing.provider },+ ),+ ]);+ return context.json(await readSettings(context, dependencies));});app.post(- "/api/v1/ai/settings/test",- zValidator("json", AiConnectionTestSchema),+ "/api/v1/ai/providers/:providerConfigId/test",+ zValidator("json", AiProviderConnectionTestSchema),async (context) => {const denied = requireUser(context);if (denied) return denied;- const input = context.req.valid("json");try {+ const input = context.req.valid("json");+ const { row, apiKey } = await getSavedProviderApiKey(+ context,+ context.req.param("providerConfigId"),+ );const result = await testAiModel({- provider: input.provider,- baseUrl: input.baseUrl,- apiKey: await getSubmittedApiKey(context, input.apiKey),+ provider: row.provider,+ baseUrl: row.base_url,+ apiKey,modelId: input.modelId,});return context.json({ ok: true, response: result.text.trim() });} catch (error) {- return apiError(context, "ai_connection_failed", providerErrorMessage(error), 400);+ return withAiError(context, error, "ai_connection_failed");}},);- app.put(- "/api/v1/ai/settings",- zValidator("json", AiModelSettingsUpdateSchema),+ app.post("/api/v1/ai/providers/:providerConfigId/discover-models", async (context) => {+ const denied = requireUser(context);+ if (denied) return denied;+ try {+ const { row, apiKey } = await getSavedProviderApiKey(+ context,+ context.req.param("providerConfigId"),+ );+ return context.json({+ models: await discoverAiModels({+ provider: row.provider,+ baseUrl: row.base_url,+ apiKey,+ }),+ });+ } catch (error) {+ return withAiError(context, error, "ai_model_discovery_failed");+ }+ });++ app.post(+ "/api/v1/ai/providers/:providerConfigId/models",+ zValidator("json", AiModelConfigCreateSchema),async (context) => {- const denied = requireUser(context);+ const denied = denyMutation(context, dependencies);if (denied) return denied;- if (dependencies.isDemoMode(context.env)) {- return forbidden(context, "AI settings cannot be changed in demo mode.");+ const providerConfigId = context.req.param("providerConfigId");+ const workspaceId = getWorkspaceId(context);+ const provider = await getAiProviderConfig(+ context.env.storage.db,+ workspaceId,+ providerConfigId,+ );+ if (!provider) return notFound(context, "AI provider not found.");+ const input = context.req.valid("json");+ const modelConfigId = createId("aim");+ const now = isoNow();+ const statements = [+ context.env.storage.db.prepare(+ `INSERT INTO ai_models (+ id, provider_config_id, model_id, display_name, created_at, updated_at+ ) VALUES (?, ?, ?, ?, ?, ?)`,+ ).bind(+ modelConfigId,+ providerConfigId,+ input.modelId,+ input.displayName ?? input.modelId,+ now,+ now,+ ),+ ];+ if (provider.is_enabled && !(await getDefaultAiModelId(context.env.storage.db, workspaceId))) {+ statements.push(context.env.storage.db.prepare(+ `INSERT INTO ai_workspace_settings (+ workspace_id, default_model_id, created_at, updated_at+ ) VALUES (?, ?, ?, ?)+ ON CONFLICT(workspace_id) DO UPDATE SET+ default_model_id = excluded.default_model_id,+ updated_at = excluded.updated_at`,+ ).bind(workspaceId, modelConfigId, now, now));}- const encryptionKey = resolvePrimaryAiCredentialEncryptionKey(context.env);- if (!encryptionKey) {- return apiError(- context,- "ai_encryption_key_missing",- "AI credential encryption requires instance authentication or an optional EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY.",- 400,- );+ statements.push(auditStatement(+ context.env.storage.db,+ "user",+ context.get("auth").actorId,+ "workspace.ai_model.create",+ "ai_model",+ modelConfigId,+ { providerConfigId, modelId: input.modelId },+ ));+ try {+ await context.env.storage.db.batch(statements);+ return context.json(await readSettings(context, dependencies), 201);+ } catch (error) {+ return withAiError(context, error, "ai_model_create_failed");}+ },+ );++ app.delete(+ "/api/v1/ai/providers/:providerConfigId/models/:modelConfigId",+ async (context) => {+ const denied = denyMutation(context, dependencies);+ if (denied) return denied;+ const workspaceId = getWorkspaceId(context);+ const providerConfigId = context.req.param("providerConfigId");+ const modelConfigId = context.req.param("modelConfigId");+ const model = await getAiModelConfig(context.env.storage.db, workspaceId, modelConfigId);+ if (!model || model.provider_config_id !== providerConfigId) {+ return notFound(context, "AI model not found.");+ }+ await context.env.storage.db.batch([+ context.env.storage.db.prepare(+ `DELETE FROM ai_models WHERE id = ? AND provider_config_id = ?`,+ ).bind(modelConfigId, providerConfigId),+ auditStatement(+ context.env.storage.db,+ "user",+ context.get("auth").actorId,+ "workspace.ai_model.delete",+ "ai_model",+ modelConfigId,+ { providerConfigId, modelId: model.model_id },+ ),+ ]);+ return context.json(await readSettings(context, dependencies));+ },+ );++ app.put(+ "/api/v1/ai/default-model",+ zValidator("json", AiDefaultModelUpdateSchema),+ async (context) => {+ const denied = denyMutation(context, dependencies);+ if (denied) return denied;const input = context.req.valid("json");- const apiKey = await getSubmittedApiKey(context, input.apiKey);const workspaceId = getWorkspaceId(context);+ if (input.modelConfigId) {+ const model = await context.env.storage.db.prepare(+ `SELECT models.id+ FROM ai_models AS models+ JOIN ai_provider_configs AS providers ON providers.id = models.provider_config_id+ WHERE models.id = ? AND providers.workspace_id = ? AND providers.is_enabled = 1+ LIMIT 1`,+ ).bind(input.modelConfigId, workspaceId).first<{ id: string }>();+ if (!model) {+ return apiError(+ context,+ "ai_default_model_unavailable",+ "The selected AI model belongs to a disabled or unavailable provider.",+ 400,+ );+ }+ }const now = isoNow();- const configId = `ai_${workspaceId}`;await context.env.storage.db.batch([context.env.storage.db.prepare(- `INSERT INTO ai_model_configs (- id, workspace_id, provider, display_name, base_url, api_key_encrypted,- model_id, is_enabled, created_at, updated_at- ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)+ `INSERT INTO ai_workspace_settings (+ workspace_id, default_model_id, created_at, updated_at+ ) VALUES (?, ?, ?, ?)ON CONFLICT(workspace_id) DO UPDATE SET- provider = excluded.provider, display_name = excluded.display_name,- base_url = excluded.base_url, api_key_encrypted = excluded.api_key_encrypted,- model_id = excluded.model_id, is_enabled = excluded.is_enabled,+ default_model_id = excluded.default_model_id,updated_at = excluded.updated_at`,- ).bind(- configId,- workspaceId,- input.provider,- input.displayName,- normalizeAiBaseUrl(input.baseUrl),- await encryptSecret(apiKey, encryptionKey),- input.modelId,- input.isEnabled ? 1 : 0,- now,- now,- ),+ ).bind(workspaceId, input.modelConfigId, now, now),auditStatement(context.env.storage.db,"user",context.get("auth").actorId,- "workspace.ai_model.update",- "ai_model_config",- configId,- { provider: input.provider, modelId: input.modelId, isEnabled: input.isEnabled },+ "workspace.ai_default_model.update",+ "workspace",+ workspaceId,+ { modelConfigId: input.modelConfigId },),]);- const row = await getAiModelConfig(context.env.storage.db, workspaceId);- return context.json({- settings: row ? mapAiModelSettings(row, true) : null,- encryptionConfigured: true,- });+ return context.json(await readSettings(context, dependencies));},);@@ -148,7 +440,7 @@ export const registerAiRoutes = (app: Hono<AppEnv>, dependencies: AiRouteDependeif (denied) return denied;try {const input = context.req.valid("json");- const model = await loadActiveAiModel(+ const model = await loadDefaultAiModel(context.env.storage.db,getWorkspaceId(context),context.env,@@ -185,8 +477,7 @@ export const registerAiRoutes = (app: Hono<AppEnv>, dependencies: AiRouteDepende},});} catch (error) {- if (error instanceof AppError) return apiError(context, error.code, error.message, error.status);- return apiError(context, "ai_generation_failed", providerErrorMessage(error), 400);+ return withAiError(context, error, "ai_generation_failed");}},);diff --git a/apps/api/src/ai-service.test.mjs b/apps/api/src/ai-service.test.mjsindex 389c8f76..71c12e7f 100644--- a/apps/api/src/ai-service.test.mjs+++ b/apps/api/src/ai-service.test.mjs@@ -1,7 +1,8 @@import { describe, expect, test } from "bun:test";import {aiActionInstructions,- mapAiModelSettings,+ discoverAiModels,+ mapAiProviderConfig,normalizeAiBaseUrl,decryptAiCredential,resolveAiCredentialEncryptionKeys,@@ -41,26 +42,76 @@ describe("AI model service", () => {});test("never exposes the encrypted API key in settings", () => {- const settings = mapAiModelSettings({- id: "ai_ws_personal",+ const settings = mapAiProviderConfig({+ id: "aip_personal",workspace_id: "ws_personal",provider: "openai-compatible",display_name: "My model",base_url: "https://models.example.com/v1",api_key_encrypted: "v1.secret.ciphertext",- model_id: "model-a",is_enabled: 1,- }, true);+ created_at: "2026-08-10T00:00:00.000Z",+ updated_at: "2026-08-10T00:00:00.000Z",+ }, [{+ id: "aim_a",+ provider_config_id: "aip_personal",+ model_id: "model-a",+ display_name: "Model A",+ created_at: "2026-08-10T00:00:00.000Z",+ updated_at: "2026-08-10T00:00:00.000Z",+ }]);expect(settings).toEqual({+ id: "aip_personal",provider: "openai-compatible",displayName: "My model",baseUrl: "https://models.example.com/v1",- modelId: "model-a",isEnabled: true,hasApiKey: true,- encryptionConfigured: true,+ models: [{+ id: "aim_a",+ providerConfigId: "aip_personal",+ modelId: "model-a",+ displayName: "Model A",+ }],});expect(JSON.stringify(settings)).not.toContain("ciphertext");});++ test("discovers multiple OpenAI-compatible models from one Base URL", async () => {+ const requests = [];+ const models = await discoverAiModels({+ provider: "openai-compatible",+ baseUrl: "https://openrouter.ai/api/v1/",+ apiKey: "router-key",+ }, async (url, init) => {+ requests.push({ url, authorization: new Headers(init.headers).get("authorization") });+ return Response.json({ data: [+ { id: "anthropic/claude-sonnet-4", name: "Claude Sonnet 4" },+ { id: "openai/gpt-4.1", name: "GPT-4.1" },+ ] });+ });++ expect(requests).toEqual([{+ url: "https://openrouter.ai/api/v1/models",+ authorization: "Bearer router-key",+ }]);+ expect(models.map((model) => model.modelId)).toEqual([+ "anthropic/claude-sonnet-4",+ "openai/gpt-4.1",+ ]);+ expect(models.map((model) => model.displayName)).toEqual(["Claude Sonnet 4", "GPT-4.1"]);+ });++ test("normalizes Google model resource names during discovery", async () => {+ const models = await discoverAiModels({+ provider: "google",+ baseUrl: "https://generativelanguage.googleapis.com/v1beta",+ apiKey: "google-key",+ }, async (_url, init) => {+ expect(new Headers(init.headers).get("x-goog-api-key")).toBe("google-key");+ return Response.json({ models: [{ name: "models/gemini-2.5-flash", displayName: "Gemini 2.5 Flash" }] });+ });+ expect(models).toEqual([{ modelId: "gemini-2.5-flash", displayName: "Gemini 2.5 Flash" }]);+ });});diff --git a/apps/api/src/ai-service.ts b/apps/api/src/ai-service.tsindex effcfdf2..cfe89c76 100644--- a/apps/api/src/ai-service.ts+++ b/apps/api/src/ai-service.ts@@ -1,25 +1,55 @@import { createAnthropic } from "@ai-sdk/anthropic";import { createGoogle } from "@ai-sdk/google";import { createOpenAICompatible } from "@ai-sdk/openai-compatible";-import type { AiAction, AiModelSettings, AiProvider } from "@edgeever/shared";+import type {+ AiAction,+ AiDiscoveredModel,+ AiModelConfig,+ AiProvider,+ AiProviderConfig,+ AiSettings,+} from "@edgeever/shared";import { generateText, streamText } from "ai";import { AppError } from "./app-error";import { decryptSecret } from "./secret-encryption";import type { DatabaseAdapter } from "./storage-contract";-export type AiModelConfigRow = {+export type AiProviderConfigRow = {id: string;workspace_id: string;provider: AiProvider;display_name: string;base_url: string;api_key_encrypted: string;+ is_enabled: number;+ created_at: string;+ updated_at: string;+};++export type AiModelConfigRow = {+ id: string;+ provider_config_id: string;model_id: string;+ display_name: string;+ created_at: string;+ updated_at: string;+};++export type ResolvedAiModelRow = {+ model_config_id: string;+ model_id: string;+ provider_config_id: string;+ provider: AiProvider;+ base_url: string;+ api_key_encrypted: string;is_enabled: number;};-const selectConfigSql = `SELECT id, workspace_id, provider, display_name, base_url,- api_key_encrypted, model_id, is_enabled FROM ai_model_configs`;+const selectProviderSql = `SELECT id, workspace_id, provider, display_name, base_url,+ api_key_encrypted, is_enabled, created_at, updated_at FROM ai_provider_configs`;++const selectModelSql = `SELECT id, provider_config_id, model_id, display_name,+ created_at, updated_at FROM ai_models`;export const resolveCredentialEncryptionKey = (value: string | undefined) => {const key = value?.trim();@@ -72,22 +102,82 @@ export const decryptAiCredential = async ();};-export const getAiModelConfig = (db: DatabaseAdapter, workspaceId: string) =>- db.prepare(`${selectConfigSql} WHERE workspace_id = ? LIMIT 1`).bind(workspaceId).first<AiModelConfigRow>();+export const getAiProviderConfig = (+ db: DatabaseAdapter,+ workspaceId: string,+ providerConfigId: string,+) => db.prepare(+ `${selectProviderSql} WHERE workspace_id = ? AND id = ? LIMIT 1`,+).bind(workspaceId, providerConfigId).first<AiProviderConfigRow>();-export const mapAiModelSettings = (- row: AiModelConfigRow,- encryptionConfigured: boolean,-): AiModelSettings => ({+export const getAiModelConfig = (+ db: DatabaseAdapter,+ workspaceId: string,+ modelConfigId: string,+) => db.prepare(+ `${selectModelSql}+ WHERE id = ? AND provider_config_id IN (+ SELECT id FROM ai_provider_configs WHERE workspace_id = ?+ )+ LIMIT 1`,+).bind(modelConfigId, workspaceId).first<AiModelConfigRow>();++export const getDefaultAiModelId = async (db: DatabaseAdapter, workspaceId: string) => {+ const row = await db.prepare(+ `SELECT default_model_id FROM ai_workspace_settings WHERE workspace_id = ? LIMIT 1`,+ ).bind(workspaceId).first<{ default_model_id: string | null }>();+ return row?.default_model_id ?? null;+};++export const mapAiModelConfig = (row: AiModelConfigRow): AiModelConfig => ({+ id: row.id,+ providerConfigId: row.provider_config_id,+ modelId: row.model_id,+ displayName: row.display_name,+});++export const mapAiProviderConfig = (+ row: AiProviderConfigRow,+ models: AiModelConfigRow[],+): AiProviderConfig => ({+ id: row.id,provider: row.provider,displayName: row.display_name,baseUrl: row.base_url,- modelId: row.model_id,isEnabled: Boolean(row.is_enabled),hasApiKey: Boolean(row.api_key_encrypted),- encryptionConfigured,+ models: models.filter((model) => model.provider_config_id === row.id).map(mapAiModelConfig),});+export const getAiSettings = async (+ db: DatabaseAdapter,+ workspaceId: string,+ encryptionConfigured: boolean,+ readOnly: boolean,+): Promise<AiSettings> => {+ const [providersResult, modelsResult, defaultModelId] = await Promise.all([+ db.prepare(+ `${selectProviderSql} WHERE workspace_id = ? ORDER BY created_at ASC, id ASC`,+ ).bind(workspaceId).all<AiProviderConfigRow>(),+ db.prepare(+ `${selectModelSql}+ WHERE provider_config_id IN (+ SELECT id FROM ai_provider_configs WHERE workspace_id = ?+ )+ ORDER BY created_at ASC, id ASC`,+ ).bind(workspaceId).all<AiModelConfigRow>(),+ getDefaultAiModelId(db, workspaceId),+ ]);++ return {+ providers: providersResult.results.map((provider) =>+ mapAiProviderConfig(provider, modelsResult.results)),+ defaultModelId,+ encryptionConfigured,+ readOnly,+ };+};+export const normalizeAiBaseUrl = (value: string) => value.trim().replace(/\/+$/, "");export const createAiModel = (config: {@@ -112,14 +202,31 @@ export const createAiModel = (config: {}};-export const loadActiveAiModel = async (+export const loadDefaultAiModel = async (db: DatabaseAdapter,workspaceId: string,environment: AiCredentialEnvironment,) => {- const row = await getAiModelConfig(db, workspaceId);- if (!row || !row.is_enabled) {- throw new AppError("ai_not_configured", "Configure and enable an AI model first.", 409);+ const row = await db.prepare(+ `SELECT+ models.id AS model_config_id,+ models.model_id,+ providers.id AS provider_config_id,+ providers.provider,+ providers.base_url,+ providers.api_key_encrypted,+ providers.is_enabled+ FROM ai_workspace_settings AS settings+ JOIN ai_models AS models ON models.id = settings.default_model_id+ JOIN ai_provider_configs AS providers ON providers.id = models.provider_config_id+ WHERE settings.workspace_id = ? AND providers.workspace_id = ?+ LIMIT 1`,+ ).bind(workspaceId, workspaceId).first<ResolvedAiModelRow>();+ if (!row) {+ throw new AppError("ai_not_configured", "Choose a default AI model first.", 409);+ }+ if (!row.is_enabled) {+ throw new AppError("ai_not_configured", "The default AI model provider is disabled.", 409);}if (!resolvePrimaryAiCredentialEncryptionKey(environment)) {throw new AppError(@@ -136,6 +243,74 @@ export const loadActiveAiModel = async (});};+type AiModelDiscoveryFetch = typeof fetch;++const asRecord = (value: unknown): Record<string, unknown> | null =>+ value && typeof value === "object" ? value as Record<string, unknown> : null;++export const discoverAiModels = async (+ config: {+ provider: AiProvider;+ baseUrl: string;+ apiKey: string;+ },+ fetchImpl: AiModelDiscoveryFetch = fetch,+): Promise<AiDiscoveredModel[]> => {+ const url = `${normalizeAiBaseUrl(config.baseUrl)}/models`;+ const headers = new Headers({ Accept: "application/json" });+ if (config.provider === "anthropic") {+ headers.set("x-api-key", config.apiKey);+ headers.set("anthropic-version", "2023-06-01");+ } else if (config.provider === "google") {+ headers.set("x-goog-api-key", config.apiKey);+ } else {+ headers.set("Authorization", `Bearer ${config.apiKey}`);+ }++ const response = await fetchImpl(url, {+ headers,+ signal: AbortSignal.timeout(20_000),+ });+ if (!response.ok) {+ throw new AppError(+ "ai_model_discovery_failed",+ `The model list endpoint responded with HTTP ${response.status}.`,+ 400,+ );+ }++ const body = asRecord(await response.json());+ const rawModels = Array.isArray(body?.data)+ ? body.data+ : Array.isArray(body?.models)+ ? body.models+ : [];+ const discovered = new Map<string, AiDiscoveredModel>();++ for (const item of rawModels.slice(0, 2_000)) {+ const record = asRecord(item);+ if (!record) continue;+ const rawId = typeof record.id === "string"+ ? record.id+ : typeof record.name === "string"+ ? record.name+ : "";+ const modelId = config.provider === "google" ? rawId.replace(/^models\//, "") : rawId;+ if (!modelId || discovered.has(modelId)) continue;+ const displayName = typeof record.display_name === "string"+ ? record.display_name+ : typeof record.displayName === "string"+ ? record.displayName+ : typeof record.name === "string" && config.provider !== "google"+ ? record.name+ : modelId;+ discovered.set(modelId, { modelId, displayName });+ }++ return Array.from(discovered.values()).sort((left, right) =>+ left.displayName.localeCompare(right.displayName));+};+export const testAiModel = async (config: {provider: AiProvider;baseUrl: string;diff --git a/apps/web/src/components/SettingsPane.tsx b/apps/web/src/components/SettingsPane.tsxindex 87ed0f85..a0e00588 100644--- a/apps/web/src/components/SettingsPane.tsx+++ b/apps/web/src/components/SettingsPane.tsx@@ -221,7 +221,7 @@ export const SettingsPane = ({case "ai":return (<SettingsGroup>- <AiModelCard demoMode={demoMode} />+ <AiModelCard /><McpConfigCard /><AdvancedPlayCard /></SettingsGroup>diff --git a/apps/web/src/components/settings/AiModelCard.tsx b/apps/web/src/components/settings/AiModelCard.tsxindex bf910b09..72087edc 100644--- a/apps/web/src/components/settings/AiModelCard.tsx+++ b/apps/web/src/components/settings/AiModelCard.tsx@@ -1,87 +1,76 @@-import { useEffect, useState, type FormEvent, type ReactNode } from "react";+import { useState, type FormEvent, type ReactNode } from "react";import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import type { AiProvider } from "@edgeever/shared";-import { CheckCircle2, ChevronDown, Loader2, Sparkles, TriangleAlert } from "lucide-react";+import { ChevronDown, Loader2, Plus, Sparkles, TriangleAlert } from "lucide-react";import { useTranslation } from "react-i18next";+import { AiProviderCard } from "@/components/settings/AiProviderCard";+import { aiErrorMessage, providerDefaults } from "@/components/settings/ai-provider-options";import { Button } from "@/components/ui/button";import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";import { Input } from "@/components/ui/input";import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";-import { Switch } from "@/components/ui/switch";-import { ApiRequestError, api } from "@/lib/api";+import { 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" },-};--export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {+export const AiModelCard = () => {const { t } = useTranslation();const queryClient = useQueryClient();const settingsQuery = useQuery({ queryKey: ["ai-settings"], queryFn: api.getAiSettings });+ const [expanded, setExpanded] = useState(true);+ const [showAdd, setShowAdd] = useState(false);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 [apiKey, setApiKey] = useState("");- const [isEnabled, setIsEnabled] = useState(true);- const [expanded, setExpanded] = useState(true);-- useEffect(() => {- const settings = settingsQuery.data?.settings;- if (!settings) return;- setProvider(settings.provider);- setDisplayName(settings.displayName);- setBaseUrl(settings.baseUrl);- setModelId(settings.modelId);- setIsEnabled(settings.isEnabled);- }, [settingsQuery.data]);-- const payload = () => ({- provider,- displayName,- baseUrl,- modelId,- ...(apiKey ? { apiKey } : {}),- });+ const [initialModelId, setInitialModelId] = useState(providerDefaults["openai-compatible"].modelId);- const testMutation = useMutation({ mutationFn: () => api.testAiConnection(payload()) });- const saveMutation = useMutation({- mutationFn: () => api.updateAiSettings({ ...payload(), isEnabled }),+ const refresh = () => queryClient.invalidateQueries({ queryKey: ["ai-settings"] });+ const createMutation = useMutation({+ mutationFn: () => api.createAiProvider({+ provider,+ displayName,+ baseUrl,+ apiKey,+ isEnabled: true,+ ...(initialModelId.trim() ? { initialModelId: initialModelId.trim() } : {}),+ }),onSuccess: async () => {setApiKey("");- await queryClient.invalidateQueries({ queryKey: ["ai-settings"] });+ setShowAdd(false);+ await refresh();},});+ const defaultMutation = useMutation({+ mutationFn: api.updateDefaultAiModel,+ onSuccess: refresh,+ });const handleProviderChange = (next: AiProvider) => {- const previousDefaults = providerDefaults[provider];- const nextDefaults = providerDefaults[next];+ const previous = providerDefaults[provider];+ const defaults = 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);- testMutation.reset();- saveMutation.reset();+ if (!displayName || displayName === previous.displayName) setDisplayName(defaults.displayName);+ if (!baseUrl || baseUrl === previous.baseUrl) setBaseUrl(defaults.baseUrl);+ if (!initialModelId || initialModelId === previous.modelId) setInitialModelId(defaults.modelId);};- const errorMessage = (error: unknown) => {- if (error instanceof ApiRequestError && error.code === "ai_encryption_key_missing") {- return t("aiModel.encryptionKeyMissing");- }- return error instanceof Error ? error.message : t("aiModel.failed");+ const resetAddForm = () => {+ setProvider("openai-compatible");+ setDisplayName(providerDefaults["openai-compatible"].displayName);+ setBaseUrl(providerDefaults["openai-compatible"].baseUrl);+ setInitialModelId(providerDefaults["openai-compatible"].modelId);+ setApiKey("");+ createMutation.reset();};- const encryptionConfigured = settingsQuery.data?.encryptionConfigured ?? false;- const hasSavedKey = settingsQuery.data?.settings?.hasApiKey ?? false;-- const submit = (event: FormEvent) => {- event.preventDefault();- saveMutation.mutate();- };+ const settings = settingsQuery.data;+ const readOnly = settings?.readOnly ?? true;+ const allModels = settings?.providers.flatMap((item) =>+ item.models.map((model) => ({ ...model, providerName: item.displayName, providerEnabled: item.isEnabled }))) ?? [];+ const defaultModelAvailable = !settings?.defaultModelId+ || allModels.some((model) => model.id === settings.defaultModelId && model.providerEnabled);+ const error = createMutation.error ?? defaultMutation.error ?? settingsQuery.error;return (<Collapsible open={expanded} onOpenChange={setExpanded} asChild>@@ -96,111 +85,83 @@ export const AiModelCard = ({ demoMode }: { demoMode: boolean }) => {</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")} /></button></CollapsibleTrigger></CardHeader><CollapsibleContent asChild>- <CardContent className="p-4 pt-0 sm:px-5 sm:pb-5">+ <CardContent className="grid gap-4 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 ? (+ <>+ {!settings?.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")}- </p>- ) : null}- <div className="grid gap-4 sm:grid-cols-2">- <Field label={t("aiModel.provider")}>- <Select value={provider} onValueChange={(value) => handleProviderChange(value as AiProvider)}>- <SelectTrigger>- <SelectValue />- </SelectTrigger>- <SelectContent>- <SelectItem value="openai-compatible">{t("aiModel.providers.openai-compatible")}</SelectItem>- <SelectItem value="anthropic">{t("aiModel.providers.anthropic")}</SelectItem>- <SelectItem value="google">{t("aiModel.providers.google")}</SelectItem>- </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.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 ? "••••••••••••" : ""}- />- </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>- <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")}+ <TriangleAlert className="mt-0.5 h-4 w-4 shrink-0" />{t("aiModel.encryptionKeyMissing")}</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)}++ <Field label={t("aiModel.defaultModel")}>+ <Select+ value={settings?.defaultModelId ?? "none"}+ onValueChange={(value) => defaultMutation.mutate(value === "none" ? null : value)}+ disabled={readOnly || defaultMutation.isPending}>- {saveMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}- {t("common.save")}- </Button>+ <SelectTrigger className="h-10"><SelectValue /></SelectTrigger>+ <SelectContent>+ <SelectItem value="none">{t("aiModel.noDefaultModel")}</SelectItem>+ {allModels.map((model) => (+ <SelectItem key={model.id} value={model.id} disabled={!model.providerEnabled}>+ {model.providerName} · {model.displayName}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ </Field>+ {!defaultModelAvailable ? (+ <p className="flex items-center gap-2 text-xs text-amber-700"><TriangleAlert className="h-4 w-4" />{t("aiModel.defaultUnavailable")}</p>+ ) : null}++ <div className="grid gap-3">+ {settings?.providers.map((item) => (+ <AiProviderCard key={item.id} provider={item} readOnly={readOnly} onChanged={refresh} />+ ))}+ {!settings?.providers.length ? <p className="rounded-lg border border-dashed p-5 text-center text-sm text-slate-500">{t("aiModel.noProviders")}</p> : null}</div>- </form>++ {showAdd ? (+ <form className="grid gap-4 rounded-lg border bg-slate-50/60 p-4" onSubmit={(event: FormEvent) => { event.preventDefault(); createMutation.mutate(); }}>+ <h3 className="text-sm font-semibold text-slate-900">{t("aiModel.addProvider")}</h3>+ <div className="grid gap-4 sm:grid-cols-2">+ <Field label={t("aiModel.provider")}>+ <Select value={provider} onValueChange={(value) => handleProviderChange(value as AiProvider)}>+ <SelectTrigger className="h-10"><SelectValue /></SelectTrigger>+ <SelectContent>+ <SelectItem value="openai-compatible">{t("aiModel.providers.openai-compatible")}</SelectItem>+ <SelectItem value="anthropic">{t("aiModel.providers.anthropic")}</SelectItem>+ <SelectItem value="google">{t("aiModel.providers.google")}</SelectItem>+ </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.initialModelId")}><Input value={initialModelId} onChange={(event) => setInitialModelId(event.target.value)} /></Field>+ <div className="sm:col-span-2"><Field label={t("aiModel.apiKey")}><Input type="password" value={apiKey} onChange={(event) => setApiKey(event.target.value)} required autoComplete="new-password" /></Field></div>+ </div>+ {createMutation.isError ? <p className="text-xs font-medium text-rose-600" role="alert">{aiErrorMessage(createMutation.error, t("aiModel.failed"), t("aiModel.encryptionKeyMissing"))}</p> : null}+ <div className="flex justify-end gap-2">+ <Button type="button" variant="outline" onClick={() => { setShowAdd(false); resetAddForm(); }}>{t("common.cancel")}</Button>+ <Button type="submit" disabled={readOnly || createMutation.isPending || !settings?.encryptionConfigured}>+ {createMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("aiModel.createProvider")}+ </Button>+ </div>+ </form>+ ) : (+ <Button type="button" variant="outline" className="justify-self-start" disabled={readOnly} onClick={() => setShowAdd(true)}><Plus className="h-4 w-4" />{t("aiModel.addProvider")}</Button>+ )}++ {error && !createMutation.isError ? <p className="text-xs font-medium text-rose-600" role="alert">{aiErrorMessage(error, t("aiModel.failed"), t("aiModel.encryptionKeyMissing"))}</p> : null}+ </>)}</CardContent></CollapsibleContent>@@ -211,8 +172,6 @@ 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}{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/AiProviderCard.tsx b/apps/web/src/components/settings/AiProviderCard.tsxnew file mode 100644index 00000000..5645d1db--- /dev/null+++ b/apps/web/src/components/settings/AiProviderCard.tsx@@ -0,0 +1,164 @@+import { useEffect, useId, useState, type FormEvent, type ReactNode } from "react";+import { useMutation } from "@tanstack/react-query";+import type { AiDiscoveredModel, AiProvider, AiProviderConfig } from "@edgeever/shared";+import { CheckCircle2, Loader2, Plus, Search, Trash2 } from "lucide-react";+import { useTranslation } from "react-i18next";+import { aiErrorMessage, providerDefaults } from "@/components/settings/ai-provider-options";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";+import { Switch } from "@/components/ui/switch";+import { api } from "@/lib/api";++export const AiProviderCard = ({ provider: saved, readOnly, onChanged }: {+ provider: AiProviderConfig;+ readOnly: boolean;+ onChanged: () => Promise<unknown>;+}) => {+ const { t } = useTranslation();+ const datalistId = `ai-models-${useId().replaceAll(":", "")}`;+ const [provider, setProvider] = useState<AiProvider>(saved.provider);+ const [displayName, setDisplayName] = useState(saved.displayName);+ const [baseUrl, setBaseUrl] = useState(saved.baseUrl);+ const [apiKey, setApiKey] = useState("");+ const [modelId, setModelId] = useState("");+ const [discoveredModels, setDiscoveredModels] = useState<AiDiscoveredModel[]>([]);++ useEffect(() => {+ setProvider(saved.provider);+ setDisplayName(saved.displayName);+ setBaseUrl(saved.baseUrl);+ }, [saved.baseUrl, saved.displayName, saved.provider]);++ const updateMutation = useMutation({+ mutationFn: (isEnabled: boolean = saved.isEnabled) => api.updateAiProvider(saved.id, {+ provider,+ displayName,+ baseUrl,+ isEnabled,+ ...(apiKey ? { apiKey } : {}),+ }),+ onSuccess: async () => { setApiKey(""); await onChanged(); },+ });+ const deleteMutation = useMutation({ mutationFn: () => api.deleteAiProvider(saved.id), onSuccess: onChanged });+ const testMutation = useMutation({+ mutationFn: () => api.testAiProvider(saved.id, { modelId: saved.models[0]?.modelId ?? "" }),+ });+ const discoverMutation = useMutation({+ mutationFn: () => api.discoverAiProviderModels(saved.id),+ onSuccess: ({ models }) => setDiscoveredModels(models),+ });+ const addModelMutation = useMutation({+ mutationFn: () => {+ const discovered = discoveredModels.find((item) => item.modelId === modelId.trim());+ return api.addAiModel(saved.id, { modelId: modelId.trim(), ...(discovered ? { displayName: discovered.displayName } : {}) });+ },+ onSuccess: async () => { setModelId(""); await onChanged(); },+ });+ const deleteModelMutation = useMutation({+ mutationFn: (modelConfigId: string) => api.deleteAiModel(saved.id, modelConfigId),+ onSuccess: onChanged,+ });++ const mutations = [updateMutation, deleteMutation, testMutation, discoverMutation, addModelMutation, deleteModelMutation];+ const mutationError = mutations.find((item) => item.isError)?.error;+ const isBusy = mutations.some((item) => item.isPending);+ const handleProviderChange = (next: AiProvider) => {+ const previous = providerDefaults[provider];+ const defaults = providerDefaults[next];+ setProvider(next);+ if (!displayName || displayName === previous.displayName) setDisplayName(defaults.displayName);+ if (!baseUrl || baseUrl === previous.baseUrl) setBaseUrl(defaults.baseUrl);+ };++ const submit = (event: FormEvent) => { event.preventDefault(); updateMutation.mutate(saved.isEnabled); };+ const deleteProvider = () => {+ if (window.confirm(t("aiModel.deleteProviderConfirm", { name: saved.displayName }))) deleteMutation.mutate();+ };++ return (+ <section className="grid gap-4 rounded-lg border p-4">+ <div className="flex items-start justify-between gap-4">+ <div className="min-w-0">+ <h3 className="truncate text-sm font-semibold text-slate-900">{saved.displayName}</h3>+ <p className="mt-0.5 truncate text-xs text-slate-500">{saved.baseUrl}</p>+ </div>+ <div className="flex shrink-0 items-center gap-2">+ <span className="hidden text-xs text-slate-500 sm:inline">{t("aiModel.serviceEnabled")}</span>+ <Switch+ checked={saved.isEnabled}+ disabled={readOnly || updateMutation.isPending}+ aria-label={t("aiModel.serviceEnabled")}+ onCheckedChange={(checked) => updateMutation.mutate(checked)}+ />+ </div>+ </div>++ <form className="grid gap-4" onSubmit={submit}>+ <div className="grid gap-4 sm:grid-cols-2">+ <Field label={t("aiModel.provider")}>+ <Select value={provider} onValueChange={(value) => handleProviderChange(value as AiProvider)}>+ <SelectTrigger className="h-10"><SelectValue /></SelectTrigger>+ <SelectContent>+ <SelectItem value="openai-compatible">{t("aiModel.providers.openai-compatible")}</SelectItem>+ <SelectItem value="anthropic">{t("aiModel.providers.anthropic")}</SelectItem>+ <SelectItem value="google">{t("aiModel.providers.google")}</SelectItem>+ </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.apiKey")}>+ <Input type="password" value={apiKey} onChange={(event) => setApiKey(event.target.value)} autoComplete="new-password" placeholder="••••••••••••" />+ </Field>+ </div>+ <div className="flex flex-wrap justify-end gap-2">+ <Button type="button" variant="ghost" className="mr-auto text-rose-600 hover:text-rose-700" disabled={readOnly || isBusy} onClick={deleteProvider}><Trash2 className="h-4 w-4" />{t("common.delete")}</Button>+ <Button type="button" variant="outline" disabled={isBusy || !saved.hasApiKey || saved.models.length === 0} onClick={() => testMutation.mutate()}>+ {testMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("aiModel.test")}+ </Button>+ <Button type="submit" disabled={readOnly || isBusy}>{updateMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("common.save")}</Button>+ </div>+ </form>++ <div className="grid gap-3 border-t pt-4">+ <div>+ <h4 className="text-sm font-semibold text-slate-900">{t("aiModel.modelsTitle")}</h4>+ <p className="mt-0.5 text-xs text-slate-500">{t("aiModel.modelsHint")}</p>+ </div>+ {saved.models.length ? (+ <div className="grid gap-2">+ {saved.models.map((model) => (+ <div key={model.id} className="flex min-w-0 items-center justify-between gap-3 rounded-md bg-slate-50 px-3 py-2">+ <div className="min-w-0"><p className="truncate text-sm text-slate-800">{model.displayName}</p><p className="truncate text-xs text-slate-500">{model.modelId}</p></div>+ <Button type="button" variant="ghost" size="icon" className="h-8 w-8 shrink-0 text-slate-500" disabled={readOnly || deleteModelMutation.isPending} onClick={() => deleteModelMutation.mutate(model.id)} aria-label={t("aiModel.removeModel")}><Trash2 className="h-4 w-4" /></Button>+ </div>+ ))}+ </div>+ ) : <p className="text-xs text-slate-500">{t("aiModel.noModels")}</p>}+ <div className="flex flex-col gap-2 sm:flex-row">+ <div className="min-w-0 flex-1">+ <Input list={datalistId} value={modelId} onChange={(event) => setModelId(event.target.value)} placeholder={t("aiModel.modelIdPlaceholder")} />+ <datalist id={datalistId}>{discoveredModels.map((model) => <option key={model.modelId} value={model.modelId}>{model.displayName}</option>)}</datalist>+ </div>+ <Button type="button" variant="outline" disabled={isBusy || !saved.hasApiKey} onClick={() => discoverMutation.mutate()}>+ {discoverMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : <Search className="h-4 w-4" />}{t("aiModel.discoverModels")}+ </Button>+ <Button type="button" disabled={readOnly || isBusy || !modelId.trim()} onClick={() => addModelMutation.mutate()}>+ {addModelMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : <Plus className="h-4 w-4" />}{t("aiModel.addModel")}+ </Button>+ </div>+ {discoverMutation.isSuccess ? <p className="text-xs text-emerald-700">{t("aiModel.discoveryComplete", { count: discoveredModels.length })}</p> : null}+ </div>++ {testMutation.isSuccess || updateMutation.isSuccess ? (+ <p className="flex items-center gap-1.5 text-xs font-medium text-emerald-700"><CheckCircle2 className="h-4 w-4" />{testMutation.isSuccess ? t("aiModel.testSucceeded") : t("aiModel.saved")}</p>+ ) : null}+ {mutationError ? <p className="text-xs font-medium text-rose-600" role="alert">{aiErrorMessage(mutationError, t("aiModel.failed"), t("aiModel.encryptionKeyMissing"))}</p> : null}+ </section>+ );+};++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>+);diff --git a/apps/web/src/components/settings/ai-provider-options.ts b/apps/web/src/components/settings/ai-provider-options.tsnew file mode 100644index 00000000..d76a1445--- /dev/null+++ b/apps/web/src/components/settings/ai-provider-options.ts@@ -0,0 +1,13 @@+import type { AiProvider } from "@edgeever/shared";+import { ApiRequestError } from "@/lib/api";++export 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" },+};++export const aiErrorMessage = (error: unknown, fallback: string, encryptionMessage: string) => {+ if (error instanceof ApiRequestError && error.code === "ai_encryption_key_missing") return encryptionMessage;+ return error instanceof Error ? error.message : fallback;+};diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.tsindex a9dafbdf..11596c48 100644--- a/apps/web/src/lib/api.ts+++ b/apps/web/src/lib/api.ts@@ -18,7 +18,8 @@ import type {ResourceListItem,ResourceStorageSummary,ObjectStorageSettings,- AiModelSettings,+ AiSettings,+ AiDiscoveredModel,AiProvider,AiAction,AiStreamEvent,@@ -67,17 +68,20 @@ type ObjectStorageSettingsResponse = {settings: ObjectStorageSettings;externalSettings?: ObjectStorageSettings | null;};-type AiSettingsResponse = {- settings: AiModelSettings | null;- encryptionConfigured: boolean;+export type AiProviderCreatePayload = {+ provider: AiProvider;+ displayName: string;+ baseUrl: string;+ apiKey: string;+ isEnabled: boolean;+ initialModelId?: string;};-export type AiSettingsPayload = {+export type AiProviderUpdatePayload = {provider: AiProvider;displayName: string;baseUrl: string;apiKey?: string;- modelId: string;isEnabled: boolean;};@@ -446,20 +450,54 @@ export const api = {body: JSON.stringify(payload),}),- getAiSettings: () => request<AiSettingsResponse>("/api/v1/ai/settings"),+ getAiSettings: () => request<AiSettings>("/api/v1/ai/settings"),- testAiConnection: (payload: Omit<AiSettingsPayload, "isEnabled">) =>- request<{ ok: true; response: string }>("/api/v1/ai/settings/test", {+ createAiProvider: (payload: AiProviderCreatePayload) =>+ request<AiSettings>("/api/v1/ai/providers", {method: "POST",body: JSON.stringify(payload),}),- updateAiSettings: (payload: AiSettingsPayload) =>- request<AiSettingsResponse>("/api/v1/ai/settings", {+ updateAiProvider: (providerConfigId: string, payload: AiProviderUpdatePayload) =>+ request<AiSettings>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}`, {method: "PUT",body: JSON.stringify(payload),}),+ deleteAiProvider: (providerConfigId: string) =>+ request<AiSettings>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}`, {+ method: "DELETE",+ }),++ testAiProvider: (providerConfigId: string, payload: { modelId: string }) =>+ request<{ ok: true; response: string }>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}/test`, {+ method: "POST",+ body: JSON.stringify(payload),+ }),++ discoverAiProviderModels: (providerConfigId: string) =>+ request<{ models: AiDiscoveredModel[] }>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}/discover-models`, {+ method: "POST",+ body: JSON.stringify({}),+ }),++ addAiModel: (providerConfigId: string, payload: { modelId: string; displayName?: string }) =>+ request<AiSettings>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}/models`, {+ method: "POST",+ body: JSON.stringify(payload),+ }),++ deleteAiModel: (providerConfigId: string, modelConfigId: string) =>+ request<AiSettings>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}/models/${encodeURIComponent(modelConfigId)}`, {+ method: "DELETE",+ }),++ updateDefaultAiModel: (modelConfigId: string | null) =>+ request<AiSettings>("/api/v1/ai/default-model", {+ method: "PUT",+ body: JSON.stringify({ modelConfigId }),+ }),+streamAiGeneration: async (payload: { action: AiAction; title: string; contentMarkdown: string; targetLanguage?: string },options: { signal?: AbortSignal; onEvent: (event: AiStreamEvent) => void },diff --git a/docs/openapi.json b/docs/openapi.jsonindex fe456af4..b0545d00 100644--- a/docs/openapi.json+++ b/docs/openapi.json@@ -69,47 +69,66 @@},"/api/v1/ai/settings": {"get": {- "summary": "Read the current workspace AI model settings",+ "summary": "List AI providers, their models, and the workspace default model","responses": {"200": {- "description": "AI model settings with the API key omitted",+ "description": "AI settings with all API keys omitted","content": {"application/json": {- "schema": {- "type": "object",- "properties": {- "settings": { "anyOf": [{ "$ref": "#/components/schemas/AiModelSettings" }, { "type": "null" }] },- "encryptionConfigured": { "type": "boolean" }- },- "required": ["settings", "encryptionConfigured"]- }+ "schema": { "$ref": "#/components/schemas/AiSettings" }}}},"401": { "$ref": "#/components/responses/Error" },"403": { "$ref": "#/components/responses/Error" }}- },- "put": {- "summary": "Save the current workspace AI model settings",+ }+ },+ "/api/v1/ai/providers": {+ "post": {+ "summary": "Add an AI provider service","requestBody": {"required": true,- "content": { "application/json": { "schema": { "$ref": "#/components/schemas/AiModelSettingsInput" } } }+ "content": { "application/json": { "schema": { "$ref": "#/components/schemas/AiProviderCreateInput" } } }},"responses": {- "200": { "description": "AI model settings saved" },+ "201": { "description": "Provider created" },"400": { "$ref": "#/components/responses/Error" },"401": { "$ref": "#/components/responses/Error" },"403": { "$ref": "#/components/responses/Error" }}}},- "/api/v1/ai/settings/test": {+ "/api/v1/ai/providers/{providerConfigId}": {+ "parameters": [{ "name": "providerConfigId", "in": "path", "required": true, "schema": { "type": "string" } }],+ "put": {+ "summary": "Update or enable/disable an AI provider service",+ "requestBody": { "required": true, "content": { "application/json": { "schema": { "$ref": "#/components/schemas/AiProviderUpdateInput" } } } },+ "responses": {+ "200": { "description": "Provider updated" },+ "400": { "$ref": "#/components/responses/Error" },+ "401": { "$ref": "#/components/responses/Error" },+ "403": { "$ref": "#/components/responses/Error" },+ "404": { "$ref": "#/components/responses/Error" }+ }+ },+ "delete": {+ "summary": "Delete an AI provider and all of its models",+ "responses": {+ "200": { "description": "Provider deleted" },+ "401": { "$ref": "#/components/responses/Error" },+ "403": { "$ref": "#/components/responses/Error" },+ "404": { "$ref": "#/components/responses/Error" }+ }+ }+ },+ "/api/v1/ai/providers/{providerConfigId}/test": {"post": {- "summary": "Test an AI model endpoint without exposing its credential",+ "summary": "Test a saved AI provider with a model ID",+ "parameters": [{ "name": "providerConfigId", "in": "path", "required": true, "schema": { "type": "string" } }],"requestBody": {"required": true,- "content": { "application/json": { "schema": { "$ref": "#/components/schemas/AiModelSettingsInput" } } }+ "content": { "application/json": { "schema": { "type": "object", "properties": { "modelId": { "type": "string", "minLength": 1, "maxLength": 200 } }, "required": ["modelId"] } } }},"responses": {"200": { "description": "The model endpoint responded successfully" },@@ -119,6 +138,59 @@}}},+ "/api/v1/ai/providers/{providerConfigId}/discover-models": {+ "post": {+ "summary": "Discover models exposed by a saved provider service",+ "parameters": [{ "name": "providerConfigId", "in": "path", "required": true, "schema": { "type": "string" } }],+ "responses": {+ "200": { "description": "Discovered models" },+ "400": { "$ref": "#/components/responses/Error" },+ "401": { "$ref": "#/components/responses/Error" },+ "404": { "$ref": "#/components/responses/Error" }+ }+ }+ },+ "/api/v1/ai/providers/{providerConfigId}/models": {+ "post": {+ "summary": "Add a model to an AI provider service",+ "parameters": [{ "name": "providerConfigId", "in": "path", "required": true, "schema": { "type": "string" } }],+ "requestBody": { "required": true, "content": { "application/json": { "schema": { "$ref": "#/components/schemas/AiModelCreateInput" } } } },+ "responses": {+ "201": { "description": "Model added" },+ "400": { "$ref": "#/components/responses/Error" },+ "401": { "$ref": "#/components/responses/Error" },+ "403": { "$ref": "#/components/responses/Error" },+ "404": { "$ref": "#/components/responses/Error" }+ }+ }+ },+ "/api/v1/ai/providers/{providerConfigId}/models/{modelConfigId}": {+ "delete": {+ "summary": "Remove a model from an AI provider service",+ "parameters": [+ { "name": "providerConfigId", "in": "path", "required": true, "schema": { "type": "string" } },+ { "name": "modelConfigId", "in": "path", "required": true, "schema": { "type": "string" } }+ ],+ "responses": {+ "200": { "description": "Model removed" },+ "401": { "$ref": "#/components/responses/Error" },+ "403": { "$ref": "#/components/responses/Error" },+ "404": { "$ref": "#/components/responses/Error" }+ }+ }+ },+ "/api/v1/ai/default-model": {+ "put": {+ "summary": "Choose or clear the workspace default AI model",+ "requestBody": { "required": true, "content": { "application/json": { "schema": { "type": "object", "properties": { "modelConfigId": { "type": ["string", "null"] } }, "required": ["modelConfigId"] } } } },+ "responses": {+ "200": { "description": "Default model updated" },+ "400": { "$ref": "#/components/responses/Error" },+ "401": { "$ref": "#/components/responses/Error" },+ "403": { "$ref": "#/components/responses/Error" }+ }+ }+ },"/api/v1/ai/generate": {"post": {"summary": "Stream a note AI action using the current workspace model",@@ -1820,30 +1892,69 @@] }]},- "AiModelSettings": {+ "AiModel": {+ "type": "object",+ "properties": {+ "id": { "type": "string" },+ "providerConfigId": { "type": "string" },+ "modelId": { "type": "string" },+ "displayName": { "type": "string" }+ },+ "required": ["id", "providerConfigId", "modelId", "displayName"]+ },+ "AiProvider": {"type": "object","properties": {+ "id": { "type": "string" },"provider": { "type": "string", "enum": ["openai-compatible", "anthropic", "google"] },"displayName": { "type": "string" },"baseUrl": { "type": "string", "format": "uri" },- "modelId": { "type": "string" },"isEnabled": { "type": "boolean" },"hasApiKey": { "type": "boolean" },- "encryptionConfigured": { "type": "boolean" }+ "models": { "type": "array", "items": { "$ref": "#/components/schemas/AiModel" } }},- "required": ["provider", "displayName", "baseUrl", "modelId", "isEnabled", "hasApiKey", "encryptionConfigured"]+ "required": ["id", "provider", "displayName", "baseUrl", "isEnabled", "hasApiKey", "models"]},- "AiModelSettingsInput": {+ "AiSettings": {+ "type": "object",+ "properties": {+ "providers": { "type": "array", "items": { "$ref": "#/components/schemas/AiProvider" } },+ "defaultModelId": { "type": ["string", "null"] },+ "encryptionConfigured": { "type": "boolean" },+ "readOnly": { "type": "boolean" }+ },+ "required": ["providers", "defaultModelId", "encryptionConfigured", "readOnly"]+ },+ "AiProviderCreateInput": {+ "type": "object",+ "properties": {+ "provider": { "type": "string", "enum": ["openai-compatible", "anthropic", "google"] },+ "displayName": { "type": "string", "minLength": 1, "maxLength": 80 },+ "baseUrl": { "type": "string", "format": "uri", "maxLength": 500 },+ "apiKey": { "type": "string", "minLength": 1, "maxLength": 4096 },+ "isEnabled": { "type": "boolean", "default": true },+ "initialModelId": { "type": "string", "minLength": 1, "maxLength": 200 }+ },+ "required": ["provider", "displayName", "baseUrl", "apiKey"]+ },+ "AiProviderUpdateInput": {"type": "object","properties": {"provider": { "type": "string", "enum": ["openai-compatible", "anthropic", "google"] },"displayName": { "type": "string", "minLength": 1, "maxLength": 80 },"baseUrl": { "type": "string", "format": "uri", "maxLength": 500 },"apiKey": { "type": "string", "minLength": 1, "maxLength": 4096 },- "modelId": { "type": "string", "minLength": 1, "maxLength": 200 },"isEnabled": { "type": "boolean", "default": true }},- "required": ["provider", "displayName", "baseUrl", "modelId"]+ "required": ["provider", "displayName", "baseUrl"]+ },+ "AiModelCreateInput": {+ "type": "object",+ "properties": {+ "modelId": { "type": "string", "minLength": 1, "maxLength": 200 },+ "displayName": { "type": "string", "minLength": 1, "maxLength": 200 }+ },+ "required": ["modelId"]},"LoginInput": {"type": "object",diff --git a/migrations/0025_ai_providers_and_models.sql b/migrations/0025_ai_providers_and_models.sqlnew file mode 100644index 00000000..62138bf5--- /dev/null+++ b/migrations/0025_ai_providers_and_models.sql@@ -0,0 +1,71 @@+PRAGMA foreign_keys = ON;++CREATE TABLE ai_provider_configs (+ id TEXT PRIMARY KEY,+ workspace_id TEXT NOT NULL,+ provider TEXT NOT NULL CHECK (provider IN ('openai-compatible', 'anthropic', 'google')),+ display_name TEXT NOT NULL CHECK (length(trim(display_name)) > 0),+ base_url TEXT NOT NULL CHECK (length(trim(base_url)) > 0),+ api_key_encrypted TEXT NOT NULL,+ is_enabled INTEGER NOT NULL DEFAULT 1 CHECK (is_enabled IN (0, 1)),+ created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ FOREIGN KEY (workspace_id) REFERENCES workspaces(id)+ ON UPDATE CASCADE+ ON DELETE CASCADE+);++CREATE INDEX idx_ai_provider_configs_workspace+ ON ai_provider_configs(workspace_id, is_enabled, created_at);++CREATE TABLE ai_models (+ id TEXT PRIMARY KEY,+ provider_config_id TEXT NOT NULL,+ model_id TEXT NOT NULL CHECK (length(trim(model_id)) > 0),+ display_name TEXT NOT NULL CHECK (length(trim(display_name)) > 0),+ created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ FOREIGN KEY (provider_config_id) REFERENCES ai_provider_configs(id)+ ON UPDATE CASCADE+ ON DELETE CASCADE,+ UNIQUE (provider_config_id, model_id)+);++CREATE INDEX idx_ai_models_provider+ ON ai_models(provider_config_id, created_at);++CREATE TABLE ai_workspace_settings (+ workspace_id TEXT PRIMARY KEY,+ default_model_id TEXT,+ created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),+ FOREIGN KEY (workspace_id) REFERENCES workspaces(id)+ ON UPDATE CASCADE+ ON DELETE CASCADE,+ FOREIGN KEY (default_model_id) REFERENCES ai_models(id)+ ON UPDATE CASCADE+ ON DELETE SET NULL+);++INSERT INTO ai_provider_configs (+ id, workspace_id, provider, display_name, base_url, api_key_encrypted,+ is_enabled, created_at, updated_at+)+SELECT+ id, workspace_id, provider, display_name, base_url, api_key_encrypted,+ is_enabled, created_at, updated_at+FROM ai_model_configs;++INSERT INTO ai_models (+ id, provider_config_id, model_id, display_name, created_at, updated_at+)+SELECT+ 'aim_' || id, id, model_id, model_id, created_at, updated_at+FROM ai_model_configs;++INSERT INTO ai_workspace_settings (+ workspace_id, default_model_id, created_at, updated_at+)+SELECT+ workspace_id, 'aim_' || id, created_at, updated_at+FROM ai_model_configs;diff --git a/packages/client/src/index.ts b/packages/client/src/index.tsindex 058d92b4..76e6f1d1 100644--- a/packages/client/src/index.ts+++ b/packages/client/src/index.ts@@ -22,7 +22,8 @@ import type {TagSummary,TiptapDoc,AiAction,- AiModelSettings,+ AiSettings,+ AiDiscoveredModel,AiProvider,AiStreamEvent,} from "@edgeever/shared";@@ -116,17 +117,20 @@ export type JsonBackupPage = MarkdownExportPage & {revisions: JsonBackupRevision[];};-export type AiSettingsResponse = {- settings: AiModelSettings | null;- encryptionConfigured: boolean;+export type AiProviderCreatePayload = {+ provider: AiProvider;+ displayName: string;+ baseUrl: string;+ apiKey: string;+ isEnabled: boolean;+ initialModelId?: string;};-export type AiSettingsPayload = {+export type AiProviderUpdatePayload = {provider: AiProvider;displayName: string;baseUrl: string;apiKey?: string;- modelId: string;isEnabled: boolean;};@@ -234,20 +238,54 @@ export const createEdgeEverClient = (options: EdgeEverClientOptions = {}) => {body: JSON.stringify(payload),}),- getAiSettings: () => request<AiSettingsResponse>("/api/v1/ai/settings"),+ getAiSettings: () => request<AiSettings>("/api/v1/ai/settings"),- testAiConnection: (payload: Omit<AiSettingsPayload, "isEnabled">) =>- request<{ ok: true; response: string }>("/api/v1/ai/settings/test", {+ createAiProvider: (payload: AiProviderCreatePayload) =>+ request<AiSettings>("/api/v1/ai/providers", {method: "POST",body: JSON.stringify(payload),}),- updateAiSettings: (payload: AiSettingsPayload) =>- request<AiSettingsResponse>("/api/v1/ai/settings", {+ updateAiProvider: (providerConfigId: string, payload: AiProviderUpdatePayload) =>+ request<AiSettings>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}`, {method: "PUT",body: JSON.stringify(payload),}),+ deleteAiProvider: (providerConfigId: string) =>+ request<AiSettings>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}`, {+ method: "DELETE",+ }),++ testAiProvider: (providerConfigId: string, payload: { modelId: string }) =>+ request<{ ok: true; response: string }>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}/test`, {+ method: "POST",+ body: JSON.stringify(payload),+ }),++ discoverAiProviderModels: (providerConfigId: string) =>+ request<{ models: AiDiscoveredModel[] }>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}/discover-models`, {+ method: "POST",+ body: JSON.stringify({}),+ }),++ addAiModel: (providerConfigId: string, payload: { modelId: string; displayName?: string }) =>+ request<AiSettings>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}/models`, {+ method: "POST",+ body: JSON.stringify(payload),+ }),++ deleteAiModel: (providerConfigId: string, modelConfigId: string) =>+ request<AiSettings>(`/api/v1/ai/providers/${encodeURIComponent(providerConfigId)}/models/${encodeURIComponent(modelConfigId)}`, {+ method: "DELETE",+ }),++ updateDefaultAiModel: (modelConfigId: string | null) =>+ request<AiSettings>("/api/v1/ai/default-model", {+ method: "PUT",+ body: JSON.stringify({ modelConfigId }),+ }),+streamAiGeneration: async (payload: { action: AiAction; title: string; contentMarkdown: string; targetLanguage?: string },streamOptions: { signal?: AbortSignal; onEvent: (event: AiStreamEvent) => void },diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex c04cca15..98edb1e8 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -270,7 +270,7 @@ export const enUS = {demoDisabled: "Object storage cannot be changed on the demo instance.",},aiModel: {- title: "External AI configuration",+ title: "External AI models",description: "Connect your own cloud model endpoint. Credentials are encrypted on the EdgeEver server and isolated to your workspace.",provider: "API protocol",providers: {@@ -278,16 +278,31 @@ export const enUS = {anthropic: "Anthropic Messages",google: "Google Gemini",},- displayName: "Configuration name",+ displayName: "Service name",baseUrl: "Base URL",modelId: "Model ID",+ modelIdPlaceholder: "Enter a model ID, or discover models first",apiKey: "API Key",apiKeySavedHint: "The key is encrypted. Leave this blank to keep it unchanged.",- enabled: "Enable AI features",- enabledHint: "Use this model for note AI actions.",+ serviceEnabled: "Enable service",+ defaultModel: "Default model for note AI",+ noDefaultModel: "No model selected",+ defaultUnavailable: "The service for the current default model is disabled. Enable it or choose another model.",+ noProviders: "No model services yet. Add OpenAI, OpenRouter, Anthropic, Gemini, or another compatible service to begin.",+ addProvider: "Add model service",+ createProvider: "Add service",+ initialModelId: "Initial model ID (optional)",+ deleteProviderConfirm: "Delete “{{name}}” and all of its models?",+ modelsTitle: "Models in this service",+ modelsHint: "One Base URL can contain multiple models. For example, one OpenRouter service can provide models from several vendors.",+ noModels: "No models added yet. Discover available models or enter a model ID directly.",+ discoverModels: "Discover models",+ discoveryComplete: "Found {{count}} available models.",+ addModel: "Add model",+ removeModel: "Remove model",test: "Test connection",testSucceeded: "The model endpoint responded successfully.",- saved: "AI model settings saved.",+ saved: "Model service saved.",failed: "The AI model operation failed.",encryptionKeyMissing: "Encrypted AI credentials require instance authentication. Configure authentication first; an independent credential key is optional for advanced deployments.",},diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex d28c6de2..a3f2d15c 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -270,7 +270,7 @@ export const zhCN = {demoDisabled: "演示实例不允许修改对象存储。",},aiModel: {- title: "外部 AI 配置",+ title: "外部 AI 模型",description: "连接你自己的云端模型服务。凭据由 EdgeEver 服务端加密保存,并按个人工作区隔离。",provider: "API 协议",providers: {@@ -278,16 +278,31 @@ export const zhCN = {anthropic: "Anthropic Messages",google: "Google Gemini",},- displayName: "配置名称",+ displayName: "服务名称",baseUrl: "Base URL",modelId: "模型 ID",+ modelIdPlaceholder: "输入模型 ID,或先发现模型",apiKey: "API Key",apiKeySavedHint: "密钥已加密保存;留空表示保持不变。",- enabled: "启用 AI 功能",- enabledHint: "将此模型用于笔记 AI 操作。",+ serviceEnabled: "启用服务",+ defaultModel: "笔记 AI 默认模型",+ noDefaultModel: "未选择模型",+ defaultUnavailable: "当前默认模型所在的服务已禁用,请启用该服务或选择其他模型。",+ noProviders: "还没有模型服务。添加 OpenAI、OpenRouter、Anthropic、Gemini 或其他兼容服务即可开始。",+ addProvider: "添加模型服务",+ createProvider: "添加服务",+ initialModelId: "首个模型 ID(可选)",+ deleteProviderConfirm: "确定删除“{{name}}”及其全部模型吗?",+ modelsTitle: "服务中的模型",+ modelsHint: "同一个 Base URL 可以添加多个模型;例如一个 OpenRouter 服务可同时使用多个厂商模型。",+ noModels: "尚未添加模型。可以自动发现,也可以直接输入模型 ID。",+ discoverModels: "发现模型",+ discoveryComplete: "发现了 {{count}} 个可选模型。",+ addModel: "添加模型",+ removeModel: "移除模型",test: "测试连接",testSucceeded: "模型服务已成功响应。",- saved: "AI 模型设置已保存。",+ saved: "模型服务已保存。",failed: "AI 模型操作失败。",encryptionKeyMissing: "加密保存 AI 凭据需要先启用实例认证;标准部署无需增加环境变量,高级部署可选用独立凭据密钥。",},diff --git a/packages/shared/src/schemas.ts b/packages/shared/src/schemas.tsindex c63d289b..7c4680b6 100644--- a/packages/shared/src/schemas.ts+++ b/packages/shared/src/schemas.ts@@ -170,16 +170,34 @@ const AiBaseUrlSchema = z.string().trim().url().max(500).superRefine((value, con}});-export const AiModelSettingsUpdateSchema = z.object({+const AiProviderConfigFieldsSchema = z.object({provider: AiProviderSchema,displayName: z.string().trim().min(1).max(80),baseUrl: AiBaseUrlSchema,+ isEnabled: z.boolean().default(true),+});++export const AiProviderConfigCreateSchema = AiProviderConfigFieldsSchema.extend({+ apiKey: z.string().min(1).max(4096),+ initialModelId: z.string().trim().min(1).max(200).optional(),+});++export const AiProviderConfigUpdateSchema = AiProviderConfigFieldsSchema.extend({apiKey: z.string().min(1).max(4096).optional(),+});++export const AiProviderConnectionTestSchema = z.object({modelId: z.string().trim().min(1).max(200),- isEnabled: z.boolean().default(true),});-export const AiConnectionTestSchema = AiModelSettingsUpdateSchema.omit({ isEnabled: true });+export const AiModelConfigCreateSchema = z.object({+ modelId: z.string().trim().min(1).max(200),+ displayName: z.string().trim().min(1).max(200).optional(),+});++export const AiDefaultModelUpdateSchema = z.object({+ modelConfigId: z.string().trim().min(1).nullable(),+});export const AiGenerateSchema = z.object({action: z.enum([@@ -220,6 +238,9 @@ export type TagRenameInput = z.infer<typeof TagRenameSchema>;export type ResourceUpdateInput = z.infer<typeof ResourceUpdateSchema>;export type ObjectStorageSettingsUpdateInput = z.infer<typeof ObjectStorageSettingsUpdateSchema>;export type ObjectStorageConnectionTestInput = z.infer<typeof ObjectStorageConnectionTestSchema>;-export type AiModelSettingsUpdateInput = z.infer<typeof AiModelSettingsUpdateSchema>;-export type AiConnectionTestInput = z.infer<typeof AiConnectionTestSchema>;+export type AiProviderConfigCreateInput = z.infer<typeof AiProviderConfigCreateSchema>;+export type AiProviderConfigUpdateInput = z.infer<typeof AiProviderConfigUpdateSchema>;+export type AiProviderConnectionTestInput = z.infer<typeof AiProviderConnectionTestSchema>;+export type AiModelConfigCreateInput = z.infer<typeof AiModelConfigCreateSchema>;+export type AiDefaultModelUpdateInput = z.infer<typeof AiDefaultModelUpdateSchema>;export type AiGenerateInput = z.infer<typeof AiGenerateSchema>;diff --git a/packages/shared/src/types.ts b/packages/shared/src/types.tsindex 2030cd2a..d1bd784a 100644--- a/packages/shared/src/types.ts+++ b/packages/shared/src/types.ts@@ -118,14 +118,33 @@ export type ObjectStorageSettings = {export type AiProvider = "openai-compatible" | "anthropic" | "google";-export type AiModelSettings = {+export type AiModelConfig = {+ id: string;+ providerConfigId: string;+ modelId: string;+ displayName: string;+};++export type AiProviderConfig = {+ id: string;provider: AiProvider;displayName: string;baseUrl: string;- modelId: string;isEnabled: boolean;hasApiKey: boolean;+ models: AiModelConfig[];+};++export type AiSettings = {+ providers: AiProviderConfig[];+ defaultModelId: string | null;encryptionConfigured: boolean;+ readOnly: boolean;+};++export type AiDiscoveredModel = {+ modelId: string;+ displayName: string;};export type AiAction =diff --git a/scripts/run-wrangler.mjs b/scripts/run-wrangler.mjsindex 8e3c54e8..4335a8a5 100644--- a/scripts/run-wrangler.mjs+++ b/scripts/run-wrangler.mjs@@ -8,6 +8,7 @@ import {} from "node:fs";import { dirname, resolve } from "node:path";import {+ buildLocalDevEnvironmentFile,findD1DatabaseIdByName,normalizeD1MigrationSql,runWranglerSync,@@ -342,7 +343,7 @@ if (isDeployCommand && Object.keys(authSecrets).length === 0 && useExistingAuthS}if (isLocalDevCommand && !hasEnvFileArg) {- writeFileSync(generatedLocalDevEnvPath, "# Intentionally empty: local development must not inherit remote instance secrets.\n");+ writeFileSync(generatedLocalDevEnvPath, buildLocalDevEnvironmentFile());finalWranglerArgs.push("--env-file", generatedLocalDevEnvPath);}diff --git a/scripts/verify-deployment.mjs b/scripts/verify-deployment.mjsindex a6305c68..1451edb5 100644--- a/scripts/verify-deployment.mjs+++ b/scripts/verify-deployment.mjs@@ -12,6 +12,9 @@ export const REQUIRED_TABLES = ["memo_shares","memo_import_sources","mobile_sync_changes",+ "ai_provider_configs",+ "ai_models",+ "ai_workspace_settings",];export const buildSchemaVerificationSql = () =>diff --git a/scripts/wrangler-runner.mjs b/scripts/wrangler-runner.mjsindex d537084b..fa304a90 100644--- a/scripts/wrangler-runner.mjs+++ b/scripts/wrangler-runner.mjs@@ -25,6 +25,15 @@ export const buildWranglerEnvironment = (args, env = process.env) => ({export const normalizeD1MigrationSql = (sql) => sql.replace(/\r\n?/g, "\n");+export const LOCAL_DEV_CREDENTIALS_ENCRYPTION_KEY =+ "edgeever-local-development-credentials-key-v1";++export const buildLocalDevEnvironmentFile = () => [+ "# Local-only values. Remote instance secrets are intentionally excluded.",+ `EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY=${LOCAL_DEV_CREDENTIALS_ENCRYPTION_KEY}`,+ "",+].join("\n");+export const findD1DatabaseIdByName = (json, databaseName) => {let databases;try {diff --git a/tests/ai-provider-migration.test.ts b/tests/ai-provider-migration.test.tsnew file mode 100644index 00000000..88867f90--- /dev/null+++ b/tests/ai-provider-migration.test.ts@@ -0,0 +1,50 @@+import { globSync, readFileSync } from "node:fs";+import { Database } from "bun:sqlite";+import { describe, expect, test } from "bun:test";++describe("AI provider migration", () => {+ test("preserves the legacy provider as one service with one default model", () => {+ const db = new Database(":memory:");+ const migrations = globSync("migrations/*.sql").sort();++ for (const migration of migrations.filter((path) => !path.endsWith("0025_ai_providers_and_models.sql"))) {+ db.exec(readFileSync(migration, "utf8"));+ }+ db.query(+ `INSERT INTO ai_model_configs (+ id, workspace_id, provider, display_name, base_url,+ api_key_encrypted, model_id, is_enabled+ ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,+ ).run(+ "ai_legacy",+ "ws_default",+ "openai-compatible",+ "OpenRouter",+ "https://openrouter.ai/api/v1",+ "encrypted-key",+ "anthropic/claude-sonnet-4",+ 1,+ );++ db.exec(readFileSync("migrations/0025_ai_providers_and_models.sql", "utf8"));++ expect(db.query(+ `SELECT id, display_name, is_enabled FROM ai_provider_configs WHERE workspace_id = ?`,+ ).get("ws_default")).toEqual({ id: "ai_legacy", display_name: "OpenRouter", is_enabled: 1 });+ expect(db.query(+ `SELECT id, provider_config_id, model_id FROM ai_models WHERE provider_config_id = ?`,+ ).get("ai_legacy")).toEqual({+ id: "aim_ai_legacy",+ provider_config_id: "ai_legacy",+ model_id: "anthropic/claude-sonnet-4",+ });+ expect(db.query(+ `SELECT default_model_id FROM ai_workspace_settings WHERE workspace_id = ?`,+ ).get("ws_default")).toEqual({ default_model_id: "aim_ai_legacy" });++ db.query("DELETE FROM ai_provider_configs WHERE id = ?").run("ai_legacy");+ expect(db.query(+ `SELECT default_model_id FROM ai_workspace_settings WHERE workspace_id = ?`,+ ).get("ws_default")).toEqual({ default_model_id: null });+ });+});diff --git a/tests/wrangler-runner.test.ts b/tests/wrangler-runner.test.tsindex 546cb325..63cca3d9 100644--- a/tests/wrangler-runner.test.ts+++ b/tests/wrangler-runner.test.ts@@ -2,12 +2,14 @@ import { describe, expect, test } from "bun:test";import { readFileSync } from "node:fs";import { resolve, sep } from "node:path";import {+ buildLocalDevEnvironmentFile,buildWranglerInvocation,buildWranglerEnvironment,buildWranglerSpawnOptions,findD1DatabaseIdByName,isD1MigrationApplyCommand,normalizeD1MigrationSql,+ LOCAL_DEV_CREDENTIALS_ENCRYPTION_KEY,resolveWranglerCliPath,resolveWranglerRuntimeExecutable,runWranglerSync,@@ -58,6 +60,17 @@ describe("cross-platform Wrangler runner", () => {);});+ test("gives local development an isolated credential encryption key", () => {+ const envFile = buildLocalDevEnvironmentFile();++ expect(LOCAL_DEV_CREDENTIALS_ENCRYPTION_KEY.length).toBeGreaterThanOrEqual(32);+ expect(envFile).toContain(+ `EDGE_EVER_CREDENTIALS_ENCRYPTION_KEY=${LOCAL_DEV_CREDENTIALS_ENCRYPTION_KEY}`,+ );+ expect(envFile).not.toContain("EDGE_EVER_AUTH_PASSWORD=");+ expect(envFile).not.toContain("EDGE_EVER_AUTH_PASSWORD_HASH=");+ });+test("resolves an exact D1 database name from Wrangler JSON", () => {const databases = JSON.stringify([{ uuid: "11111111-1111-1111-1111-111111111111", name: "another-database" },