mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-12 20:49:53 +08:00
## Problem
Two audits of the repository (a workflow of finder, dedup and per-file verifier agents, run on 2026-10-11 against 1f4141e and again against 07f3e3c after a first round of refactoring) found dead code and features that were more machinery than the app needs: an Electron configuration-preset system with its own settings window, three copies of the about page, a hand-written `.env` parser, an "extended" system prompt nobody selected, two data migrations for formats from 2025-12 and 2026-01, a server-side example cache, type-to-confirm provider deletion, 81 unused dictionary keys, wrapper components around single call sites, and a long tail of unused exports, props, options and tests.
## Change
Every item below was either approved one by one or covered by "fix all of the others".
- **Electron:** the configuration-preset system is gone (settings window, preload, IPC, menu entry, dev watcher); `config-manager.ts` keeps only `userLocale`; `.env` files are parsed with `dotenv`. Entitlements file and a duplicate CI workflow removed; `test.yml` gets a type check and concurrency.
- **Server:** no extended prompt, no example cache, no `ENABLE_HISTORY_XML_REPLACE`, no message metadata or `hasConfig`; the connection test is one shared helper; EdgeOne loses its mock branch and model aliases; `DEBUG_LLM_PAYLOAD` logs message structure instead of payloads; Langfuse scoring helper; `apiKeyEnv` arrays kept and documented in `env.example` and the provider docs.
- **Pages:** one about page per language from a single component (old `/cn` and `/ja` URLs redirect with 308); layout uses `hasLocale`; the GitHub icon is a local component instead of `react-icons`; Cloudflare deploys without an R2 cache by default.
- **Chat and canvas:** the legacy `diagramHistory` conversion, the localStorage chat migration and the templates storage are gone; `chat-engine` reads the diagram through the context's refs; the diagram context has one tagged export path (`requestTaggedExport` / `fetchDiagramXml`); the screenshot check uses fetch + JSON and `generateText` with `Output.object`; `load-diagram` accepts `<svg:svg>` and strips the XML prolog.
- **Settings UI:** `model-selector` inlines its Dialog, Command and Tooltip; `ai-elements/model-selector`, `button-with-tooltip`, `error-toast` removed; no type-to-confirm, no footer, no `bedrockApiKey`; `use-model-config` loses the old-format migration; one reasoning component; the shimmer is CSS (no `motion`, no `@radix-ui/react-use-controllable-state`); 81 dictionary keys removed in all four languages.
- **MCP server:** `registerTool` / `ok` / `fail` replace per-tool try/catch; `syncFromBrowser`, `commitDocument`, `describePages`; the hand-written XML syntax check, unused result fields, `pickPageSelector`, `expandStyles` and the `host` attribute handling are gone; tests get a shared `setup.ts` and drive the server through the SDK client.
- **Prompt:** the web app's style rules come from the MCP drawing guide (`styleRules`), byte-identical to before.
- **Tests:** shared e2e helpers (`openApp`, `sse`, `toolCallEvents`, `chunkedReplies`); placeholder specs dropped; `settings-review-fixes` split by topic; unit tests use `vi.stubEnv`.
- **Dependencies removed:** `@xmldom/xmldom`, `remark-gfm`, `@anthropic-ai/tokenizer`, `@testing-library/user-event`, `concurrently`, `wait-on`, `eslint`, `eslint-config-next`, `@vitest/coverage-v8`, `shx`, `motion`, `@radix-ui/react-use-controllable-state`, `react-icons`.
Source lines: 74,983 before, 67,418 after (excluding lockfiles).
The last commit merges #984 (the canvas shell). Where the shell, the classic page or their tests depend on a wire format or signature this branch had changed, main's version wins (export fields of the poll response, `addHistory` signature); where main only extended code this branch restructured, main's change is carried into the new structure (`start_session`, `get_selection`, `prepareNewDiagram`, the diagram context's `requestExport`).
## Testing
- `tsc --noEmit` for the web app, `packages/mcp-server`, its shell and `electron`: clean
- `biome ci`: 0 errors (37 pre-existing warnings)
- Root `vitest run`: 719 passed; `packages/mcp-server` `vitest run`: 372 passed
- `next build`: clean
- Playwright, whole web suite on the dev server (4 workers): 280 tests, 279 passed; `language.spec.ts` "a stale offer to switch without saving does nothing once a message is being sent" failed under parallel load and passed alone, as it does on main
252 lines
8.6 KiB
TypeScript
252 lines
8.6 KiB
TypeScript
import fs from "fs/promises"
|
|
import path from "path"
|
|
import { z } from "zod"
|
|
import type { ProviderName } from "@/lib/types/model-config"
|
|
import { PROVIDER_INFO } from "@/lib/types/model-config"
|
|
|
|
export const ProviderNameSchema: z.ZodType<ProviderName> = z
|
|
.string()
|
|
.refine((val): val is ProviderName => val in PROVIDER_INFO, {
|
|
message: "Invalid provider name",
|
|
})
|
|
|
|
const ServerProviderSchema = z.object({
|
|
name: z.string().min(1),
|
|
provider: ProviderNameSchema,
|
|
models: z.array(z.string().min(1)),
|
|
// Optional: custom environment variable name(s) for API key
|
|
// Can be a single string or array of strings for load balancing
|
|
// e.g., "OPENAI_API_KEY_TEAM_A" or ["OPENAI_KEY_1", "OPENAI_KEY_2"]
|
|
apiKeyEnv: z
|
|
.union([z.string().min(1), z.array(z.string().min(1)).min(1)])
|
|
.optional(),
|
|
// Optional: custom environment variable name for base URL
|
|
baseUrlEnv: z.string().min(1).optional(),
|
|
// Optional: mark the first model in this provider as the default
|
|
default: z.boolean().optional(),
|
|
})
|
|
|
|
export const ServerModelsConfigSchema = z.object({
|
|
providers: z.array(ServerProviderSchema),
|
|
})
|
|
|
|
export type ServerModelsConfig = z.infer<typeof ServerModelsConfigSchema>
|
|
|
|
export interface FlattenedServerModel {
|
|
id: string // "server:<slugified-name>:<modelId>" - name ensures uniqueness for multiple API keys per provider
|
|
modelId: string
|
|
provider: ProviderName
|
|
providerLabel: string
|
|
isDefault: boolean
|
|
// Custom env var name(s) for API key (optional)
|
|
// Can be a single string or array of strings for load balancing
|
|
apiKeyEnv?: string | string[]
|
|
baseUrlEnv?: string
|
|
}
|
|
|
|
/**
|
|
* Convert provider name to URL-safe slug for use in model ID
|
|
* e.g., "OpenAI Production" → "openai-production", "主力" → "4e3b-529b"
|
|
* Non-ASCII characters become their hex code point so CJK names stay
|
|
* distinct; the id is sent in HTTP headers, which must be ASCII.
|
|
*/
|
|
export function slugify(name: string): string {
|
|
return name
|
|
.toLowerCase()
|
|
.replace(/[^\p{ASCII}]/gu, (c) => `-${c.codePointAt(0)?.toString(16)}-`)
|
|
.replace(/[^a-z0-9]+/g, "-")
|
|
.replace(/^-|-$/g, "")
|
|
}
|
|
|
|
function getConfigPath(): string {
|
|
const custom = process.env.AI_MODELS_CONFIG_PATH
|
|
if (custom && custom.trim().length > 0) return custom
|
|
return path.join(process.cwd(), "ai-models.json")
|
|
}
|
|
|
|
/**
|
|
* Synthesize a config from a comma-separated AI_MODEL value (Priority 3 fallback).
|
|
* Lets users expose multiple models without authoring AI_MODELS_CONFIG / ai-models.json.
|
|
* Triggers only when AI_MODEL contains a comma AND AI_PROVIDER is set to a known provider.
|
|
*/
|
|
function configFromCommaSeparatedAiModel(): ServerModelsConfig | null {
|
|
const aiModel = process.env.AI_MODEL
|
|
if (!aiModel || !aiModel.includes(",")) return null
|
|
|
|
const aiProvider = process.env.AI_PROVIDER
|
|
if (!aiProvider) {
|
|
console.warn(
|
|
"[server-model-config] AI_MODEL contains commas but AI_PROVIDER is not set; " +
|
|
"skipping multi-model fallback. Set AI_PROVIDER, or use AI_MODELS_CONFIG / ai-models.json.",
|
|
)
|
|
return null
|
|
}
|
|
if (!(aiProvider in PROVIDER_INFO)) {
|
|
console.warn(
|
|
`[server-model-config] AI_PROVIDER="${aiProvider}" is not a known provider; skipping multi-model fallback.`,
|
|
)
|
|
return null
|
|
}
|
|
|
|
const models = Array.from(
|
|
new Set(
|
|
aiModel
|
|
.split(",")
|
|
.map((s) => s.trim())
|
|
.filter((s) => s.length > 0),
|
|
),
|
|
)
|
|
if (models.length === 0) return null
|
|
|
|
const providerName = aiProvider as ProviderName
|
|
return {
|
|
providers: [
|
|
{
|
|
name: PROVIDER_INFO[providerName]?.label || providerName,
|
|
provider: providerName,
|
|
models,
|
|
default: true,
|
|
},
|
|
],
|
|
}
|
|
}
|
|
|
|
export async function loadEnvServerModelsConfig(): Promise<ServerModelsConfig | null> {
|
|
// Priority 1: AI_MODELS_CONFIG env var (JSON string) - for cloud deployments
|
|
const envConfig = process.env.AI_MODELS_CONFIG
|
|
if (envConfig && envConfig.trim().length > 0) {
|
|
try {
|
|
const json = JSON.parse(envConfig)
|
|
return ServerModelsConfigSchema.parse(json)
|
|
} catch (err) {
|
|
console.error(
|
|
"[server-model-config] Failed to parse AI_MODELS_CONFIG:",
|
|
err,
|
|
)
|
|
return null
|
|
}
|
|
}
|
|
|
|
// Priority 2: ai-models.json file
|
|
const configPath = getConfigPath()
|
|
try {
|
|
const jsonStr = await fs.readFile(configPath, "utf8")
|
|
const json = JSON.parse(jsonStr)
|
|
return ServerModelsConfigSchema.parse(json)
|
|
} catch (err: any) {
|
|
if (err?.code !== "ENOENT") {
|
|
console.error(
|
|
"[server-model-config] Failed to load ai-models.json:",
|
|
err,
|
|
)
|
|
return null
|
|
}
|
|
}
|
|
|
|
// Priority 3: AI_MODEL with comma-separated values + AI_PROVIDER
|
|
return configFromCommaSeparatedAiModel()
|
|
}
|
|
|
|
export async function loadRawServerModelsConfig(): Promise<ServerModelsConfig | null> {
|
|
const envConfig = await loadEnvServerModelsConfig()
|
|
|
|
// Merge in providers managed via the admin panel (settings.json).
|
|
// Dynamic import to avoid a module-init cycle with lib/admin/providers.
|
|
let adminConfig: ServerModelsConfig | null = null
|
|
try {
|
|
const { adminProvidersToConfig, loadAdminProviders } = await import(
|
|
"./admin/providers"
|
|
)
|
|
const adminProviders = loadAdminProviders()
|
|
if (adminProviders.length > 0) {
|
|
adminConfig = adminProvidersToConfig(adminProviders)
|
|
}
|
|
} catch (err) {
|
|
console.error(
|
|
"[server-model-config] Failed to load admin providers:",
|
|
err,
|
|
)
|
|
}
|
|
|
|
if (!adminConfig || adminConfig.providers.length === 0) return envConfig
|
|
if (!envConfig) return adminConfig
|
|
|
|
// A panel default overrides an env default
|
|
const adminHasDefault = adminConfig.providers.some((p) => p.default)
|
|
const envProviders = adminHasDefault
|
|
? envConfig.providers.map((p) =>
|
|
p.default ? { ...p, default: undefined } : p,
|
|
)
|
|
: envConfig.providers
|
|
return { providers: [...envProviders, ...adminConfig.providers] }
|
|
}
|
|
|
|
export async function loadFlattenedServerModels(): Promise<
|
|
FlattenedServerModel[]
|
|
> {
|
|
const cfg = await loadRawServerModelsConfig()
|
|
if (!cfg) return []
|
|
|
|
const defaultProvider = process.env.AI_PROVIDER as ProviderName | undefined
|
|
const defaultModelId = process.env.AI_MODEL
|
|
|
|
const flattened: FlattenedServerModel[] = []
|
|
const seenIds = new Set<string>()
|
|
|
|
for (const p of cfg.providers) {
|
|
const providerLabel =
|
|
p.name || PROVIDER_INFO[p.provider]?.label || p.provider
|
|
|
|
// Use slugified name for unique ID (supports multiple API keys per provider)
|
|
const nameSlug = slugify(p.name)
|
|
|
|
for (const modelId of p.models) {
|
|
const id = `server:${nameSlug}:${modelId}`
|
|
// Names that differ only in case or punctuation share a slug.
|
|
// A repeated id would always resolve to the first provider's
|
|
// credentials, so drop it instead.
|
|
if (seenIds.has(id)) {
|
|
console.warn(
|
|
`[server-model-config] Skipping duplicate model id "${id}". Provider names must differ in letters or digits.`,
|
|
)
|
|
continue
|
|
}
|
|
seenIds.add(id)
|
|
|
|
// Default model priority:
|
|
// 1. From ai-models.json: first model of provider with default: true
|
|
// 2. From env vars: AI_MODEL matches (legacy behavior)
|
|
const isDefault =
|
|
(p.default === true && modelId === p.models[0]) ||
|
|
(!!defaultModelId &&
|
|
modelId === defaultModelId &&
|
|
(!defaultProvider || defaultProvider === p.provider))
|
|
|
|
flattened.push({
|
|
id,
|
|
modelId,
|
|
provider: p.provider,
|
|
providerLabel,
|
|
isDefault,
|
|
apiKeyEnv: p.apiKeyEnv,
|
|
baseUrlEnv: p.baseUrlEnv,
|
|
})
|
|
}
|
|
}
|
|
|
|
return flattened
|
|
}
|
|
|
|
/**
|
|
* Find a server model by its ID (format: "server:<slugified-name>:<modelId>")
|
|
* Returns the model config including apiKeyEnv/baseUrlEnv if configured
|
|
*/
|
|
export async function findServerModelById(
|
|
modelId: string,
|
|
): Promise<FlattenedServerModel | null> {
|
|
if (!modelId.startsWith("server:")) return null
|
|
|
|
const models = await loadFlattenedServerModels()
|
|
return models.find((m) => m.id === modelId) || null
|
|
}
|