fix(mcp-server): fix XSS and crashes, make XML validation strict

- Validate and escape the mcp session id; only serve localhost Host/Origin
- Malformed URLs and session ids return errors instead of crashing the process
- Strict XML syntax check with saxes (linkedom never reports parse errors)
- autoFixXml no longer corrupts valid XML; attribute newlines serialized as entities
- Sessions stay alive while polled; browser pushes carry a base version (409 on conflict)
- Page tools respect the edit gate; UTF-8 bodies decoded correctly
- Export replies matched to requests and serialized; xml sync export handled
- UserObject/object cells addressable by id; history restored by stable id; logs off stdout

.github/renovate.json

@@ -33,6 +33,11 @@
             "matchPackagePatterns": ["@ai-sdk/*", "ai", "next"],
             "groupName": "Core framework packages",
             "automerge": false
+        },
+        {
+            "matchPackageNames": ["@biomejs/biome"],
+            "groupName": "Biome",
+            "automerge": false
         }
     ],
     "vulnerabilityAlerts": {

.github/workflows/auto-format.yml

@@ -23,7 +23,9 @@ jobs:
           node-version: '24'
 
       - name: Run Biome format
-        run: npx @biomejs/biome@latest check --write --no-errors-on-unmatched .
+        # Pin to the version in package.json so CI matches local/pre-commit
+        # (npx @latest drifts — e.g. 2.5.0 broke this job on unrelated PRs).
+        run: npx @biomejs/[email protected] check --write --no-errors-on-unmatched .
 
       - name: Check for changes
         id: changes

.github/workflows/docker-build.yml

@@ -58,6 +58,8 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
+          provenance: mode=max
+          sbom: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
@@ -89,4 +91,3 @@ jobs:
           docker pull ghcr.io/${REPO_LOWER}:latest
           docker tag ghcr.io/${REPO_LOWER}:latest ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-1.amazonaws.com/next-ai-draw-io:latest
           docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-1.amazonaws.com/next-ai-draw-io:latest
-

.github/workflows/electron-release.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Download draw.io static files for offline use
         run: |
           rm -rf public/drawio
-          git clone --depth 1 --branch v29.3.5 https://github.com/jgraph/drawio.git /tmp/drawio
+          git clone --depth 1 https://github.com/jgraph/drawio.git /tmp/drawio
           mkdir -p public/drawio
           cp -r /tmp/drawio/src/main/webapp/* public/drawio/
           rm -rf public/drawio/WEB-INF
@@ -70,7 +70,7 @@ jobs:
         shell: bash
         run: |
           rm -rf public/drawio
-          git clone --depth 1 --branch v29.3.5 https://github.com/jgraph/drawio.git /tmp/drawio
+          git clone --depth 1 https://github.com/jgraph/drawio.git /tmp/drawio
           mkdir -p public/drawio
           cp -r /tmp/drawio/src/main/webapp/* public/drawio/
           rm -rf public/drawio/WEB-INF

.github/workflows/publish-mcp.yml

@@ -0,0 +1,67 @@
+name: Publish MCP Server
+
+# Publishes @next-ai-drawio/mcp-server to npm via OIDC trusted publishing
+# (no token, no OTP). Triggers when packages/mcp-server changes on main;
+# skips silently if the package.json version is already on npm — so a
+# release is just "bump the version in a PR and merge".
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "packages/mcp-server/**"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  id-token: write # OIDC token for npm trusted publishing
+
+concurrency:
+  group: publish-mcp
+  cancel-in-progress: false
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/mcp-server
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+          cache: "npm"
+          cache-dependency-path: packages/mcp-server/package-lock.json
+          registry-url: "https://registry.npmjs.org"
+
+      # Trusted publishing requires npm >= 11.5.1
+      - name: Update npm
+        run: npm install -g npm@latest
+
+      - name: Check if version is already published
+        id: version
+        run: |
+          LOCAL=$(node -p "require('./package.json').version")
+          if npm view "@next-ai-drawio/mcp-server@${LOCAL}" version >/dev/null 2>&1; then
+            echo "Version ${LOCAL} already on npm - nothing to publish"
+            echo "publish=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "Version ${LOCAL} not on npm - publishing"
+            echo "publish=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Install dependencies
+        if: steps.version.outputs.publish == 'true'
+        run: npm ci
+
+      - name: Test
+        if: steps.version.outputs.publish == 'true'
+        run: npm test
+
+      - name: Publish to npm
+        if: steps.version.outputs.publish == 'true'
+        run: npm publish

.github/workflows/test.yml

@@ -28,6 +28,16 @@ jobs:
       - name: Run unit tests
         run: npm run test -- --run
 
+      # The MCP server package ships its own vitest because its DOM polyfill
+      # (linkedom) needs `environment: node`, while the root vitest uses jsdom
+      # for the Next.js app. Install + run its tests separately so CI catches
+      # multi-page mxfile regressions.
+      - name: Install MCP server dependencies
+        run: npm --prefix packages/mcp-server ci
+
+      - name: Run MCP server unit tests
+        run: npm --prefix packages/mcp-server test
+
   e2e:
     name: E2E Tests
     runs-on: ubuntu-latest

.gitignore

@@ -76,3 +76,6 @@ ai-models.json
 # local backups
 *.bak
 .gstack/
+
+# admin panel settings (contains secrets)
+data/

Dockerfile

@@ -61,6 +61,9 @@ COPY --from=builder /app/public ./public
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
+# Writable dir for admin panel settings (data/settings.json)
+RUN mkdir -p /app/data && chown nextjs:nodejs /app/data
+
 USER nextjs
 
 EXPOSE 3000

README.md

@@ -21,6 +21,17 @@ A Next.js web application that integrates AI capabilities with draw.io diagrams.
 
 > Note: Thanks to <img src="https://raw.githubusercontent.com/DayuanJiang/next-ai-draw-io/main/public/doubao-color.png" alt="" height="20" /> [ByteDance Doubao](https://www.volcengine.com/activity/codingplan?ac=MMAP8JTTCAQ2&rc=Z9Z3LDTJ&utm_campaign=drawio&utm_content=drawio&utm_medium=devrel&utm_source=OWO&utm_term=drawio) sponsorship, the demo site now uses the powerful glm-4.7 model!
 
+<p align="center">
+  <a href="https://www.atlascloud.ai/?utm_source=github&utm_medium=link&utm_campaign=next-ai-draw-io">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="./public/atlas-cloud-logo-white.svg">
+      <img src="./public/atlas-cloud-logo.svg" alt="Atlas Cloud" width="200">
+    </picture>
+  </a>
+</p>
+
+> 🎁 Thanks to **[Atlas Cloud](https://www.atlascloud.ai/?utm_source=github&utm_medium=link&utm_campaign=next-ai-draw-io)** for sponsoring next-ai-draw-io. Its OpenAI-compatible API gives diagram workflows one provider connection for DeepSeek, Qwen, GLM, Kimi, MiniMax, and more. Budget-friendly access is available through the [Coding Plan](https://www.atlascloud.ai/console/coding-plan).
+
 
 https://github.com/user-attachments/assets/9d60a3e8-4a1c-4b5e-acbb-26af2d3eabd1
 
@@ -31,7 +42,7 @@ https://github.com/user-attachments/assets/9d60a3e8-4a1c-4b5e-acbb-26af2d3eabd1
   - [Table of Contents](#table-of-contents)
   - [Examples](#examples)
   - [Features](#features)
-  - [MCP Server (Preview)](#mcp-server-preview)
+  - [MCP Server](#mcp-server)
     - [Claude Code CLI](#claude-code-cli)
   - [Getting Started](#getting-started)
     - [Try it Online](#try-it-online)
@@ -43,6 +54,8 @@ https://github.com/user-attachments/assets/9d60a3e8-4a1c-4b5e-acbb-26af2d3eabd1
     - [Deploy on Vercel](#deploy-on-vercel)
     - [Deploy on Cloudflare Workers](#deploy-on-cloudflare-workers)
   - [Multi-Provider Support](#multi-provider-support)
+    - [Server-Side Multi-Model Configuration](#server-side-multi-model-configuration)
+    - [Admin Panel](#admin-panel)
   - [How It Works](#how-it-works)
   - [Support \& Contact](#support--contact)
   - [FAQ](#faq)
@@ -63,24 +76,24 @@ Here are some example prompts and their generated diagrams:
   </tr>
   <tr>
     <td width="50%" valign="top">
-      <strong>GCP architecture diagram</strong><br />
-      <p><strong>Prompt:</strong> Generate a GCP architecture diagram with **GCP icons**. In this diagram, users connect to a frontend hosted on an instance.</p>
-      <img src="./public/gcp_demo.svg" alt="GCP Architecture Diagram" width="480" />
+      <strong>RAG Technique Diagram</strong><br />
+      <p><strong>Prompt:</strong> Generate a RAG architecture diagram for **chat application**. Use connected diagram for data ingestion</p>
+      <img src="./public/rag_prod.svg" alt="RAG Architecture Diagram" width="480" />
     </td>
     <td width="50%" valign="top">
-      <strong>AWS architecture diagram</strong><br />
-      <p><strong>Prompt:</strong> Generate a AWS architecture diagram with **AWS icons**. In this diagram, users connect to a frontend hosted on an instance.</p>
-      <img src="./public/aws_demo.svg" alt="AWS Architecture Diagram" width="480" />
+      <strong>Authentication using React and AWS</strong><br />
+      <p><strong>Prompt:</strong> Generate authentication process using React with **AWS**. Use Serverless architecture.</p>
+      <img src="./public/auth.svg" alt="Authentication Architecture Diagram" width="480" />
     </td>
   </tr>
   <tr>
     <td width="50%" valign="top">
-      <strong>Azure architecture diagram</strong><br />
-      <p><strong>Prompt:</strong> Generate a Azure architecture diagram with **Azure icons**. In this diagram, users connect to a frontend hosted on an instance.</p>
-      <img src="./public/azure_demo.svg" alt="Azure Architecture Diagram" width="480" />
+      <strong>Open Innovation</strong><br />
+      <p><strong>Prompt:</strong> Create visualization of Henry Chesbrough's Open Innovation model.</p>
+      <img src="./public/inno.svg" alt="Open Innovation Diagram" width="480" />
     </td>
     <td width="50%" valign="top">
-      <strong>Cat sketch prompt</strong><br />
+      <strong>Cat sketch</strong><br />
       <p><strong>Prompt:</strong> Draw a cute cat for me.</p>
       <img src="./public/cat_demo.svg" alt="Cat Drawing" width="240" />
     </td>
@@ -99,9 +112,7 @@ Here are some example prompts and their generated diagrams:
 -   **Cloud Architecture Diagram Support**: Specialized support for generating cloud architecture diagrams (AWS, GCP, Azure)
 -   **Animated Connectors**: Create dynamic and animated connectors between diagram elements for better visualization
 
-## MCP Server (Preview)
-
-> **Preview Feature**: This feature is experimental and may not be stable.
+## MCP Server
 
 Use Next AI Draw.io with AI agents like Claude Desktop, Cursor, and VS Code via MCP (Model Context Protocol).
 
@@ -211,11 +222,13 @@ See the [Next.js deployment documentation](https://nextjs.org/docs/app/building-
 -   Azure OpenAI
 -   Ollama
 -   OpenRouter
+-   AIHubMix
 -   DeepSeek
 -   SiliconFlow
 -   ModelScope
 -   SGLang
 -   Vercel AI Gateway
+-   [Atlas Cloud](https://www.atlascloud.ai/?utm_source=github&utm_medium=link&utm_campaign=next-ai-draw-io)
 
 
 All providers except AWS Bedrock and OpenRouter support custom endpoints.
@@ -224,7 +237,13 @@ All providers except AWS Bedrock and OpenRouter support custom endpoints.
 
 ### Server-Side Multi-Model Configuration
 
-Administrators can configure multiple server-side models that are available to all users without requiring personal API keys. Configure via `AI_MODELS_CONFIG` environment variable (JSON string) or `ai-models.json` file.
+Administrators can configure multiple server-side models that are available to all users without requiring personal API keys. Configure via `AI_MODELS_CONFIG` environment variable (JSON string) or `ai-models.json` file. For a single-provider quick setup, list comma-separated model IDs in `AI_MODEL`.
+
+### Admin Panel
+
+Set the `ADMIN_PASSWORD` environment variable and visit `/admin` to manage server settings (models, access codes, features, observability, quota) from a web panel instead of hand-editing `.env`.
+
+📖 **[Admin Panel Guide](./docs/en/admin-panel.md)** — setup, precedence rules, and notes.
 
 **Model Requirements**: This task requires strong model capabilities for generating long-form text with strict formatting constraints (draw.io XML). Recommended models include Claude Sonnet 4.5, GPT-5.1, Gemini 3 Pro, and DeepSeek V3.2/R1.
 
@@ -246,6 +265,8 @@ Diagrams are represented as XML that can be rendered in draw.io. The AI processe
 
 **Special thanks to [ByteDance Doubao](https://www.volcengine.com/activity/codingplan?ac=MMAP8JTTCAQ2&rc=Z9Z3LDTJ&utm_campaign=drawio&utm_content=drawio&utm_medium=devrel&utm_source=OWO&utm_term=drawio) for sponsoring the API token usage of the demo site!** Register on the ARK platform to get 500K free tokens for all models!
 
+**Special thanks to [Atlas Cloud](https://www.atlascloud.ai/?utm_source=github&utm_medium=link&utm_campaign=next-ai-draw-io) for sponsoring next-ai-draw-io and supporting its multi-provider ecosystem!** Try its OpenAI-compatible LLM API through the [Atlas Cloud Coding Plan](https://www.atlascloud.ai/console/coding-plan).
+
 If you find this project useful, please consider [sponsoring](https://github.com/sponsors/DayuanJiang) to help me host the live demo site!
 
 For support or inquiries, please open an issue on the GitHub repository or contact the maintainer at:

app/[lang]/about/cn/page.tsx

@@ -175,92 +175,106 @@ export default function AboutCN() {
                     </p>
 
                     <div className="space-y-8">
-                        {/* Animated Transformer */}
+                        {/* ResNet50 Architecture */}
                         <div className="text-center">
                             <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                动画Transformer连接器
+                                ResNet50模型架构动画
                             </h3>
                             <p className="text-gray-600 mb-4">
-                                <strong>提示词：</strong> 给我一个带有
-                                <strong>动画连接器</strong>的Transformer架构图。
+                                <strong>Prompt:</strong> Give me an{" "}
+                                <strong>animated</strong> architecture diagram
+                                of the ResNet50 model.
                             </p>
-                            <Image
-                                src="/animated_connectors.svg"
-                                alt="带动画连接器的Transformer架构"
-                                width={480}
-                                height={360}
-                                className="mx-auto"
-                            />
+                            <div className="bg-neutral-950 rounded-lg p-4 inline-block">
+                                <Image
+                                    src="/resnet50.svg"
+                                    alt="ResNet50模型架构图"
+                                    width={480}
+                                    height={360}
+                                    className="mx-auto"
+                                />
+                            </div>
                         </div>
 
-                        {/* Cloud Architecture Grid */}
+                        {/* Diagram Grid */}
                         <div className="grid md:grid-cols-2 gap-6">
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    GCP架构图
+                                    RAG技术图
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>提示词：</strong> 使用
-                                    <strong>GCP图标</strong>
-                                    生成一个GCP架构图。用户连接到托管在实例上的前端。
+                                    <strong>Prompt:</strong> Generate a RAG
+                                    architecture diagram for{" "}
+                                    <strong>chat application</strong>. Use
+                                    connected diagram for data ingestion
                                 </p>
-                                <Image
-                                    src="/gcp_demo.svg"
-                                    alt="GCP架构图"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/rag_prod.svg"
+                                        alt="RAG架构图"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    AWS架构图
+                                    React和AWS认证流程
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>提示词：</strong> 使用
-                                    <strong>AWS图标</strong>
-                                    生成一个AWS架构图。用户连接到托管在实例上的前端。
+                                    <strong>Prompt:</strong> Generate
+                                    authentication process using React with{" "}
+                                    <strong>AWS</strong>. Use Serverless
+                                    architecture.
                                 </p>
-                                <Image
-                                    src="/aws_demo.svg"
-                                    alt="AWS架构图"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/auth.svg"
+                                        alt="认证架构图"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    Azure架构图
+                                    敏捷Scrum流程
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>提示词：</strong> 使用
-                                    <strong>Azure图标</strong>
-                                    生成一个Azure架构图。用户连接到托管在实例上的前端。
+                                    <strong>Prompt:</strong> Generate agile
+                                    scrum workflow diagram for software
+                                    development team.
                                 </p>
-                                <Image
-                                    src="/azure_demo.svg"
-                                    alt="Azure架构图"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/agile_scrum.svg"
+                                        alt="敏捷Scrum流程图"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    猫咪素描
+                                    开放式创新
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>提示词：</strong>{" "}
-                                    给我画一只可爱的猫。
+                                    <strong>Prompt:</strong> Create
+                                    visualization of Henry Chesbrough&apos;s
+                                    Open Innovation model.
                                 </p>
-                                <Image
-                                    src="/cat_demo.svg"
-                                    alt="猫咪绘图"
-                                    width={240}
-                                    height={240}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/inno.svg"
+                                        alt="开放式创新图"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                         </div>
                     </div>

app/[lang]/about/ja/page.tsx

@@ -168,93 +168,106 @@ export default function AboutJA() {
                     </p>
 
                     <div className="space-y-8">
-                        {/* Animated Transformer */}
+                        {/* ResNet50 Architecture */}
                         <div className="text-center">
                             <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                アニメーションTransformerコネクタ
+                                ResNet50モデルアーキテクチャアニメーション
                             </h3>
                             <p className="text-gray-600 mb-4">
-                                <strong>プロンプト：</strong>{" "}
-                                <strong>アニメーションコネクタ</strong>
-                                付きのTransformerアーキテクチャ図を作成してください。
+                                <strong>Prompt:</strong> Give me an{" "}
+                                <strong>animated</strong> architecture diagram
+                                of the ResNet50 model.
                             </p>
-                            <Image
-                                src="/animated_connectors.svg"
-                                alt="アニメーションコネクタ付きTransformerアーキテクチャ"
-                                width={480}
-                                height={360}
-                                className="mx-auto"
-                            />
+                            <div className="bg-neutral-950 rounded-lg p-4 inline-block">
+                                <Image
+                                    src="/resnet50.svg"
+                                    alt="ResNet50モデルアーキテクチャ図"
+                                    width={480}
+                                    height={360}
+                                    className="mx-auto"
+                                />
+                            </div>
                         </div>
 
-                        {/* Cloud Architecture Grid */}
+                        {/* Diagram Grid */}
                         <div className="grid md:grid-cols-2 gap-6">
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    GCPアーキテクチャ図
+                                    RAG技術ダイアグラム
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>プロンプト：</strong>{" "}
-                                    <strong>GCPアイコン</strong>
-                                    を使用してGCPアーキテクチャ図を生成してください。ユーザーがインスタンス上でホストされているフロントエンドに接続します。
+                                    <strong>Prompt:</strong> Generate a RAG
+                                    architecture diagram for{" "}
+                                    <strong>chat application</strong>. Use
+                                    connected diagram for data ingestion
                                 </p>
-                                <Image
-                                    src="/gcp_demo.svg"
-                                    alt="GCPアーキテクチャ図"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/rag_prod.svg"
+                                        alt="RAGアーキテクチャ図"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    AWSアーキテクチャ図
+                                    ReactとAWSによる認証
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>プロンプト：</strong>{" "}
-                                    <strong>AWSアイコン</strong>
-                                    を使用してAWSアーキテクチャ図を生成してください。ユーザーがインスタンス上でホストされているフロントエンドに接続します。
+                                    <strong>Prompt:</strong> Generate
+                                    authentication process using React with{" "}
+                                    <strong>AWS</strong>. Use Serverless
+                                    architecture.
                                 </p>
-                                <Image
-                                    src="/aws_demo.svg"
-                                    alt="AWSアーキテクチャ図"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/auth.svg"
+                                        alt="認証アーキテクチャ図"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    Azureアーキテクチャ図
+                                    アジャイルスクラムプロセス
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>プロンプト：</strong>{" "}
-                                    <strong>Azureアイコン</strong>
-                                    を使用してAzureアーキテクチャ図を生成してください。ユーザーがインスタンス上でホストされているフロントエンドに接続します。
+                                    <strong>Prompt:</strong> Generate agile
+                                    scrum workflow diagram for software
+                                    development team.
                                 </p>
-                                <Image
-                                    src="/azure_demo.svg"
-                                    alt="Azureアーキテクチャ図"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/agile_scrum.svg"
+                                        alt="アジャイルスクラム図"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    猫のスケッチ
+                                    オープンイノベーション
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>プロンプト：</strong>{" "}
-                                    かわいい猫を描いてください。
+                                    <strong>Prompt:</strong> Create
+                                    visualization of Henry Chesbrough&apos;s
+                                    Open Innovation model.
                                 </p>
-                                <Image
-                                    src="/cat_demo.svg"
-                                    alt="猫の絵"
-                                    width={240}
-                                    height={240}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/inno.svg"
+                                        alt="オープンイノベーション図"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                         </div>
                     </div>

app/[lang]/about/page.tsx

@@ -182,96 +182,106 @@ export default function About() {
                     </p>
 
                     <div className="space-y-8">
-                        {/* Animated Transformer */}
+                        {/* ResNet50 Architecture */}
                         <div className="text-center">
                             <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                Animated Transformer Connectors
+                                Animated ResNet50 Model Architecture
                             </h3>
                             <p className="text-gray-600 mb-4">
                                 <strong>Prompt:</strong> Give me an{" "}
-                                <strong>animated connector</strong> diagram of
-                                transformer&apos;s architecture.
+                                <strong>animated</strong> architecture diagram
+                                of the ResNet50 model.
                             </p>
-                            <Image
-                                src="/animated_connectors.svg"
-                                alt="Transformer Architecture with Animated Connectors"
-                                width={480}
-                                height={360}
-                                className="mx-auto"
-                            />
+                            <div className="bg-neutral-950 rounded-lg p-4 inline-block">
+                                <Image
+                                    src="/resnet50.svg"
+                                    alt="Architecture diagram for ResNet50 model"
+                                    width={480}
+                                    height={360}
+                                    className="mx-auto"
+                                />
+                            </div>
                         </div>
 
-                        {/* Cloud Architecture Grid */}
+                        {/* Diagram Grid */}
                         <div className="grid md:grid-cols-2 gap-6">
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    GCP Architecture Diagram
+                                    RAG Technique Diagram
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>Prompt:</strong> Generate a GCP
-                                    architecture diagram with{" "}
-                                    <strong>GCP icons</strong>. Users connect to
-                                    a frontend hosted on an instance.
+                                    <strong>Prompt:</strong> Generate a RAG
+                                    architecture diagram for{" "}
+                                    <strong>chat application</strong>. Use
+                                    connected diagram for data ingestion
                                 </p>
-                                <Image
-                                    src="/gcp_demo.svg"
-                                    alt="GCP Architecture Diagram"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/rag_prod.svg"
+                                        alt="RAG Architecture Diagram"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    AWS Architecture Diagram
+                                    Authentication using React and AWS
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>Prompt:</strong> Generate an AWS
-                                    architecture diagram with{" "}
-                                    <strong>AWS icons</strong>. Users connect to
-                                    a frontend hosted on an instance.
+                                    <strong>Prompt:</strong> Generate
+                                    authentication process using React with{" "}
+                                    <strong>AWS</strong>. Use Serverless
+                                    architecture.
                                 </p>
-                                <Image
-                                    src="/aws_demo.svg"
-                                    alt="AWS Architecture Diagram"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/auth.svg"
+                                        alt="Authentication Architecture Diagram"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    Azure Architecture Diagram
+                                    Agile Scrum Process
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>Prompt:</strong> Generate an Azure
-                                    architecture diagram with{" "}
-                                    <strong>Azure icons</strong>. Users connect
-                                    to a frontend hosted on an instance.
+                                    <strong>Prompt:</strong> Generate agile
+                                    scrum workflow diagram for software
+                                    development team.
                                 </p>
-                                <Image
-                                    src="/azure_demo.svg"
-                                    alt="Azure Architecture Diagram"
-                                    width={400}
-                                    height={300}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/agile_scrum.svg"
+                                        alt="Agile Scrum Diagram"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                             <div className="text-center">
                                 <h3 className="text-lg font-semibold text-gray-900 mb-2">
-                                    Cat Sketch
+                                    Open Innovation
                                 </h3>
                                 <p className="text-gray-600 text-sm mb-4">
-                                    <strong>Prompt:</strong> Draw a cute cat for
-                                    me.
+                                    <strong>Prompt:</strong> Create
+                                    visualization of Henry Chesbrough&apos;s
+                                    Open Innovation model.
                                 </p>
-                                <Image
-                                    src="/cat_demo.svg"
-                                    alt="Cat Drawing"
-                                    width={240}
-                                    height={240}
-                                    className="mx-auto"
-                                />
+                                <div className="bg-neutral-950 rounded-lg p-4 flex items-center justify-center w-full h-[400px]">
+                                    <Image
+                                        src="/inno.svg"
+                                        alt="Open Innovation Diagram"
+                                        width={480}
+                                        height={360}
+                                        className="max-w-full max-h-full object-contain"
+                                    />
+                                </div>
                             </div>
                         </div>
                     </div>

app/[lang]/admin/admin-shared.ts

@@ -0,0 +1,65 @@
+import { getApiEndpoint } from "@/lib/base-path"
+import type { ProviderName } from "@/lib/types/model-config"
+
+export const SESSION_PASSWORD_KEY = "next-ai-draw-io-admin-password"
+
+// ── Shared types ─────────────────────────────────────────────────────
+
+export type SecretValue = { isSet: true; hint: string }
+
+export function isSecretValue(v: unknown): v is SecretValue {
+    return typeof v === "object" && v !== null && "isSet" in v
+}
+
+export interface SettingState {
+    key: string
+    source: "file" | "env" | "default"
+    value: string | SecretValue | null
+}
+
+export type SettingsMap = Record<string, SettingState>
+
+// Editable text of a saved setting; secrets have none (write-only)
+export function savedTextOf(state: SettingState | undefined): string {
+    return state && !isSecretValue(state.value) ? (state.value ?? "") : ""
+}
+
+// Admin provider in client state. Secret fields hold either a masked
+// marker (unchanged) or a plaintext string (new value).
+export interface AdminProvider {
+    id: string
+    provider: ProviderName
+    name?: string
+    apiKey?: string | SecretValue
+    baseUrl?: string
+    awsAccessKeyId?: string | SecretValue
+    awsSecretAccessKey?: string | SecretValue
+    awsRegion?: string
+    vertexApiKey?: string | SecretValue
+    models: string[]
+    isDefault?: boolean
+}
+
+// Provider defined in AI_MODELS_CONFIG / ai-models.json — shown read-only
+export interface EnvProvider {
+    name: string
+    provider: ProviderName
+    models: string[]
+    isDefault: boolean
+}
+
+export async function adminFetch(path: string, pw: string, init?: RequestInit) {
+    const res = await fetch(getApiEndpoint(path), {
+        ...init,
+        headers: {
+            ...init?.headers,
+            "x-admin-password": pw,
+            ...(init?.body ? { "Content-Type": "application/json" } : {}),
+        },
+    })
+    const data = await res.json().catch(() => ({}))
+    if (!res.ok) {
+        throw new Error(data.error || `Request failed (${res.status})`)
+    }
+    return data
+}

app/[lang]/admin/models-section.tsx

@@ -0,0 +1,621 @@
+import {
+    AlertCircle,
+    Check,
+    Loader2,
+    Plus,
+    Star,
+    Trash2,
+    X,
+    Zap,
+} from "lucide-react"
+import { useState } from "react"
+import { ProviderCredentialsFields } from "@/components/provider-credentials-fields"
+import { ProviderLogo } from "@/components/provider-logo"
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from "@/components/ui/alert-dialog"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+} from "@/components/ui/select"
+import { Switch } from "@/components/ui/switch"
+import { useDictionary } from "@/hooks/use-dictionary"
+import { formatMessage } from "@/lib/i18n/utils"
+import {
+    FIXED_CRED_PROVIDERS,
+    generateId,
+    PROVIDER_INFO,
+    type ProviderName,
+    SUGGESTED_MODELS,
+} from "@/lib/types/model-config"
+import { cn } from "@/lib/utils"
+import {
+    type AdminProvider,
+    adminFetch,
+    type EnvProvider,
+} from "./admin-shared"
+import { SecretInput } from "./setting-field"
+
+// ── Models section (mirrors the user ModelConfigDialog) ──────────────
+
+function ProviderDetail({
+    provider,
+    disabled,
+    password,
+    onUpdate,
+    onDelete,
+}: {
+    provider: AdminProvider
+    disabled: boolean
+    password: string
+    onUpdate: (patch: Partial<AdminProvider>) => void
+    onDelete: () => void
+}) {
+    const dict = useDictionary()
+    const [modelInput, setModelInput] = useState("")
+    const [deleteOpen, setDeleteOpen] = useState(false)
+    const [testing, setTesting] = useState<string | null>(null)
+    const [testResults, setTestResults] = useState<
+        Record<string, { ok: boolean; message: string }>
+    >({})
+
+    const info = PROVIDER_INFO[provider.provider]
+    const suggestions = (SUGGESTED_MODELS[provider.provider] || []).filter(
+        (m) => !provider.models.includes(m),
+    )
+
+    const addModel = (modelId: string) => {
+        const trimmed = modelId.trim()
+        if (!trimmed || provider.models.includes(trimmed)) return
+        onUpdate({ models: [...provider.models, trimmed] })
+        setModelInput("")
+    }
+
+    const testModel = async (modelId: string) => {
+        setTesting(modelId)
+        try {
+            const data = await adminFetch("/api/admin/test-model", password, {
+                method: "POST",
+                body: JSON.stringify({ provider, modelId }),
+            })
+            setTestResults((prev) => ({
+                ...prev,
+                [modelId]: data.valid
+                    ? {
+                          ok: true,
+                          message: formatMessage(dict.admin.testOk, {
+                              ms: data.responseTime,
+                          }),
+                      }
+                    : {
+                          ok: false,
+                          message: data.error || dict.admin.testFailed,
+                      },
+            }))
+        } catch (err) {
+            setTestResults((prev) => ({
+                ...prev,
+                [modelId]: {
+                    ok: false,
+                    message:
+                        err instanceof Error
+                            ? err.message
+                            : dict.admin.testFailed,
+                },
+            }))
+        } finally {
+            setTesting(null)
+        }
+    }
+
+    return (
+        <div className="space-y-6">
+            <div className="flex items-center gap-3">
+                <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-muted">
+                    <ProviderLogo
+                        provider={provider.provider}
+                        className="size-5"
+                    />
+                </div>
+                <div className="min-w-0 flex-1">
+                    <h3 className="font-semibold">{info.label}</h3>
+                    <p className="text-xs text-muted-foreground">
+                        {provider.models.length === 0
+                            ? dict.admin.noModelsConfigured
+                            : formatMessage(
+                                  provider.models.length === 1
+                                      ? dict.admin.modelCount
+                                      : dict.admin.modelCountPlural,
+                                  { count: provider.models.length },
+                              )}
+                    </p>
+                </div>
+                <label className="flex cursor-pointer items-center gap-1.5 text-xs text-muted-foreground">
+                    <Star
+                        className={cn(
+                            "h-3.5 w-3.5",
+                            provider.isDefault &&
+                                "fill-amber-400 text-amber-400",
+                        )}
+                        aria-hidden="true"
+                    />
+                    {dict.admin.default}
+                    <Switch
+                        checked={!!provider.isDefault}
+                        disabled={disabled}
+                        aria-label={dict.admin.setAsDefault}
+                        onCheckedChange={(checked) =>
+                            onUpdate({ isDefault: checked })
+                        }
+                    />
+                </label>
+                <Button
+                    type="button"
+                    variant="ghost"
+                    size="sm"
+                    disabled={disabled}
+                    className="text-destructive hover:bg-destructive/10 hover:text-destructive"
+                    onClick={() => setDeleteOpen(true)}
+                >
+                    <Trash2 className="mr-1.5 h-4 w-4" aria-hidden="true" />
+                    {dict.admin.delete}
+                </Button>
+            </div>
+
+            {/* Credentials (shared with the user ModelConfigDialog) */}
+            <ProviderCredentialsFields
+                provider={provider.provider}
+                name={provider.name}
+                baseUrl={provider.baseUrl}
+                awsRegion={provider.awsRegion}
+                disabled={disabled}
+                onChange={(field, value) => onUpdate({ [field]: value })}
+                renderSecret={({ field, id }) => (
+                    // Bare id keeps the shared component's <Label htmlFor={id}>
+                    // associated; only one ProviderDetail is mounted at a time.
+                    <SecretInput
+                        id={id}
+                        keepOnEmpty
+                        value={provider[field]}
+                        disabled={disabled}
+                        onChange={(v) => onUpdate({ [field]: v })}
+                    />
+                )}
+            />
+
+            {/* Models */}
+            <div>
+                <div className="mb-2 flex flex-wrap items-center justify-between gap-2">
+                    <Label className="text-xs font-medium uppercase tracking-wider text-muted-foreground">
+                        {dict.admin.models}
+                    </Label>
+                    <div className="flex items-center gap-1.5">
+                        <Input
+                            value={modelInput}
+                            disabled={disabled}
+                            placeholder={dict.admin.modelIdPlaceholder}
+                            spellCheck={false}
+                            className="h-8 w-48 font-mono text-xs"
+                            onChange={(e) => setModelInput(e.target.value)}
+                            onKeyDown={(e) => {
+                                if (e.key === "Enter") addModel(modelInput)
+                            }}
+                        />
+                        <Button
+                            type="button"
+                            variant="outline"
+                            size="sm"
+                            className="h-8"
+                            disabled={disabled || !modelInput.trim()}
+                            aria-label={dict.admin.addModel}
+                            onClick={() => addModel(modelInput)}
+                        >
+                            <Plus className="h-3.5 w-3.5" aria-hidden="true" />
+                        </Button>
+                        {suggestions.length > 0 && (
+                            <Select
+                                value=""
+                                disabled={disabled}
+                                onValueChange={(v) => addModel(v)}
+                            >
+                                <SelectTrigger className="h-8 w-28 text-xs">
+                                    {dict.admin.suggested}
+                                </SelectTrigger>
+                                <SelectContent className="max-h-72">
+                                    {suggestions.map((m) => (
+                                        <SelectItem
+                                            key={m}
+                                            value={m}
+                                            className="font-mono text-xs"
+                                        >
+                                            {m}
+                                        </SelectItem>
+                                    ))}
+                                </SelectContent>
+                            </Select>
+                        )}
+                    </div>
+                </div>
+                <div className="overflow-hidden rounded-lg border">
+                    {provider.models.length === 0 ? (
+                        <p className="p-5 text-center text-sm text-muted-foreground">
+                            {dict.admin.addProviderToOfferModels}
+                        </p>
+                    ) : (
+                        <ul className="divide-y">
+                            {provider.models.map((modelId, index) => {
+                                const result = testResults[modelId]
+                                return (
+                                    <li
+                                        key={modelId}
+                                        className="flex items-center gap-2 px-3 py-2"
+                                    >
+                                        <span className="min-w-0 flex-1 truncate font-mono text-xs">
+                                            {modelId}
+                                            {provider.isDefault &&
+                                                index === 0 && (
+                                                    <span className="ml-2 rounded bg-amber-500/10 px-1.5 py-0.5 text-[10px] font-medium uppercase text-amber-600 dark:text-amber-400">
+                                                        {
+                                                            dict.admin
+                                                                .defaultModel
+                                                        }
+                                                    </span>
+                                                )}
+                                        </span>
+                                        {result && (
+                                            <span
+                                                className={cn(
+                                                    "flex items-center gap-1 text-xs",
+                                                    result.ok
+                                                        ? "text-green-600 dark:text-green-400"
+                                                        : "text-destructive",
+                                                )}
+                                            >
+                                                {result.ok ? (
+                                                    <Check
+                                                        className="h-3.5 w-3.5"
+                                                        aria-hidden="true"
+                                                    />
+                                                ) : (
+                                                    <AlertCircle
+                                                        className="h-3.5 w-3.5"
+                                                        aria-hidden="true"
+                                                    />
+                                                )}
+                                                <span className="max-w-48 truncate">
+                                                    {result.message}
+                                                </span>
+                                            </span>
+                                        )}
+                                        <Button
+                                            type="button"
+                                            variant="ghost"
+                                            size="sm"
+                                            className="h-7 px-2 text-xs"
+                                            disabled={
+                                                disabled || testing !== null
+                                            }
+                                            onClick={() =>
+                                                void testModel(modelId)
+                                            }
+                                        >
+                                            {testing === modelId ? (
+                                                <Loader2
+                                                    className="h-3.5 w-3.5 animate-spin motion-reduce:animate-none"
+                                                    aria-hidden="true"
+                                                />
+                                            ) : (
+                                                <Zap
+                                                    className="h-3.5 w-3.5"
+                                                    aria-hidden="true"
+                                                />
+                                            )}
+                                            <span className="ml-1">
+                                                {dict.admin.test}
+                                            </span>
+                                        </Button>
+                                        <Button
+                                            type="button"
+                                            variant="ghost"
+                                            size="icon"
+                                            className="h-7 w-7"
+                                            disabled={disabled}
+                                            aria-label={formatMessage(
+                                                dict.admin.removeModel,
+                                                { model: modelId },
+                                            )}
+                                            onClick={() =>
+                                                onUpdate({
+                                                    models: provider.models.filter(
+                                                        (m) => m !== modelId,
+                                                    ),
+                                                })
+                                            }
+                                        >
+                                            <X
+                                                className="h-3.5 w-3.5"
+                                                aria-hidden="true"
+                                            />
+                                        </Button>
+                                    </li>
+                                )
+                            })}
+                        </ul>
+                    )}
+                </div>
+            </div>
+
+            <AlertDialog open={deleteOpen} onOpenChange={setDeleteOpen}>
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>
+                            {formatMessage(dict.admin.deleteProviderTitle, {
+                                name: provider.name || info.label,
+                            })}
+                        </AlertDialogTitle>
+                        <AlertDialogDescription>
+                            {dict.admin.deleteProviderDesc}
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <AlertDialogFooter>
+                        <AlertDialogCancel>
+                            {dict.admin.cancel}
+                        </AlertDialogCancel>
+                        <AlertDialogAction
+                            className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+                            onClick={() => {
+                                setDeleteOpen(false)
+                                onDelete()
+                            }}
+                        >
+                            {dict.admin.delete}
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+        </div>
+    )
+}
+
+export function ModelsSection({
+    providers,
+    envProviders,
+    envHasDefaultModel,
+    disabled,
+    password,
+    onChange,
+}: {
+    providers: AdminProvider[]
+    envProviders: EnvProvider[]
+    envHasDefaultModel: boolean
+    disabled: boolean
+    password: string
+    onChange: (providers: AdminProvider[]) => void
+}) {
+    const dict = useDictionary()
+    const [selectedId, setSelectedId] = useState<string | null>(
+        providers[0]?.id ?? null,
+    )
+    const selected = providers.find((p) => p.id === selectedId)
+    const selectedEnv = envProviders.find((p) => `env:${p.name}` === selectedId)
+
+    const addProvider = (provider: ProviderName) => {
+        const newProvider: AdminProvider = {
+            // generateId works over plain HTTP; crypto.randomUUID needs HTTPS
+            id: generateId(),
+            provider,
+            models: [],
+            // Only the very first provider becomes the default, and only when
+            // the env config has no default that it would replace on save
+            isDefault:
+                providers.length === 0 &&
+                !envProviders.some((p) => p.isDefault) &&
+                !envHasDefaultModel,
+        }
+        onChange([...providers, newProvider])
+        setSelectedId(newProvider.id)
+    }
+
+    const updateProvider = (id: string, patch: Partial<AdminProvider>) => {
+        onChange(
+            providers.map((p) => {
+                if (p.id !== id) {
+                    // Only one default at a time
+                    return patch.isDefault ? { ...p, isDefault: false } : p
+                }
+                return { ...p, ...patch }
+            }),
+        )
+    }
+
+    const deleteProvider = (id: string) => {
+        const next = providers.filter((p) => p.id !== id)
+        onChange(next)
+        setSelectedId(next[0]?.id ?? null)
+    }
+
+    return (
+        <div className="flex min-h-72 flex-col sm:flex-row">
+            {/* Provider list */}
+            <div className="flex w-full shrink-0 flex-col border-b sm:w-52 sm:border-b-0 sm:border-r">
+                <div className="flex-1 space-y-1 p-2">
+                    {providers.length === 0 && envProviders.length === 0 && (
+                        <p className="px-2 py-6 text-center text-xs text-muted-foreground">
+                            {dict.admin.addProviderHint}
+                        </p>
+                    )}
+                    {envProviders.map((p) => (
+                        <button
+                            key={`env:${p.name}`}
+                            type="button"
+                            onClick={() => setSelectedId(`env:${p.name}`)}
+                            className={cn(
+                                "flex w-full items-center gap-2 rounded-md px-2.5 py-2 text-left text-sm hover:bg-muted/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+                                selectedId === `env:${p.name}` &&
+                                    "bg-muted font-medium",
+                            )}
+                        >
+                            <ProviderLogo provider={p.provider} />
+                            <span className="min-w-0 flex-1 truncate">
+                                {p.name}
+                            </span>
+                            <span className="rounded bg-muted px-1 py-0.5 text-[10px] font-medium uppercase text-muted-foreground">
+                                {dict.admin.sourceEnv}
+                            </span>
+                            {p.isDefault && (
+                                <Star
+                                    className="h-3.5 w-3.5 shrink-0 fill-amber-400 text-amber-400"
+                                    aria-label={dict.admin.defaultProvider}
+                                />
+                            )}
+                        </button>
+                    ))}
+                    {providers.map((p) => (
+                        <button
+                            key={p.id}
+                            type="button"
+                            onClick={() => setSelectedId(p.id)}
+                            className={cn(
+                                "flex w-full items-center gap-2 rounded-md px-2.5 py-2 text-left text-sm hover:bg-muted/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+                                selectedId === p.id && "bg-muted font-medium",
+                            )}
+                        >
+                            <ProviderLogo provider={p.provider} />
+                            <span className="min-w-0 flex-1 truncate">
+                                {p.name || PROVIDER_INFO[p.provider].label}
+                            </span>
+                            {p.isDefault && (
+                                <Star
+                                    className="h-3.5 w-3.5 shrink-0 fill-amber-400 text-amber-400"
+                                    aria-label={dict.admin.defaultProvider}
+                                />
+                            )}
+                        </button>
+                    ))}
+                </div>
+                <div className="border-t p-2">
+                    {/* Always empty so picking the same type again still fires */}
+                    <Select
+                        value=""
+                        disabled={disabled}
+                        onValueChange={(v) => addProvider(v as ProviderName)}
+                    >
+                        <SelectTrigger className="w-full">
+                            <Plus
+                                className="mr-1 h-4 w-4 text-muted-foreground"
+                                aria-hidden="true"
+                            />
+                            {dict.modelConfig.addProvider}
+                        </SelectTrigger>
+                        <SelectContent className="max-h-72">
+                            {(Object.keys(PROVIDER_INFO) as ProviderName[]).map(
+                                (p) => {
+                                    // Global-credential providers already in
+                                    // the env config can't be added here —
+                                    // panel credentials would override theirs
+                                    const envBlocked =
+                                        FIXED_CRED_PROVIDERS.includes(p) &&
+                                        envProviders.some(
+                                            (e) => e.provider === p,
+                                        )
+                                    return (
+                                        <SelectItem
+                                            key={p}
+                                            value={p}
+                                            disabled={envBlocked}
+                                        >
+                                            <div className="flex items-center gap-2">
+                                                <ProviderLogo provider={p} />
+                                                {PROVIDER_INFO[p].label}
+                                                {envBlocked && (
+                                                    <span className="text-xs text-muted-foreground">
+                                                        {
+                                                            dict.admin
+                                                                .managedViaEnv
+                                                        }
+                                                    </span>
+                                                )}
+                                            </div>
+                                        </SelectItem>
+                                    )
+                                },
+                            )}
+                        </SelectContent>
+                    </Select>
+                </div>
+            </div>
+
+            {/* Detail */}
+            <div className="min-w-0 flex-1 p-4">
+                {selected ? (
+                    <ProviderDetail
+                        key={selected.id}
+                        provider={selected}
+                        disabled={disabled}
+                        password={password}
+                        onUpdate={(patch) => updateProvider(selected.id, patch)}
+                        onDelete={() => deleteProvider(selected.id)}
+                    />
+                ) : selectedEnv ? (
+                    <div className="space-y-4">
+                        <div className="flex items-center gap-3">
+                            <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-muted">
+                                <ProviderLogo
+                                    provider={selectedEnv.provider}
+                                    className="size-5"
+                                />
+                            </div>
+                            <div className="min-w-0 flex-1">
+                                <h3 className="font-semibold">
+                                    {selectedEnv.name}
+                                </h3>
+                                <p className="text-xs text-muted-foreground">
+                                    {dict.admin.envReadOnly}
+                                </p>
+                            </div>
+                        </div>
+                        <div className="overflow-hidden rounded-lg border">
+                            <ul className="divide-y">
+                                {selectedEnv.models.map((modelId, index) => (
+                                    <li
+                                        key={modelId}
+                                        className="flex items-center gap-2 px-3 py-2"
+                                    >
+                                        <span className="min-w-0 flex-1 truncate font-mono text-xs">
+                                            {modelId}
+                                            {selectedEnv.isDefault &&
+                                                index === 0 && (
+                                                    <span className="ml-2 rounded bg-amber-500/10 px-1.5 py-0.5 text-[10px] font-medium uppercase text-amber-600 dark:text-amber-400">
+                                                        {
+                                                            dict.admin
+                                                                .defaultModel
+                                                        }
+                                                    </span>
+                                                )}
+                                        </span>
+                                    </li>
+                                ))}
+                            </ul>
+                        </div>
+                    </div>
+                ) : (
+                    <p className="py-12 text-center text-sm text-muted-foreground">
+                        {dict.admin.selectProviderHint}
+                    </p>
+                )}
+            </div>
+        </div>
+    )
+}

app/[lang]/admin/page.tsx

@@ -0,0 +1,645 @@
+"use client"
+
+import {
+    AlertTriangle,
+    Check,
+    Loader2,
+    LockKeyhole,
+    ShieldCheck,
+} from "lucide-react"
+import { useCallback, useEffect, useState } from "react"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Switch } from "@/components/ui/switch"
+import { useDictionary } from "@/hooks/use-dictionary"
+import {
+    SETTING_GROUPS,
+    SETTINGS_BY_GROUP,
+} from "@/lib/admin/settings-registry"
+import { getApiEndpoint } from "@/lib/base-path"
+import { formatMessage } from "@/lib/i18n/utils"
+import { cn } from "@/lib/utils"
+import {
+    type AdminProvider,
+    adminFetch,
+    type EnvProvider,
+    isSecretValue,
+    SESSION_PASSWORD_KEY,
+    type SettingState,
+    type SettingsMap,
+    savedTextOf,
+} from "./admin-shared"
+import { ModelsSection } from "./models-section"
+import { SettingField } from "./setting-field"
+
+// ── Page ─────────────────────────────────────────────────────────────
+
+const NAV_GROUP_IDS = ["models", ...SETTING_GROUPS.map((g) => g.id)]
+
+// For each toggleable group, whether any of its settings has a value (from
+// the settings file or the environment)
+function groupsWithValues(map: SettingsMap): Record<string, boolean> {
+    const result: Record<string, boolean> = {}
+    for (const group of SETTING_GROUPS) {
+        if (!group.toggleable) continue
+        result[group.id] = !!SETTINGS_BY_GROUP.get(group.id)?.some(
+            (d) => map[d.key]?.source !== "default",
+        )
+    }
+    return result
+}
+
+export default function AdminPage() {
+    const dict = useDictionary()
+    // Localized group title/description, keyed by group id
+    const groupText = (id: string) =>
+        (
+            dict.admin.groups as Record<
+                string,
+                { title: string; description: string } | undefined
+            >
+        )[id]
+    const navItems = NAV_GROUP_IDS.map((id) => ({
+        id,
+        title:
+            id === "models" ? dict.admin.models : (groupText(id)?.title ?? id),
+    }))
+    const [password, setPassword] = useState("")
+    const [authedPassword, setAuthedPassword] = useState<string | null>(null)
+    const [authError, setAuthError] = useState("")
+    const [authLoading, setAuthLoading] = useState(false)
+
+    const [writable, setWritable] = useState(true)
+
+    // Models section state
+    const [providers, setProviders] = useState<AdminProvider[]>([])
+    const [envProviders, setEnvProviders] = useState<EnvProvider[]>([])
+    // Whether .env itself sets AI_MODEL (a default the panel would override)
+    const [envHasDefaultModel, setEnvHasDefaultModel] = useState(false)
+    const [savedProviders, setSavedProviders] = useState<string>("[]")
+    const providersDirty = JSON.stringify(providers) !== savedProviders
+
+    // General settings state
+    const [settings, setSettings] = useState<SettingsMap>({})
+    const [pending, setPending] = useState<Record<string, string | null>>({})
+    const [errors, setErrors] = useState<Record<string, string>>({})
+    const [enabledGroups, setEnabledGroups] = useState<Record<string, boolean>>(
+        {},
+    )
+
+    const [saving, setSaving] = useState(false)
+    const [saveMessage, setSaveMessage] = useState<{
+        ok: boolean
+        text: string
+    } | null>(null)
+    const [activeGroup, setActiveGroup] = useState("models")
+
+    const dirtyCount = Object.keys(pending).length + (providersDirty ? 1 : 0)
+
+    const applySettingsResponse = useCallback(
+        (data: { writable: boolean; settings: SettingState[] }) => {
+            setWritable(data.writable)
+            const map: SettingsMap = {}
+            for (const s of data.settings) map[s.key] = s
+            setSettings(map)
+            // A group stays on while it still has values (e.g. from env vars
+            // that saving can't remove); a user's explicit "on" for a group
+            // with no values yet is kept across saves
+            setEnabledGroups((prev) => {
+                const next = groupsWithValues(map)
+                for (const id of Object.keys(next)) {
+                    next[id] = next[id] || !!prev[id]
+                }
+                return next
+            })
+        },
+        [],
+    )
+
+    const applyProvidersResponse = useCallback(
+        (data: {
+            providers: AdminProvider[]
+            envProviders?: EnvProvider[]
+            envHasDefaultModel?: boolean
+        }) => {
+            setProviders(data.providers)
+            setSavedProviders(JSON.stringify(data.providers))
+            setEnvProviders(data.envProviders ?? [])
+            setEnvHasDefaultModel(!!data.envHasDefaultModel)
+        },
+        [],
+    )
+
+    const login = useCallback(
+        async (pw: string) => {
+            setAuthLoading(true)
+            setAuthError("")
+            try {
+                const [settingsData, providersData] = await Promise.all([
+                    adminFetch("/api/admin/settings", pw),
+                    adminFetch("/api/admin/providers", pw),
+                ])
+                applySettingsResponse(settingsData)
+                applyProvidersResponse(providersData)
+                setAuthedPassword(pw)
+                sessionStorage.setItem(SESSION_PASSWORD_KEY, pw)
+            } catch (err) {
+                setAuthError(
+                    err instanceof Error ? err.message : dict.admin.loginFailed,
+                )
+            } finally {
+                setAuthLoading(false)
+            }
+        },
+        [applySettingsResponse, applyProvidersResponse, dict],
+    )
+
+    // Restore session on mount
+    useEffect(() => {
+        const stored = sessionStorage.getItem(SESSION_PASSWORD_KEY)
+        if (stored) void login(stored)
+    }, [login])
+
+    // Warn before leaving with unsaved changes
+    const hasDirty = dirtyCount > 0
+    useEffect(() => {
+        if (!hasDirty) return
+        const handler = (e: BeforeUnloadEvent) => {
+            e.preventDefault()
+            // Some browsers only show the prompt when returnValue is set
+            e.returnValue = ""
+        }
+        window.addEventListener("beforeunload", handler)
+        return () => window.removeEventListener("beforeunload", handler)
+    }, [hasDirty])
+
+    // Highlight the section currently in view in the sidebar
+    useEffect(() => {
+        if (!authedPassword) return
+        const observer = new IntersectionObserver(
+            (entries) => {
+                const visible = entries
+                    .filter((e) => e.isIntersecting)
+                    .sort(
+                        (a, b) =>
+                            a.boundingClientRect.top - b.boundingClientRect.top,
+                    )
+                if (visible[0]) setActiveGroup(visible[0].target.id)
+            },
+            { rootMargin: "-10% 0px -50% 0px" },
+        )
+        for (const id of NAV_GROUP_IDS) {
+            const el = document.getElementById(id)
+            if (el) observer.observe(el)
+        }
+        return () => observer.disconnect()
+    }, [authedPassword])
+
+    // value undefined drops the pending change (back to the saved value)
+    const handleChange = useCallback(
+        (key: string, value: string | null | undefined) => {
+            setSaveMessage(null)
+            setErrors((prev) => {
+                if (!(key in prev)) return prev
+                const next = { ...prev }
+                delete next[key]
+                return next
+            })
+            setPending((prev) => {
+                const state = settings[key]
+                const isRevert =
+                    value !== null &&
+                    state?.source === "file" &&
+                    !isSecretValue(state?.value) &&
+                    value === savedTextOf(state)
+                const isNoop =
+                    value === "" &&
+                    (!state || state.source !== "file") &&
+                    !isSecretValue(state?.value)
+                if (value === undefined || isRevert || isNoop) {
+                    const next = { ...prev }
+                    delete next[key]
+                    return next
+                }
+                return { ...prev, [key]: value === "" ? null : value }
+            })
+        },
+        [settings],
+    )
+
+    // Toggling a group off stages deletion of its saved values so the
+    // feature actually turns off on save; toggling on drops those deletions.
+    const handleGroupToggle = useCallback(
+        (groupId: string, enabled: boolean) => {
+            setSaveMessage(null)
+            setEnabledGroups((prev) => ({ ...prev, [groupId]: enabled }))
+            const keys = (SETTINGS_BY_GROUP.get(groupId) ?? []).map(
+                (d) => d.key,
+            )
+            setPending((prev) => {
+                const next = { ...prev }
+                for (const key of keys) {
+                    if (!enabled) {
+                        // Stage deletion of saved values; drop unsaved input
+                        if (settings[key]?.source === "default")
+                            delete next[key]
+                        else next[key] = null
+                    } else if (next[key] === null) {
+                        delete next[key]
+                    }
+                }
+                return next
+            })
+        },
+        [settings],
+    )
+
+    const handleSave = useCallback(async () => {
+        if (!authedPassword || dirtyCount === 0) return
+        setSaving(true)
+        setSaveMessage(null)
+        setErrors({})
+        try {
+            if (providersDirty) {
+                const data = await adminFetch(
+                    "/api/admin/providers",
+                    authedPassword,
+                    { method: "PUT", body: JSON.stringify({ providers }) },
+                )
+                applyProvidersResponse(data)
+            }
+            if (Object.keys(pending).length > 0) {
+                const res = await fetch(getApiEndpoint("/api/admin/settings"), {
+                    method: "PUT",
+                    headers: {
+                        "Content-Type": "application/json",
+                        "x-admin-password": authedPassword,
+                    },
+                    body: JSON.stringify({ values: pending }),
+                })
+                const data = await res.json().catch(() => ({}))
+                if (!res.ok) {
+                    // Per-field validation errors come back as {errors: {...}}
+                    if (data.errors) {
+                        setErrors(data.errors)
+                        const firstKey = Object.keys(data.errors)[0]
+                        document.getElementById(`setting-${firstKey}`)?.focus()
+                        throw new Error(dict.admin.invalidSettings)
+                    }
+                    throw new Error(
+                        data.error || `Request failed (${res.status})`,
+                    )
+                }
+                applySettingsResponse(data)
+                setPending({})
+            }
+            setSaveMessage({
+                ok: true,
+                text: dict.admin.saved,
+            })
+            setTimeout(() => setSaveMessage(null), 4000)
+        } catch (err) {
+            setSaveMessage({
+                ok: false,
+                text:
+                    err instanceof Error ? err.message : dict.admin.saveFailed,
+            })
+        } finally {
+            setSaving(false)
+        }
+    }, [
+        authedPassword,
+        pending,
+        providers,
+        providersDirty,
+        dirtyCount,
+        applySettingsResponse,
+        applyProvidersResponse,
+        dict,
+    ])
+
+    // ── Login screen ─────────────────────────────────────────────────
+    if (!authedPassword) {
+        return (
+            <div className="flex min-h-screen items-center justify-center bg-background p-4">
+                <form
+                    className="w-full max-w-sm space-y-4 rounded-lg border bg-card p-6 shadow-sm"
+                    onSubmit={(e) => {
+                        e.preventDefault()
+                        void login(password)
+                    }}
+                >
+                    <div className="flex items-center gap-2">
+                        <LockKeyhole
+                            className="h-5 w-5 text-muted-foreground"
+                            aria-hidden="true"
+                        />
+                        <h1 className="text-lg font-semibold">
+                            {dict.admin.title}
+                        </h1>
+                    </div>
+                    <p className="text-sm text-muted-foreground">
+                        {dict.admin.loginPrompt}
+                    </p>
+                    <div className="space-y-1.5">
+                        <Label htmlFor="admin-password">
+                            {dict.admin.password}
+                        </Label>
+                        <Input
+                            id="admin-password"
+                            name="admin-password"
+                            type="password"
+                            value={password}
+                            autoComplete="current-password"
+                            spellCheck={false}
+                            onChange={(e) => setPassword(e.target.value)}
+                        />
+                    </div>
+                    <p
+                        className={cn(
+                            "text-sm text-destructive",
+                            !authError && "sr-only",
+                        )}
+                        aria-live="polite"
+                    >
+                        {authError}
+                    </p>
+                    <Button
+                        type="submit"
+                        className="w-full"
+                        disabled={authLoading}
+                    >
+                        {authLoading ? (
+                            <>
+                                <Loader2
+                                    className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none"
+                                    aria-hidden="true"
+                                />
+                                {dict.admin.signingIn}
+                            </>
+                        ) : (
+                            dict.admin.signIn
+                        )}
+                    </Button>
+                </form>
+            </div>
+        )
+    }
+
+    // ── Settings screen ──────────────────────────────────────────────
+    return (
+        <div className="min-h-screen bg-background">
+            <header className="sticky top-0 z-20 border-b bg-background/95 backdrop-blur">
+                <div className="mx-auto flex max-w-6xl items-center justify-between px-4 py-3">
+                    <div className="flex items-center gap-2">
+                        <ShieldCheck
+                            className="h-5 w-5 text-primary"
+                            aria-hidden="true"
+                        />
+                        <h1 className="text-lg font-semibold">
+                            {dict.admin.title}
+                        </h1>
+                    </div>
+                    <p className="text-xs text-muted-foreground">
+                        {dict.admin.precedence}
+                    </p>
+                </div>
+            </header>
+
+            {!writable && (
+                <div className="border-b bg-amber-500/10">
+                    <div className="mx-auto flex max-w-6xl items-center gap-2 px-4 py-3 text-sm text-amber-700 dark:text-amber-400">
+                        <AlertTriangle
+                            className="h-4 w-4 shrink-0"
+                            aria-hidden="true"
+                        />
+                        {dict.admin.notWritable}
+                    </div>
+                </div>
+            )}
+
+            <div className="mx-auto flex max-w-6xl gap-8 px-4 py-6">
+                <nav
+                    aria-label={dict.admin.settingGroups}
+                    className="sticky top-20 hidden h-fit w-44 shrink-0 md:block"
+                >
+                    <ul className="space-y-1">
+                        {navItems.map((item) => (
+                            <li key={item.id}>
+                                <a
+                                    href={`#${item.id}`}
+                                    aria-current={
+                                        activeGroup === item.id
+                                            ? "true"
+                                            : undefined
+                                    }
+                                    className={cn(
+                                        "block rounded-md px-3 py-1.5 text-sm hover:bg-muted hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+                                        activeGroup === item.id
+                                            ? "bg-muted font-medium text-foreground"
+                                            : "text-muted-foreground",
+                                    )}
+                                >
+                                    {item.title}
+                                </a>
+                            </li>
+                        ))}
+                    </ul>
+                </nav>
+
+                <main className="min-w-0 flex-1 pb-24">
+                    {/* Models section */}
+                    <section aria-labelledby="models" className="mb-10">
+                        <h2
+                            id="models"
+                            className="scroll-mt-20 text-base font-semibold"
+                        >
+                            {dict.admin.models}
+                        </h2>
+                        <p className="mb-3 mt-1 text-sm text-muted-foreground text-pretty">
+                            {dict.admin.modelsDescription}
+                        </p>
+                        <div className="overflow-hidden rounded-lg border bg-card">
+                            <ModelsSection
+                                providers={providers}
+                                envProviders={envProviders}
+                                envHasDefaultModel={envHasDefaultModel}
+                                disabled={!writable || saving}
+                                password={authedPassword}
+                                onChange={(next) => {
+                                    setSaveMessage(null)
+                                    setProviders(next)
+                                }}
+                            />
+                        </div>
+                    </section>
+
+                    {/* Registry-driven groups */}
+                    {SETTING_GROUPS.map((group) => {
+                        const defs = SETTINGS_BY_GROUP.get(group.id) ?? []
+                        const groupOff =
+                            group.toggleable && !enabledGroups[group.id]
+                        // Values from env vars can't be removed here, so the
+                        // group can't be turned off from the panel
+                        const envLocked = defs.some(
+                            (d) => settings[d.key]?.source === "env",
+                        )
+                        const fieldsDisabled = !writable || saving || !!groupOff
+                        const gt = groupText(group.id)
+                        const title = gt?.title ?? group.title
+                        return (
+                            <section
+                                key={group.id}
+                                aria-labelledby={group.id}
+                                className="mb-10"
+                            >
+                                <div className="flex items-center justify-between gap-4">
+                                    <h2
+                                        id={group.id}
+                                        className="scroll-mt-20 text-base font-semibold"
+                                    >
+                                        {title}
+                                    </h2>
+                                    {group.toggleable && (
+                                        <label
+                                            title={
+                                                envLocked
+                                                    ? dict.admin.sourceEnvTitle
+                                                    : undefined
+                                            }
+                                            className={cn(
+                                                "flex cursor-pointer items-center gap-2 rounded-full border px-3 py-1.5 text-xs font-medium transition-colors motion-reduce:transition-none",
+                                                enabledGroups[group.id]
+                                                    ? "border-primary/30 bg-primary/5 text-primary"
+                                                    : "border-border bg-muted/50 text-muted-foreground hover:border-foreground/30 hover:text-foreground",
+                                            )}
+                                        >
+                                            {enabledGroups[group.id]
+                                                ? dict.admin.enabled
+                                                : dict.admin.disabled}
+                                            <Switch
+                                                checked={
+                                                    !!enabledGroups[group.id]
+                                                }
+                                                disabled={
+                                                    !writable ||
+                                                    saving ||
+                                                    envLocked
+                                                }
+                                                aria-label={formatMessage(
+                                                    dict.admin.enableGroup,
+                                                    { group: title },
+                                                )}
+                                                onCheckedChange={(checked) =>
+                                                    handleGroupToggle(
+                                                        group.id,
+                                                        checked,
+                                                    )
+                                                }
+                                            />
+                                        </label>
+                                    )}
+                                </div>
+                                <p className="mb-3 mt-1 text-sm text-muted-foreground text-pretty">
+                                    {gt?.description ?? group.description}
+                                </p>
+                                <div
+                                    className={cn(
+                                        "rounded-lg border bg-card px-4",
+                                        groupOff &&
+                                            "pointer-events-none opacity-50",
+                                    )}
+                                >
+                                    {defs.map((def) => (
+                                        <SettingField
+                                            key={def.key}
+                                            def={def}
+                                            state={settings[def.key]}
+                                            pendingValue={pending[def.key]}
+                                            error={errors[def.key]}
+                                            disabled={fieldsDisabled}
+                                            onChange={(v) =>
+                                                handleChange(def.key, v)
+                                            }
+                                        />
+                                    ))}
+                                </div>
+                            </section>
+                        )
+                    })}
+                </main>
+            </div>
+
+            {/* Always-mounted live region so save results are announced */}
+            <p aria-live="polite" className="sr-only">
+                {saveMessage?.text ?? ""}
+            </p>
+
+            {(dirtyCount > 0 || saveMessage) && (
+                <div className="fixed inset-x-0 bottom-0 z-30 border-t bg-background/95 backdrop-blur">
+                    <div className="mx-auto flex max-w-6xl items-center justify-between gap-4 px-4 py-3">
+                        <p
+                            className={cn(
+                                "flex min-w-0 items-center gap-1.5 truncate text-sm",
+                                saveMessage?.ok
+                                    ? "text-green-600 dark:text-green-400"
+                                    : saveMessage
+                                      ? "text-destructive"
+                                      : "text-muted-foreground",
+                            )}
+                        >
+                            {saveMessage?.ok && (
+                                <Check
+                                    className="h-4 w-4 shrink-0"
+                                    aria-hidden="true"
+                                />
+                            )}
+                            {saveMessage && !saveMessage.ok
+                                ? saveMessage.text
+                                : dirtyCount > 0
+                                  ? dict.admin.unsavedChanges
+                                  : saveMessage?.text}
+                        </p>
+                        {dirtyCount > 0 && (
+                            <div className="flex shrink-0 gap-2">
+                                <Button
+                                    type="button"
+                                    variant="outline"
+                                    disabled={saving}
+                                    onClick={() => {
+                                        setPending({})
+                                        setErrors({})
+                                        setProviders(JSON.parse(savedProviders))
+                                        setEnabledGroups(
+                                            groupsWithValues(settings),
+                                        )
+                                    }}
+                                >
+                                    {dict.admin.discard}
+                                </Button>
+                                <Button
+                                    type="button"
+                                    disabled={saving || !writable}
+                                    onClick={() => void handleSave()}
+                                >
+                                    {saving ? (
+                                        <>
+                                            <Loader2
+                                                className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none"
+                                                aria-hidden="true"
+                                            />
+                                            {dict.admin.saving}
+                                        </>
+                                    ) : (
+                                        dict.admin.saveChanges
+                                    )}
+                                </Button>
+                            </div>
+                        )}
+                    </div>
+                </div>
+            )}
+        </div>
+    )
+}

app/[lang]/admin/setting-field.tsx

@@ -0,0 +1,317 @@
+import { Eye, EyeOff, X } from "lucide-react"
+import { useState } from "react"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import { Switch } from "@/components/ui/switch"
+import { useDictionary } from "@/hooks/use-dictionary"
+import type { SettingDef } from "@/lib/admin/settings-registry"
+import { formatMessage } from "@/lib/i18n/utils"
+import { cn } from "@/lib/utils"
+import {
+    isSecretValue,
+    type SecretValue,
+    type SettingState,
+    savedTextOf,
+} from "./admin-shared"
+
+// ── Small shared UI bits ─────────────────────────────────────────────
+
+export function SourceChip({ source }: { source: "file" | "env" | "default" }) {
+    const dict = useDictionary()
+    if (source === "default") return null
+    return (
+        <span
+            className={cn(
+                "rounded px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wide",
+                source === "file"
+                    ? "bg-primary/10 text-primary"
+                    : "bg-muted text-muted-foreground",
+            )}
+            title={
+                source === "file"
+                    ? dict.admin.sourceSavedTitle
+                    : dict.admin.sourceEnvTitle
+            }
+        >
+            {source === "file" ? dict.admin.sourceSaved : dict.admin.sourceEnv}
+        </span>
+    )
+}
+
+export function RestartBadge() {
+    const dict = useDictionary()
+    return (
+        <span className="rounded bg-amber-500/10 px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wide text-amber-600 dark:text-amber-400">
+            {dict.admin.restartRequired}
+        </span>
+    )
+}
+
+// Secret input: shows masked hint as placeholder, typing replaces.
+// With keepOnEmpty, clearing the field reverts to the stored value
+// ("keep") instead of deleting it — explicit deletion is via the X button.
+export function SecretInput({
+    id,
+    value,
+    disabled,
+    keepOnEmpty,
+    onChange,
+}: {
+    id: string
+    value: string | SecretValue | undefined
+    disabled?: boolean
+    keepOnEmpty?: boolean
+    onChange: (value: string | SecretValue) => void
+}) {
+    const dict = useDictionary()
+    const [show, setShow] = useState(false)
+    // The stored marker to revert to on empty. Refreshed whenever the parent
+    // passes server state (a marker or nothing), e.g. after a save.
+    const [original, setOriginal] = useState(value)
+    if (typeof value !== "string" && value !== original) setOriginal(value)
+    const hadStored = isSecretValue(original)
+    const text = typeof value === "string" ? value : ""
+    const placeholder = isSecretValue(value)
+        ? formatMessage(dict.admin.savedReplace, { hint: value.hint })
+        : dict.admin.notSet
+    const handleText = (t: string) => {
+        if (t === "" && keepOnEmpty && hadStored && original) {
+            onChange(original)
+        } else {
+            onChange(t)
+        }
+    }
+    return (
+        <div className="flex items-center gap-1">
+            <Input
+                id={id}
+                type={show ? "text" : "password"}
+                value={text}
+                disabled={disabled}
+                spellCheck={false}
+                autoComplete="off"
+                placeholder={placeholder}
+                className="h-9 font-mono text-xs"
+                onChange={(e) => handleText(e.target.value)}
+            />
+            <Button
+                type="button"
+                variant="ghost"
+                size="icon"
+                className="shrink-0"
+                aria-label={show ? dict.admin.hideValue : dict.admin.showValue}
+                onClick={() => setShow((s) => !s)}
+            >
+                {show ? (
+                    <EyeOff className="h-4 w-4" aria-hidden="true" />
+                ) : (
+                    <Eye className="h-4 w-4" aria-hidden="true" />
+                )}
+            </Button>
+            {keepOnEmpty && (hadStored || text) && !disabled && (
+                <Button
+                    type="button"
+                    variant="ghost"
+                    size="icon"
+                    className="shrink-0"
+                    aria-label={dict.admin.removeValue}
+                    title={dict.admin.removeValueTitle}
+                    onClick={() => onChange("")}
+                >
+                    <X className="h-4 w-4" aria-hidden="true" />
+                </Button>
+            )}
+        </div>
+    )
+}
+
+// ── General settings field (registry-driven) ─────────────────────────
+
+export function SettingField({
+    def,
+    state,
+    pendingValue,
+    error,
+    disabled,
+    onChange,
+}: {
+    def: SettingDef
+    state: SettingState | undefined
+    pendingValue: string | null | undefined
+    error?: string
+    disabled: boolean
+    // undefined drops the pending change (back to the saved value)
+    onChange: (value: string | null | undefined) => void
+}) {
+    const dict = useDictionary()
+    const isDirty = pendingValue !== undefined
+    const source = state?.source ?? "default"
+    const currentValue = isDirty ? (pendingValue ?? "") : savedTextOf(state)
+    const secretState = state && isSecretValue(state.value) ? state.value : null
+
+    // Localized label/description keyed by env var name, falling back to the
+    // registry's English (the registry stays canonical for the server).
+    const t = (
+        dict.admin.settings as Record<
+            string,
+            { label?: string; description?: string } | undefined
+        >
+    )[def.key]
+    const label = t?.label ?? def.label
+    const description = t?.description ?? def.description
+
+    const inputId = `setting-${def.key}`
+    const errorId = `${inputId}-error`
+
+    let control: React.ReactNode
+    switch (def.type) {
+        case "boolean": {
+            // When unset, reflect the built-in runtime default so the toggle
+            // matches actual behavior (e.g. ALLOW_PRIVATE_URLS defaults on).
+            const effective =
+                currentValue !== "" ? currentValue : (def.default ?? "false")
+            // A saved boolean can be cleared back to its env/default value.
+            const canClear =
+                (isDirty && pendingValue !== null) || source === "file"
+            control = (
+                <div className="flex items-center gap-3">
+                    <Switch
+                        id={inputId}
+                        checked={effective === "true"}
+                        disabled={disabled}
+                        onCheckedChange={(checked) =>
+                            onChange(checked ? "true" : "false")
+                        }
+                    />
+                    {canClear && !disabled && (
+                        <Button
+                            type="button"
+                            variant="ghost"
+                            size="sm"
+                            className="h-7 px-2 text-xs text-muted-foreground"
+                            onClick={() => onChange(null)}
+                        >
+                            {dict.admin.resetToDefault}
+                        </Button>
+                    )}
+                </div>
+            )
+            break
+        }
+        case "enum":
+            control = (
+                <Select
+                    value={currentValue || undefined}
+                    disabled={disabled}
+                    onValueChange={onChange}
+                >
+                    <SelectTrigger id={inputId} className="w-full max-w-xs">
+                        <SelectValue placeholder={dict.admin.notSet} />
+                    </SelectTrigger>
+                    <SelectContent>
+                        {def.options?.map((opt) => (
+                            <SelectItem key={opt} value={opt}>
+                                {opt}
+                            </SelectItem>
+                        ))}
+                    </SelectContent>
+                </Select>
+            )
+            break
+        case "secret":
+            control = (
+                <div className="w-full max-w-md">
+                    {/* Clearing a saved secret reverts to it; the X button deletes */}
+                    <SecretInput
+                        id={inputId}
+                        keepOnEmpty={source === "file"}
+                        value={
+                            isDirty
+                                ? (pendingValue ?? "")
+                                : (secretState ?? undefined)
+                        }
+                        disabled={disabled}
+                        onChange={(v) =>
+                            onChange(typeof v === "string" ? v : undefined)
+                        }
+                    />
+                </div>
+            )
+            break
+        case "number":
+            control = (
+                <Input
+                    id={inputId}
+                    type="number"
+                    inputMode="numeric"
+                    min={def.min}
+                    max={def.max}
+                    value={currentValue}
+                    disabled={disabled}
+                    placeholder={def.placeholder ?? dict.admin.notSet}
+                    className="w-full max-w-xs tabular-nums"
+                    aria-invalid={!!error}
+                    aria-describedby={error ? errorId : undefined}
+                    onChange={(e) => onChange(e.target.value)}
+                />
+            )
+            break
+        default:
+            control = (
+                <Input
+                    id={inputId}
+                    type="text"
+                    value={currentValue}
+                    disabled={disabled}
+                    spellCheck={false}
+                    autoComplete="off"
+                    placeholder={def.placeholder ?? dict.admin.notSet}
+                    className="w-full max-w-md"
+                    aria-invalid={!!error}
+                    aria-describedby={error ? errorId : undefined}
+                    onChange={(e) => onChange(e.target.value)}
+                />
+            )
+    }
+
+    return (
+        <div className="border-b border-border/60 py-4 last:border-b-0">
+            <div className="mb-1.5 flex flex-wrap items-center gap-2">
+                <Label htmlFor={inputId} className="text-sm font-medium">
+                    {label}
+                </Label>
+                <SourceChip source={source} />
+                {def.restartRequired && <RestartBadge />}
+                {isDirty && (
+                    <span className="rounded bg-blue-500/10 px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wide text-blue-600 dark:text-blue-400">
+                        {dict.admin.modified}
+                    </span>
+                )}
+            </div>
+            {description && (
+                <p className="mb-2 max-w-prose text-xs text-muted-foreground">
+                    {description}
+                </p>
+            )}
+            {control}
+            <p
+                id={errorId}
+                className={cn(
+                    "text-xs text-destructive",
+                    error ? "mt-1.5" : "sr-only",
+                )}
+                aria-live="polite"
+            >
+                {error ?? ""}
+            </p>
+        </div>
+    )
+}

app/[lang]/page.tsx

@@ -10,8 +10,8 @@ import {
     ResizablePanelGroup,
 } from "@/components/ui/resizable"
 import { useDiagram } from "@/contexts/diagram-context"
+import { type DrawioTheme, isDrawioTheme } from "@/lib/drawio-themes"
 import { i18n, type Locale } from "@/lib/i18n/config"
-import { isIndexedDBUsable } from "@/lib/session-storage"
 
 export default function Home() {
     const {
@@ -27,19 +27,16 @@ export default function Home() {
     const currentLang = (pathname.split("/")[1] || i18n.defaultLocale) as Locale
     const [isMobile, setIsMobile] = useState(false)
     const [isChatVisible, setIsChatVisible] = useState(true)
-    const [drawioUi, setDrawioUi] = useState<"min" | "sketch">("min")
+    const [drawioUi, setDrawioUi] = useState<DrawioTheme>("kennedy")
     const [darkMode, setDarkMode] = useState(false)
     const [isLoaded, setIsLoaded] = useState(false)
     const [isDrawioReady, setIsDrawioReady] = useState(false)
     const [isElectron, setIsElectron] = useState(false)
-    const [canPersist, setCanPersist] = useState(false)
-    const [canPersistChecked, setCanPersistChecked] = useState(false)
     const [drawioBaseUrl, setDrawioBaseUrl] = useState(
         process.env.NEXT_PUBLIC_DRAWIO_BASE_URL || "https://embed.diagrams.net",
     )
 
     const chatPanelRef = useRef<ImperativePanelHandle>(null)
-    const isMobileRef = useRef(false)
 
     // Load preferences from localStorage after mount
     useEffect(() => {
@@ -50,13 +47,15 @@ export default function Home() {
             const currentLocale = pathParts[0]
             if (currentLocale !== savedLocale) {
                 pathParts[0] = savedLocale
-                router.replace(`/${pathParts.join("/")}`)
+                // Keep the query (e.g. ?session=) and hash
+                const { search, hash } = window.location
+                router.replace(`/${pathParts.join("/")}${search}${hash}`)
                 return // Wait for redirect
             }
         }
 
         const savedUi = localStorage.getItem("drawio-theme")
-        if (savedUi === "min" || savedUi === "sketch") {
+        if (isDrawioTheme(savedUi)) {
             setDrawioUi(savedUi)
         }
 
@@ -84,11 +83,6 @@ export default function Home() {
             setDrawioBaseUrl(`${window.location.origin}/drawio/index.html`)
         }
 
-        void (async () => {
-            const usable = await isIndexedDBUsable()
-            setCanPersist(usable)
-            setCanPersistChecked(true)
-        })()
         setIsLoaded(true)
     }, [pathname, router])
 
@@ -97,17 +91,6 @@ export default function Home() {
         onDrawioLoad()
     }, [onDrawioLoad])
 
-    const handleDrawioAutoSave = useCallback(
-        (data: { xml?: string }) => {
-            handleDiagramAutoSave(data)
-            // Only suppress modified state when persistence is available
-            if (canPersist) {
-                drawioRef.current?.status({ message: "", modified: false })
-            }
-        },
-        [canPersist, drawioRef, handleDiagramAutoSave],
-    )
-
     const handleDarkModeChange = () => {
         const newValue = !darkMode
         setDarkMode(newValue)
@@ -117,35 +100,24 @@ export default function Home() {
         resetDrawioReady()
     }
 
-    const handleDrawioUiChange = () => {
-        const newUi = drawioUi === "min" ? "sketch" : "min"
-        localStorage.setItem("drawio-theme", newUi)
-        setDrawioUi(newUi)
+    const handleDrawioUiChange = (theme: DrawioTheme) => {
+        localStorage.setItem("drawio-theme", theme)
+        setDrawioUi(theme)
         setIsDrawioReady(false)
         resetDrawioReady()
     }
 
-    // Check mobile - reset draw.io before crossing breakpoint
-    const isInitialRenderRef = useRef(true)
+    // Check mobile. The draw.io iframe is not remounted when crossing the
+    // breakpoint (only the chat panel is), so its ready state stays as is.
     useEffect(() => {
         const checkMobile = () => {
-            const newIsMobile = window.innerWidth < 768
-            if (
-                !isInitialRenderRef.current &&
-                newIsMobile !== isMobileRef.current
-            ) {
-                setIsDrawioReady(false)
-                resetDrawioReady()
-            }
-            isMobileRef.current = newIsMobile
-            isInitialRenderRef.current = false
-            setIsMobile(newIsMobile)
+            setIsMobile(window.innerWidth < 768)
         }
 
         checkMobile()
         window.addEventListener("resize", checkMobile)
         return () => window.removeEventListener("resize", checkMobile)
-    }, [resetDrawioReady])
+    }, [])
 
     const toggleChatPanel = () => {
         const panel = chatPanelRef.current
@@ -191,7 +163,7 @@ export default function Home() {
                         }`}
                     >
                         <div className="h-full rounded-xl overflow-hidden shadow-soft-lg border border-border/30 relative">
-                            {isLoaded && canPersistChecked && (
+                            {isLoaded && (
                                 <div
                                     className={`h-full w-full ${isDrawioReady ? "" : "invisible absolute inset-0"}`}
                                 >
@@ -199,29 +171,24 @@ export default function Home() {
                                         key={`${drawioUi}-${darkMode}-${currentLang}-${isElectron}`}
                                         ref={drawioRef}
                                         autosave
-                                        onAutoSave={handleDrawioAutoSave}
+                                        onAutoSave={handleDiagramAutoSave}
                                         onExport={handleDiagramExport}
                                         onLoad={handleDrawioLoad}
                                         baseUrl={drawioBaseUrl}
-                                        configuration={
-                                            canPersist
-                                                ? { confirmExit: false }
-                                                : undefined
-                                        }
                                         urlParameters={{
                                             ui: drawioUi,
                                             spin: false,
                                             libraries: false,
-                                            // Disable modified tracking only when persistence is available
-                                            ...(canPersist && {
-                                                modified: false,
-                                                keepmodified: false,
-                                            }),
                                             saveAndExit: false,
                                             noSaveBtn: true,
                                             noExitBtn: true,
-                                            dark: darkMode,
-                                            lang: currentLang,
+                                            dark:
+                                                darkMode || drawioUi === "dark",
+                                            // draw.io names Traditional Chinese "zh-tw"
+                                            lang:
+                                                currentLang === "zh-Hant"
+                                                    ? "zh-tw"
+                                                    : currentLang,
                                             // Enable offline mode in Electron to disable external service calls
                                             ...(isElectron && {
                                                 offline: true,
@@ -268,7 +235,7 @@ export default function Home() {
                                 isVisible={isChatVisible}
                                 onToggleVisibility={toggleChatPanel}
                                 drawioUi={drawioUi}
-                                onToggleDrawioUi={handleDrawioUiChange}
+                                onDrawioUiChange={handleDrawioUiChange}
                                 darkMode={darkMode}
                                 onToggleDarkMode={handleDarkModeChange}
                                 isMobile={isMobile}

app/api/admin/providers/route.ts

@@ -0,0 +1,96 @@
+import { checkAdminAuth } from "@/lib/admin/auth"
+import {
+    AdminProvidersSchema,
+    deriveEnvUpdates,
+    loadAdminProviders,
+    maskAdminProviders,
+    mergeSecrets,
+    validateAdminProviders,
+} from "@/lib/admin/providers"
+import {
+    getEnvFallback,
+    isSettingsWritable,
+    saveSettings,
+} from "@/lib/admin/settings"
+import { loadEnvServerModelsConfig } from "@/lib/server-model-config"
+
+export const runtime = "nodejs"
+export const dynamic = "force-dynamic"
+
+async function payload() {
+    // Env-based providers (AI_MODELS_CONFIG / ai-models.json) are shown
+    // read-only in the panel; their credentials live in the environment
+    const envConfig = await loadEnvServerModelsConfig()
+    const adminProviders = loadAdminProviders()
+    // A panel default overrides any env default (matches the merge in
+    // loadRawServerModelsConfig), so env stars must reflect that
+    const adminHasDefault = adminProviders.some(
+        (p) => p.isDefault && p.models.length > 0,
+    )
+    return {
+        writable: isSettingsWritable(),
+        providers: maskAdminProviders(adminProviders),
+        envProviders:
+            envConfig?.providers.map((p) => ({
+                name: p.name,
+                provider: p.provider,
+                models: p.models,
+                isDefault: !!p.default && !adminHasDefault,
+            })) ?? [],
+        // Whether .env sets a default model. getEnvFallback skips the value
+        // the panel overlays onto process.env, so a panel default doesn't count.
+        envHasDefaultModel: !!getEnvFallback("AI_MODEL"),
+    }
+}
+
+export async function GET(req: Request) {
+    const authError = checkAdminAuth(req)
+    if (authError) return authError
+    return Response.json(await payload())
+}
+
+export async function PUT(req: Request) {
+    const authError = checkAdminAuth(req)
+    if (authError) return authError
+
+    if (!isSettingsWritable()) {
+        return Response.json(
+            {
+                error: "Settings file is not writable on this deployment. Configure via environment variables instead.",
+            },
+            { status: 503 },
+        )
+    }
+
+    let body: unknown
+    try {
+        body = await req.json()
+    } catch {
+        return Response.json({ error: "Invalid JSON body" }, { status: 400 })
+    }
+
+    const parsed = AdminProvidersSchema.safeParse(
+        (body as { providers?: unknown })?.providers,
+    )
+    if (!parsed.success) {
+        return Response.json(
+            {
+                error: `Invalid providers: ${parsed.error.issues[0]?.message ?? "schema mismatch"}`,
+            },
+            { status: 400 },
+        )
+    }
+
+    const stored = loadAdminProviders()
+    const merged = mergeSecrets(parsed.data, stored)
+
+    const envConfig = await loadEnvServerModelsConfig()
+    const validationError = validateAdminProviders(merged, envConfig)
+    if (validationError) {
+        return Response.json({ error: validationError }, { status: 400 })
+    }
+
+    saveSettings(deriveEnvUpdates(merged, stored))
+
+    return Response.json(await payload())
+}

app/api/admin/settings/route.ts

@@ -0,0 +1,126 @@
+import { checkAdminAuth, maskSecret } from "@/lib/admin/auth"
+import {
+    getEnvFallback,
+    getValueSource,
+    isSettingsWritable,
+    loadSettings,
+    saveSettings,
+} from "@/lib/admin/settings"
+import {
+    SETTINGS_BY_KEY,
+    SETTINGS_REGISTRY,
+    type SettingDef,
+} from "@/lib/admin/settings-registry"
+
+export const runtime = "nodejs"
+export const dynamic = "force-dynamic"
+
+function serializeSettings() {
+    const fileValues = loadSettings()
+    return SETTINGS_REGISTRY.map((def) => {
+        const source = getValueSource(def.key)
+        const raw =
+            source === "file"
+                ? fileValues[def.key]
+                : (getEnvFallback(def.key) ?? null)
+        const value = def.type === "secret" && raw ? maskSecret(raw) : raw
+        return { key: def.key, source, value }
+    })
+}
+
+export async function GET(req: Request) {
+    const authError = checkAdminAuth(req)
+    if (authError) return authError
+
+    return Response.json({
+        writable: isSettingsWritable(),
+        settings: serializeSettings(),
+    })
+}
+
+function validateValue(def: SettingDef, value: string): string | null {
+    switch (def.type) {
+        case "number": {
+            const num = Number(value)
+            if (!Number.isFinite(num)) return "Must be a number"
+            if (def.min !== undefined && num < def.min)
+                return `Must be at least ${def.min}`
+            if (def.max !== undefined && num > def.max)
+                return `Must be at most ${def.max}`
+            return null
+        }
+        case "boolean":
+            return value === "true" || value === "false"
+                ? null
+                : 'Must be "true" or "false"'
+        case "enum":
+            return def.options?.includes(value)
+                ? null
+                : `Must be one of: ${def.options?.join(", ")}`
+        default:
+            return null
+    }
+}
+
+export async function PUT(req: Request) {
+    const authError = checkAdminAuth(req)
+    if (authError) return authError
+
+    if (!isSettingsWritable()) {
+        return Response.json(
+            {
+                error: "Settings file is not writable on this deployment. Configure via environment variables instead.",
+            },
+            { status: 503 },
+        )
+    }
+
+    let body: { values?: Record<string, unknown> }
+    try {
+        body = await req.json()
+    } catch {
+        return Response.json({ error: "Invalid JSON body" }, { status: 400 })
+    }
+    if (!body.values || typeof body.values !== "object") {
+        return Response.json(
+            { error: "Body must contain a values object" },
+            { status: 400 },
+        )
+    }
+
+    const updates: Record<string, string | null> = {}
+    const errors: Record<string, string> = {}
+
+    for (const [key, value] of Object.entries(body.values)) {
+        const def = SETTINGS_BY_KEY.get(key)
+        if (!def) {
+            errors[key] = "Unknown setting"
+            continue
+        }
+        if (value === null || value === "") {
+            updates[key] = null
+            continue
+        }
+        if (typeof value !== "string") {
+            errors[key] = "Value must be a string"
+            continue
+        }
+        const error = validateValue(def, value)
+        if (error) {
+            errors[key] = error
+            continue
+        }
+        updates[key] = value
+    }
+
+    if (Object.keys(errors).length > 0) {
+        return Response.json({ errors }, { status: 400 })
+    }
+
+    saveSettings(updates)
+
+    return Response.json({
+        writable: true,
+        settings: serializeSettings(),
+    })
+}

app/api/admin/test-model/route.ts

@@ -0,0 +1,66 @@
+import { POST as validateModel } from "@/app/api/validate-model/route"
+import { checkAdminAuth } from "@/lib/admin/auth"
+import {
+    AdminProviderSchema,
+    loadAdminProviders,
+    mergeSecrets,
+} from "@/lib/admin/providers"
+
+export const runtime = "nodejs"
+export const dynamic = "force-dynamic"
+
+// Test a model with the client's CURRENT provider state (which may be
+// unsaved). Secret fields arrive either as plaintext (newly typed) or as
+// masked {isSet} markers, which are resolved against settings.json — so
+// testing works both before and after saving.
+export async function POST(req: Request) {
+    const authError = checkAdminAuth(req)
+    if (authError) return authError
+
+    let body: { provider?: unknown; modelId?: string }
+    try {
+        body = await req.json()
+    } catch {
+        return Response.json({ error: "Invalid JSON body" }, { status: 400 })
+    }
+
+    const parsed = AdminProviderSchema.safeParse(body.provider)
+    if (!parsed.success || !body.modelId) {
+        return Response.json(
+            { valid: false, error: "Invalid provider or model" },
+            { status: 400 },
+        )
+    }
+
+    // SECURITY: a stored secret is only resolved from an {isSet} marker if
+    // the endpoint it would be sent to (provider + baseUrl) still matches
+    // the stored entry. Otherwise a tampered baseUrl could exfiltrate the
+    // stored key to an arbitrary host. Mismatches must re-supply plaintext.
+    const stored = loadAdminProviders().find((p) => p.id === parsed.data.id)
+    const sameEndpoint =
+        stored &&
+        stored.provider === parsed.data.provider &&
+        (stored.baseUrl ?? "") === (parsed.data.baseUrl ?? "") &&
+        (stored.awsRegion ?? "") === (parsed.data.awsRegion ?? "")
+    const [resolved] = mergeSecrets(
+        [parsed.data],
+        sameEndpoint && stored ? [stored] : [],
+    )
+
+    return validateModel(
+        new Request(new URL("/api/validate-model", req.url), {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                provider: resolved.provider,
+                apiKey: resolved.apiKey,
+                baseUrl: resolved.baseUrl,
+                modelId: body.modelId,
+                awsAccessKeyId: resolved.awsAccessKeyId,
+                awsSecretAccessKey: resolved.awsSecretAccessKey,
+                awsRegion: resolved.awsRegion,
+                vertexApiKey: resolved.vertexApiKey,
+            }),
+        }),
+    )
+}

app/api/aihubmix-models/route.ts

@@ -0,0 +1,61 @@
+import { NextResponse } from "next/server"
+import {
+    AIHUBMIX_MODELS_ENDPOINT,
+    extractAihubmixModelIds,
+} from "@/lib/aihubmix-models"
+import { SUGGESTED_MODELS } from "@/lib/types/model-config"
+
+const SUCCESS_CACHE_CONTROL =
+    "public, max-age=300, s-maxage=3600, stale-while-revalidate=86400"
+
+function fallbackResponse() {
+    return NextResponse.json(
+        {
+            models: SUGGESTED_MODELS.aihubmix || [],
+            source: "fallback",
+        },
+        {
+            headers: {
+                "Cache-Control": "no-store",
+            },
+        },
+    )
+}
+
+export async function GET() {
+    try {
+        const response = await fetch(AIHUBMIX_MODELS_ENDPOINT, {
+            next: { revalidate: 3600 },
+        })
+
+        if (!response.ok) {
+            console.warn(
+                `[aihubmix-models] Failed to fetch models: ${response.status}`,
+            )
+            return fallbackResponse()
+        }
+
+        const payload = await response.json()
+        const models = extractAihubmixModelIds(payload)
+
+        if (models.length === 0) {
+            console.warn("[aihubmix-models] Model list response was empty")
+            return fallbackResponse()
+        }
+
+        return NextResponse.json(
+            {
+                models,
+                source: "aihubmix",
+            },
+            {
+                headers: {
+                    "Cache-Control": SUCCESS_CACHE_CONTROL,
+                },
+            },
+        )
+    } catch (error) {
+        console.warn("[aihubmix-models] Failed to load models:", error)
+        return fallbackResponse()
+    }
+}

app/api/chat/route.ts

@@ -12,14 +12,17 @@ import fs from "fs/promises"
 import { jsonrepair } from "jsonrepair"
 import path from "path"
 import { z } from "zod"
+import { checkAccessCode } from "@/lib/access-code"
 import {
     getAIModel,
     SINGLE_SYSTEM_PROVIDERS,
-    supportsImageInput,
     supportsPromptCaching,
+    usesServerCredentials,
 } from "@/lib/ai-providers"
 import { findCachedResponse } from "@/lib/cached-responses"
 import {
+    dropInvalidToolCalls,
+    fixToolInputJson,
     isMinimalDiagram,
     replaceHistoricalToolInputs,
     validateFileParts,
@@ -30,16 +33,27 @@ import {
     recordTokenUsage,
 } from "@/lib/dynamo-quota-manager"
 import {
+    endTrace,
     getTelemetryConfig,
     setTraceInput,
     setTraceOutput,
     wrapWithObserve,
 } from "@/lib/langfuse"
-import { findServerModelById } from "@/lib/server-model-config"
+import {
+    resolveMaxOutputTokens,
+    withOutputTokenLimitFallback,
+} from "@/lib/output-token-limit"
+import {
+    type FlattenedServerModel,
+    findServerModelById,
+} from "@/lib/server-model-config"
+import { allowPrivateUrls, isPrivateUrl } from "@/lib/ssrf-protection"
 import { getSystemPrompt } from "@/lib/system-prompts"
 import { getUserIdFromRequest } from "@/lib/user-id"
 
-export const maxDuration = 120
+// No explicit cap: a reasoning model can spend minutes planning before it emits
+// the tool call, so take whatever the host allows. Vercel's own default is 300s,
+// which is also where Node's response-body timeout on the upstream stream lands.
 
 // Helper function to create cached stream response
 function createCachedStreamResponse(xml: string): Response {
@@ -71,24 +85,14 @@ function createCachedStreamResponse(xml: string): Response {
     return createUIMessageStreamResponse({ stream })
 }
 
+// Responses streamed from the model, whose trace streamText's callbacks end
+const modelStreamResponses = new WeakSet<Response>()
+
 // Inner handler function
 async function handleChatRequest(req: Request): Promise<Response> {
     // Check for access code
-    const accessCodes =
-        process.env.ACCESS_CODE_LIST?.split(",")
-            .map((code) => code.trim())
-            .filter(Boolean) || []
-    if (accessCodes.length > 0) {
-        const accessCodeHeader = req.headers.get("x-access-code")
-        if (!accessCodeHeader || !accessCodes.includes(accessCodeHeader)) {
-            return Response.json(
-                {
-                    error: "Invalid or missing access code. Please configure it in Settings.",
-                },
-                { status: 401 },
-            )
-        }
-    }
+    const accessDenied = checkAccessCode(req)
+    if (accessDenied) return accessDenied
 
     const body = await req.json()
     const { messages, xml, previousXml, sessionId } = body
@@ -187,6 +191,15 @@ async function handleChatRequest(req: Request): Promise<Response> {
         baseUrl = `${origin}/api/edgeai`
     }
 
+    // Same rule as validate-model: with ALLOW_PRIVATE_URLS=false a request may
+    // not point the server at a private or internal address
+    if (baseUrl && !allowPrivateUrls() && (await isPrivateUrl(baseUrl))) {
+        return Response.json(
+            { error: "Private or internal base URLs are not allowed." },
+            { status: 400 },
+        )
+    }
+
     // Get cookie header for EdgeOne authentication (eo_token, eo_time)
     const cookieHeader = req.headers.get("cookie")
 
@@ -196,8 +209,9 @@ async function handleChatRequest(req: Request): Promise<Response> {
         baseUrlEnv?: string
         provider?: string
     } = {}
+    let serverModel: FlattenedServerModel | null = null
     if (selectedModelId?.startsWith("server:")) {
-        const serverModel = await findServerModelById(selectedModelId)
+        serverModel = await findServerModelById(selectedModelId)
         console.log(
             `[Server Model Lookup] ID: ${selectedModelId}, Found: ${!!serverModel}, Provider: ${serverModel?.provider}`,
         )
@@ -216,7 +230,8 @@ async function handleChatRequest(req: Request): Promise<Response> {
         provider: serverModelConfig.provider || provider,
         baseUrl,
         apiKey: req.headers.get("x-ai-api-key"),
-        modelId: req.headers.get("x-ai-model"),
+        // A server model runs the model it was configured with, whatever the header says
+        modelId: serverModel?.modelId || req.headers.get("x-ai-model"),
         // AWS Bedrock credentials
         awsAccessKeyId: req.headers.get("x-aws-access-key-id"),
         awsSecretAccessKey: req.headers.get("x-aws-secret-access-key"),
@@ -226,11 +241,14 @@ async function handleChatRequest(req: Request): Promise<Response> {
         ...serverModelConfig,
         // Vertex AI credentials (Express Mode)
         vertexApiKey: req.headers.get("x-vertex-api-key"),
-        // Pass cookies for EdgeOne Pages authentication
-        ...(provider === "edgeone" &&
-            cookieHeader && {
-                headers: { cookie: cookieHeader },
-            }),
+        // Pass cookies for EdgeOne Pages authentication, and the access code,
+        // which the EdgeOne function checks too
+        ...(provider === "edgeone" && {
+            headers: {
+                ...(cookieHeader && { cookie: cookieHeader }),
+                "x-access-code": req.headers.get("x-access-code") || "",
+            },
+        }),
     }
 
     // Read minimal style preference from header
@@ -242,13 +260,42 @@ async function handleChatRequest(req: Request): Promise<Response> {
 
     // Get AI model with optional client overrides
     const {
-        model,
+        model: baseModel,
         providerOptions,
         headers,
         modelId,
         provider: resolvedProvider,
     } = getAIModel(clientOverrides)
 
+    // On the server's own keys, only run models the server offers: a server
+    // model picked by id (its model name is fixed above) or one in AI_MODEL.
+    // With their own key, users can run any model.
+    const onServerCredentials = usesServerCredentials(
+        resolvedProvider,
+        clientOverrides,
+    )
+    const envModels =
+        process.env.AI_MODEL?.split(",").map((m) => m.trim()) || []
+    if (onServerCredentials && !serverModel && !envModels.includes(modelId)) {
+        return Response.json(
+            {
+                error: `Model "${modelId}" is not available on this server. Add your own API key in Settings to use it.`,
+            },
+            { status: 400 },
+        )
+    }
+
+    // Retry with a smaller budget if the provider rejects the requested one
+    const model = withOutputTokenLimitFallback(baseModel)
+
+    // The user setting can raise the budget only on their own key (desktop users
+    // can still raise it themselves); on the server's keys it can only lower it
+    const maxOutputTokens = resolveMaxOutputTokens(
+        req.headers.get("x-max-output-tokens"),
+        onServerCredentials,
+    )
+    console.log(`[maxOutputTokens] ${maxOutputTokens}`)
+
     // Check if model supports prompt caching
     const shouldCache = supportsPromptCaching(modelId)
     console.log(
@@ -266,16 +313,10 @@ async function handleChatRequest(req: Request): Promise<Response> {
         lastUserMessage?.parts?.filter((part: any) => part.type === "file") ||
         []
 
-    // Check if user is sending images to a model that doesn't support them
-    // AI SDK silently drops unsupported parts, so we need to catch this early
-    if (fileParts.length > 0 && !supportsImageInput(modelId)) {
-        return Response.json(
-            {
-                error: `The model "${modelId}" does not support image input. Please use a vision-capable model (e.g., GPT-4o, Claude, Gemini) or remove the image.`,
-            },
-            { status: 400 },
-        )
-    }
+    // Note: we used to pre-emptively reject images for models we guessed were
+    // text-only (by name matching). That heuristic misfired on newer models
+    // (see issue #874), so we now let the request through and surface the real
+    // provider error if the model genuinely can't accept images.
 
     // User input only - XML is now in a separate cached system message
     const formattedUserInput = `User input:
@@ -332,32 +373,9 @@ ${userInputText}
     )
 
     // Filter out tool-calls with invalid inputs (from failed repair or interrupted streaming)
-    // Bedrock API rejects messages where toolUse.input is not a valid JSON object
-    enhancedMessages = enhancedMessages
-        .map((msg: any) => {
-            if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
-                return msg
-            }
-            const filteredContent = msg.content.filter((part: any) => {
-                if (part.type === "tool-call") {
-                    // Check if input is a valid object (not null, undefined, or empty)
-                    if (
-                        !part.input ||
-                        typeof part.input !== "object" ||
-                        Object.keys(part.input).length === 0
-                    ) {
-                        console.warn(
-                            `[route.ts] Filtering out tool-call with invalid input:`,
-                            { toolName: part.toolName, input: part.input },
-                        )
-                        return false
-                    }
-                }
-                return true
-            })
-            return { ...msg, content: filteredContent }
-        })
-        .filter((msg: any) => msg.content && msg.content.length > 0)
+    // and their results. Bedrock API rejects messages where toolUse.input is not a valid
+    // JSON object, and every provider rejects a tool result whose call is gone.
+    enhancedMessages = dropInvalidToolCalls(enhancedMessages)
 
     // DEBUG: Log modelMessages structure (what's being sent to AI)
     console.log("[route.ts] Model messages count:", enhancedMessages.length)
@@ -402,7 +420,7 @@ ${userInputText}
                 contentParts.push({
                     type: "image",
                     image: filePart.url,
-                    mimeType: filePart.mediaType,
+                    mediaType: filePart.mediaType,
                 })
             }
 
@@ -463,7 +481,7 @@ ${previousXml}
 ${xml || ""}
 """
 
-IMPORTANT: The "Current diagram XML" is the SINGLE SOURCE OF TRUTH for what's on the canvas right now. The user can manually add, delete, or modify shapes directly in draw.io. Always count and describe elements based on the CURRENT XML, not on what you previously generated. If both previous and current XML are shown, compare them to understand what the user changed. When using edit_diagram, COPY search patterns exactly from the CURRENT XML - attribute order matters!`
+IMPORTANT: The "Current diagram XML" is the SINGLE SOURCE OF TRUTH for what's on the canvas right now. The user can manually add, delete, or modify shapes directly in draw.io. Always count and describe elements based on the CURRENT XML, not on what you previously generated. If both previous and current XML are shown, compare them to understand what the user changed.`
 
     const systemMessages = isSingleSystemProvider
         ? [
@@ -500,9 +518,9 @@ IMPORTANT: The "Current diagram XML" is the SINGLE SOURCE OF TRUTH for what's on
     const result = streamText({
         model,
         abortSignal: req.signal,
-        ...(process.env.MAX_OUTPUT_TOKENS && {
-            maxOutputTokens: parseInt(process.env.MAX_OUTPUT_TOKENS, 10),
-        }),
+        // Must be sent: unset means the provider's own default, and Bedrock's is
+        // 4096, enough for a small diagram, so larger ones were cut off mid-attribute.
+        maxOutputTokens,
         stopWhen: stepCountIs(5),
         // Repair truncated tool calls when maxOutputTokens is reached mid-JSON
         experimental_repairToolCall: async ({ toolCall, error }) => {
@@ -520,23 +538,11 @@ IMPORTANT: The "Current diagram XML" is the SINGLE SOURCE OF TRUTH for what's on
                 error.name === "AI_InvalidToolInputError"
             ) {
                 try {
-                    // Pre-process to fix common LLM JSON errors that jsonrepair can't handle
-                    let inputToRepair = toolCall.input
-                    if (typeof inputToRepair === "string") {
-                        // Fix `:=` instead of `: ` (LLM sometimes generates this)
-                        inputToRepair = inputToRepair.replace(/:=/g, ": ")
-                        // Fix `= "` instead of `: "`
-                        inputToRepair = inputToRepair.replace(/=\s*"/g, ': "')
-                        // Fix inconsistent quote escaping in XML attributes within JSON strings
-                        // Pattern: attribute="value\" where opening quote is unescaped but closing is escaped
-                        // Example: y="-20\" should be y=\"-20\"
-                        inputToRepair = inputToRepair.replace(
-                            /(\w+)="([^"]*?)\\"/g,
-                            '$1=\\"$2\\"',
-                        )
-                    }
-                    // Use jsonrepair to fix truncated JSON
-                    const repairedInput = jsonrepair(inputToRepair)
+                    // Pre-process to fix common LLM JSON errors that jsonrepair can't handle,
+                    // then use jsonrepair to fix truncated JSON
+                    const repairedInput = jsonrepair(
+                        fixToolInputJson(toolCall.input),
+                    )
                     console.log(
                         `[repairToolCall] Repaired truncated JSON for tool: ${toolCall.toolName}`,
                     )
@@ -546,26 +552,8 @@ IMPORTANT: The "Current diagram XML" is the SINGLE SOURCE OF TRUTH for what's on
                         `[repairToolCall] Failed to repair JSON for tool: ${toolCall.toolName}`,
                         repairError,
                     )
-                    // Return a placeholder input to avoid API errors in multi-step
-                    // The tool will fail gracefully on client side
-                    if (toolCall.toolName === "edit_diagram") {
-                        return {
-                            ...toolCall,
-                            input: {
-                                operations: [],
-                                _error: "JSON repair failed - no operations to apply",
-                            },
-                        }
-                    }
-                    if (toolCall.toolName === "display_diagram") {
-                        return {
-                            ...toolCall,
-                            input: {
-                                xml: "",
-                                _error: "JSON repair failed - empty diagram",
-                            },
-                        }
-                    }
+                    // Keep the original error, so the model and the client see why
+                    // the input was rejected and the model can retry the call
                     return null
                 }
             }
@@ -588,7 +576,7 @@ IMPORTANT: The "Current diagram XML" is the SINGLE SOURCE OF TRUTH for what's on
 
             // Record token usage for server-side quota tracking (if enabled)
             // Use totalUsage (cumulative across all steps) instead of usage (final step only)
-            // Include all 4 token types: input, output, cache read, cache write
+            // inputTokens already includes cache reads and writes in AI SDK 6
             if (
                 isQuotaEnabled() &&
                 !hasOwnApiKey &&
@@ -597,12 +585,16 @@ IMPORTANT: The "Current diagram XML" is the SINGLE SOURCE OF TRUTH for what's on
             ) {
                 const totalTokens =
                     (totalUsage.inputTokens || 0) +
-                    (totalUsage.outputTokens || 0) +
-                    (totalUsage.cachedInputTokens || 0) +
-                    (totalUsage.inputTokenDetails?.cacheWriteTokens || 0)
+                    (totalUsage.outputTokens || 0)
                 recordTokenUsage(userId, totalTokens)
             }
         },
+        // onFinish is skipped when the stream fails or is aborted, so end the trace here
+        onError: ({ error }) => {
+            console.error(error) // what AI SDK does without an onError
+            endTrace()
+        },
+        onAbort: () => endTrace(),
         tools: {
             // Client-side tool that will be executed on the client
             display_diagram: {
@@ -774,7 +766,7 @@ Call this tool to get shape names and usage syntax for a specific library.`,
         }),
     })
 
-    return result.toUIMessageStreamResponse({
+    const response = result.toUIMessageStreamResponse({
         sendReasoning: true,
         messageMetadata: ({ part }) => {
             if (part.type === "finish") {
@@ -788,6 +780,8 @@ Call this tool to get shape names and usage syntax for a specific library.`,
             return undefined
         },
     })
+    modelStreamResponses.add(response)
+    return response
 }
 
 // Helper to categorize errors and return appropriate response
@@ -854,11 +848,16 @@ function handleError(error: unknown): Response {
 
 // Wrap handler with error handling
 async function safeHandler(req: Request): Promise<Response> {
+    let response: Response
     try {
-        return await handleChatRequest(req)
+        response = await handleChatRequest(req)
     } catch (error) {
-        return handleError(error)
+        response = handleError(error)
     }
+    // Early returns, cache hits and errors never reach streamText's callbacks,
+    // so their Langfuse trace has to be ended here
+    if (!modelStreamResponses.has(response)) endTrace()
+    return response
 }
 
 // Wrap with Langfuse observe (if configured)

app/api/parse-url/route.ts

@@ -1,13 +1,69 @@
-import { extract } from "@extractus/article-extractor"
+import { extractFromHtml } from "@extractus/article-extractor"
 import { NextResponse } from "next/server"
 import TurndownService from "turndown"
-import { allowPrivateUrls, isPrivateUrl } from "@/lib/ssrf-protection"
+import { checkAccessCode } from "@/lib/access-code"
+import { isPrivateUrl } from "@/lib/ssrf-protection"
 
 const MAX_CONTENT_LENGTH = 150000 // Match PDF limit
+const MAX_RESPONSE_BYTES = 5 * 1024 * 1024
 const EXTRACT_TIMEOUT_MS = 15000
 const USER_AGENT = "Mozilla/5.0 (compatible; NextAIDrawio/1.0)"
 
+// Detect the page's charset so non-UTF-8 pages (Shift_JIS/GBK/EUC/Big5, common
+// on CJK sites) are decoded correctly. Response.text() always assumes UTF-8 and
+// would produce mojibake; the article-extractor library does the same detection
+// when it fetches the page itself, which we no longer rely on.
+function detectCharset(
+    contentType: string | null,
+    buffer: ArrayBuffer,
+): string {
+    // 1. HTTP Content-Type header charset (most authoritative).
+    const headerCharset = contentType?.match(/charset=([^;]+)/i)?.[1]?.trim()
+    // 2. <meta charset> / <meta http-equiv> in the first bytes of the document.
+    const head = new TextDecoder("utf-8").decode(buffer.slice(0, 4096))
+    const metaCharset =
+        head.match(/<meta[^>]+charset=["']?\s*([\w-]+)/i)?.[1] ||
+        head.match(/<meta[^>]+content=["'][^"']*charset=([\w-]+)/i)?.[1]
+    const charset = (headerCharset || metaCharset || "utf-8").toLowerCase()
+    // TextDecoder throws on unknown encoding labels; fall back to UTF-8.
+    try {
+        new TextDecoder(charset)
+        return charset
+    } catch {
+        return "utf-8"
+    }
+}
+
+// Read the response body, giving up once it passes MAX_RESPONSE_BYTES so a
+// huge download can't exhaust server memory. Returns null when too large.
+async function readLimitedBody(
+    response: Response,
+): Promise<ArrayBuffer | null> {
+    if (Number(response.headers.get("content-length")) > MAX_RESPONSE_BYTES) {
+        return null
+    }
+    if (!response.body) return new ArrayBuffer(0)
+
+    const reader = response.body.getReader()
+    const chunks: Uint8Array[] = []
+    let total = 0
+    while (true) {
+        const { done, value } = await reader.read()
+        if (done) break
+        total += value.byteLength
+        if (total > MAX_RESPONSE_BYTES) {
+            await reader.cancel()
+            return null
+        }
+        chunks.push(value)
+    }
+    return new Blob(chunks as BlobPart[]).arrayBuffer()
+}
+
 export async function POST(req: Request) {
+    const accessError = checkAccessCode(req)
+    if (accessError) return accessError
+
     try {
         const { url } = await req.json()
 
@@ -28,22 +84,34 @@ export async function POST(req: Request) {
             )
         }
 
-        // SSRF protection
-        if (!allowPrivateUrls && isPrivateUrl(url)) {
+        // SSRF protection: parse-url has no use case for fetching internal
+        // hosts, so private URLs are always rejected. ALLOW_PRIVATE_URLS only
+        // governs LLM provider baseUrl overrides (validate-model, chat).
+        if (await isPrivateUrl(url)) {
             return NextResponse.json(
                 { error: "Cannot access private/internal URLs" },
                 { status: 400 },
             )
         }
-        const headController = new AbortController()
-        const headTimeout = setTimeout(() => headController.abort(), 3000)
+        // Fetch the page ourselves so we control redirect handling. The
+        // article-extractor library follows redirects internally and ignores a
+        // `redirect` option, which would let a public URL 302 to an internal
+        // host and bypass the SSRF check above. `redirect: "error"` rejects any
+        // redirect outright.
+        const controller = new AbortController()
+        const timeoutId = setTimeout(() => {
+            controller.abort()
+        }, EXTRACT_TIMEOUT_MS)
+
+        let html: string
         try {
-            const headResponse = await fetch(url, {
-                method: "HEAD",
+            const response = await fetch(url, {
                 headers: { "User-Agent": USER_AGENT },
-                signal: headController.signal,
+                redirect: "error",
+                signal: controller.signal,
             })
-            const contentType = headResponse.headers.get("content-type")
+
+            const contentType = response.headers.get("content-type")
             if (contentType?.includes("application/pdf")) {
                 return NextResponse.json(
                     {
@@ -52,27 +120,25 @@ export async function POST(req: Request) {
                     { status: 422 },
                 )
             }
-        } catch (err) {
-            console.warn(
-                "HEAD pre-check failed, proceeding with extraction:",
-                err,
-            )
-        } finally {
-            clearTimeout(headTimeout)
-        }
 
-        // Extract article content with timeout to avoid tying up server resources
-        const controller = new AbortController()
-        const timeoutId = setTimeout(() => {
-            controller.abort()
-        }, EXTRACT_TIMEOUT_MS)
+            if (!response.ok) {
+                return NextResponse.json(
+                    { error: "Could not fetch URL content" },
+                    { status: 400 },
+                )
+            }
 
-        let article
-        try {
-            article = await extract(url, undefined, {
-                headers: { "User-Agent": USER_AGENT },
-                signal: controller.signal,
-            })
+            const buffer = await readLimitedBody(response)
+            if (!buffer) {
+                return NextResponse.json(
+                    {
+                        error: `Page exceeds the ${MAX_RESPONSE_BYTES / 1024 / 1024} MB download limit`,
+                    },
+                    { status: 413 },
+                )
+            }
+            const charset = detectCharset(contentType, buffer)
+            html = new TextDecoder(charset).decode(buffer)
         } catch (err: any) {
             if (err?.name === "AbortError") {
                 return NextResponse.json(
@@ -80,11 +146,25 @@ export async function POST(req: Request) {
                     { status: 504 },
                 )
             }
-            throw err
+            // Redirects are rejected with a TypeError ("failed to fetch" /
+            // "unexpected redirect") when redirect: "error" is set.
+            return NextResponse.json(
+                { error: "Could not fetch URL content" },
+                { status: 400 },
+            )
         } finally {
             clearTimeout(timeoutId)
         }
 
+        // extractFromHtml throws (not returns null) on empty/non-HTML bodies,
+        // so map any parse error to the same 400 as the no-content case.
+        let article: Awaited<ReturnType<typeof extractFromHtml>>
+        try {
+            article = await extractFromHtml(html, url)
+        } catch {
+            article = null
+        }
+
         if (!article || !article.content) {
             return NextResponse.json(
                 { error: "Could not extract content from URL" },

app/api/validate-diagram/route.ts

@@ -4,6 +4,7 @@
  */
 
 import { streamObject } from "ai"
+import { checkAccessCode } from "@/lib/access-code"
 import { getValidationModel } from "@/lib/ai-providers"
 import { VALIDATION_SYSTEM_PROMPT } from "@/lib/validation-prompts"
 import {
@@ -13,6 +14,9 @@ import {
 
 export const maxDuration = 30
 
+// Data URL length cap (~3.75 MB of PNG), well above a normal diagram capture
+const MAX_IMAGE_DATA_LENGTH = 5 * 1024 * 1024
+
 interface ValidateDiagramRequest {
     imageData: string // Base64 PNG data URL
     sessionId?: string
@@ -44,6 +48,10 @@ function createStreamingResponse(result: ValidationResult): Response {
 }
 
 export async function POST(req: Request): Promise<Response> {
+    // Uses the server's model credentials, so require the access code
+    const accessError = checkAccessCode(req)
+    if (accessError) return accessError
+
     try {
         // Check if VLM validation is enabled (default: true)
         const enableValidation = process.env.ENABLE_VLM_VALIDATION !== "false"
@@ -72,6 +80,13 @@ export async function POST(req: Request): Promise<Response> {
             )
         }
 
+        if (imageData.length > MAX_IMAGE_DATA_LENGTH) {
+            return Response.json(
+                { error: "Image data too large" },
+                { status: 413 },
+            )
+        }
+
         // Get the validation model
         let model
         try {

app/api/validate-model/route.ts

@@ -5,11 +5,17 @@ import { createGateway } from "@ai-sdk/gateway"
 import { createGoogleGenerativeAI } from "@ai-sdk/google"
 import { createVertex } from "@ai-sdk/google-vertex"
 import { createOpenAI } from "@ai-sdk/openai"
+import { createAihubmix } from "@aihubmix/ai-sdk-provider"
 import { createOpenRouter } from "@openrouter/ai-sdk-provider"
 import { generateText } from "ai"
 import { NextResponse } from "next/server"
 import { createOllama } from "ollama-ai-provider-v2"
-import { normalizeMiniMaxBaseURL } from "@/lib/ai-providers"
+import { checkAccessCode } from "@/lib/access-code"
+import {
+    AIHUBMIX_APP_CODE,
+    isAihubmixStandardBaseURL,
+    normalizeMiniMaxBaseURL,
+} from "@/lib/ai-providers"
 import { allowPrivateUrls, isPrivateUrl } from "@/lib/ssrf-protection"
 import { PROVIDER_INFO, type ProviderName } from "@/lib/types/model-config"
 
@@ -28,7 +34,24 @@ interface ValidateRequest {
     vertexApiKey?: string // Express Mode API key
 }
 
+// With private URLs blocked, a public baseUrl could still redirect the
+// request to an internal host, so redirects are refused in that case.
+function redirectGuardedFetch(): typeof fetch | undefined {
+    if (allowPrivateUrls()) return undefined
+    return async (input, init) => {
+        const response = await fetch(input, { ...init, redirect: "manual" })
+        if (response.status >= 300 && response.status < 400) {
+            throw new Error("Redirects are not allowed for custom base URLs")
+        }
+        return response
+    }
+}
+
 export async function POST(req: Request) {
+    // Lets the server send requests to arbitrary URLs, so require the access code
+    const accessError = checkAccessCode(req)
+    if (accessError) return accessError
+
     try {
         const body: ValidateRequest = await req.json()
         const {
@@ -51,7 +74,7 @@ export async function POST(req: Request) {
         }
 
         // SECURITY: Block SSRF attacks via custom baseUrl
-        if (baseUrl && !allowPrivateUrls && isPrivateUrl(baseUrl)) {
+        if (baseUrl && !allowPrivateUrls() && (await isPrivateUrl(baseUrl))) {
             return NextResponse.json(
                 { valid: false, error: "Invalid base URL" },
                 { status: 400 },
@@ -86,6 +109,7 @@ export async function POST(req: Request) {
             )
         }
 
+        const guardedFetch = redirectGuardedFetch()
         let model: any
 
         switch (provider) {
@@ -93,6 +117,7 @@ export async function POST(req: Request) {
                 const openai = createOpenAI({
                     apiKey,
                     ...(baseUrl && { baseURL: baseUrl }),
+                    fetch: guardedFetch,
                 })
                 model = openai.chat(modelId)
                 break
@@ -102,6 +127,7 @@ export async function POST(req: Request) {
                 const anthropic = createAnthropic({
                     apiKey,
                     baseURL: baseUrl || "https://api.anthropic.com/v1",
+                    fetch: guardedFetch,
                 })
                 model = anthropic(modelId)
                 break
@@ -111,6 +137,7 @@ export async function POST(req: Request) {
                 const google = createGoogleGenerativeAI({
                     apiKey,
                     ...(baseUrl && { baseURL: baseUrl }),
+                    fetch: guardedFetch,
                 })
                 model = google(modelId)
                 break
@@ -120,6 +147,7 @@ export async function POST(req: Request) {
                 const vertex = createVertex({
                     apiKey: vertexApiKey,
                     ...(baseUrl && { baseURL: baseUrl }),
+                    fetch: guardedFetch,
                 })
                 model = vertex(modelId)
                 break
@@ -129,6 +157,7 @@ export async function POST(req: Request) {
                 const azure = createOpenAI({
                     apiKey,
                     baseURL: baseUrl,
+                    fetch: guardedFetch,
                 })
                 model = azure.chat(modelId)
                 break
@@ -148,16 +177,41 @@ export async function POST(req: Request) {
                 const openrouter = createOpenRouter({
                     apiKey,
                     ...(baseUrl && { baseURL: baseUrl }),
+                    fetch: guardedFetch,
                 })
                 model = openrouter(modelId)
                 break
             }
 
+            case "aihubmix": {
+                const defaultBaseURL = PROVIDER_INFO.aihubmix.defaultBaseUrl
+
+                if (
+                    isAihubmixStandardBaseURL(baseUrl) ||
+                    baseUrl === defaultBaseURL
+                ) {
+                    const aihubmix = createAihubmix({
+                        apiKey,
+                        appCode: AIHUBMIX_APP_CODE,
+                    })
+                    model = aihubmix(modelId)
+                } else {
+                    const aihubmixCompatible = createOpenAI({
+                        apiKey,
+                        baseURL: baseUrl,
+                        fetch: guardedFetch,
+                    })
+                    model = aihubmixCompatible.chat(modelId)
+                }
+                break
+            }
+
             case "deepseek": {
                 if (baseUrl || apiKey) {
                     const ds = createDeepSeek({
                         apiKey,
                         ...(baseUrl && { baseURL: baseUrl }),
+                        fetch: guardedFetch,
                     })
                     model = ds(modelId)
                 } else {
@@ -170,6 +224,7 @@ export async function POST(req: Request) {
                 const sf = createOpenAI({
                     apiKey,
                     baseURL: baseUrl || "https://api.siliconflow.cn/v1",
+                    fetch: guardedFetch,
                 })
                 model = sf.chat(modelId)
                 break
@@ -186,6 +241,7 @@ export async function POST(req: Request) {
                         baseUrl ||
                         process.env.OLLAMA_BASE_URL ||
                         "https://ollama.com/api",
+                    fetch: guardedFetch,
                     ...(ollamaApiKey && {
                         headers: { Authorization: `Bearer ${ollamaApiKey}` },
                     }),
@@ -198,6 +254,7 @@ export async function POST(req: Request) {
                 const gw = createGateway({
                     apiKey,
                     ...(baseUrl && { baseURL: baseUrl }),
+                    fetch: guardedFetch,
                 })
                 model = gw(modelId)
                 break
@@ -205,13 +262,16 @@ export async function POST(req: Request) {
 
             case "edgeone": {
                 // EdgeOne uses OpenAI-compatible API via Edge Functions
-                // Need to pass cookies for EdgeOne Pages authentication
+                // Need to pass cookies for EdgeOne Pages authentication,
+                // and the access code, which the edge function also checks
                 const cookieHeader = req.headers.get("cookie") || ""
                 const edgeone = createOpenAI({
                     apiKey: "edgeone", // EdgeOne doesn't require API key
                     baseURL: baseUrl || "/api/edgeai",
+                    fetch: guardedFetch,
                     headers: {
                         cookie: cookieHeader,
+                        "x-access-code": req.headers.get("x-access-code") || "",
                     },
                 })
                 model = edgeone.chat(modelId)
@@ -223,6 +283,7 @@ export async function POST(req: Request) {
                 const sglang = createOpenAI({
                     apiKey: apiKey || "not-needed",
                     baseURL: baseUrl || "http://127.0.0.1:8000/v1",
+                    fetch: guardedFetch,
                 })
                 model = sglang.chat(modelId)
                 break
@@ -240,12 +301,14 @@ export async function POST(req: Request) {
                     const doubao = createDeepSeek({
                         apiKey,
                         baseURL: doubaoBaseUrl,
+                        fetch: guardedFetch,
                     })
                     model = doubao(modelId)
                 } else {
                     const doubao = createOpenAI({
                         apiKey,
                         baseURL: doubaoBaseUrl,
+                        fetch: guardedFetch,
                     })
                     model = doubao.chat(modelId)
                 }
@@ -259,7 +322,7 @@ export async function POST(req: Request) {
 
                 try {
                     // Initiate a streaming request (required for QwQ-32B and certain Qwen3 models)
-                    const response = await fetch(
+                    const response = await (guardedFetch ?? fetch)(
                         `${baseURL}/chat/completions`,
                         {
                             method: "POST",
@@ -280,9 +343,15 @@ export async function POST(req: Request) {
                     )
 
                     if (!response.ok) {
-                        const errorText = await response.text()
+                        // Log the body but return only the status: the
+                        // caller chooses baseUrl, so the body may come from
+                        // any host the server can reach
+                        console.error(
+                            "[validate-model] ModelScope error body:",
+                            await response.text(),
+                        )
                         throw new Error(
-                            `ModelScope API error (${response.status}): ${errorText}`,
+                            `ModelScope API error (${response.status})`,
                         )
                     }
 
@@ -333,24 +402,28 @@ export async function POST(req: Request) {
                     const minimax = createAnthropic({
                         apiKey,
                         baseURL: minimaxBaseUrl,
+                        fetch: guardedFetch,
                     })
                     model = minimax.chat(modelId)
                 } else {
                     const minimax = createOpenAI({
                         apiKey,
                         baseURL: minimaxBaseUrl,
+                        fetch: guardedFetch,
                     })
                     model = minimax.chat(modelId)
                 }
                 break
             }
 
-            // GLM, Qwen, Kimi, Qiniu, Novita - OpenAI compatible
+            // GLM, Qwen, Kimi, Qiniu, Novita, MiMo, Atlas Cloud - OpenAI compatible
             case "glm":
             case "qwen":
             case "kimi":
             case "qiniu":
-            case "novita": {
+            case "novita":
+            case "atlascloud":
+            case "mimo": {
                 const baseURL =
                     baseUrl ||
                     PROVIDER_INFO[provider as ProviderName]?.defaultBaseUrl ||
@@ -369,6 +442,7 @@ export async function POST(req: Request) {
                 const openai = createOpenAI({
                     apiKey,
                     baseURL,
+                    fetch: guardedFetch,
                 })
                 model = openai.chat(modelId)
                 break

app/api/verify-access-code/route.ts

@@ -1,29 +1,9 @@
+import { checkAccessCode } from "@/lib/access-code"
+
 export async function POST(req: Request) {
-    const accessCodes =
-        process.env.ACCESS_CODE_LIST?.split(",")
-            .map((code) => code.trim())
-            .filter(Boolean) || []
-
-    // If no access codes configured, verification always passes
-    if (accessCodes.length === 0) {
-        return Response.json({
-            valid: true,
-            message: "No access code required",
-        })
-    }
-
-    const accessCodeHeader = req.headers.get("x-access-code")
-
-    if (!accessCodeHeader) {
+    if (checkAccessCode(req)) {
         return Response.json(
-            { valid: false, message: "Access code is required" },
-            { status: 401 },
-        )
-    }
-
-    if (!accessCodes.includes(accessCodeHeader)) {
-        return Response.json(
-            { valid: false, message: "Invalid access code" },
+            { valid: false, message: "Invalid or missing access code" },
             { status: 401 },
         )
     }

biome.json

@@ -1,12 +1,13 @@
 {
-    "$schema": "https://biomejs.dev/schemas/2.4.4/schema.json",
+    "$schema": "https://biomejs.dev/schemas/2.4.14/schema.json",
     "vcs": {
         "enabled": true,
         "clientKind": "git",
         "useIgnoreFile": true
     },
     "files": {
-        "ignoreUnknown": false
+        "ignoreUnknown": false,
+        "includes": ["**", "!public"]
     },
     "formatter": {
         "enabled": true,

components/chat-example-panel.tsx

@@ -141,9 +141,6 @@ export default function ExamplePanel({
                                     <span className="text-sm font-medium text-foreground group-hover:text-purple-500 transition-colors">
                                         {dict.examples.mcpServer}
                                     </span>
-                                    <span className="px-1.5 py-0.5 text-[10px] font-semibold bg-purple-500 text-white rounded">
-                                        {dict.examples.preview}
-                                    </span>
                                 </div>
                                 <p className="text-xs text-muted-foreground">
                                     {dict.examples.mcpDescription}

components/chat-input.tsx

@@ -11,7 +11,9 @@ import {
 } from "lucide-react"
 import type React from "react"
 import {
+    type Dispatch,
     forwardRef,
+    type SetStateAction,
     useCallback,
     useEffect,
     useImperativeHandle,
@@ -41,9 +43,20 @@ import { FilePreviewList } from "./file-preview-list"
 
 const MAX_IMAGE_SIZE = 2 * 1024 * 1024 // 2MB
 const MAX_FILES = 5
+// Image formats every supported model provider accepts (SVG is read as text)
+const SUPPORTED_IMAGE_TYPES = [
+    "image/png",
+    "image/jpeg",
+    "image/gif",
+    "image/webp",
+]
 
 function isValidFileType(file: File): boolean {
-    return file.type.startsWith("image/") || isPdfFile(file) || isTextFile(file)
+    return (
+        SUPPORTED_IMAGE_TYPES.includes(file.type) ||
+        isPdfFile(file) ||
+        isTextFile(file)
+    )
 }
 
 function formatFileSize(bytes: number): string {
@@ -164,7 +177,7 @@ interface ChatInputProps {
         { text: string; charCount: number; isExtracting: boolean }
     >
     urlData?: Map<string, UrlData>
-    onUrlChange?: (data: Map<string, UrlData>) => void
+    onUrlChange?: Dispatch<SetStateAction<Map<string, UrlData>>>
 
     sessionId?: string
     error?: Error | null
@@ -244,6 +257,11 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
         // Allow retry when there's an error (even if status is still "streaming" or "submitted")
         const isDisabled =
             (status === "streaming" || status === "submitted") && !error
+        // Block sending until attached files and URLs have their text, otherwise
+        // their content would be silently dropped
+        const isExtractingAttachments =
+            files.some((file) => pdfData.get(file)?.isExtracting) ||
+            Array.from(urlData?.values() ?? []).some((d) => d.isExtracting)
 
         const adjustTextareaHeight = useCallback(() => {
             const textarea = textareaRef.current
@@ -281,6 +299,9 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
         }
 
         const handleKeyDown = (e: React.KeyboardEvent) => {
+            // Enter that confirms an IME candidate must not send the message
+            if (e.nativeEvent.isComposing || e.keyCode === 229) return
+
             const shouldSend =
                 sendShortcut === "enter"
                     ? e.key === "Enter" &&
@@ -292,7 +313,12 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
             if (shouldSend) {
                 e.preventDefault()
                 const form = e.currentTarget.closest("form")
-                if (form && input.trim() && !isDisabled) {
+                if (
+                    form &&
+                    input.trim() &&
+                    !isDisabled &&
+                    !isExtractingAttachments
+                ) {
                     form.requestSubmit()
                 }
             }
@@ -380,13 +406,9 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
 
             if (isDisabled) return
 
-            const droppedFiles = e.dataTransfer.files
-            const supportedFiles = Array.from(droppedFiles).filter((file) =>
-                isValidFileType(file),
-            )
-
+            // Let validateFiles show a toast for unsupported types
             const { validFiles, errors } = validateFiles(
-                supportedFiles,
+                Array.from(e.dataTransfer.files),
                 files.length,
                 dict,
             )
@@ -401,33 +423,34 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
 
             setIsExtractingUrl(true)
 
+            // Use functional updates so a removal or send made while extracting
+            // is not overwritten when the request finishes
             try {
-                const existing = urlData
-                    ? new Map(urlData)
-                    : new Map<string, UrlData>()
-                existing.set(url, {
-                    url,
-                    title: url,
-                    content: "",
-                    charCount: 0,
-                    isExtracting: true,
-                })
-                onUrlChange(existing)
+                onUrlChange((prev) =>
+                    new Map(prev).set(url, {
+                        url,
+                        title: url,
+                        content: "",
+                        charCount: 0,
+                        isExtracting: true,
+                    }),
+                )
 
                 const data = await extractUrlContent(url)
 
-                const newUrlData = new Map(existing)
-                newUrlData.set(url, data)
-                onUrlChange(newUrlData)
+                // Skip if the URL was removed while extracting
+                onUrlChange((prev) =>
+                    prev.has(url) ? new Map(prev).set(url, data) : prev,
+                )
 
                 setShowUrlDialog(false)
             } catch (error) {
                 // Remove the URL from the data map on error
-                const newUrlData = urlData
-                    ? new Map(urlData)
-                    : new Map<string, UrlData>()
-                newUrlData.delete(url)
-                onUrlChange(newUrlData)
+                onUrlChange((prev) => {
+                    const next = new Map(prev)
+                    next.delete(url)
+                    return next
+                })
                 showErrorToast(
                     <span className="text-muted-foreground">
                         {error instanceof Error
@@ -463,11 +486,12 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
                             urlData={urlData}
                             onRemoveUrl={
                                 onUrlChange
-                                    ? (url) => {
-                                          const next = new Map(urlData)
-                                          next.delete(url)
-                                          onUrlChange(next)
-                                      }
+                                    ? (url) =>
+                                          onUrlChange((prev) => {
+                                              const next = new Map(prev)
+                                              next.delete(url)
+                                              return next
+                                          })
                                     : undefined
                             }
                         />
@@ -559,7 +583,7 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
                                 ref={fileInputRef}
                                 className="hidden"
                                 onChange={handleFileChange}
-                                accept="image/*,.pdf,application/pdf,text/*,.md,.markdown,.json,.csv,.xml,.yaml,.yml,.toml"
+                                accept="image/png,image/jpeg,image/gif,image/webp,.svg,.pdf,application/pdf,text/*,.md,.markdown,.json,.csv,.xml,.yaml,.yml,.toml"
                                 multiple
                                 disabled={isDisabled}
                             />
@@ -588,7 +612,11 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
                         ) : (
                             <Button
                                 type="submit"
-                                disabled={isDisabled || !input.trim()}
+                                disabled={
+                                    isDisabled ||
+                                    isExtractingAttachments ||
+                                    !input.trim()
+                                }
                                 size="sm"
                                 className="h-8 px-4 rounded-xl font-medium shadow-sm"
                                 aria-label={dict.chat.send}
@@ -629,7 +657,11 @@ export const ChatInput = forwardRef<ChatInputRef, ChatInputProps>(
                 <TemplateCreateDialog
                     open={showSaveAsTemplate}
                     onOpenChange={setShowSaveAsTemplate}
-                    onSuccess={() => setShowSaveAsTemplate(false)}
+                    onSuccess={() => {
+                        setShowSaveAsTemplate(false)
+                        // Let the template list in the lobby reload
+                        window.dispatchEvent(new Event("templatesChanged"))
+                    }}
                     initialPrompt={input.trim()}
                 />
             </form>

components/chat-message-display.tsx

@@ -129,12 +129,14 @@ const getMessageTextContent = (message: UIMessage): string => {
         .join("\n")
 }
 
+// Matches the [PDF: ...], [File: ...] and [URL: ...] sections appended to the user's text
+export const APPENDED_FILE_SECTIONS_PATTERN =
+    /\n\n\[(PDF|File|URL):\s*[^\]]+\]\n[\s\S]*$/
+
 // Get only the user's original text, excluding appended file content
 const getUserOriginalText = (message: UIMessage): string => {
     const fullText = getMessageTextContent(message)
-    // Strip out [PDF: ...], [File: ...], and [URL: ...] sections that were appended
-    const filePattern = /\n\n\[(PDF|File|URL):\s*[^\]]+\]\n[\s\S]*$/
-    return fullText.replace(filePattern, "").trim()
+    return fullText.replace(APPENDED_FILE_SECTIONS_PATTERN, "").trim()
 }
 
 interface SessionMetadata {
@@ -417,6 +419,7 @@ export function ChatMessageDisplay({
 
     // Track previous message count to detect bulk loads vs streaming
     const prevMessageCountRef = useRef(0)
+    const scrollThrottleRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 
     useEffect(() => {
         if (messagesEndRef.current && messages.length > 0) {
@@ -430,8 +433,17 @@ export function ChatMessageDisplay({
                 return
             }
 
-            // Single message added - smooth scroll
-            messagesEndRef.current.scrollIntoView({ behavior: "smooth" })
+            // Throttle scroll during streaming to avoid layout thrashing
+            // Leading + trailing: scroll immediately, then once more after cooldown
+            if (!scrollThrottleRef.current) {
+                messagesEndRef.current.scrollIntoView({ behavior: "smooth" })
+                scrollThrottleRef.current = setTimeout(() => {
+                    scrollThrottleRef.current = null
+                    messagesEndRef.current?.scrollIntoView({
+                        behavior: "smooth",
+                    })
+                }, 150)
+            }
         }
     }, [messages])
 
@@ -448,6 +460,11 @@ export function ChatMessageDisplay({
             messages.length > 0 ? [messages[messages.length - 1]] : []
 
         messagesToProcess.forEach((message) => {
+            // Messages restored from a saved session were applied before it was
+            // saved; the saved diagram is authoritative, so don't replay them
+            const isRestoredMessage =
+                loadedMessageIdsRef?.current.has(message.id) ?? false
+
             if (message.parts) {
                 message.parts.forEach((part) => {
                     if (part.type?.startsWith("tool-")) {
@@ -465,6 +482,8 @@ export function ChatMessageDisplay({
                             })
                         }
 
+                        if (isRestoredMessage) return
+
                         if (
                             part.type === "tool-display_diagram" &&
                             input?.xml
@@ -531,6 +550,32 @@ export function ChatMessageDisplay({
                             part.type === "tool-edit_diagram" &&
                             input?.operations
                         ) {
+                            // Failed or stopped: drop the queued preview. If the original
+                            // XML is still stored, the tool handler never ran (user pressed
+                            // stop), so undo the streamed preview here.
+                            if (state === "output-error") {
+                                if (
+                                    pendingEditRef.current?.toolCallId ===
+                                        toolCallId &&
+                                    editDebounceTimeoutRef.current
+                                ) {
+                                    clearTimeout(editDebounceTimeoutRef.current)
+                                    editDebounceTimeoutRef.current = null
+                                    pendingEditRef.current = null
+                                }
+                                const originalXml =
+                                    editDiagramOriginalXmlRef.current.get(
+                                        toolCallId,
+                                    )
+                                if (originalXml) {
+                                    editDiagramOriginalXmlRef.current.delete(
+                                        toolCallId,
+                                    )
+                                    onDisplayChart(originalXml, true)
+                                }
+                                return
+                            }
+
                             const completeOps = getCompleteOperations(
                                 input.operations as DiagramOperation[],
                             )
@@ -600,9 +645,10 @@ export function ChatMessageDisplay({
                                                         origXml,
                                                         pending.operations,
                                                     )
-                                                    handleDisplayChart(
+                                                    // Load the full document so other pages stay intact
+                                                    onDisplayChart(
                                                         editedXml,
-                                                        false,
+                                                        true,
                                                     )
                                                     lastProcessedXmlRef.current.set(
                                                         pending.toolCallId +

components/chat-panel.tsx

@@ -32,6 +32,8 @@ import { useSessionManager } from "@/hooks/use-session-manager"
 import { useValidateDiagram } from "@/hooks/use-validate-diagram"
 import { getApiEndpoint } from "@/lib/base-path"
 import { findCachedResponse } from "@/lib/cached-responses"
+import { isMinimalDiagram } from "@/lib/chat-helpers"
+import type { DrawioTheme } from "@/lib/drawio-themes"
 import { formatMessage } from "@/lib/i18n/utils"
 import { isPdfFile, isTextFile } from "@/lib/pdf-utils"
 import { sanitizeMessages } from "@/lib/session-storage"
@@ -39,9 +41,12 @@ import { STORAGE_KEYS } from "@/lib/storage"
 import type { UrlData } from "@/lib/url-utils"
 import { type FileData, useFileProcessor } from "@/lib/use-file-processor"
 import { useQuotaManager } from "@/lib/use-quota-manager"
-import { cn, formatXML, isRealDiagram } from "@/lib/utils"
+import { cn, formatXML, isRealDiagram, wrapWithMxFile } from "@/lib/utils"
 import type { ValidationState } from "./chat/ValidationCard"
-import { ChatMessageDisplay } from "./chat-message-display"
+import {
+    APPENDED_FILE_SECTIONS_PATTERN,
+    ChatMessageDisplay,
+} from "./chat-message-display"
 import { DevXmlSimulator } from "./dev-xml-simulator"
 
 // localStorage keys for persistence
@@ -68,8 +73,8 @@ interface ChatMessage {
 interface ChatPanelProps {
     isVisible: boolean
     onToggleVisibility: () => void
-    drawioUi: "min" | "sketch"
-    onToggleDrawioUi: () => void
+    drawioUi: DrawioTheme
+    onDrawioUiChange: (theme: DrawioTheme) => void
     darkMode: boolean
     onToggleDarkMode: () => void
     isMobile?: boolean
@@ -106,11 +111,23 @@ function hasToolErrors(messages: ChatMessage[]): boolean {
     return lastToolPart?.state === TOOL_ERROR_STATE
 }
 
+/**
+ * Snapshots keep the full multi-page document, but the model only sees and
+ * edits the first page, so give it the first page's mxGraphModel.
+ * Older snapshots already hold a single mxGraphModel and are returned as is.
+ */
+function getFirstPageXml(xml: string): string {
+    if (!xml.includes("<mxfile")) return xml
+    const doc = new DOMParser().parseFromString(xml, "text/xml")
+    const model = doc.querySelector("diagram")?.querySelector("mxGraphModel")
+    return model ? formatXML(new XMLSerializer().serializeToString(model)) : xml
+}
+
 export default function ChatPanel({
     isVisible,
     onToggleVisibility,
     drawioUi,
-    onToggleDrawioUi,
+    onDrawioUiChange,
     darkMode,
     onToggleDarkMode,
     isMobile = false,
@@ -177,6 +194,7 @@ export default function ChatPanel({
     const [minimalStyle, setMinimalStyle] = useState(false)
     const [vlmValidationEnabled, setVlmValidationEnabled] = useState(false)
     const [customSystemMessage, setCustomSystemMessage] = useState("")
+    const [maxOutputTokens, setMaxOutputTokens] = useState("")
     const [shouldFocusInput, setShouldFocusInput] = useState(false)
 
     // Restore input from sessionStorage on mount (when ChatPanel remounts due to key change)
@@ -203,6 +221,14 @@ export default function ChatPanel({
         }
     }, [])
 
+    // Load output token budget from localStorage on mount
+    useEffect(() => {
+        const stored = localStorage.getItem(STORAGE_KEYS.maxOutputTokens)
+        if (stored !== null) {
+            setMaxOutputTokens(stored)
+        }
+    }, [])
+
     // Check config on mount
     useEffect(() => {
         fetch(getApiEndpoint("/api/config"))
@@ -319,20 +345,16 @@ export default function ChatPanel({
         localStorage.setItem(STORAGE_KEYS.customSystemMessage, value)
     }, [])
 
-    // Ref to store the sendMessage function for use in callbacks
-    const sendMessageRef = useRef<typeof sendMessage | null>(null)
-
-    // Callback to improve diagram with validation suggestions
-    const handleImproveWithSuggestions = useCallback((feedback: string) => {
-        if (sendMessageRef.current) {
-            // Send the feedback as a new user message to trigger regeneration
-            sendMessageRef.current({
-                role: "user",
-                parts: [{ type: "text", text: feedback }],
-            })
-        }
+    // Handler for output token budget change (empty string = use server default)
+    const handleMaxOutputTokensChange = useCallback((value: string) => {
+        const digitsOnly = value.replace(/\D/g, "")
+        setMaxOutputTokens(digitsOnly)
+        localStorage.setItem(STORAGE_KEYS.maxOutputTokens, digitsOnly)
     }, [])
 
+    // Failed VLM validations in the current user turn (reset on user action)
+    const validationRetryCountRef = useRef(0)
+
     // VLM validation hook using AI SDK's useObject
     const { validateWithFallback } = useValidateDiagram()
 
@@ -340,6 +362,7 @@ export default function ChatPanel({
     const { handleToolCall } = useDiagramToolHandlers({
         partialXmlRef,
         editDiagramOriginalXmlRef,
+        validationRetryCountRef,
         chartXMLRef,
         onDisplayChart,
         onFetchChart,
@@ -501,11 +524,6 @@ export default function ChatPanel({
         },
     })
 
-    // Store sendMessage in ref for use in callbacks (like handleImproveWithSuggestions)
-    useEffect(() => {
-        sendMessageRef.current = sendMessage
-    }, [sendMessage])
-
     // Ref to track latest messages for unload persistence
     const messagesRef = useRef(messages)
     useEffect(() => {
@@ -514,6 +532,9 @@ export default function ChatPanel({
 
     // Track last synced session ID to detect external changes (e.g., URL back/forward)
     const lastSyncedSessionIdRef = useRef<string | null>(null)
+    // Messages array from our latest save. A session holding this exact array was
+    // created by our own save, so it must not be treated as an external switch.
+    const lastSavedMessagesRef = useRef<unknown[] | null>(null)
 
     // Helper: Sync UI state with session data (eliminates duplication)
     // Track message IDs that are being loaded from session (to skip animations/scroll)
@@ -580,8 +601,10 @@ export default function ChatPanel({
                     thumbnailDataUrl = latestSvgRef.current
                 }
             }
+            const messages = sanitizeMessages(messagesRef.current)
+            lastSavedMessagesRef.current = messages
             return {
-                messages: sanitizeMessages(messagesRef.current),
+                messages,
                 xmlSnapshots: Array.from(xmlSnapshotsRef.current.entries()),
                 diagramXml: currentDiagramXml,
                 thumbnailDataUrl,
@@ -634,8 +657,13 @@ export default function ChatPanel({
         // Skip if session ID hasn't changed (our own saves don't change the ID)
         if (newSessionId === lastSyncedSessionIdRef.current) return
 
+        // Our own save created this session; the UI already shows its content
+        const isOwnNewSession =
+            newSession?.messages === lastSavedMessagesRef.current
+
         // Update last synced ID
         lastSyncedSessionIdRef.current = newSessionId
+        if (isOwnNewSession) return
 
         // Sync UI with new session
         if (newSession) {
@@ -776,12 +804,23 @@ export default function ChatPanel({
     const onFormSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
         e.preventDefault()
         const isProcessing = status === "streaming" || status === "submitted"
-        if (input.trim() && !isProcessing) {
-            // Check if input matches a cached example (only when no messages yet)
-            if (messages.length === 0) {
+        // Attachments still extracting have no text yet. Template sends call
+        // requestSubmit() and skip the disabled send button, so check here too.
+        const isExtracting =
+            files.some((f) => pdfData.get(f)?.isExtracting) ||
+            Array.from(urlData.values()).some((d) => d.isExtracting)
+        if (input.trim() && !isProcessing && !isExtracting) {
+            // Check if input matches a cached example (only when no messages
+            // yet and the canvas is empty, same rule as the server)
+            if (
+                messages.length === 0 &&
+                isMinimalDiagram(chartXMLRef.current || "")
+            ) {
+                // Pass the file name so a user's own file never matches an example
                 const cached = findCachedResponse(
                     input.trim(),
                     files.length > 0,
+                    files.length === 1 ? files[0].name : undefined,
                 )
                 if (cached) {
                     // Add user message and fake assistant response to messages
@@ -817,6 +856,11 @@ export default function ChatPanel({
                             ],
                         },
                     ] as any)
+                    // Snapshot the canvas before the example so editing this message works
+                    xmlSnapshotsRef.current.set(
+                        0,
+                        chartXMLRef.current || wrapWithMxFile(""),
+                    )
                     setInput("")
                     sessionStorage.removeItem(SESSION_STORAGE_INPUT_KEY)
                     setFiles([])
@@ -826,13 +870,6 @@ export default function ChatPanel({
             }
 
             try {
-                let chartXml = await onFetchChart()
-                chartXml = formatXML(chartXml)
-
-                // Update ref directly to avoid race condition with React's async state update
-                // This ensures edit_diagram has the correct XML before AI responds
-                chartXMLRef.current = chartXml
-
                 // Build user text by concatenating input with pre-extracted text
                 // (Backend only reads first text part, so we must combine them)
                 const parts: any[] = []
@@ -847,20 +884,7 @@ export default function ChatPanel({
                 // Add the combined text as the first part
                 parts.unshift({ type: "text", text: userText })
 
-                // Get previous XML from the last snapshot (before this message)
-                const snapshotKeys = Array.from(
-                    xmlSnapshotsRef.current.keys(),
-                ).sort((a, b) => b - a)
-                const previousXml =
-                    snapshotKeys.length > 0
-                        ? xmlSnapshotsRef.current.get(snapshotKeys[0]) || ""
-                        : ""
-
-                // Save XML snapshot for this message (will be at index = current messages.length)
-                const messageIndex = messages.length
-                xmlSnapshotsRef.current.set(messageIndex, chartXml)
-
-                sendChatMessage(parts, chartXml, previousXml, sessionId)
+                await sendWithCurrentDiagram(parts)
 
                 // Token count is tracked in onFinish with actual server usage
                 setInput("")
@@ -869,10 +893,37 @@ export default function ChatPanel({
                 setUrlData(new Map())
             } catch (error) {
                 console.error("Error fetching chart data:", error)
+                toast.error(dict.errors.failedToExport)
             }
         }
     }
 
+    // Export the current diagram, snapshot it for this message, and send
+    const sendWithCurrentDiagram = async (parts: any[]) => {
+        const chartXml = formatXML(await onFetchChart())
+        const previousXml = getPreviousXml(messages.length)
+
+        // Snapshot the full multi-page document (kept fresh by autosave) so
+        // regenerate/edit can restore every page; the model gets page 1 only
+        xmlSnapshotsRef.current.set(
+            messages.length,
+            chartXMLRef.current || chartXml,
+        )
+
+        sendChatMessage(parts, chartXml, previousXml, sessionId)
+    }
+
+    // Send VLM validation feedback as a new user message through the normal send path
+    const handleImproveWithSuggestions = async (feedback: string) => {
+        if (status === "streaming" || status === "submitted") return
+        try {
+            await sendWithCurrentDiagram([{ type: "text", text: feedback }])
+        } catch (error) {
+            console.error("Error fetching chart data:", error)
+            toast.error(dict.errors.failedToExport)
+        }
+    }
+
     // Handle session switching from history dropdown
     const handleSelectSession = useCallback(
         async (sessionId: string) => {
@@ -976,10 +1027,9 @@ export default function ChatPanel({
     // Handle sending a template directly (called from TemplatePanel)
     const handleSendTemplate = useCallback(
         async (template: { prompt: string }) => {
+            // Keep attachments: they are sent along with the template prompt
             flushSync(() => {
                 setInput(template.prompt)
-                setFiles([])
-                setUrlData(new Map())
             })
 
             const formElement = document.getElementById(
@@ -989,7 +1039,7 @@ export default function ChatPanel({
                 formElement.requestSubmit()
             }
         },
-        [setInput, setFiles, setUrlData],
+        [setInput],
     )
 
     const handleInputChange = (
@@ -1004,13 +1054,15 @@ export default function ChatPanel({
     }
 
     // Helper functions for message actions (regenerate/edit)
-    // Extract previous XML snapshot before a given message index
+    // Extract previous XML snapshot (first page, as sent to the model) before a given message index
     const getPreviousXml = (beforeIndex: number): string => {
         const snapshotKeys = Array.from(xmlSnapshotsRef.current.keys())
             .filter((k) => k < beforeIndex)
             .sort((a, b) => b - a)
         return snapshotKeys.length > 0
-            ? xmlSnapshotsRef.current.get(snapshotKeys[0]) || ""
+            ? getFirstPageXml(
+                  xmlSnapshotsRef.current.get(snapshotKeys[0]) || "",
+              )
             : ""
     }
 
@@ -1062,6 +1114,7 @@ export default function ChatPanel({
         // Reset all retry/continuation state on user-initiated message
         autoRetryCountRef.current = 0
         continuationRetryCountRef.current = 0
+        validationRetryCountRef.current = 0
         partialXmlRef.current = ""
 
         const config = getSelectedAIConfig()
@@ -1107,6 +1160,9 @@ export default function ChatPanel({
                     ...(minimalStyle && {
                         "x-minimal-style": "true",
                     }),
+                    ...(maxOutputTokens && {
+                        "x-max-output-tokens": maxOutputTokens,
+                    }),
                 },
             },
         )
@@ -1207,7 +1263,12 @@ export default function ChatPanel({
         })
 
         // Now send the message after state is guaranteed to be updated
-        sendChatMessage(userParts, savedXml, previousXml, sessionId)
+        sendChatMessage(
+            userParts,
+            getFirstPageXml(savedXml),
+            previousXml,
+            sessionId,
+        )
     }
 
     const handleEditMessage = async (messageIndex: number, newText: string) => {
@@ -1234,10 +1295,13 @@ export default function ChatPanel({
         // Clean up snapshots for messages after the user message (they will be removed)
         cleanupSnapshotsAfter(messageIndex)
 
-        // Create new parts with updated text
+        // Create new parts with updated text. The edit box only shows the typed
+        // text, so keep the appended PDF/file/URL content
         const newParts = message.parts?.map((part: any) => {
             if (part.type === "text") {
-                return { ...part, text: newText }
+                const appended =
+                    part.text.match(APPENDED_FILE_SECTIONS_PATTERN)?.[0] ?? ""
+                return { ...part, text: newText + appended }
             }
             return part
         }) || [{ type: "text", text: newText }]
@@ -1250,7 +1314,12 @@ export default function ChatPanel({
         })
 
         // Now send the edited message after state is guaranteed to be updated
-        sendChatMessage(newParts, savedXml, previousXml, sessionId)
+        sendChatMessage(
+            newParts,
+            getFirstPageXml(savedXml),
+            previousXml,
+            sessionId,
+        )
     }
 
     // Collapsed view (desktop only)
@@ -1442,7 +1511,7 @@ export default function ChatPanel({
                 open={showSettingsDialog}
                 onOpenChange={setShowSettingsDialog}
                 drawioUi={drawioUi}
-                onToggleDrawioUi={onToggleDrawioUi}
+                onDrawioUiChange={onDrawioUiChange}
                 darkMode={darkMode}
                 onToggleDarkMode={onToggleDarkMode}
                 minimalStyle={minimalStyle}
@@ -1451,6 +1520,8 @@ export default function ChatPanel({
                 onVlmValidationChange={handleVlmValidationChange}
                 customSystemMessage={customSystemMessage}
                 onCustomSystemMessageChange={handleCustomSystemMessageChange}
+                maxOutputTokens={maxOutputTokens}
+                onMaxOutputTokensChange={handleMaxOutputTokensChange}
                 onOpenModelConfig={() => setShowModelConfigDialog(true)}
             />
 

components/chat/ChatLobby.tsx

@@ -107,8 +107,8 @@ export function ChatLobby({
     currentInput = "",
     dict,
 }: ChatLobbyProps) {
-    const [templatesExpanded, setTemplatesExpanded] = useState(false)
-    const [examplesExpanded, setExamplesExpanded] = useState(false)
+    const [templatesExpanded, setTemplatesExpanded] = useState(true)
+    const [examplesExpanded, setExamplesExpanded] = useState(true)
     const [panelVisibility, setPanelVisibility] = useState(getPanelVisibility)
     const [deleteDialogOpen, setDeleteDialogOpen] = useState(false)
     const [sessionToDelete, setSessionToDelete] = useState<string | null>(null)
@@ -125,19 +125,25 @@ export function ChatLobby({
     const hasHistory = sessions.length > 0
 
     if (!hasHistory) {
-        if (panelVisibility.myTemplates) {
-            return (
-                <TemplatePanel
-                    setInput={setInput}
-                    onSendTemplate={onSendTemplate}
-                    currentInput={currentInput}
-                />
-            )
+        if (!panelVisibility.myTemplates && !panelVisibility.quickExamples) {
+            return null
         }
-        if (panelVisibility.quickExamples) {
-            return <ExamplePanel setInput={setInput} setFiles={setFiles} />
-        }
-        return null
+        return (
+            <div className="animate-fade-in">
+                {panelVisibility.myTemplates && (
+                    <TemplatePanel
+                        setInput={setInput}
+                        onSendTemplate={onSendTemplate}
+                        currentInput={currentInput}
+                    />
+                )}
+                {panelVisibility.quickExamples && (
+                    <div className={panelVisibility.myTemplates ? "mt-6" : ""}>
+                        <ExamplePanel setInput={setInput} setFiles={setFiles} />
+                    </div>
+                )}
+            </div>
+        )
     }
 
     // Show history + collapsible examples when there are sessions
@@ -188,6 +194,8 @@ export function ChatLobby({
                                     className="group w-full flex items-center gap-3 p-3 rounded-xl border border-border/60 bg-card hover:bg-accent/50 hover:border-primary/30 transition-all duration-200 cursor-pointer text-left"
                                     onClick={() => onSelectSession(session.id)}
                                     onKeyDown={(e) => {
+                                        // Ignore keys bubbling up from the delete button
+                                        if (e.target !== e.currentTarget) return
                                         if (
                                             e.key === "Enter" ||
                                             e.key === " "

components/chat/TemplateCreateDialog.tsx

@@ -55,6 +55,9 @@ export function TemplateCreateDialog({
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault()
+        // React submit events bubble through the portal; keep them away from
+        // the chat form this dialog may be rendered in
+        e.stopPropagation()
 
         const trimmedPrompt = prompt.trim()
         if (!trimmedPrompt) {

components/chat/TemplateEditDialog.tsx

@@ -39,16 +39,16 @@ export function TemplateEditDialog({
     const [isSubmitting, setIsSubmitting] = useState(false)
     const [error, setError] = useState<string | null>(null)
 
-    // Populate form when template changes
+    // Populate form each time the dialog opens, dropping any cancelled edits
     useEffect(() => {
-        if (template) {
+        if (open && template) {
             setTitle(template.title || "")
             setDescription(template.description || "")
             setPrompt(template.prompt || "")
             setPinned(template.pinned || false)
             setError(null)
         }
-    }, [template])
+    }, [open, template])
 
     const handleOpenChange = (newOpen: boolean) => {
         if (!newOpen) {
@@ -59,6 +59,9 @@ export function TemplateEditDialog({
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault()
+        // React submit events bubble through the portal; keep them away from
+        // any form this dialog may be rendered in
+        e.stopPropagation()
 
         if (!template) return
 

components/chat/TemplatePanel.tsx

@@ -110,6 +110,10 @@ export function TemplatePanel({
 
     useEffect(() => {
         loadTemplates()
+        // Reload when a template is saved elsewhere, e.g. from the chat input
+        window.addEventListener("templatesChanged", loadTemplates)
+        return () =>
+            window.removeEventListener("templatesChanged", loadTemplates)
     }, [loadTemplates])
 
     const handleCreateSuccess = () => {
@@ -302,6 +306,28 @@ export function TemplatePanel({
         }
     }
 
+    // Shared by the empty state and the list, so import works in both
+    const importInput = (
+        <input
+            ref={fileInputRef}
+            type="file"
+            accept="application/json,.json"
+            onChange={handleImport}
+            className="hidden"
+        />
+    )
+    const importMessageBox = importMessage && (
+        <div
+            className={`text-xs px-3 py-2 rounded-lg ${
+                importMessage.type === "success"
+                    ? "bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400"
+                    : "bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-400"
+            }`}
+        >
+            {importMessage.text}
+        </div>
+    )
+
     // Empty state: no templates at all
     if (!loading && templates.length === 0) {
         return (
@@ -332,6 +358,18 @@ export function TemplatePanel({
                         <Plus className="w-4 h-4" />
                         {dict.templates.createFirst}
                     </button>
+                    <button
+                        type="button"
+                        onClick={() => fileInputRef.current?.click()}
+                        className="mt-2 inline-flex items-center gap-1.5 px-3 py-1.5 rounded-md text-xs font-medium text-muted-foreground hover:text-foreground hover:bg-muted transition-colors"
+                    >
+                        <Upload className="w-3.5 h-3.5" />
+                        {dict.templates.importTemplates}
+                    </button>
+                    {importInput}
+                    {importMessageBox && (
+                        <div className="mt-3">{importMessageBox}</div>
+                    )}
 
                     <TemplateCreateDialog
                         open={createDialogOpen}
@@ -389,27 +427,11 @@ export function TemplatePanel({
                         <Upload className="w-3.5 h-3.5" />
                         {dict.templates.importTemplates}
                     </button>
-                    <input
-                        ref={fileInputRef}
-                        type="file"
-                        accept="application/json,.json"
-                        onChange={handleImport}
-                        className="hidden"
-                    />
+                    {importInput}
                 </div>
 
                 {/* Import message */}
-                {importMessage && (
-                    <div
-                        className={`text-xs px-3 py-2 rounded-lg ${
-                            importMessage.type === "success"
-                                ? "bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400"
-                                : "bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-400"
-                        }`}
-                    >
-                        {importMessage.text}
-                    </div>
-                )}
+                {importMessageBox}
 
                 <div className="space-y-2">
                     {loading
@@ -447,6 +469,8 @@ export function TemplatePanel({
                                         handleTemplateClick(template)
                                     }
                                     onKeyDown={(e) => {
+                                        // Ignore keys bubbling up from the action buttons
+                                        if (e.target !== e.currentTarget) return
                                         if (
                                             e.key === "Enter" ||
                                             e.key === " "

components/chat/ToolCallCard.tsx

@@ -66,7 +66,7 @@ export function ToolCallCard({
     dict,
 }: ToolCallCardProps) {
     const callId = part.toolCallId
-    const { state, input, output } = part
+    const { state, input, output, errorText } = part
     // Default to expanded for all states (user can manually collapse if needed)
     const isExpanded = expandedTools[callId] ?? true
     const toolName = part.type?.replace("tool-", "")
@@ -92,6 +92,14 @@ export function ToolCallCard({
         }
     }
 
+    // Incomplete XML means the output hit the length limit, unless the user
+    // stopped the generation themselves
+    const isTruncated =
+        state === "output-error" &&
+        errorText !== "Stopped by user" &&
+        (toolName === "display_diagram" || toolName === "append_diagram") &&
+        !isMxCellXmlComplete(input?.xml)
+
     const handleCopy = () => {
         let textToCopy = ""
 
@@ -161,22 +169,15 @@ export function ToolCallCard({
                         </>
                     )}
                     {state === "output-error" &&
-                        (() => {
-                            // Check if this is a truncation (incomplete XML) vs real error
-                            const isTruncated =
-                                (toolName === "display_diagram" ||
-                                    toolName === "append_diagram") &&
-                                !isMxCellXmlComplete(input?.xml)
-                            return isTruncated ? (
-                                <span className="text-xs font-medium text-yellow-600 bg-yellow-50 px-2 py-0.5 rounded-full">
-                                    Truncated
-                                </span>
-                            ) : (
-                                <span className="text-xs font-medium text-red-600 bg-red-50 px-2 py-0.5 rounded-full">
-                                    Error
-                                </span>
-                            )
-                        })()}
+                        (isTruncated ? (
+                            <span className="text-xs font-medium text-yellow-600 bg-yellow-50 px-2 py-0.5 rounded-full">
+                                Truncated
+                            </span>
+                        ) : (
+                            <span className="text-xs font-medium text-red-600 bg-red-50 px-2 py-0.5 rounded-full">
+                                Error
+                            </span>
+                        ))}
                     {input && Object.keys(input).length > 0 && (
                         <button
                             type="button"
@@ -195,7 +196,22 @@ export function ToolCallCard({
             {input && isExpanded && (
                 <div className="px-4 py-3 border-t border-border/40 bg-muted/20">
                     {typeof input === "object" && input.xml ? (
-                        <CodeBlock code={input.xml} language="xml" />
+                        state === "input-streaming" ||
+                        state === "input-available" ? (
+                            <pre
+                                className="text-[11px] leading-relaxed overflow-x-auto overflow-y-auto max-h-48 scrollbar-thin break-all whitespace-pre-wrap"
+                                style={{
+                                    fontFamily:
+                                        "var(--font-mono), ui-monospace, monospace",
+                                    margin: 0,
+                                    padding: 0,
+                                }}
+                            >
+                                {input.xml}
+                            </pre>
+                        ) : (
+                            <CodeBlock code={input.xml} language="xml" />
+                        )
                     ) : typeof input === "object" &&
                       input.operations &&
                       Array.isArray(input.operations) ? (
@@ -209,23 +225,16 @@ export function ToolCallCard({
                     ) : null}
                 </div>
             )}
-            {output &&
-                state === "output-error" &&
-                (() => {
-                    const isTruncated =
-                        (toolName === "display_diagram" ||
-                            toolName === "append_diagram") &&
-                        !isMxCellXmlComplete(input?.xml)
-                    return (
-                        <div
-                            className={`px-4 py-3 border-t border-border/40 text-sm ${isTruncated ? "text-yellow-600" : "text-red-600"}`}
-                        >
-                            {isTruncated
-                                ? "Output truncated due to length limits. Try a simpler request or increase the maxOutputLength."
-                                : output}
-                        </div>
-                    )
-                })()}
+            {/* AI SDK stores tool errors in errorText */}
+            {state === "output-error" && (errorText || output) && (
+                <div
+                    className={`px-4 py-3 border-t border-border/40 text-sm whitespace-pre-wrap break-words ${isTruncated ? "text-yellow-600" : "text-red-600"}`}
+                >
+                    {isTruncated
+                        ? "Output truncated due to length limits. Try a simpler request or increase Max Output Tokens in Settings."
+                        : (errorText ?? output)}
+                </div>
+            )}
             {/* Show get_shape_library output on success */}
             {output &&
                 toolName === "get_shape_library" &&

components/chat/types.ts

@@ -13,4 +13,5 @@ export interface ToolPartLike {
         operations?: DiagramOperation[]
     } & Record<string, unknown>
     output?: string
+    errorText?: string
 }

components/model-selector.tsx

@@ -158,7 +158,7 @@ export function ModelSelector({
     }, [])
 
     return (
-        <div ref={wrapperRef} className="inline-block">
+        <div ref={wrapperRef} className="min-w-0 max-w-48">
             <ModelSelectorRoot open={open} onOpenChange={setOpen}>
                 <ModelSelectorTrigger asChild>
                     <ButtonWithTooltip
@@ -167,7 +167,7 @@ export function ModelSelector({
                         size="sm"
                         disabled={disabled}
                         className={cn(
-                            "hover:bg-accent gap-1.5 h-8 px-2 transition-[padding,background-color] duration-150 ease-in-out",
+                            "h-8 min-w-0 max-w-full shrink overflow-hidden gap-1.5 px-2 transition-[padding,background-color] duration-150 ease-in-out hover:bg-accent",
                             !showLabel && "px-1.5 justify-center",
                         )}
                         // accessibility: expose label to screen readers
@@ -176,7 +176,7 @@ export function ModelSelector({
                         <Bot className="h-4 w-4 flex-shrink-0 text-muted-foreground" />
                         {/* show/hide visible label based on measured width */}
                         {showLabel ? (
-                            <span className="text-xs truncate">
+                            <span className="min-w-0 truncate text-xs">
                                 {selectedModel
                                     ? selectedModel.modelId
                                     : dict.modelConfig.default}
@@ -264,9 +264,13 @@ export function ModelSelector({
                                                         (model) => (
                                                             <ModelSelectorItem
                                                                 key={model.id}
-                                                                value={
-                                                                    model.modelId
-                                                                }
+                                                                // Unique value so same-named models highlight
+                                                                // separately; keywords keep search by name
+                                                                value={model.id}
+                                                                keywords={[
+                                                                    model.modelId,
+                                                                    providerLabel,
+                                                                ]}
                                                                 onSelect={() =>
                                                                     handleSelect(
                                                                         model.id,
@@ -351,9 +355,11 @@ export function ModelSelector({
                                                         (model) => (
                                                             <ModelSelectorItem
                                                                 key={model.id}
-                                                                value={
-                                                                    model.modelId
-                                                                }
+                                                                value={model.id}
+                                                                keywords={[
+                                                                    model.modelId,
+                                                                    providerLabel,
+                                                                ]}
                                                                 onSelect={() =>
                                                                     handleSelect(
                                                                         model.id,

components/provider-credentials-fields.tsx

@@ -0,0 +1,264 @@
+"use client"
+
+import { Key, Link2, Tag } from "lucide-react"
+import type { ReactNode } from "react"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import { useDictionary } from "@/hooks/use-dictionary"
+import { formatMessage } from "@/lib/i18n/utils"
+import { PROVIDER_INFO, type ProviderName } from "@/lib/types/model-config"
+
+// Logical secret field. The caller owns the actual input — plaintext for the
+// user dialog, write-only masked for the admin panel — supplied via
+// renderSecret. That (and the optional test action) are the only genuine
+// differences between the two screens; the field structure is shared here.
+export type SecretField =
+    | "apiKey"
+    | "awsAccessKeyId"
+    | "awsSecretAccessKey"
+    | "vertexApiKey"
+
+// AWS regions offered for Bedrock (shared by both screens)
+const AWS_REGIONS: Array<[string, string]> = [
+    ["us-east-1", "N. Virginia"],
+    ["us-east-2", "Ohio"],
+    ["us-west-2", "Oregon"],
+    ["eu-west-1", "Ireland"],
+    ["eu-west-2", "London"],
+    ["eu-west-3", "Paris"],
+    ["eu-central-1", "Frankfurt"],
+    ["ap-south-1", "Mumbai"],
+    ["ap-northeast-1", "Tokyo"],
+    ["ap-northeast-2", "Seoul"],
+    ["ap-southeast-1", "Singapore"],
+    ["ap-southeast-2", "Sydney"],
+    ["sa-east-1", "São Paulo"],
+]
+
+interface ProviderCredentialsFieldsProps {
+    provider: ProviderName
+    // Plain (non-secret) field values — secrets are owned by renderSecret
+    name?: string
+    baseUrl?: string
+    awsRegion?: string
+    disabled?: boolean
+    // Update a plain text field
+    onChange: (field: "name" | "baseUrl" | "awsRegion", value: string) => void
+    // Render the control for a secret field. The caller may include trailing
+    // UI (e.g. the user dialog's inline Test button + validation error); the
+    // shared component only supplies the label above it.
+    renderSecret: (opts: { field: SecretField; id: string }) => ReactNode
+    // Extra content after the fields — used for the Bedrock test row and the
+    // EdgeOne test button, which aren't beside a credential input.
+    footer?: ReactNode
+}
+
+// Display name + per-provider credential inputs, shared by the user
+// ModelConfigDialog and the admin Models panel.
+export function ProviderCredentialsFields({
+    provider,
+    name,
+    baseUrl,
+    awsRegion,
+    disabled,
+    onChange,
+    renderSecret,
+    footer,
+}: ProviderCredentialsFieldsProps) {
+    const dict = useDictionary()
+    const info = PROVIDER_INFO[provider]
+    const baseUrlLabel = formatMessage(dict.modelConfig.baseUrlWithExample, {
+        example: info.defaultBaseUrl || "https://api.example.com/v1",
+    })
+
+    // EdgeOne needs no credentials — the caller supplies just a test button
+    if (provider === "edgeone") {
+        return <div className="space-y-5">{footer}</div>
+    }
+
+    return (
+        <div className="space-y-5">
+            {/* Display Name */}
+            <div className="space-y-2">
+                <Label
+                    htmlFor="provider-name"
+                    className="text-xs font-medium flex items-center gap-1.5"
+                >
+                    <Tag className="h-3.5 w-3.5 text-muted-foreground" />
+                    {dict.modelConfig.displayName}
+                </Label>
+                <Input
+                    id="provider-name"
+                    value={name ?? ""}
+                    disabled={disabled}
+                    onChange={(e) => onChange("name", e.target.value)}
+                    placeholder={info.label}
+                    className="h-9"
+                />
+            </div>
+
+            {provider === "bedrock" ? (
+                <>
+                    {/* AWS Access Key ID */}
+                    <div className="space-y-2">
+                        <Label
+                            htmlFor="aws-access-key-id"
+                            className="text-xs font-medium flex items-center gap-1.5"
+                        >
+                            <Key className="h-3.5 w-3.5 text-muted-foreground" />
+                            {dict.modelConfig.awsAccessKeyId}
+                        </Label>
+                        {renderSecret({
+                            field: "awsAccessKeyId",
+                            id: "aws-access-key-id",
+                        })}
+                    </div>
+
+                    {/* AWS Secret Access Key */}
+                    <div className="space-y-2">
+                        <Label
+                            htmlFor="aws-secret-access-key"
+                            className="text-xs font-medium flex items-center gap-1.5"
+                        >
+                            <Key className="h-3.5 w-3.5 text-muted-foreground" />
+                            {dict.modelConfig.awsSecretAccessKey}
+                        </Label>
+                        {renderSecret({
+                            field: "awsSecretAccessKey",
+                            id: "aws-secret-access-key",
+                        })}
+                    </div>
+
+                    {/* AWS Region */}
+                    <div className="space-y-2">
+                        <Label
+                            htmlFor="aws-region"
+                            className="text-xs font-medium flex items-center gap-1.5"
+                        >
+                            <Link2 className="h-3.5 w-3.5 text-muted-foreground" />
+                            {dict.modelConfig.awsRegion}
+                        </Label>
+                        <Select
+                            value={awsRegion || ""}
+                            disabled={disabled}
+                            onValueChange={(v) => onChange("awsRegion", v)}
+                        >
+                            <SelectTrigger
+                                id="aws-region"
+                                className="h-9 font-mono text-xs hover:bg-accent"
+                            >
+                                <SelectValue
+                                    placeholder={dict.modelConfig.selectRegion}
+                                />
+                            </SelectTrigger>
+                            <SelectContent className="max-h-64">
+                                {AWS_REGIONS.map(([region, label]) => (
+                                    <SelectItem key={region} value={region}>
+                                        {region} ({label})
+                                    </SelectItem>
+                                ))}
+                            </SelectContent>
+                        </Select>
+                    </div>
+                </>
+            ) : provider === "vertexai" ? (
+                <>
+                    {/* Vertex AI API Key (Express Mode) */}
+                    <div className="space-y-2">
+                        <Label
+                            htmlFor="vertex-api-key"
+                            className="text-xs font-medium flex items-center gap-1.5"
+                        >
+                            <Key className="h-3.5 w-3.5 text-muted-foreground" />
+                            {dict.modelConfig.apiKey}
+                        </Label>
+                        {renderSecret({
+                            field: "vertexApiKey",
+                            id: "vertex-api-key",
+                        })}
+                    </div>
+
+                    {/* Base URL (optional) */}
+                    <div className="space-y-2">
+                        <Label
+                            htmlFor="vertex-base-url"
+                            className="text-xs font-medium flex items-center gap-1.5"
+                        >
+                            <Link2 className="h-3.5 w-3.5 text-muted-foreground" />
+                            {baseUrlLabel}
+                        </Label>
+                        <Input
+                            id="vertex-base-url"
+                            value={baseUrl ?? ""}
+                            disabled={disabled}
+                            onChange={(e) =>
+                                onChange("baseUrl", e.target.value)
+                            }
+                            placeholder={dict.modelConfig.customEndpoint}
+                            className="h-9 font-mono text-xs"
+                        />
+                    </div>
+                </>
+            ) : (
+                <>
+                    {/* API Key */}
+                    <div className="space-y-2">
+                        <Label
+                            htmlFor="api-key"
+                            className="text-xs font-medium flex items-center gap-1.5"
+                        >
+                            <Key className="h-3.5 w-3.5 text-muted-foreground" />
+                            {dict.modelConfig.apiKey}
+                            {provider === "ollama" &&
+                                ` ${dict.modelConfig.optional}`}
+                        </Label>
+                        {renderSecret({ field: "apiKey", id: "api-key" })}
+                    </div>
+
+                    {/* Base URL */}
+                    <div className="space-y-2">
+                        <Label
+                            htmlFor="base-url"
+                            className="text-xs font-medium flex items-center gap-1.5"
+                        >
+                            <Link2 className="h-3.5 w-3.5 text-muted-foreground" />
+                            {baseUrlLabel}
+                        </Label>
+                        <Input
+                            id="base-url"
+                            value={baseUrl ?? ""}
+                            disabled={disabled}
+                            onChange={(e) =>
+                                onChange("baseUrl", e.target.value)
+                            }
+                            placeholder={
+                                info.defaultBaseUrl ||
+                                dict.modelConfig.customEndpoint
+                            }
+                            className="h-9 rounded-xl font-mono text-xs"
+                        />
+                        {provider === "minimax" && (
+                            <p className="text-xs text-muted-foreground">
+                                {dict.modelConfig.minimaxBaseUrlHint}
+                            </p>
+                        )}
+                        {provider === "mimo" && (
+                            <p className="text-xs text-muted-foreground">
+                                {dict.modelConfig.mimoBaseUrlHint}
+                            </p>
+                        )}
+                    </div>
+                </>
+            )}
+
+            {footer}
+        </div>
+    )
+}

components/provider-logo.tsx

@@ -0,0 +1,36 @@
+import { Cloud, Server, Sparkles } from "lucide-react"
+import { PROVIDER_LOGO_MAP, type ProviderName } from "@/lib/types/model-config"
+import { cn } from "@/lib/utils"
+
+// Provider logo from models.dev, with Lucide fallbacks for providers
+// that have no logo there
+export function ProviderLogo({
+    provider,
+    className,
+}: {
+    provider: ProviderName
+    className?: string
+}) {
+    if (provider === "bedrock") {
+        return <Cloud className={cn("size-4", className)} />
+    }
+    if (provider === "sglang") {
+        return <Server className={cn("size-4", className)} />
+    }
+    if (provider === "doubao") {
+        return <Sparkles className={cn("size-4", className)} />
+    }
+
+    const logoName = PROVIDER_LOGO_MAP[provider] || provider
+    return (
+        // biome-ignore lint/performance/noImgElement: External URL from models.dev
+        <img
+            alt=""
+            aria-hidden="true"
+            className={cn("size-4 dark:invert", className)}
+            height={16}
+            src={`https://models.dev/logos/${logoName}.svg`}
+            width={16}
+        />
+    )
+}

components/settings-dialog.tsx

@@ -25,6 +25,7 @@ import { Switch } from "@/components/ui/switch"
 import { Textarea } from "@/components/ui/textarea"
 import { useDictionary } from "@/hooks/use-dictionary"
 import { getApiEndpoint } from "@/lib/base-path"
+import type { DrawioTheme } from "@/lib/drawio-themes"
 import { i18n, type Locale } from "@/lib/i18n/config"
 import { STORAGE_KEYS } from "@/lib/storage"
 
@@ -63,8 +64,8 @@ const LANGUAGE_LABELS: Record<Locale, string> = {
 interface SettingsDialogProps {
     open: boolean
     onOpenChange: (open: boolean) => void
-    drawioUi: "min" | "sketch"
-    onToggleDrawioUi: () => void
+    drawioUi: DrawioTheme
+    onDrawioUiChange: (theme: DrawioTheme) => void
     darkMode: boolean
     onToggleDarkMode: () => void
     minimalStyle?: boolean
@@ -74,6 +75,8 @@ interface SettingsDialogProps {
     onOpenModelConfig?: () => void
     customSystemMessage?: string
     onCustomSystemMessageChange?: (value: string) => void
+    maxOutputTokens?: string
+    onMaxOutputTokensChange?: (value: string) => void
 }
 
 export const STORAGE_ACCESS_CODE_KEY = "next-ai-draw-io-access-code"
@@ -90,7 +93,7 @@ function SettingsContent({
     open,
     onOpenChange,
     drawioUi,
-    onToggleDrawioUi,
+    onDrawioUiChange,
     darkMode,
     onToggleDarkMode,
     minimalStyle = false,
@@ -100,6 +103,8 @@ function SettingsContent({
     onOpenModelConfig,
     customSystemMessage = "",
     onCustomSystemMessageChange = () => {},
+    maxOutputTokens = "",
+    onMaxOutputTokensChange = () => {},
 }: SettingsDialogProps) {
     const dict = useDictionary()
     const router = useRouter()
@@ -134,8 +139,11 @@ function SettingsContent({
     const [isApplyingProxy, setIsApplyingProxy] = useState(false)
 
     useEffect(() => {
-        // Only fetch if not cached in localStorage
-        if (getStoredAccessCodeRequired() !== null) return
+        // Re-fetch config whenever the dialog opens to ensure we always show
+        // the access code input if the server requires it. This fixes the case
+        // where a stale localStorage cache (from before ACCESS_CODE_LIST was
+        // configured) would hide the access code input.
+        if (!open) return
 
         fetch(getApiEndpoint("/api/config"))
             .then((res) => {
@@ -151,10 +159,9 @@ function SettingsContent({
                 setAccessCodeRequired(required)
             })
             .catch(() => {
-                // Don't cache on error - allow retry on next mount
-                setAccessCodeRequired(false)
+                // Keep existing cached value on error
             })
-    }, [])
+    }, [open])
 
     // Detect current language from pathname
     useEffect(() => {
@@ -430,23 +437,40 @@ function SettingsContent({
                     {/* Draw.io Style */}
                     <SettingItem
                         label={dict.settings.drawioStyle}
-                        description={`${dict.settings.drawioStyleDescription} ${
-                            drawioUi === "min"
-                                ? dict.settings.minimal
-                                : dict.settings.sketch
-                        }`}
+                        description={dict.settings.drawioStyleDescription}
                     >
-                        <Button
-                            id="drawio-ui"
-                            variant="outline"
-                            onClick={onToggleDrawioUi}
-                            className="h-9 w-[120px] rounded-xl border-border-subtle hover:bg-interactive-hover font-normal"
+                        <Select
+                            value={drawioUi}
+                            onValueChange={(v) =>
+                                onDrawioUiChange(v as DrawioTheme)
+                            }
                         >
-                            {dict.settings.switchTo}{" "}
-                            {drawioUi === "min"
-                                ? dict.settings.sketch
-                                : dict.settings.minimal}
-                        </Button>
+                            <SelectTrigger
+                                id="drawio-ui-select"
+                                aria-label={dict.settings.drawioStyle}
+                                className="w-[120px] h-9 rounded-xl"
+                            >
+                                <SelectValue />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="kennedy">
+                                    {dict.settings.themeDefault}
+                                </SelectItem>
+                                <SelectItem value="atlas">Atlas</SelectItem>
+                                <SelectItem value="dark">
+                                    {dict.settings.themeDark}
+                                </SelectItem>
+                                <SelectItem value="min">
+                                    {dict.settings.themeMinimal}
+                                </SelectItem>
+                                <SelectItem value="sketch">
+                                    {dict.settings.themeSketch}
+                                </SelectItem>
+                                <SelectItem value="simple">
+                                    {dict.settings.themeSimple}
+                                </SelectItem>
+                            </SelectContent>
+                        </Select>
                     </SettingItem>
 
                     {/* Diagram Style */}
@@ -571,6 +595,24 @@ function SettingsContent({
                         />
                     </div>
 
+                    {/* Max Output Tokens */}
+                    <SettingItem
+                        label={dict.settings.maxOutputTokens}
+                        description={dict.settings.maxOutputTokensDescription}
+                    >
+                        <Input
+                            id="max-output-tokens"
+                            type="text"
+                            inputMode="numeric"
+                            value={maxOutputTokens}
+                            onChange={(e) =>
+                                onMaxOutputTokensChange(e.target.value)
+                            }
+                            placeholder="64000"
+                            className="h-9 w-28 text-sm"
+                        />
+                    </SettingItem>
+
                     {/* Send Shortcut */}
                     <SettingItem
                         label={dict.settings.sendShortcut}

contexts/diagram-context.tsx

@@ -1,8 +1,8 @@
 "use client"
 
 import type React from "react"
-import { createContext, useContext, useEffect, useRef, useState } from "react"
-import type { DrawIoEmbedRef } from "react-drawio"
+import { createContext, useContext, useRef, useState } from "react"
+import type { DrawIoEmbedRef, EventExport } from "react-drawio"
 import { toast } from "sonner"
 import type { ExportFormat } from "@/components/save-dialog"
 import { getApiEndpoint } from "@/lib/base-path"
@@ -22,7 +22,7 @@ interface DiagramContextType {
     handleExportWithoutHistory: () => void
     resolverRef: React.MutableRefObject<((value: string) => void) | null>
     drawioRef: React.MutableRefObject<DrawIoEmbedRef | null>
-    handleDiagramExport: (data: any) => void
+    handleDiagramExport: (data: EventExport) => void
     handleDiagramAutoSave: (data: { xml?: string }) => void
     clearDiagram: () => void
     saveDiagramToFile: (
@@ -42,6 +42,12 @@ interface DiagramContextType {
 
 const DiagramContext = createContext<DiagramContextType | undefined>(undefined)
 
+// Exports for thumbnails, validation PNGs and file saves carry a tag in the
+// request's `message` field. draw.io echoes the request back in the export
+// event, so each result reaches its own caller; untagged exports (chat-panel's
+// onFetchChart) resolve resolverRef.
+type ExportTag = "thumbnail" | "validation"
+
 export function DiagramProvider({ children }: { children: React.ReactNode }) {
     const [chartXML, setChartXML] = useState<string>("")
     const [latestSvg, setLatestSvg] = useState<string>("")
@@ -53,8 +59,10 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
     const hasCalledOnLoadRef = useRef(false)
     const drawioRef = useRef<DrawIoEmbedRef | null>(null)
     const resolverRef = useRef<((value: string) => void) | null>(null)
-    // Resolver for PNG export (used for VLM validation)
-    const pngResolverRef = useRef<((value: string) => void) | null>(null)
+    // Pending thumbnail and validation PNG exports, keyed by their export tag
+    const taggedResolversRef = useRef<
+        Partial<Record<ExportTag, (value: string) => void>>
+    >({})
     // Track if we're expecting an export for history (user-initiated)
     const expectHistoryExportRef = useRef<boolean>(false)
     // Track latest chartXML for restoration after remount
@@ -65,6 +73,10 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
         if (hasCalledOnLoadRef.current) return
         hasCalledOnLoadRef.current = true
         setIsDrawioReady(true)
+        // Restore diagram after remount (e.g., theme/UI change)
+        if (drawioRef.current && isRealDiagram(chartXMLRef.current)) {
+            drawioRef.current.load({ xml: chartXMLRef.current })
+        }
     }
 
     const resetDrawioReady = () => {
@@ -72,32 +84,16 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
         setIsDrawioReady(false)
     }
 
-    // Keep chartXMLRef in sync with state for restoration after remount
-    useEffect(() => {
-        chartXMLRef.current = chartXML
-    }, [chartXML])
-
-    // Restore diagram when DrawIO becomes ready after remount (e.g., theme/UI change)
-    // Also restore when chartXML changes while DrawIO is ready (e.g., session loaded after iframe ready)
-    const lastRestoredXmlRef = useRef<string>("")
-    useEffect(() => {
-        if (!isDrawioReady || !drawioRef.current) return
-        // Only load if we have a real diagram and it's different from what we already loaded
-        if (
-            isRealDiagram(chartXML) &&
-            chartXML !== lastRestoredXmlRef.current
-        ) {
-            lastRestoredXmlRef.current = chartXML
-            drawioRef.current.load({ xml: chartXML })
-        } else if (!isRealDiagram(chartXML)) {
-            // Reset when diagram is cleared so a future restore can re-load the same XML.
-            lastRestoredXmlRef.current = ""
-        }
-    }, [isDrawioReady, chartXML])
+    // Update chartXML and its ref together, so callbacks that read the ref
+    // (export handler, autosave) see the new value right away
+    const updateChartXML = (xml: string) => {
+        chartXMLRef.current = xml
+        setChartXML(xml)
+    }
 
     // Track if we're expecting an export for file save (stores raw export data)
     const saveResolverRef = useRef<{
-        resolver: ((data: string) => void) | null
+        resolver: ((data: string, fullDiagramXML?: string) => void) | null
         format: ExportFormat | null
     }>({ resolver: null, format: null })
 
@@ -120,64 +116,52 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
         }
     }
 
+    // Export with a tag in `message` (draw.io echoes it back in the export
+    // event) and wait for that result. Resolves to null on timeout, which is
+    // expected occasionally.
+    const requestTaggedExport = (
+        tag: ExportTag,
+        format: "xmlsvg" | "png",
+        timeoutMs: number,
+    ) =>
+        new Promise<string | null>((resolve) => {
+            const finish = (value: string | null) => {
+                clearTimeout(timer)
+                if (taggedResolversRef.current[tag] === finish) {
+                    delete taggedResolversRef.current[tag]
+                }
+                resolve(value)
+            }
+            const timer = setTimeout(() => finish(null), timeoutMs)
+            taggedResolversRef.current[tag] = finish
+            drawioRef.current?.exportDiagram({ format, message: tag })
+        })
+
     // Get current diagram as SVG for thumbnail (used by session storage)
     const getThumbnailSvg = async (): Promise<string | null> => {
         if (!drawioRef.current) return null
         // Don't export if diagram is empty
-        if (!isRealDiagram(chartXML)) return null
-
-        try {
-            const svgData = await Promise.race([
-                new Promise<string>((resolve) => {
-                    resolverRef.current = resolve
-                    drawioRef.current?.exportDiagram({ format: "xmlsvg" })
-                }),
-                new Promise<string>((_, reject) =>
-                    setTimeout(() => reject(new Error("Export timeout")), 3000),
-                ),
-            ])
+        if (!isRealDiagram(chartXMLRef.current)) return null
 
+        // xmlsvg exports return an SVG data URL
+        const svgData = await requestTaggedExport("thumbnail", "xmlsvg", 3000)
+        if (svgData?.startsWith("data:image/svg")) {
             // Update latestSvg so it's available for future saves
-            if (svgData?.includes("<svg")) {
-                setLatestSvg(svgData)
-                return svgData
-            }
-            return null
-        } catch {
-            // Timeout is expected occasionally - don't log as error
-            return null
+            setLatestSvg(svgData)
+            return svgData
         }
+        return null
     }
 
     // Capture current diagram as PNG for VLM validation
     const captureValidationPng = async (): Promise<string | null> => {
         if (!drawioRef.current) return null
         // Don't export if diagram is empty
-        if (!isRealDiagram(chartXML)) return null
+        if (!isRealDiagram(chartXMLRef.current)) return null
 
-        try {
-            const pngData = await Promise.race([
-                new Promise<string>((resolve) => {
-                    pngResolverRef.current = resolve
-                    drawioRef.current?.exportDiagram({ format: "png" })
-                }),
-                new Promise<string>((_, reject) =>
-                    setTimeout(
-                        () => reject(new Error("PNG export timeout")),
-                        5000,
-                    ),
-                ),
-            ])
-
-            // PNG data should be a base64 data URL
-            if (pngData?.startsWith("data:image/png")) {
-                return pngData
-            }
-            return null
-        } catch {
-            // Timeout is expected occasionally - don't log as error
-            return null
-        }
+        const pngData = await requestTaggedExport("validation", "png", 5000)
+        // PNG data should be a base64 data URL
+        return pngData?.startsWith("data:image/png") ? pngData : null
     }
 
     const loadDiagram = (
@@ -207,7 +191,7 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
         }
 
         // Keep chartXML in sync even when diagrams are injected (e.g., display_diagram tool)
-        setChartXML(xmlToLoad)
+        updateChartXML(xmlToLoad)
 
         if (drawioRef.current) {
             drawioRef.current.load({
@@ -218,41 +202,40 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
         return null
     }
 
-    const handleDiagramExport = (data: any) => {
-        // Handle PNG export for VLM validation
-        if (pngResolverRef.current && data.data?.startsWith("data:image/png")) {
-            pngResolverRef.current(data.data)
-            pngResolverRef.current = null
+    const handleDiagramExport = (data: EventExport) => {
+        // Tagged exports (thumbnail, validation PNG, file save) go only to
+        // their own caller, so they never take the result meant for resolverRef
+        const tag = data.message?.message
+        if (tag === "thumbnail" || tag === "validation") {
+            taggedResolversRef.current[tag]?.(data.data)
+            return
+        }
+        if (tag === "save") {
+            saveResolverRef.current.resolver?.(data.data, data.xml)
+            saveResolverRef.current = { resolver: null, format: null }
             return
         }
 
-        // Handle save to file if requested (process raw data before extraction)
-        if (saveResolverRef.current.resolver) {
-            const format = saveResolverRef.current.format
-            saveResolverRef.current.resolver(data.data)
-            saveResolverRef.current = { resolver: null, format: null }
-            // For non-xmlsvg formats, skip XML extraction as it will fail
-            // Only drawio (which uses xmlsvg internally) has the content attribute
-            // xmlsvg is saved directly as SVG file, no need for extraction
-            if (format === "png" || format === "svg" || format === "xmlsvg") {
-                return
-            }
-        }
-
+        // Don't write chartXML here: exports don't change the diagram, and
+        // data.xml from xmlsvg exports has compressed <diagram> payloads that
+        // would break edit_diagram/display_diagram. Autosave keeps chartXML
+        // up to date with the full uncompressed multi-page document (#879).
         const extractedXML = extractDiagramXML(data.data)
-        setChartXML(extractedXML)
         setLatestSvg(data.data)
 
         // Only add to history if this was a user-initiated export
         // Limit to 20 entries to prevent memory leaks during long sessions
         const MAX_HISTORY_SIZE = 20
         if (expectHistoryExportRef.current) {
+            // Store the full multi-page document (extractedXML is only the
+            // first page), so restoring a version keeps every page
+            const historyXml = chartXMLRef.current || extractedXML
             setDiagramHistory((prev) => {
                 const newHistory = [
                     ...prev,
                     {
                         svg: data.data,
-                        xml: extractedXML,
+                        xml: historyXml,
                     },
                 ]
                 // Keep only the last MAX_HISTORY_SIZE entries (circular buffer)
@@ -267,14 +250,16 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
         }
     }
 
+    // react-drawio registers this callback once per iframe mount, so it must
+    // read refs: state captured in its closure would stay stale after a remount
     const handleDiagramAutoSave = (data: { xml?: string }) => {
         if (!data?.xml) return
-        // Don't overwrite a pending restore - if we have a real diagram in state
-        // but DrawIO isn't ready yet, it means we're waiting to restore
-        if (!isDrawioReady && isRealDiagram(chartXML)) {
+        // Don't overwrite a pending restore - if we have a real diagram but
+        // DrawIO hasn't loaded yet, it means we're waiting to restore
+        if (!hasCalledOnLoadRef.current && isRealDiagram(chartXMLRef.current)) {
             return
         }
-        setChartXML(data.xml)
+        updateChartXML(data.xml)
     }
 
     const clearDiagram = () => {
@@ -302,14 +287,16 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
 
         // Set up the resolver before triggering export
         saveResolverRef.current = {
-            resolver: (exportData: string) => {
+            resolver: (exportData: string, fullDiagramXML?: string) => {
                 let fileContent: string | Blob
                 let mimeType: string
                 let extension: string
 
                 if (format === "drawio") {
-                    // Extract XML from SVG for .drawio format
-                    const xml = extractDiagramXML(exportData)
+                    // Prefer the complete document from the export event so all pages are saved.
+                    const xml = fullDiagramXML?.trim()
+                        ? fullDiagramXML
+                        : extractDiagramXML(exportData)
                     let xmlContent = xml
                     if (!xml.includes("<mxfile")) {
                         xmlContent = `<mxfile><diagram name="Page-1" id="page-1">${xml}</diagram></mxfile>`
@@ -374,7 +361,10 @@ export function DiagramProvider({ children }: { children: React.ReactNode }) {
         }
 
         // Export diagram - callback will be handled in handleDiagramExport
-        drawioRef.current.exportDiagram({ format: drawioFormat })
+        drawioRef.current.exportDiagram({
+            format: drawioFormat,
+            message: "save",
+        })
     }
 
     // Log save event to Langfuse (just flags the trace, doesn't send content)

docker-compose.yml

@@ -11,6 +11,9 @@ services:
         # - NEXT_PUBLIC_BASE_PATH=/nextaidrawio
     ports: ["3000:3000"]
     env_file: .env
+    volumes:
+      # Persists admin panel settings (data/settings.json)
+      - ./data:/app/data
     # environment:
     #   # For subdirectory deployment, uncomment and set your path:
     #   NEXT_PUBLIC_BASE_PATH: /nextaidrawio

docs/cn/README_CN.md

@@ -30,7 +30,7 @@ https://github.com/user-attachments/assets/b2eef5f3-b335-4e71-a755-dc2e80931979
   - [目录](#目录)
   - [示例](#示例)
   - [功能特性](#功能特性)
-  - [MCP服务器（预览）](#mcp服务器预览)
+  - [MCP服务器](#mcp服务器)
     - [Claude Code CLI](#claude-code-cli)
   - [快速开始](#快速开始)
     - [在线试用](#在线试用)
@@ -56,31 +56,31 @@ https://github.com/user-attachments/assets/b2eef5f3-b335-4e71-a755-dc2e80931979
   <tr>
     <td colspan="2" valign="top" align="center">
       <strong>动画Transformer连接器</strong><br />
-      <p><strong>提示词：</strong> 给我一个带有**动画连接器**的Transformer架构图。</p>
+      <p><strong>Prompt:</strong> Give me a **animated connector** diagram of transformer's architecture.</p>
       <img src="../../public/animated_connectors.svg" alt="带动画连接器的Transformer架构" width="480" />
     </td>
   </tr>
   <tr>
     <td width="50%" valign="top">
-      <strong>GCP架构图</strong><br />
-      <p><strong>提示词：</strong> 使用**GCP图标**生成一个GCP架构图。在这个图中，用户连接到托管在实例上的前端。</p>
-      <img src="../../public/gcp_demo.svg" alt="GCP架构图" width="480" />
+      <strong>RAG技术图</strong><br />
+      <p><strong>Prompt:</strong> Generate a RAG architecture diagram for **chat application**. Use connected diagram for data ingestion</p>
+      <img src="../../public/rag_prod.svg" alt="RAG架构图" width="480" />
     </td>
     <td width="50%" valign="top">
-      <strong>AWS架构图</strong><br />
-      <p><strong>提示词：</strong> 使用**AWS图标**生成一个AWS架构图。在这个图中，用户连接到托管在实例上的前端。</p>
-      <img src="../../public/aws_demo.svg" alt="AWS架构图" width="480" />
+      <strong>React和AWS认证流程</strong><br />
+      <p><strong>Prompt:</strong> Generate authentication process using React with **AWS**. Use Serverless architecture.</p>
+      <img src="../../public/auth.svg" alt="认证架构图" width="480" />
     </td>
   </tr>
   <tr>
     <td width="50%" valign="top">
-      <strong>Azure架构图</strong><br />
-      <p><strong>提示词：</strong> 使用**Azure图标**生成一个Azure架构图。在这个图中，用户连接到托管在实例上的前端。</p>
-      <img src="../../public/azure_demo.svg" alt="Azure架构图" width="480" />
+      <strong>开放式创新</strong><br />
+      <p><strong>Prompt:</strong> Create visualization of Henry Chesbrough's Open Innovation model.</p>
+      <img src="../../public/inno.svg" alt="开放式创新图" width="480" />
     </td>
     <td width="50%" valign="top">
       <strong>猫咪素描</strong><br />
-      <p><strong>提示词：</strong> 给我画一只可爱的猫。</p>
+      <p><strong>Prompt:</strong> Draw a cute cat for me.</p>
       <img src="../../public/cat_demo.svg" alt="猫咪绘图" width="240" />
     </td>
   </tr>
@@ -98,9 +98,7 @@ https://github.com/user-attachments/assets/b2eef5f3-b335-4e71-a755-dc2e80931979
 -   **云架构图支持**：专门支持生成云架构图（AWS、GCP、Azure）
 -   **动画连接器**：在图表元素之间创建动态动画连接器，实现更好的可视化效果
 
-## MCP服务器（预览）
-
-> **预览功能**：此功能为实验性功能，可能不稳定。
+## MCP服务器
 
 通过MCP（模型上下文协议）在Claude Desktop、Cursor和VS Code等AI代理中使用Next AI Draw.io。
 
@@ -206,6 +204,7 @@ npm run dev
 -   Azure OpenAI
 -   Ollama
 -   OpenRouter
+-   AIHubMix
 -   DeepSeek
 -   SiliconFlow
 -   ModelScope
@@ -218,12 +217,18 @@ npm run dev
 
 ### 服务端多模型配置
 
-管理员可以配置多个服务端模型，让所有用户无需提供个人 API Key 即可使用。通过 `AI_MODELS_CONFIG` 环境变量（JSON 字符串）或 `ai-models.json` 文件配置。
+管理员可以配置多个服务端模型，让所有用户无需提供个人 API Key 即可使用。通过 `AI_MODELS_CONFIG` 环境变量（JSON 字符串）或 `ai-models.json` 文件配置。如果只需要单 provider 下的多个模型，也可以直接在 `AI_MODEL` 中用逗号分隔模型 ID。
 
 **模型要求**：此任务需要强大的模型能力，因为它涉及生成具有严格格式约束的长文本（draw.io XML）。推荐使用 Claude Sonnet 4.5、GPT-5.1、Gemini 3 Pro 和 DeepSeek V3.2/R1。
 
 注意：`claude` 系列已在带有 AWS、Azure、GCP 等云架构 Logo 的 draw.io 图表上进行训练，因此如果您想创建云架构图，这是最佳选择。
 
+### 管理面板
+
+设置 `ADMIN_PASSWORD` 环境变量并访问 `/admin`，即可在 Web 面板中管理服务端设置（模型、访问码、功能开关、可观测性、配额），无需手动编辑 `.env`。
+
+📖 **[管理面板指南](./admin-panel.md)** — 启用方法、优先级规则和注意事项。
+
 
 ## 工作原理
 

docs/cn/admin-panel.md

@@ -0,0 +1,24 @@
+# 管理面板
+
+无需手动编辑 `.env`，您可以在 Web 管理面板中管理服务端设置。
+
+## 启用面板
+
+1. 设置 `ADMIN_PASSWORD` 环境变量（不设置则面板禁用）。
+2. 访问 `/admin` 并登录。
+
+## 可配置内容
+
+1. **Models（模型）** — 添加提供商及其 API Key 和模型列表，交互与应用内的模型设置相同。保存后这些模型成为所有用户可用的服务端模型，并在请求时与环境中的 `AI_MODELS_CONFIG` / `ai-models.json` 合并（面板不会修改这些环境文件）。
+2. **其余区块** — 访问码、生成参数、功能开关、可观测性和配额。保存的设置会写入 `data/settings.json` 并立即生效，无需重启（少数设置如 Langfuse 和 DynamoDB 标记为"需要重启"）。
+
+## 优先级
+
+面板中保存的设置覆盖环境变量，环境变量覆盖内置默认值。删除已保存的值会回退到环境变量。
+
+## 注意事项
+
+- 密钥以明文形式存储在 `data/settings.json` 中（文件权限 600），请妥善保管该文件。
+- 在无服务器平台（Vercel、Cloudflare Workers）上没有持久化磁盘，面板为只读 — 请改用环境变量配置。
+- 使用 Docker 时，`data/` 目录通过 `docker-compose.yml` 中的卷持久化。
+- `NEXT_PUBLIC_*` 变量在构建时固化，无法在面板中修改。

docs/cn/ai-providers.md

@@ -46,6 +46,21 @@ AI_MODEL=gpt-4o
 OPENAI_BASE_URL=https://your-custom-endpoint/v1
 ```
 
+### AIHubMix
+
+AIHubMix 通过单个 API Key 聚合 Claude、GPT、Gemini、DeepSeek 等模型。
+
+```bash
+AIHUBMIX_API_KEY=your_api_key
+AI_MODEL=claude-sonnet-4-5-20250929
+```
+
+可选的自定义端点：
+
+```bash
+AIHUBMIX_BASE_URL=https://aihubmix.com/v1
+```
+
 ### Anthropic
 
 ```bash
@@ -53,6 +68,13 @@ ANTHROPIC_API_KEY=your_api_key
 AI_MODEL=claude-sonnet-4-5-20250514
 ```
 
+或者使用 Bearer 认证令牌（例如通过会下发 OAuth 风格 token 的网关时）。`ANTHROPIC_AUTH_TOKEN` 会作为 `Authorization: Bearer <token>` 头发送，而 `ANTHROPIC_API_KEY` 会作为 `x-api-key` 头发送。两者互斥，只能设置其中之一：
+
+```bash
+ANTHROPIC_AUTH_TOKEN=your_auth_token
+AI_MODEL=claude-sonnet-4-5-20250514
+```
+
 可选的自定义端点：
 
 ```bash
@@ -215,7 +237,7 @@ MiniMax 支持两种 API 格式：
 
 ```bash
 MINIMAX_API_KEY=your_api_key
-AI_MODEL=MiniMax-M2.7
+AI_MODEL=MiniMax-M3
 ```
 
 可选配置：
@@ -286,6 +308,19 @@ AI_MODEL=your_model_id
 QINIU_BASE_URL=https://your-custom-endpoint
 ```
 
+### MiMo (小米)
+
+```bash
+MIMO_API_KEY=your_api_key
+AI_MODEL=mimo-v2.5-pro
+```
+
+可选的自定义端点（Token Plan 订阅用户请设置专属 Base URL）：
+
+```bash
+MIMO_BASE_URL=https://token-plan-cn.xiaomimimo.com/v1
+```
+
 ## 自动检测
 
 如果您只配置了**一个**提供商的 API 密钥，系统将自动检测并使用该提供商。无需设置 `AI_PROVIDER`。
@@ -293,7 +328,7 @@ QINIU_BASE_URL=https://your-custom-endpoint
 如果您配置了**多个** API 密钥，则必须显式设置 `AI_PROVIDER`：
 
 ```bash
-AI_PROVIDER=google  # 或：openai, anthropic, deepseek, siliconflow, doubao, azure, bedrock, openrouter, ollama, gateway, sglang, modelscope, minimax, glm, qwen, kimi, qiniu
+AI_PROVIDER=google  # 或：openai, anthropic, aihubmix, deepseek, siliconflow, doubao, azure, bedrock, openrouter, ollama, gateway, sglang, modelscope, minimax, glm, qwen, kimi, qiniu, mimo
 ```
 
 ## 服务端多模型配置
@@ -314,6 +349,17 @@ AI_MODELS_CONFIG='{"providers":[{"name":"OpenAI","provider":"openai","models":["
 
 在项目根目录创建 `ai-models.json` 文件（或通过 `AI_MODELS_CONFIG_PATH` 指定路径）。
 
+**方式三：`AI_MODEL` 用逗号分隔**（单 provider 的快速配置）
+
+如果只需要暴露同一 provider 下的多个模型，可以直接在 `AI_MODEL` 里用逗号分隔。第一个模型会作为默认值。
+
+```bash
+AI_PROVIDER=doubao
+AI_MODEL=doubao-seed-1-8-251215,doubao-seed-1-6-flash,doubao-seed-1-6-pro
+```
+
+这是等价 `ai-models.json` 的简写形式。如果需要配置多个 provider，或自定义 `apiKeyEnv` / `baseUrlEnv`，请使用方式一或方式二。
+
 ### 配置示例
 
 ```json

docs/en/admin-panel.md

@@ -0,0 +1,24 @@
+# Admin Panel
+
+Instead of hand-editing `.env`, you can manage server settings in a web admin panel.
+
+## Enabling the panel
+
+1. Set the `ADMIN_PASSWORD` environment variable (leave unset to disable the panel).
+2. Visit `/admin` and sign in.
+
+## What you can configure
+
+1. **Models** — add providers with their API keys and model lists, using the same UI as the in-app model settings. Saved models become server-side models available to all users, merged with any `AI_MODELS_CONFIG` / `ai-models.json` from your environment at request time (the panel does not modify those env files).
+2. **Other sections** — access codes, generation parameters, features, observability, and quota. Saved settings are written to `data/settings.json` and apply immediately — no restart needed (a few settings such as Langfuse and DynamoDB are marked "Restart Required").
+
+## Precedence
+
+Settings saved in the panel override environment variables, which override built-in defaults. Removing a saved value falls back to the environment variable.
+
+## Notes
+
+- Secrets are stored in plaintext in `data/settings.json` (file mode 600). Keep the file private.
+- On serverless platforms (Vercel, Cloudflare Workers) there is no persistent disk, so the panel is read-only — configure via environment variables there.
+- With Docker, the `data/` directory is persisted via the volume in `docker-compose.yml`.
+- `NEXT_PUBLIC_*` variables are baked in at build time and cannot be changed in the panel.

docs/en/ai-providers.md

@@ -61,6 +61,21 @@ Optional custom endpoint (for OpenAI-compatible services):
 OPENAI_BASE_URL=https://your-custom-endpoint/v1
 ```
 
+### AIHubMix
+
+AIHubMix provides access to Claude, GPT, Gemini, DeepSeek, and other models through a single API key.
+
+```bash
+AIHUBMIX_API_KEY=your_api_key
+AI_MODEL=claude-sonnet-4-5-20250929
+```
+
+Optional custom endpoint:
+
+```bash
+AIHUBMIX_BASE_URL=https://aihubmix.com/v1
+```
+
 ### Anthropic
 
 ```bash
@@ -68,6 +83,13 @@ ANTHROPIC_API_KEY=your_api_key
 AI_MODEL=claude-sonnet-4-5-20250514
 ```
 
+Or use a Bearer auth token instead of an API key (e.g. when going through a gateway that issues OAuth-style tokens). `ANTHROPIC_AUTH_TOKEN` is sent as `Authorization: Bearer <token>`, while `ANTHROPIC_API_KEY` is sent as `x-api-key`. The two are mutually exclusive — set only one:
+
+```bash
+ANTHROPIC_AUTH_TOKEN=your_auth_token
+AI_MODEL=claude-sonnet-4-5-20250514
+```
+
 Optional custom endpoint:
 
 ```bash
@@ -230,7 +252,7 @@ MiniMax supports two API formats:
 
 ```bash
 MINIMAX_API_KEY=your_api_key
-AI_MODEL=MiniMax-M2.7
+AI_MODEL=MiniMax-M3
 ```
 
 Optional configuration:
@@ -301,6 +323,19 @@ Optional custom endpoint:
 QINIU_BASE_URL=https://your-custom-endpoint
 ```
 
+### MiMo (Xiaomi)
+
+```bash
+MIMO_API_KEY=your_api_key
+AI_MODEL=mimo-v2.5-pro
+```
+
+Optional custom endpoint (Token Plan subscribers should set their dedicated Base URL):
+
+```bash
+MIMO_BASE_URL=https://token-plan-cn.xiaomimimo.com/v1
+```
+
 ## Auto-Detection
 
 If you only configure **one** provider's API key, the system will automatically detect and use that provider. No need to set `AI_PROVIDER`.
@@ -308,7 +343,7 @@ If you only configure **one** provider's API key, the system will automatically
 If you configure **multiple** API keys, you must explicitly set `AI_PROVIDER`:
 
 ```bash
-AI_PROVIDER=google  # or: openai, anthropic, deepseek, siliconflow, doubao, azure, bedrock, openrouter, ollama, gateway, sglang, modelscope, minimax, glm, qwen, kimi, qiniu
+AI_PROVIDER=google  # or: openai, anthropic, aihubmix, deepseek, siliconflow, doubao, azure, bedrock, openrouter, ollama, gateway, sglang, modelscope, minimax, glm, qwen, kimi, qiniu, mimo
 ```
 
 ## Server-Side Multi-Model Configuration
@@ -329,6 +364,17 @@ AI_MODELS_CONFIG='{"providers":[{"name":"OpenAI","provider":"openai","models":["
 
 Create an `ai-models.json` file in the project root (or set `AI_MODELS_CONFIG_PATH` to a custom location).
 
+**Option 3: Comma-separated `AI_MODEL`** (quick setup, single provider)
+
+If you only need multiple models from one provider, list them in `AI_MODEL` separated by commas. The first model is treated as the default.
+
+```bash
+AI_PROVIDER=doubao
+AI_MODEL=doubao-seed-1-8-251215,doubao-seed-1-6-flash,doubao-seed-1-6-pro
+```
+
+This is shorthand for the equivalent `ai-models.json`. For multiple providers or custom `apiKeyEnv` / `baseUrlEnv`, use Option 1 or 2 instead.
+
 ### Example Configuration
 
 ```json

docs/ja/README_JA.md

@@ -28,7 +28,7 @@ https://github.com/user-attachments/assets/b2eef5f3-b335-4e71-a755-dc2e80931979
   - [目次](#目次)
   - [例](#例)
   - [機能](#機能)
-  - [MCPサーバー（プレビュー）](#mcpサーバープレビュー)
+  - [MCPサーバー](#mcpサーバー)
     - [Claude Code CLI](#claude-code-cli)
   - [はじめに](#はじめに)
     - [オンラインで試す](#オンラインで試す)
@@ -54,31 +54,31 @@ https://github.com/user-attachments/assets/b2eef5f3-b335-4e71-a755-dc2e80931979
   <tr>
     <td colspan="2" valign="top" align="center">
       <strong>アニメーションTransformerコネクタ</strong><br />
-      <p><strong>プロンプト：</strong> **アニメーションコネクタ**付きのTransformerアーキテクチャ図を作成してください。</p>
+      <p><strong>Prompt:</strong> Give me a **animated connector** diagram of transformer's architecture.</p>
       <img src="../../public/animated_connectors.svg" alt="アニメーションコネクタ付きTransformerアーキテクチャ" width="480" />
     </td>
   </tr>
   <tr>
     <td width="50%" valign="top">
-      <strong>GCPアーキテクチャ図</strong><br />
-      <p><strong>プロンプト：</strong> **GCPアイコン**を使用してGCPアーキテクチャ図を生成してください。この図では、ユーザーがインスタンス上でホストされているフロントエンドに接続します。</p>
-      <img src="../../public/gcp_demo.svg" alt="GCPアーキテクチャ図" width="480" />
+      <strong>RAG技術ダイアグラム</strong><br />
+      <p><strong>Prompt:</strong> Generate a RAG architecture diagram for **chat application**. Use connected diagram for data ingestion</p>
+      <img src="../../public/rag_prod.svg" alt="RAGアーキテクチャ図" width="480" />
     </td>
     <td width="50%" valign="top">
-      <strong>AWSアーキテクチャ図</strong><br />
-      <p><strong>プロンプト：</strong> **AWSアイコン**を使用してAWSアーキテクチャ図を生成してください。この図では、ユーザーがインスタンス上でホストされているフロントエンドに接続します。</p>
-      <img src="../../public/aws_demo.svg" alt="AWSアーキテクチャ図" width="480" />
+      <strong>ReactとAWSによる認証</strong><br />
+      <p><strong>Prompt:</strong> Generate authentication process using React with **AWS**. Use Serverless architecture.</p>
+      <img src="../../public/auth.svg" alt="認証アーキテクチャ図" width="480" />
     </td>
   </tr>
   <tr>
     <td width="50%" valign="top">
-      <strong>Azureアーキテクチャ図</strong><br />
-      <p><strong>プロンプト：</strong> **Azureアイコン**を使用してAzureアーキテクチャ図を生成してください。この図では、ユーザーがインスタンス上でホストされているフロントエンドに接続します。</p>
-      <img src="../../public/azure_demo.svg" alt="Azureアーキテクチャ図" width="480" />
+      <strong>オープンイノベーション</strong><br />
+      <p><strong>Prompt:</strong> Create visualization of Henry Chesbrough's Open Innovation model.</p>
+      <img src="../../public/inno.svg" alt="オープンイノベーション図" width="480" />
     </td>
     <td width="50%" valign="top">
       <strong>猫のスケッチ</strong><br />
-      <p><strong>プロンプト：</strong> かわいい猫を描いてください。</p>
+      <p><strong>Prompt:</strong> Draw a cute cat for me.</p>
       <img src="../../public/cat_demo.svg" alt="猫の絵" width="240" />
     </td>
   </tr>
@@ -96,9 +96,7 @@ https://github.com/user-attachments/assets/b2eef5f3-b335-4e71-a755-dc2e80931979
 -   **クラウドアーキテクチャダイアグラムサポート**：クラウドアーキテクチャダイアグラムの生成を専門的にサポート（AWS、GCP、Azure）
 -   **アニメーションコネクタ**：より良い可視化のためにダイアグラム要素間に動的でアニメーション化されたコネクタを作成
 
-## MCPサーバー（プレビュー）
-
-> **プレビュー機能**：この機能は実験的であり、安定しない可能性があります。
+## MCPサーバー
 
 MCP（Model Context Protocol）を介して、Claude Desktop、Cursor、VS CodeなどのAIエージェントでNext AI Draw.ioを使用できます。
 
@@ -205,6 +203,7 @@ Next.jsアプリをデプロイする最も簡単な方法は、Next.jsの作成
 -   Azure OpenAI
 -   Ollama
 -   OpenRouter
+-   AIHubMix
 -   DeepSeek
 -   SiliconFlow
 -   ModelScope
@@ -217,12 +216,18 @@ AWS BedrockとOpenRouter以外のすべてのプロバイダーはカスタム
 
 ### サーバーサイドマルチモデル設定
 
-管理者は、ユーザーが個人のAPIキーを提供することなく利用できる複数のサーバーサイドモデルを設定できます。`AI_MODELS_CONFIG` 環境変数（JSON文字列）または `ai-models.json` ファイルで設定します。
+管理者は、ユーザーが個人のAPIキーを提供することなく利用できる複数のサーバーサイドモデルを設定できます。`AI_MODELS_CONFIG` 環境変数（JSON文字列）または `ai-models.json` ファイルで設定します。同一プロバイダー内の複数モデルだけが必要な場合は、`AI_MODEL` にカンマ区切りでモデルIDを列挙する簡易設定も使えます。
 
 **モデル要件**：このタスクは厳密なフォーマット制約（draw.io XML）を持つ長文テキスト生成を伴うため、強力なモデル機能が必要です。Claude Sonnet 4.5、GPT-5.1、Gemini 3 Pro、DeepSeek V3.2/R1を推奨します。
 
 注：`claude`シリーズはAWS、Azure、GCPなどのクラウドアーキテクチャロゴ付きのdraw.ioダイアグラムで学習されているため、クラウドアーキテクチャダイアグラムを作成したい場合は最適な選択です。
 
+### 管理パネル
+
+`ADMIN_PASSWORD` 環境変数を設定して `/admin` にアクセスすると、`.env` を手動で編集する代わりに Web パネルでサーバー設定（モデル、アクセスコード、機能、可観測性、クォータ）を管理できます。
+
+📖 **[管理パネルガイド](./admin-panel.md)** — 有効化の方法、優先順位ルール、注意事項。
+
 
 ## 仕組み
 

docs/ja/admin-panel.md

@@ -0,0 +1,24 @@
+# 管理パネル
+
+`.env` を手動で編集する代わりに、Web 管理パネルでサーバー設定を管理できます。
+
+## パネルの有効化
+
+1. `ADMIN_PASSWORD` 環境変数を設定します（未設定の場合、パネルは無効になります）。
+2. `/admin` にアクセスしてサインインします。
+
+## 設定できる項目
+
+1. **Models（モデル）** — アプリ内のモデル設定と同じ UI で、プロバイダーの API キーとモデルリストを追加します。保存するとそれらは全ユーザーが利用できるサーバーサイドモデルになり、リクエスト時に環境の `AI_MODELS_CONFIG` / `ai-models.json` とマージされます（パネルがこれらの環境ファイルを変更することはありません）。
+2. **その他のセクション** — アクセスコード、生成パラメータ、機能、可観測性、クォータ。保存された設定は `data/settings.json` に書き込まれ、即座に反映されます — 再起動は不要です（Langfuse や DynamoDB など一部の設定は「再起動が必要」と表示されます）。
+
+## 優先順位
+
+パネルで保存された設定は環境変数を上書きし、環境変数は組み込みのデフォルト値を上書きします。保存した値を削除すると環境変数にフォールバックします。
+
+## 注意事項
+
+- シークレットは `data/settings.json` に平文で保存されます（ファイルモード 600）。このファイルは非公開に保ってください。
+- サーバーレスプラットフォーム（Vercel、Cloudflare Workers）には永続ディスクがないため、パネルは読み取り専用です — その環境では環境変数で設定してください。
+- Docker 使用時は、`data/` ディレクトリが `docker-compose.yml` のボリュームで永続化されます。
+- `NEXT_PUBLIC_*` 変数はビルド時に固定され、パネルでは変更できません。

docs/ja/ai-providers.md

@@ -46,6 +46,21 @@ AI_MODEL=gpt-4o
 OPENAI_BASE_URL=https://your-custom-endpoint/v1
 ```
 
+### AIHubMix
+
+AIHubMix は、単一の API キーで Claude、GPT、Gemini、DeepSeek などのモデルへのアクセスを提供します。
+
+```bash
+AIHUBMIX_API_KEY=your_api_key
+AI_MODEL=claude-sonnet-4-5-20250929
+```
+
+任意のカスタムエンドポイント:
+
+```bash
+AIHUBMIX_BASE_URL=https://aihubmix.com/v1
+```
+
 ### Anthropic
 
 ```bash
@@ -53,6 +68,13 @@ ANTHROPIC_API_KEY=your_api_key
 AI_MODEL=claude-sonnet-4-5-20250514
 ```
 
+または、Bearer 認証トークンを使用することもできます（OAuth スタイルのトークンを発行するゲートウェイ経由で利用する場合など）。`ANTHROPIC_AUTH_TOKEN` は `Authorization: Bearer <token>` ヘッダーで送信され、`ANTHROPIC_API_KEY` は `x-api-key` ヘッダーで送信されます。両者は排他的なので、いずれか一方のみを設定してください:
+
+```bash
+ANTHROPIC_AUTH_TOKEN=your_auth_token
+AI_MODEL=claude-sonnet-4-5-20250514
+```
+
 任意のカスタムエンドポイント:
 
 ```bash
@@ -215,7 +237,7 @@ MiniMax は 2 つの API 形式をサポートしています：
 
 ```bash
 MINIMAX_API_KEY=your_api_key
-AI_MODEL=MiniMax-M2.7
+AI_MODEL=MiniMax-M3
 ```
 
 オプション設定：
@@ -286,6 +308,19 @@ AI_MODEL=your_model_id
 QINIU_BASE_URL=https://your-custom-endpoint
 ```
 
+### MiMo (Xiaomi)
+
+```bash
+MIMO_API_KEY=your_api_key
+AI_MODEL=mimo-v2.5-pro
+```
+
+オプションのカスタムエンドポイント（Token Plan 加入者は専用の Base URL を設定してください）：
+
+```bash
+MIMO_BASE_URL=https://token-plan-cn.xiaomimimo.com/v1
+```
+
 ## 自動検出
 
 **1つ**のプロバイダーの API キーのみを設定した場合、システムはそのプロバイダーを自動的に検出して使用します。`AI_PROVIDER` を設定する必要はありません。
@@ -293,7 +328,7 @@ QINIU_BASE_URL=https://your-custom-endpoint
 **複数**の API キーを設定する場合は、`AI_PROVIDER` を明示的に設定する必要があります:
 
 ```bash
-AI_PROVIDER=google  # または: openai, anthropic, deepseek, siliconflow, doubao, azure, bedrock, openrouter, ollama, gateway, sglang, modelscope, minimax, glm, qwen, kimi, qiniu
+AI_PROVIDER=google  # または: openai, anthropic, aihubmix, deepseek, siliconflow, doubao, azure, bedrock, openrouter, ollama, gateway, sglang, modelscope, minimax, glm, qwen, kimi, qiniu, mimo
 ```
 
 ## サーバーサイドマルチモデル設定
@@ -314,6 +349,17 @@ AI_MODELS_CONFIG='{"providers":[{"name":"OpenAI","provider":"openai","models":["
 
 プロジェクトルートに `ai-models.json` ファイルを作成します（または `AI_MODELS_CONFIG_PATH` でパスを指定）。
 
+**方法3：`AI_MODEL` をカンマ区切りで指定**（単一プロバイダーの簡易設定）
+
+同一プロバイダー内の複数モデルだけを公開したい場合は、`AI_MODEL` にカンマ区切りで列挙できます。最初のモデルがデフォルトになります。
+
+```bash
+AI_PROVIDER=doubao
+AI_MODEL=doubao-seed-1-8-251215,doubao-seed-1-6-flash,doubao-seed-1-6-pro
+```
+
+これは等価な `ai-models.json` の簡易表記です。複数のプロバイダーや、カスタム `apiKeyEnv` / `baseUrlEnv` を使う場合は、方法1または方法2を使ってください。
+
 ### 設定例
 
 ```json

edge-functions/api/edgeai/chat/completions.ts

@@ -67,41 +67,62 @@ const MODEL_ALIASES: Record<string, string> = {
     "deepseek-v3-0324": "@tx/deepseek-ai/deepseek-v3-0324",
 }
 
-const CORS_HEADERS = {
-    "Access-Control-Allow-Origin": "*",
-    "Access-Control-Allow-Methods": "POST, OPTIONS",
-    "Access-Control-Allow-Headers": "Content-Type, Authorization",
-}
-
 /**
- * Create standardized response with CORS headers
+ * Create standardized JSON response
  */
 function createResponse(body: any, status = 200, extraHeaders = {}): Response {
     return new Response(JSON.stringify(body), {
         status,
         headers: {
             "Content-Type": "application/json",
-            ...CORS_HEADERS,
             ...extraHeaders,
         },
     })
 }
 
-/**
- * Handle OPTIONS request for CORS preflight
- */
-function handleOptionsRequest(): Response {
-    return new Response(null, {
-        headers: {
-            ...CORS_HEADERS,
-            "Access-Control-Max-Age": "86400",
-        },
-    })
+// Only the app's own server (/api/chat, /api/validate-model) calls this
+// function, so no CORS headers are sent: other sites' pages can't call it
+// from a browser and spend the deployment's Edge AI quota.
+// Same rule as lib/access-code.ts, but reading the edge function's env.
+// No codes configured (or env unavailable) means no check.
+function hasValidAccessCode(request: Request, env: any): boolean {
+    const accessCodes: string[] =
+        env?.ACCESS_CODE_LIST?.split(",")
+            .map((code: string) => code.trim())
+            .filter(Boolean) || []
+    if (accessCodes.length === 0) return true
+    const accessCode = request.headers.get("x-access-code")
+    return !!accessCode && accessCodes.includes(accessCode)
 }
 
-export async function onRequest({ request, env: _env }: any) {
-    if (request.method === "OPTIONS") {
-        return handleOptionsRequest()
+export async function onRequest({ request, env }: any) {
+    // Requiring JSON also makes any cross-site browser request need a CORS
+    // preflight, which fails without CORS headers
+    if (
+        request.method !== "POST" ||
+        !request.headers.get("content-type")?.includes("application/json")
+    ) {
+        return createResponse(
+            {
+                error: {
+                    message: "Expected a POST request with a JSON body",
+                    type: "invalid_request_error",
+                },
+            },
+            400,
+        )
+    }
+
+    if (!hasValidAccessCode(request, env)) {
+        return createResponse(
+            {
+                error: {
+                    message: "Invalid or missing access code",
+                    type: "invalid_request_error",
+                },
+            },
+            401,
+        )
     }
 
     request.headers.delete("accept-encoding")
@@ -153,7 +174,7 @@ export async function onRequest({ request, env: _env }: any) {
                         type: "invalid_request_error",
                     },
                 },
-                429,
+                400,
             )
         }
 
@@ -216,7 +237,6 @@ export async function onRequest({ request, env: _env }: any) {
                     "Cache-Control": "no-cache, no-store, no-transform",
                     "X-Accel-Buffering": "no",
                     Connection: "keep-alive",
-                    ...CORS_HEADERS,
                 },
             })
         } catch (error: any) {

electron/electron-builder.yml

@@ -95,6 +95,10 @@ linux:
       arch:
         - x64
         - arm64
+    - target: rpm
+      arch:
+        - x64
+        - arm64
 
 # Publish configuration (optional)
 publish:

electron/electron.d.ts

@@ -101,8 +101,8 @@ declare global {
 }
 
 export type {
-    ConfigPreset,
     ApplyPresetResult,
+    ConfigPreset,
     ProxyConfig,
     SetProxyResult,
     SetUserLocaleResult,

electron/main/app-menu.ts

@@ -32,6 +32,55 @@ export function rebuildAppMenu(): void {
     buildAppMenu()
 }
 
+/**
+ * Apply a preset and restart the server so it takes effect.
+ * If the restart fails, go back to the previous preset and restart again,
+ * so the running server always matches the saved current preset.
+ * Throws an error describing the outcome on failure.
+ */
+export async function switchPreset(
+    id: string,
+): Promise<Record<string, string>> {
+    const previousPresetId = getCurrentPresetId()
+    const env = applyPresetToEnv(id)
+    if (!env) {
+        throw new Error("Preset not found")
+    }
+    rebuildAppMenu()
+
+    // In development, scripts/electron-dev.mjs restarts the Next.js dev server
+    if (!app.isPackaged) {
+        return env
+    }
+
+    try {
+        await restartNextServer()
+        return env
+    } catch (error) {
+        console.error("Failed to restart server:", error)
+        const reason = error instanceof Error ? error.message : String(error)
+
+        // Revert to previous preset on failure
+        if (!previousPresetId || !applyPresetToEnv(previousPresetId)) {
+            setCurrentPreset(null)
+        }
+        // Rebuild menu to restore previous checkmark state
+        rebuildAppMenu()
+
+        try {
+            await restartNextServer()
+        } catch (retryError) {
+            console.error("Failed to restart server again:", retryError)
+            throw new Error(
+                `The server could not be restarted.\n\nPlease restart the app.\n\nError: ${reason}`,
+            )
+        }
+        throw new Error(
+            `The server could not be restarted.\n\nThe previous configuration has been restored.\n\nError: ${reason}`,
+        )
+    }
+}
+
 /**
  * Get the menu template with translations
  */
@@ -192,32 +241,14 @@ function buildConfigMenu(
         type: "radio",
         checked: preset.id === currentPresetId,
         click: async () => {
-            const previousPresetId = getCurrentPresetId()
-            const env = applyPresetToEnv(preset.id)
-
-            if (env) {
-                try {
-                    await restartNextServer()
-                    rebuildAppMenu() // Rebuild menu to update checkmarks
-                } catch (error) {
-                    console.error("Failed to restart server:", error)
-
-                    // Revert to previous preset on failure
-                    if (previousPresetId) {
-                        applyPresetToEnv(previousPresetId)
-                    } else {
-                        setCurrentPreset(null)
-                    }
-
-                    // Rebuild menu to restore previous checkmark state
-                    rebuildAppMenu()
-
-                    // Show error dialog to notify user
-                    dialog.showErrorBox(
-                        "Configuration Error",
-                        `Failed to apply preset "${preset.name}". The server could not be restarted.\n\nThe previous configuration has been restored.\n\nError: ${error instanceof Error ? error.message : String(error)}`,
-                    )
-                }
+            try {
+                await switchPreset(preset.id)
+            } catch (error) {
+                // Show error dialog to notify user
+                dialog.showErrorBox(
+                    "Configuration Error",
+                    `Failed to apply preset "${preset.name}". ${error instanceof Error ? error.message : String(error)}`,
+                )
             }
         },
     }))

electron/main/config-manager.ts

@@ -1,5 +1,11 @@
 import { randomUUID } from "node:crypto"
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs"
+import {
+    existsSync,
+    mkdirSync,
+    readFileSync,
+    renameSync,
+    writeFileSync,
+} from "node:fs"
 import path from "node:path"
 import { app, safeStorage } from "electron"
 
@@ -30,7 +36,9 @@ let hasWarnedAboutPlaintext = false
  * Warns if encryption is not available (API key stored in plaintext)
  */
 function encryptValue(value: string): string {
-    if (!value) {
+    // Already encrypted (a value that could not be decrypted): keep it as is
+    // instead of wrapping it in a second layer of encryption
+    if (!value || value.startsWith(ENCRYPTED_PREFIX)) {
         return value
     }
 
@@ -61,6 +69,7 @@ function encryptValue(value: string): string {
 /**
  * Decrypt a sensitive value using safeStorage
  * Returns the original value if it's not encrypted or decryption fails
+ * (so saving writes the stored ciphertext back unchanged)
  */
 function decryptValue(value: string): string {
     if (!value || !value.startsWith(ENCRYPTED_PREFIX)) {
@@ -179,6 +188,15 @@ export function loadPresets(): ConfigPresetsFile {
         return data
     } catch (error) {
         console.error("Failed to load config presets:", error)
+        // Move the unreadable file aside so the next save can't overwrite
+        // the user's presets with an empty list
+        const backupPath = `${configPath}.corrupt-${Date.now()}`
+        try {
+            renameSync(configPath, backupPath)
+            console.error(`Unreadable config presets moved to ${backupPath}`)
+        } catch (renameError) {
+            console.error("Failed to back up config presets:", renameError)
+        }
         return {
             version: 1,
             currentPresetId: null,
@@ -211,7 +229,11 @@ export function savePresets(data: ConfigPresetsFile): void {
     }
 
     try {
-        writeFileSync(configPath, JSON.stringify(dataToSave, null, 2), "utf-8")
+        // Write a temp file and rename it, so a crash mid-write can't leave
+        // a truncated config file
+        const tempPath = `${configPath}.tmp`
+        writeFileSync(tempPath, JSON.stringify(dataToSave, null, 2), "utf-8")
+        renameSync(tempPath, configPath)
     } catch (error) {
         console.error("Failed to save config presets:", error)
         throw error
@@ -307,9 +329,10 @@ export function deletePreset(id: string): boolean {
 
     data.presets.splice(index, 1)
 
-    // Clear current preset if it was deleted
+    // Clear current preset (and its env vars) if it was deleted
     if (data.currentPresetId === id) {
         data.currentPresetId = null
+        setPresetEnv(null)
     }
 
     savePresets(data)
@@ -322,13 +345,15 @@ export function deletePreset(id: string): boolean {
 export function setCurrentPreset(id: string | null): boolean {
     const data = loadPresets()
 
+    let preset: ConfigPreset | null = null
     if (id !== null) {
-        const preset = data.presets.find((p) => p.id === id)
+        preset = data.presets.find((p) => p.id === id) || null
         if (!preset) {
             return false
         }
     }
 
+    setPresetEnv(preset)
     data.currentPresetId = id
     savePresets(data)
     return true
@@ -365,78 +390,23 @@ const PROVIDER_ENV_MAP: Record<string, { apiKey: string; baseUrl: string }> = {
 }
 
 /**
- * Apply preset environment variables to the current process
- * Returns the environment variables that were applied
- */
-export function applyPresetToEnv(id: string): Record<string, string> | null {
-    const data = loadPresets()
-    const preset = data.presets.find((p) => p.id === id)
-
-    if (!preset) {
-        return null
-    }
-
-    const appliedEnv: Record<string, string> = {}
-    const provider = preset.config.AI_PROVIDER?.toLowerCase()
-
-    for (const [key, value] of Object.entries(preset.config)) {
-        if (value !== undefined && value !== "") {
-            // Map generic AI_API_KEY to provider-specific key
-            if (
-                key === "AI_API_KEY" &&
-                provider &&
-                PROVIDER_ENV_MAP[provider]
-            ) {
-                const providerApiKey = PROVIDER_ENV_MAP[provider].apiKey
-                if (providerApiKey) {
-                    process.env[providerApiKey] = value
-                    appliedEnv[providerApiKey] = value
-                }
-            }
-            // Map generic AI_BASE_URL to provider-specific key
-            else if (
-                key === "AI_BASE_URL" &&
-                provider &&
-                PROVIDER_ENV_MAP[provider]
-            ) {
-                const providerBaseUrl = PROVIDER_ENV_MAP[provider].baseUrl
-                if (providerBaseUrl) {
-                    process.env[providerBaseUrl] = value
-                    appliedEnv[providerBaseUrl] = value
-                }
-            }
-            // Apply other env vars directly
-            else {
-                process.env[key] = value
-                appliedEnv[key] = value
-            }
-        }
-    }
-
-    // Set as current preset
-    data.currentPresetId = id
-    savePresets(data)
-
-    return appliedEnv
-}
-
-/**
- * Get environment variables from current preset
+ * Map a preset's config to environment variables
  * Maps generic AI_API_KEY/AI_BASE_URL to provider-specific keys
  */
-export function getCurrentPresetEnv(): Record<string, string> {
-    const preset = getCurrentPreset()
-    if (!preset) {
-        return {}
-    }
-
+function presetToEnv(preset: ConfigPreset): Record<string, string> {
     const env: Record<string, string> = {}
     const provider = preset.config.AI_PROVIDER?.toLowerCase()
 
     for (const [key, value] of Object.entries(preset.config)) {
         if (value !== undefined && value !== "") {
+            // A key that could not be decrypted is useless to the server
+            if (value.startsWith(ENCRYPTED_PREFIX)) {
+                console.warn(
+                    `Preset "${preset.name}": ${key} could not be decrypted. Please enter it again in Settings.`,
+                )
+            }
             // Map generic AI_API_KEY to provider-specific key
-            if (
+            else if (
                 key === "AI_API_KEY" &&
                 provider &&
                 PROVIDER_ENV_MAP[provider]
@@ -466,6 +436,90 @@ export function getCurrentPresetEnv(): Record<string, string> {
     return env
 }
 
+/**
+ * Values that env vars had before a preset first set them
+ * (from the system or .env files), and the keys the active preset set
+ */
+const originalEnv: Record<string, string | undefined> = {}
+let presetEnvKeys: string[] = []
+
+/**
+ * Replace the env vars of the previous preset with those of the given preset
+ * (null leaves no preset applied). Restoring first means switching presets
+ * never leaves the previous preset's base URL, model or key behind.
+ */
+function setPresetEnv(preset: ConfigPreset | null): Record<string, string> {
+    for (const key of presetEnvKeys) {
+        if (originalEnv[key] === undefined) {
+            delete process.env[key]
+        } else {
+            process.env[key] = originalEnv[key]
+        }
+    }
+
+    const env = preset ? presetToEnv(preset) : {}
+    for (const [key, value] of Object.entries(env)) {
+        if (!(key in originalEnv)) {
+            originalEnv[key] = process.env[key]
+        }
+        process.env[key] = value
+    }
+    presetEnvKeys = Object.keys(env)
+
+    writeDevPresetEnv(env)
+    return env
+}
+
+const DEV_ENV_FILE_NAME = "dev-preset-env.json"
+
+/**
+ * Development only: write the active preset's env vars (decrypted and mapped)
+ * for scripts/electron-dev.mjs, which restarts the Next.js dev server when
+ * this file changes. The dev server can't decrypt the config file itself.
+ */
+function writeDevPresetEnv(env: Record<string, string>): void {
+    if (app.isPackaged) {
+        return
+    }
+    try {
+        const filePath = path.join(app.getPath("userData"), DEV_ENV_FILE_NAME)
+        writeFileSync(filePath, JSON.stringify(env, null, 2), {
+            encoding: "utf-8",
+            mode: 0o600,
+        })
+    } catch (error) {
+        console.error("Failed to write dev preset env:", error)
+    }
+}
+
+/**
+ * Apply preset environment variables to the current process
+ * Returns the environment variables that were applied
+ */
+export function applyPresetToEnv(id: string): Record<string, string> | null {
+    const data = loadPresets()
+    const preset = data.presets.find((p) => p.id === id)
+
+    if (!preset) {
+        return null
+    }
+
+    const appliedEnv = setPresetEnv(preset)
+
+    // Set as current preset
+    data.currentPresetId = id
+    savePresets(data)
+
+    return appliedEnv
+}
+
+/**
+ * Apply the saved current preset's environment variables (used at startup)
+ */
+export function applyCurrentPresetToEnv(): void {
+    setPresetEnv(getCurrentPreset())
+}
+
 /**
  * Get user's preferred locale from config
  * Returns undefined if not set

electron/main/env-loader.ts

@@ -48,12 +48,16 @@ function loadEnvFromFile(filePath: string): void {
             const key = trimmed.slice(0, equalIndex).trim()
             let value = trimmed.slice(equalIndex + 1).trim()
 
-            // Remove surrounding quotes
-            if (
-                (value.startsWith('"') && value.endsWith('"')) ||
-                (value.startsWith("'") && value.endsWith("'"))
-            ) {
-                value = value.slice(1, -1)
+            const quote = value[0]
+            const closingQuote =
+                quote === '"' || quote === "'" ? value.indexOf(quote, 1) : -1
+            if (closingQuote > 0) {
+                // Quoted value: keep what's inside the quotes and drop
+                // anything after them (e.g. a comment)
+                value = value.slice(1, closingQuote)
+            } else {
+                // Unquoted value: drop an inline comment ("value  # comment")
+                value = value.replace(/\s+#.*$/, "")
             }
 
             // Don't override existing environment variables

electron/main/index.ts

@@ -1,12 +1,17 @@
 import { app, BrowserWindow, dialog, shell } from "electron"
 import { buildAppMenu } from "./app-menu"
-import { getCurrentPresetEnv } from "./config-manager"
+import { applyCurrentPresetToEnv } from "./config-manager"
 import { loadEnvFile } from "./env-loader"
 import { registerIpcHandlers } from "./ipc-handlers"
 import { startNextServer, stopNextServer } from "./next-server"
 import { applyProxyToEnv } from "./proxy-manager"
 import { registerSettingsWindowHandlers } from "./settings-window"
-import { createWindow, getMainWindow } from "./window-manager"
+import {
+    createWindow,
+    getAppUrl,
+    getMainWindow,
+    isAppUrl,
+} from "./window-manager"
 
 // Single instance lock
 const gotTheLock = app.requestSingleInstanceLock()
@@ -28,16 +33,14 @@ if (!gotTheLock) {
     // Apply proxy settings from saved config
     applyProxyToEnv()
 
-    // Apply saved preset environment variables (overrides .env)
-    const presetEnv = getCurrentPresetEnv()
-    for (const [key, value] of Object.entries(presetEnv)) {
-        process.env[key] = value
-    }
-
-    const isDev = process.env.NODE_ENV === "development"
-    let serverUrl: string | null = null
+    const isDev = !app.isPackaged
 
     app.whenReady().then(async () => {
+        // Apply saved preset environment variables (overrides .env).
+        // Must run after ready: on Windows and Linux safeStorage can't
+        // decrypt the API key before that.
+        applyCurrentPresetToEnv()
+
         // Register IPC handlers
         registerIpcHandlers()
         registerSettingsWindowHandlers()
@@ -46,6 +49,7 @@ if (!gotTheLock) {
         buildAppMenu()
 
         try {
+            let serverUrl: string
             if (isDev) {
                 // Development: use the dev server URL
                 serverUrl =
@@ -69,8 +73,9 @@ if (!gotTheLock) {
 
         app.on("activate", () => {
             if (BrowserWindow.getAllWindows().length === 0) {
-                if (serverUrl) {
-                    createWindow(serverUrl)
+                const appUrl = getAppUrl()
+                if (appUrl) {
+                    createWindow(appUrl)
                 }
             }
         })
@@ -87,24 +92,47 @@ if (!gotTheLock) {
         stopNextServer()
     })
 
+    // Pages allowed inside app windows: the app server and draw.io
+    const isInAppUrl = (url: string): boolean => {
+        if (isAppUrl(url)) return true
+        try {
+            const { hostname } = new URL(url)
+            return ["diagrams.net", "draw.io"].some(
+                (domain) =>
+                    hostname === domain || hostname.endsWith(`.${domain}`),
+            )
+        } catch {
+            return false
+        }
+    }
+
+    const isWebUrl = (url: string): boolean =>
+        url.startsWith("http://") || url.startsWith("https://")
+
     // Open external links in default browser
     app.on("web-contents-created", (_, contents) => {
         contents.setWindowOpenHandler(({ url }) => {
-            // Allow diagrams.net iframe
-            if (
-                url.includes("diagrams.net") ||
-                url.includes("draw.io") ||
-                url.startsWith("http://localhost") ||
-                url.startsWith("http://127.0.0.1")
-            ) {
+            if (isInAppUrl(url)) {
                 return { action: "allow" }
             }
             // Open other links in external browser
-            if (url.startsWith("http://") || url.startsWith("https://")) {
+            if (isWebUrl(url)) {
                 shell.openExternal(url)
                 return { action: "deny" }
             }
             return { action: "allow" }
         })
+
+        // Clicking a plain link would otherwise replace the app page with
+        // an external site that keeps the preload API
+        contents.on("will-navigate", (event) => {
+            if (isInAppUrl(event.url)) {
+                return
+            }
+            event.preventDefault()
+            if (isWebUrl(event.url)) {
+                shell.openExternal(event.url)
+            }
+        })
     })
 }

electron/main/ipc-handlers.ts

@@ -1,7 +1,12 @@
-import { app, BrowserWindow, dialog, ipcMain } from "electron"
-import { rebuildAppMenu } from "./app-menu"
 import {
-    applyPresetToEnv,
+    app,
+    BrowserWindow,
+    dialog,
+    type IpcMainInvokeEvent,
+    ipcMain,
+} from "electron"
+import { rebuildAppMenu, switchPreset } from "./app-menu"
+import {
     type ConfigPreset,
     createPreset,
     deletePreset,
@@ -20,6 +25,7 @@ import {
     type ProxyConfig,
     saveProxyConfig,
 } from "./proxy-manager"
+import { isAppUrl } from "./window-manager"
 
 /**
  * Allowed configuration keys for presets
@@ -48,13 +54,32 @@ function sanitizePresetConfig(
     return sanitized
 }
 
+/**
+ * Register an IPC handler that only answers the app's own pages
+ * (the main window on the app server, or the local settings page).
+ * A main window that somehow ends up on an external site still gets the
+ * preload API, so its calls must be rejected here.
+ */
+function handle<Args extends unknown[]>(
+    channel: string,
+    listener: (event: IpcMainInvokeEvent, ...args: Args) => unknown,
+): void {
+    ipcMain.handle(channel, (event, ...args) => {
+        const url = event.senderFrame?.url
+        if (!isAppUrl(url) && !url?.startsWith("file://")) {
+            throw new Error(`Blocked "${channel}" from untrusted page: ${url}`)
+        }
+        return listener(event, ...(args as Args))
+    })
+}
+
 /**
  * Register all IPC handlers
  */
 export function registerIpcHandlers(): void {
     // ==================== App Info ====================
 
-    ipcMain.handle("get-version", () => {
+    handle("get-version", () => {
         return app.getVersion()
     })
 
@@ -81,7 +106,7 @@ export function registerIpcHandlers(): void {
 
     // ==================== File Dialogs ====================
 
-    ipcMain.handle("dialog-open-file", async (event) => {
+    handle("dialog-open-file", async (event) => {
         const win = BrowserWindow.fromWebContents(event.sender)
         if (!win) return null
 
@@ -108,9 +133,9 @@ export function registerIpcHandlers(): void {
         }
     })
 
-    ipcMain.handle("dialog-save-file", async (event, data: string) => {
+    handle("dialog-save-file", async (event, data: string) => {
         const win = BrowserWindow.fromWebContents(event.sender)
-        if (!win) return false
+        if (!win || typeof data !== "string") return false
 
         const result = await dialog.showSaveDialog(win, {
             filters: [
@@ -135,28 +160,28 @@ export function registerIpcHandlers(): void {
 
     // ==================== Config Presets ====================
 
-    ipcMain.handle("config-presets:get-all", () => {
+    handle("config-presets:get-all", () => {
         return getAllPresets()
     })
 
-    ipcMain.handle("config-presets:get-current", () => {
+    handle("config-presets:get-current", () => {
         return getCurrentPreset()
     })
 
-    ipcMain.handle("config-presets:get-current-id", () => {
+    handle("config-presets:get-current-id", () => {
         return getCurrentPresetId()
     })
 
-    ipcMain.handle(
+    handle(
         "config-presets:save",
-        (
+        async (
             _event,
             preset: Omit<ConfigPreset, "id" | "createdAt" | "updatedAt"> & {
                 id?: string
             },
         ) => {
             // Validate preset name
-            if (typeof preset.name !== "string" || !preset.name.trim()) {
+            if (typeof preset?.name !== "string" || !preset.name.trim()) {
                 throw new Error("Invalid preset name")
             }
 
@@ -165,42 +190,48 @@ export function registerIpcHandlers(): void {
 
             if (preset.id) {
                 // Update existing preset
-                return updatePreset(preset.id, {
+                const updated = updatePreset(preset.id, {
                     name: preset.name.trim(),
                     config: sanitizedConfig,
                 })
+                // Re-apply the active preset so the edit takes effect
+                if (updated && updated.id === getCurrentPresetId()) {
+                    await switchPreset(updated.id)
+                } else {
+                    rebuildAppMenu()
+                }
+                return updated
             }
             // Create new preset
-            return createPreset({
+            const created = createPreset({
                 name: preset.name.trim(),
                 config: sanitizedConfig,
             })
+            rebuildAppMenu()
+            return created
         },
     )
 
-    ipcMain.handle("config-presets:delete", (_event, id: string) => {
-        return deletePreset(id)
+    handle("config-presets:delete", async (_event, id: string) => {
+        const wasCurrent = id === getCurrentPresetId()
+        // Deleting the active preset also clears its env vars
+        const deleted = deletePreset(id)
+        rebuildAppMenu()
+
+        // Restart so the server stops using the deleted preset
+        if (deleted && wasCurrent && app.isPackaged) {
+            await restartNextServer()
+        }
+        return deleted
     })
 
-    ipcMain.handle("config-presets:apply", async (_event, id: string) => {
-        const env = applyPresetToEnv(id)
-        if (!env) {
-            return { success: false, error: "Preset not found" }
-        }
-
-        const isDev = process.env.NODE_ENV === "development"
-
-        if (isDev) {
-            // In development mode, the config file change will trigger
-            // the file watcher in electron-dev.mjs to restart Next.js
-            // We just need to save the preset (already done in applyPresetToEnv)
-            return { success: true, env, devMode: true }
-        }
-
-        // Production mode: restart the Next.js server to apply new environment variables
+    handle("config-presets:apply", async (_event, id: string) => {
         try {
-            await restartNextServer()
-            return { success: true, env }
+            const env = await switchPreset(id)
+            // In development mode, electron-dev.mjs restarts Next.js
+            return app.isPackaged
+                ? { success: true, env }
+                : { success: true, env, devMode: true }
         } catch (error) {
             return {
                 success: false,
@@ -212,30 +243,39 @@ export function registerIpcHandlers(): void {
         }
     })
 
-    ipcMain.handle(
-        "config-presets:set-current",
-        (_event, id: string | null) => {
-            return setCurrentPreset(id)
-        },
-    )
+    handle("config-presets:set-current", (_event, id: string | null) => {
+        return setCurrentPreset(id)
+    })
 
     // ==================== Proxy Settings ====================
 
-    ipcMain.handle("get-proxy", () => {
+    handle("get-proxy", () => {
         return getProxyConfig()
     })
 
-    ipcMain.handle("set-proxy", async (_event, config: ProxyConfig) => {
+    handle("set-proxy", async (_event, config: ProxyConfig) => {
+        const isOptionalString = (value: unknown) =>
+            value === undefined || typeof value === "string"
+        if (
+            typeof config !== "object" ||
+            config === null ||
+            !isOptionalString(config.httpProxy) ||
+            !isOptionalString(config.httpsProxy)
+        ) {
+            return { success: false, error: "Invalid proxy settings" }
+        }
+
         try {
             // Save config to file
-            saveProxyConfig(config)
+            saveProxyConfig({
+                httpProxy: config.httpProxy,
+                httpsProxy: config.httpsProxy,
+            })
 
             // Apply to current process environment
             applyProxyToEnv()
 
-            const isDev = process.env.NODE_ENV === "development"
-
-            if (isDev) {
+            if (!app.isPackaged) {
                 // In development, env vars are already applied
                 // Next.js dev server may need manual restart
                 return { success: true, devMode: true }
@@ -257,11 +297,11 @@ export function registerIpcHandlers(): void {
 
     // ==================== User Locale ====================
 
-    ipcMain.handle("get-user-locale", () => {
+    handle("get-user-locale", () => {
         return getUserLocale()
     })
 
-    ipcMain.handle("set-user-locale", (_event, locale: string) => {
+    handle("set-user-locale", (_event, locale: string) => {
         // Validate locale is one of the supported values
         if (!["en", "zh", "ja", "zh-Hant"].includes(locale)) {
             return { success: false, error: "Invalid locale" }

electron/main/next-server.ts

@@ -6,10 +6,22 @@ import {
     getAllocatedPort,
     getServerUrl,
     isPortAvailable,
+    saveServerPort,
 } from "./port-manager"
+import { setAppUrl } from "./window-manager"
 
 let serverProcess: UtilityProcess | null = null
 
+// Start and restart run one at a time, so overlapping calls (e.g. two quick
+// preset switches) can't leave two servers running
+let serverQueue: Promise<unknown> = Promise.resolve()
+
+function runExclusive<T>(task: () => Promise<T>): Promise<T> {
+    const result = serverQueue.then(task)
+    serverQueue = result.catch(() => {})
+    return result
+}
+
 /**
  * Get the path to the standalone server resources
  * In packaged app: resources/standalone
@@ -45,7 +57,11 @@ async function waitForServer(url: string, timeout = 30000): Promise<void> {
  * Start the Next.js standalone server using Electron's utilityProcess
  * This API is designed for running Node.js code in the background
  */
-export async function startNextServer(): Promise<string> {
+export function startNextServer(): Promise<string> {
+    return runExclusive(startServer)
+}
+
+async function startServer(): Promise<string> {
     const resourcePath = getResourcePath()
     const serverPath = path.join(resourcePath, "server.js")
 
@@ -73,6 +89,11 @@ export async function startNextServer(): Promise<string> {
         NODE_USE_ENV_PROXY: "1",
     }
 
+    // Keep requests to local model servers (e.g. Ollama) off the proxy
+    if (!process.env.NO_PROXY && !process.env.no_proxy) {
+        env.NO_PROXY = "localhost,127.0.0.1,[::1]"
+    }
+
     // Set cache directory to a writable location (user's app data folder)
     // This is necessary because the packaged app might be on a read-only volume
     if (app.isPackaged) {
@@ -96,28 +117,33 @@ export async function startNextServer(): Promise<string> {
 
     // Use Electron's utilityProcess API for running Node.js in background
     // This is the recommended way to run Node.js code in Electron
-    serverProcess = utilityProcess.fork(serverPath, [], {
+    const proc = utilityProcess.fork(serverPath, [], {
         cwd: resourcePath,
         env,
         stdio: "pipe",
     })
+    serverProcess = proc
 
-    serverProcess.stdout?.on("data", (data) => {
+    proc.stdout?.on("data", (data) => {
         console.log(`[Next.js] ${data.toString().trim()}`)
     })
 
-    serverProcess.stderr?.on("data", (data) => {
+    proc.stderr?.on("data", (data) => {
         console.error(`[Next.js Error] ${data.toString().trim()}`)
     })
 
-    serverProcess.on("exit", (code) => {
+    proc.on("exit", (code) => {
         console.log(`Next.js server exited with code ${code}`)
-        serverProcess = null
+        // An old server can exit after a new one started; keep the new one
+        if (serverProcess === proc) {
+            serverProcess = null
+        }
     })
 
     const url = getServerUrl()
     await waitForServer(url)
     console.log(`Next.js server started at ${url}`)
+    saveServerPort(port)
 
     return url
 }
@@ -126,39 +152,36 @@ export async function startNextServer(): Promise<string> {
  * Stop the Next.js server process and wait for it to exit
  */
 export async function stopNextServer(): Promise<void> {
-    if (serverProcess) {
-        console.log("Stopping Next.js server...")
+    const proc = serverProcess
+    if (!proc) {
+        return
+    }
+    console.log("Stopping Next.js server...")
+    serverProcess = null
 
-        // Create a promise that resolves when the process exits
-        const exitPromise = new Promise<void>((resolve) => {
-            const proc = serverProcess
-            if (!proc) {
-                resolve()
-                return
-            }
-
-            const onExit = () => {
-                resolve()
-            }
-
-            proc.once("exit", onExit)
-
-            // Timeout after 5 seconds
-            setTimeout(() => {
-                proc.removeListener("exit", onExit)
-                resolve()
-            }, 5000)
+    // Resolves true when the process exits, false after the timeout
+    const waitForExit = (ms: number) =>
+        new Promise<boolean>((resolve) => {
+            proc.once("exit", () => resolve(true))
+            setTimeout(() => resolve(false), ms)
         })
 
-        serverProcess.kill()
-        serverProcess = null
+    proc.kill()
 
-        // Wait for process to exit
-        await exitPromise
-
-        // Additional wait for OS to release port
-        await new Promise((resolve) => setTimeout(resolve, 500))
+    // Next.js waits for open requests (e.g. a streaming reply) before it
+    // exits, so force kill it if it is still running after 5 seconds
+    if (!(await waitForExit(5000)) && proc.pid) {
+        console.warn("Next.js server did not exit in time, force killing it")
+        try {
+            process.kill(proc.pid, "SIGKILL")
+        } catch (error) {
+            console.error("Failed to force kill Next.js server:", error)
+        }
+        await waitForExit(2000)
     }
+
+    // Additional wait for OS to release port
+    await new Promise((resolve) => setTimeout(resolve, 500))
 }
 
 /**
@@ -184,15 +207,19 @@ async function waitForServerStop(timeout = 5000): Promise<void> {
 /**
  * Restart the Next.js server with new environment variables
  */
-export async function restartNextServer(): Promise<string> {
-    console.log("Restarting Next.js server...")
+export function restartNextServer(): Promise<string> {
+    return runExclusive(async () => {
+        console.log("Restarting Next.js server...")
 
-    // Stop the current server and wait for it to exit
-    await stopNextServer()
+        // Stop the current server and wait for it to exit
+        await stopNextServer()
 
-    // Wait for the port to be released
-    await waitForServerStop()
+        // Wait for the port to be released
+        await waitForServerStop()
 
-    // Start the server again
-    return startNextServer()
+        // Start the server again, and follow it if it moved to another port
+        const url = await startServer()
+        setAppUrl(url)
+        return url
+    })
 }

electron/main/port-manager.ts

@@ -1,4 +1,6 @@
+import { readFileSync, writeFileSync } from "node:fs"
 import net from "node:net"
+import path from "node:path"
 import { app } from "electron"
 
 /**
@@ -23,6 +25,38 @@ const PORT_CONFIG = {
  */
 let allocatedPort: number | null = null
 
+/**
+ * File that remembers the production port from the last launch, so the app
+ * keeps the same origin (and its localStorage) instead of switching between
+ * the legacy and new port depending on which one is free at startup
+ */
+function getSavedPortPath(): string {
+    return path.join(app.getPath("userData"), "server-port.json")
+}
+
+function loadSavedPort(): number | null {
+    try {
+        const { port } = JSON.parse(readFileSync(getSavedPortPath(), "utf-8"))
+        return Number.isInteger(port) ? port : null
+    } catch {
+        return null
+    }
+}
+
+/**
+ * Remember the port the production server started on
+ */
+export function saveServerPort(port: number): void {
+    if (!app.isPackaged || port === loadSavedPort()) {
+        return
+    }
+    try {
+        writeFileSync(getSavedPortPath(), JSON.stringify({ port }), "utf-8")
+    } catch (error) {
+        console.error("Failed to save server port:", error)
+    }
+}
+
 /**
  * Check if a specific port is available
  */
@@ -44,7 +78,8 @@ export function isPortAvailable(port: number): Promise<boolean> {
 /**
  * Find an available port
  * - In development: uses fixed port (6002)
- * - In production: uses fixed port (13370) to preserve localStorage
+ * - In production: uses the port from the last launch, then the legacy
+ *   port (61337), then 13370, to preserve localStorage
  * - Falls back to sequential ports if preferred port is unavailable
  * - Last resort: lets the OS assign a port (port 0)
  *
@@ -69,6 +104,20 @@ export async function findAvailablePort(reuseExisting = true): Promise<number> {
         allocatedPort = null
     }
 
+    // In production, use the port from the last launch first
+    if (!isDev) {
+        const savedPort = loadSavedPort()
+        if (savedPort !== null) {
+            if (await isPortAvailable(savedPort)) {
+                allocatedPort = savedPort
+                return savedPort
+            }
+            console.warn(
+                `Port ${savedPort} from the last launch is unavailable. Data saved under it will not show on the new port.`,
+            )
+        }
+    }
+
     // In production, try legacy port first to preserve existing users' localStorage
     if (!isDev) {
         const legacyPort = PORT_CONFIG.legacyProduction

electron/main/proxy-manager.ts

@@ -13,18 +13,22 @@ function getConfigPath(): string {
 
 /**
  * Load proxy configuration from JSON file
+ * Returns null if the user never saved proxy settings (or the file is invalid)
  */
-export function loadProxyConfig(): ProxyConfig {
+export function loadProxyConfig(): ProxyConfig | null {
     try {
         const configPath = getConfigPath()
         if (fs.existsSync(configPath)) {
-            const data = fs.readFileSync(configPath, "utf-8")
-            return JSON.parse(data) as ProxyConfig
+            const data = JSON.parse(fs.readFileSync(configPath, "utf-8"))
+            if (data && typeof data === "object" && !Array.isArray(data)) {
+                return data as ProxyConfig
+            }
+            console.error("Ignoring invalid proxy config:", data)
         }
     } catch (error) {
         console.error("Failed to load proxy config:", error)
     }
-    return {}
+    return null
 }
 
 /**
@@ -33,7 +37,11 @@ export function loadProxyConfig(): ProxyConfig {
 export function saveProxyConfig(config: ProxyConfig): void {
     try {
         const configPath = getConfigPath()
-        fs.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8")
+        // Write a temp file and rename it, so a crash mid-write can't leave
+        // a truncated file
+        const tempPath = `${configPath}.tmp`
+        fs.writeFileSync(tempPath, JSON.stringify(config, null, 2), "utf-8")
+        fs.renameSync(tempPath, configPath)
     } catch (error) {
         console.error("Failed to save proxy config:", error)
         throw error
@@ -47,6 +55,11 @@ export function saveProxyConfig(config: ProxyConfig): void {
 export function applyProxyToEnv(): void {
     const config = loadProxyConfig()
 
+    // No saved settings: keep proxy vars inherited from the system or .env
+    if (!config) {
+        return
+    }
+
     if (config.httpProxy) {
         process.env.HTTP_PROXY = config.httpProxy
         process.env.http_proxy = config.httpProxy

electron/main/window-manager.ts

@@ -3,6 +3,9 @@ import { app, BrowserWindow, screen } from "electron"
 
 let mainWindow: BrowserWindow | null = null
 
+// URL of the app server the main window loads
+let appUrl: string | null = null
+
 /**
  * Get the icon path based on platform
  * Note: electron-builder converts icon.png during packaging,
@@ -28,6 +31,7 @@ function getIconPath(): string | undefined {
  * Create the main application window
  */
 export function createWindow(serverUrl: string): BrowserWindow {
+    appUrl = serverUrl
     const { width, height } = screen.getPrimaryDisplay().workAreaSize
 
     mainWindow = new BrowserWindow({
@@ -56,10 +60,17 @@ export function createWindow(serverUrl: string): BrowserWindow {
     })
 
     // Open DevTools in development
-    if (process.env.NODE_ENV === "development") {
+    if (!app.isPackaged) {
         mainWindow.webContents.openDevTools()
     }
 
+    // Override the draw.io iframe's beforeunload handler so the window can
+    // close after the user edits text in a shape (fixes #815). Diagrams are
+    // already persisted via autosave, so the prompt is unnecessary.
+    mainWindow.webContents.on("will-prevent-unload", (event) => {
+        event.preventDefault()
+    })
+
     mainWindow.on("closed", () => {
         mainWindow = null
     })
@@ -86,3 +97,36 @@ export function createWindow(serverUrl: string): BrowserWindow {
 export function getMainWindow(): BrowserWindow | null {
     return mainWindow
 }
+
+/**
+ * Get the app server URL the main window loads
+ */
+export function getAppUrl(): string | null {
+    return appUrl
+}
+
+/**
+ * Point the main window at a new app server URL
+ * (the restarted server can come up on a different port)
+ */
+export function setAppUrl(url: string): void {
+    if (url === appUrl) {
+        return
+    }
+    appUrl = url
+    mainWindow?.loadURL(url)
+}
+
+/**
+ * Check if a URL belongs to the app server (same origin)
+ */
+export function isAppUrl(url: string | undefined): boolean {
+    if (!url || !appUrl) {
+        return false
+    }
+    try {
+        return new URL(url).origin === new URL(appUrl).origin
+    } catch {
+        return false
+    }
+}

electron/settings/settings.js

@@ -213,6 +213,9 @@ async function savePreset() {
         }
     })
 
+    // closeModal() clears editingPresetId, so remember it for the toast
+    const isEdit = Boolean(editingPresetId)
+
     try {
         saveBtn.disabled = true
         saveBtn.innerHTML = '<span class="loading"></span>'
@@ -220,10 +223,7 @@ async function savePreset() {
         await window.settingsAPI.savePreset(preset)
         await loadPresets()
         closeModal()
-        showToast(
-            editingPresetId ? "Preset updated" : "Preset created",
-            "success",
-        )
+        showToast(isEdit ? "Preset updated" : "Preset created", "success")
     } catch (error) {
         console.error("Failed to save preset:", error)
         showToast("Failed to save preset", "error")
@@ -265,8 +265,6 @@ async function applyPreset(id) {
 
         const result = await window.settingsAPI.applyPreset(id)
         if (result.success) {
-            currentPresetId = id
-            renderPresets()
             showToast("Preset applied, server restarting...", "success")
         } else {
             showToast(result.error || "Failed to apply preset", "error")
@@ -274,6 +272,9 @@ async function applyPreset(id) {
     } catch (error) {
         console.error("Failed to apply preset:", error)
         showToast("Failed to apply preset", "error")
+    } finally {
+        // Reload to show the active preset and reset the Apply button
+        await loadPresets()
     }
 }
 

env.example

@@ -1,12 +1,22 @@
 # AI Provider Configuration
 # AI_PROVIDER: Which provider to use
-# Options: bedrock, openai, anthropic, google, vertexai, azure, ollama, openrouter, deepseek, siliconflow, gateway, novita
+# Options: bedrock, openai, anthropic, google, vertexai, azure, ollama, openrouter, aihubmix, deepseek, siliconflow, gateway, novita
 # Default: bedrock
 AI_PROVIDER=bedrock
 
 # AI_MODEL: The model ID for your chosen provider (REQUIRED)
+# Tip: For a single-provider quick multi-model setup, list comma-separated model IDs.
+# The first one becomes the default and the rest appear in the model picker.
+# For multiple providers or custom apiKeyEnv/baseUrlEnv, use AI_MODELS_CONFIG / ai-models.json instead.
+# Example: AI_MODEL=doubao-seed-1-8-251215,doubao-seed-1-6-flash,doubao-seed-1-6-pro
 AI_MODEL=global.anthropic.claude-sonnet-4-5-20250929-v1:0
 
+# Output limit, all providers (default: 64000). Shared by reasoning and the diagram XML,
+# so a thinking model can spend it all before the tool call. Users can lower it in Settings,
+# and raise it only when they use their own API key, so this also caps cost on server keys.
+# If a model's own ceiling is lower, the request is retried with that ceiling automatically.
+# MAX_OUTPUT_TOKENS=64000
+
 # AWS Bedrock Configuration
 # AWS_REGION=us-east-1
 # AWS_ACCESS_KEY_ID=your-access-key-id
@@ -25,7 +35,8 @@ AI_MODEL=global.anthropic.claude-sonnet-4-5-20250929-v1:0
 # OPENAI_REASONING_SUMMARY=detailed  # Optional: Override reasoning summary (none/brief/detailed)
 
 # Anthropic (Direct) Configuration
-# ANTHROPIC_API_KEY=sk-ant-...
+# ANTHROPIC_API_KEY=sk-ant-...                 # Sent as `x-api-key` header
+# ANTHROPIC_AUTH_TOKEN=                        # Alternative to ANTHROPIC_API_KEY; sent as `Authorization: Bearer` header (mutually exclusive)
 # ANTHROPIC_BASE_URL=https://your-custom-anthropic/v1
 # ANTHROPIC_THINKING_TYPE=enabled            # Optional: Anthropic extended thinking (enabled)
 # ANTHROPIC_THINKING_BUDGET_TOKENS=12000     # Optional: Budget for extended thinking in tokens
@@ -68,6 +79,10 @@ AI_MODEL=global.anthropic.claude-sonnet-4-5-20250929-v1:0
 # OPENROUTER_API_KEY=sk-or-v1-...
 # OPENROUTER_BASE_URL=https://openrouter.ai/api/v1  # Optional: Custom endpoint
 
+# AIHubMix Configuration
+# AIHUBMIX_API_KEY=your-aihubmix-api-key
+# AIHUBMIX_BASE_URL=https://aihubmix.com/v1  # Optional: Custom endpoint
+
 # DeepSeek Configuration
 # DEEPSEEK_API_KEY=sk-...
 # DEEPSEEK_BASE_URL=https://api.deepseek.com/v1  # Optional: Custom endpoint
@@ -115,6 +130,14 @@ AI_MODEL=global.anthropic.claude-sonnet-4-5-20250929-v1:0
 # Access Control (Optional)
 # ACCESS_CODE_LIST=your-secret-code,another-code
 
+# Admin Panel (Optional)
+# Set a password to enable the web admin panel at /admin, where most of the
+# settings in this file can be edited at runtime (stored in data/settings.json,
+# which takes precedence over environment variables).
+# Leave unset to disable the admin panel entirely.
+# ADMIN_PASSWORD=your-admin-password
+# SETTINGS_FILE=./data/settings.json  # Optional: custom settings file location
+
 # Draw.io Configuration (Optional)
 # NEXT_PUBLIC_DRAWIO_BASE_URL=https://embed.diagrams.net  # Default: https://embed.diagrams.net
 # Use this to point to a self-hosted draw.io instance
@@ -172,3 +195,13 @@ AI_MODEL=global.anthropic.claude-sonnet-4-5-20250929-v1:0
 # Get your API key from: https://novita.ai/dashboard/key
 # NOVITA_API_KEY=your_novita_api_key
 # NOVITA_BASE_URL=https://api.novita.ai/openai  # Optional, default
+
+# MiMo (Xiaomi) Configuration (Optional)
+# Get your API key from: https://platform.xiaomimimo.com/
+# MIMO_API_KEY=your_mimo_api_key
+# MIMO_BASE_URL=https://api.xiaomimimo.com/v1  # Optional, default. Token Plan users: https://token-plan-cn.xiaomimimo.com/v1
+
+# Atlas Cloud Configuration (Optional)
+# Get your API key from: https://www.atlascloud.ai/console/api-keys
+# ATLASCLOUD_API_KEY=your_atlascloud_api_key
+# ATLASCLOUD_BASE_URL=https://api.atlascloud.ai/v1  # Optional, default. LLM chat endpoint; media generation uses a separate API.

hooks/use-diagram-tool-handlers.ts

@@ -1,5 +1,4 @@
 import type { MutableRefObject } from "react"
-import { useRef } from "react"
 import type { DiagramOperation } from "@/components/chat/types"
 import type {
     ValidationState,
@@ -48,6 +47,8 @@ type ValidateDiagramFn = (
 interface UseDiagramToolHandlersParams {
     partialXmlRef: MutableRefObject<string>
     editDiagramOriginalXmlRef: MutableRefObject<Map<string, string>>
+    // Failed VLM validations in the current user turn (reset on each user message)
+    validationRetryCountRef: MutableRefObject<number>
     chartXMLRef: MutableRefObject<string>
     onDisplayChart: (xml: string, skipValidation?: boolean) => string | null
     onFetchChart: (saveToHistory?: boolean) => Promise<string>
@@ -72,6 +73,7 @@ interface UseDiagramToolHandlersParams {
 export function useDiagramToolHandlers({
     partialXmlRef,
     editDiagramOriginalXmlRef,
+    validationRetryCountRef,
     chartXMLRef,
     onDisplayChart,
     onFetchChart,
@@ -82,9 +84,6 @@ export function useDiagramToolHandlers({
     sessionId,
     onValidationStateChange,
 }: UseDiagramToolHandlersParams) {
-    // Track validation retry count per tool call
-    const validationRetryCountRef = useRef<Map<string, number>>(new Map())
-
     // Helper to update validation state
     const updateValidationState = (
         toolCallId: string,
@@ -232,17 +231,15 @@ ${finalXml}
                             )
                         }
 
-                        const retryCount =
-                            validationRetryCountRef.current.get(
-                                toolCall.toolCallId,
-                            ) || 0
+                        // Each retry is a new tool call, so count attempts per user turn
+                        const attempt = validationRetryCountRef.current + 1
 
                         // Notify UI that we're validating (include the image)
                         updateValidationState(
                             toolCall.toolCallId,
                             "validating",
                             {
-                                attempt: retryCount + 1,
+                                attempt,
                                 maxAttempts: MAX_VALIDATION_RETRIES,
                                 imageData: capturedPngData,
                             },
@@ -254,17 +251,14 @@ ${finalXml}
                         )
 
                         if (!result.valid) {
-                            if (retryCount < MAX_VALIDATION_RETRIES) {
-                                validationRetryCountRef.current.set(
-                                    toolCall.toolCallId,
-                                    retryCount + 1,
-                                )
+                            if (attempt < MAX_VALIDATION_RETRIES) {
+                                validationRetryCountRef.current = attempt
 
                                 const feedback =
                                     formatValidationFeedback(result)
                                 if (DEBUG) {
                                     console.log(
-                                        `[display_diagram] Validation failed (attempt ${retryCount + 1}/${MAX_VALIDATION_RETRIES}):`,
+                                        `[display_diagram] Validation failed (attempt ${attempt}/${MAX_VALIDATION_RETRIES}):`,
                                         result.issues,
                                     )
                                 }
@@ -274,7 +268,7 @@ ${finalXml}
                                     toolCall.toolCallId,
                                     "failed",
                                     {
-                                        attempt: retryCount + 1,
+                                        attempt,
                                         maxAttempts: MAX_VALIDATION_RETRIES,
                                         result,
                                         imageData: capturedPngData,
@@ -285,19 +279,17 @@ ${finalXml}
                                     tool: "display_diagram",
                                     toolCallId: toolCall.toolCallId,
                                     state: "output-error",
-                                    errorText: `[Validation attempt ${retryCount + 1}/${MAX_VALIDATION_RETRIES}]\n${feedback}`,
+                                    errorText: `[Validation attempt ${attempt}/${MAX_VALIDATION_RETRIES}]\n${feedback}`,
                                 })
                                 return
                             } else {
-                                // Max retries reached - accept the diagram with warning
+                                // Last attempt - accept the diagram with warning
                                 if (DEBUG) {
                                     console.log(
                                         "[display_diagram] Max validation retries reached, accepting diagram",
                                     )
                                 }
-                                validationRetryCountRef.current.delete(
-                                    toolCall.toolCallId,
-                                )
+                                validationRetryCountRef.current = 0
 
                                 // Notify UI that we're accepting with issues (include the image)
                                 updateValidationState(
@@ -314,10 +306,8 @@ ${finalXml}
                                 return
                             }
                         } else {
-                            // Validation passed - clean up retry count
-                            validationRetryCountRef.current.delete(
-                                toolCall.toolCallId,
-                            )
+                            // Validation passed - reset retry count
+                            validationRetryCountRef.current = 0
                             if (DEBUG) {
                                 console.log(
                                     "[display_diagram] Validation passed!",
@@ -382,12 +372,17 @@ ${finalXml}
         }
 
         let currentXml = ""
+        // Use the original XML captured during streaming (shared with chat-message-display)
+        // This ensures we apply operations to the same base XML that streaming used
+        const originalXml = editDiagramOriginalXmlRef.current.get(
+            toolCall.toolCallId,
+        )
+        // On failure, undo the streaming preview so the canvas matches the XML
+        // reported back to the model
+        const restoreOriginal = () => {
+            if (originalXml) onDisplayChart(originalXml, true)
+        }
         try {
-            // Use the original XML captured during streaming (shared with chat-message-display)
-            // This ensures we apply operations to the same base XML that streaming used
-            const originalXml = editDiagramOriginalXmlRef.current.get(
-                toolCall.toolCallId,
-            )
             if (originalXml) {
                 currentXml = originalXml
             } else {
@@ -416,6 +411,7 @@ ${finalXml}
                     )
                     .join("\n")
 
+                restoreOriginal()
                 addToolOutput({
                     tool: "edit_diagram",
                     toolCallId: toolCall.toolCallId,
@@ -441,6 +437,7 @@ Please check the cell IDs and retry.`,
                     "[edit_diagram] Validation error:",
                     validationError,
                 )
+                restoreOriginal()
                 addToolOutput({
                     tool: "edit_diagram",
                     toolCallId: toolCall.toolCallId,
@@ -472,6 +469,7 @@ Please fix the operations to avoid structural issues.`,
             const errorMessage =
                 error instanceof Error ? error.message : String(error)
 
+            restoreOriginal()
             addToolOutput({
                 tool: "edit_diagram",
                 toolCallId: toolCall.toolCallId,
@@ -496,6 +494,19 @@ Please check cell IDs and retry, or use display_diagram to regenerate.`,
     ) => {
         const { xml } = toolCall.input as { xml: string }
 
+        // Nothing to continue: loading the fragment alone would replace the whole diagram
+        if (!partialXmlRef.current) {
+            addToolOutput({
+                tool: "append_diagram",
+                toolCallId: toolCall.toolCallId,
+                state: "output-error",
+                errorText: `ERROR: There is no truncated diagram to continue, so append_diagram cannot be used now.
+
+Use display_diagram to create the complete diagram, or edit_diagram to change the current one.`,
+            })
+            return
+        }
+
         // Detect if LLM incorrectly started fresh instead of continuing
         // LLM should only output bare mxCells now, so wrapper tags indicate error
         const trimmed = xml.trim()

hooks/use-model-config.ts

@@ -101,6 +101,15 @@ function saveConfig(config: MultiModelConfig): void {
     localStorage.setItem(STORAGE_KEYS.modelConfigs, JSON.stringify(config))
 }
 
+/**
+ * Server model to fall back to: the one marked default, else the first one
+ */
+function defaultServerModelId(
+    serverModels: FlattenedServerModel[],
+): string | undefined {
+    return (serverModels.find((m) => m.isDefault) ?? serverModels[0])?.id
+}
+
 export interface UseModelConfigReturn {
     // State
     config: MultiModelConfig
@@ -144,6 +153,16 @@ export function useModelConfig(): UseModelConfigReturn {
         setIsLoaded(true)
     }, [])
 
+    // Pick up config changes saved by other tabs, so this tab neither shows a
+    // stale model nor overwrites their changes on its next save
+    useEffect(() => {
+        const handleStorage = (e: StorageEvent) => {
+            if (e.key === STORAGE_KEYS.modelConfigs) setConfig(loadConfig())
+        }
+        window.addEventListener("storage", handleStorage)
+        return () => window.removeEventListener("storage", handleStorage)
+    }, [])
+
     // Load server models on mount (if any)
     useEffect(() => {
         if (typeof window === "undefined") return
@@ -165,17 +184,18 @@ export function useModelConfig(): UseModelConfigReturn {
                 setServerModels(raw)
                 setServerLoaded(true)
 
-                // Auto-select default server model if no model is currently selected
+                // Auto-select the default server model if no model is selected,
+                // or if the saved server model is gone (renamed or removed)
                 setConfig((prev) => {
-                    if (!prev.selectedModelId && raw.length > 0) {
-                        const defaultModel = raw.find((m) => m.isDefault)
-                        if (defaultModel) {
-                            return { ...prev, selectedModelId: defaultModel.id }
-                        }
-                        // If no default marked, use first server model
-                        return { ...prev, selectedModelId: raw[0].id }
-                    }
-                    return prev
+                    const id = prev.selectedModelId
+                    const isStale =
+                        id?.startsWith("server:") &&
+                        !raw.some((m) => m.id === id)
+                    if (id && !isStale) return prev
+                    const fallback = defaultServerModelId(raw)
+                    return fallback === id
+                        ? prev
+                        : { ...prev, selectedModelId: fallback }
                 })
             })
             .catch((error) => {
@@ -260,24 +280,31 @@ export function useModelConfig(): UseModelConfigReturn {
         [],
     )
 
-    const deleteProvider = useCallback((providerId: string) => {
-        setConfig((prev) => {
-            const provider = prev.providers.find((p) => p.id === providerId)
-            const modelIds = provider?.models.map((m) => m.id) || []
+    const deleteProvider = useCallback(
+        (providerId: string) => {
+            setConfig((prev) => {
+                const provider = prev.providers.find((p) => p.id === providerId)
+                const modelIds = provider?.models.map((m) => m.id) || []
 
-            // Clear selected model if it belongs to deleted provider
-            const newSelectedId =
-                prev.selectedModelId && modelIds.includes(prev.selectedModelId)
-                    ? undefined
-                    : prev.selectedModelId
+                // Fall back to the default server model if the selected model
+                // belongs to the deleted provider
+                const newSelectedId =
+                    prev.selectedModelId &&
+                    modelIds.includes(prev.selectedModelId)
+                        ? defaultServerModelId(serverModels)
+                        : prev.selectedModelId
 
-            return {
-                ...prev,
-                providers: prev.providers.filter((p) => p.id !== providerId),
-                selectedModelId: newSelectedId,
-            }
-        })
-    }, [])
+                return {
+                    ...prev,
+                    providers: prev.providers.filter(
+                        (p) => p.id !== providerId,
+                    ),
+                    selectedModelId: newSelectedId,
+                }
+            })
+        },
+        [serverModels],
+    )
 
     const addModel = useCallback(
         (providerId: string, modelId: string): ModelConfig => {
@@ -334,14 +361,15 @@ export function useModelConfig(): UseModelConfigReturn {
                           }
                         : p,
                 ),
-                // Clear selected model if it was deleted
+                // Fall back to the default server model if the selected model
+                // was deleted
                 selectedModelId:
                     prev.selectedModelId === modelConfigId
-                        ? undefined
+                        ? defaultServerModelId(serverModels)
                         : prev.selectedModelId,
             }))
         },
-        [],
+        [serverModels],
     )
 
     const resetConfig = useCallback(() => {

hooks/use-session-manager.ts

@@ -1,6 +1,8 @@
 "use client"
 
 import { useCallback, useEffect, useRef, useState } from "react"
+import { toast } from "sonner"
+import { useDictionary } from "@/hooks/use-dictionary"
 import {
     type ChatSession,
     createEmptySession,
@@ -44,6 +46,15 @@ export interface UseSessionManagerReturn {
     clearCurrentSession: () => void
 }
 
+// Reading the session list loads every stored session in full, and window
+// focus also fires each time the user clicks back from the draw.io iframe
+const FOCUS_REFRESH_INTERVAL_MS = 30_000
+
+function notifySaveFailed(message: string) {
+    // Same id, so repeated failures update one toast instead of stacking
+    toast.error(message, { id: "session-save-failed", duration: 8000 })
+}
+
 interface UseSessionManagerOptions {
     /** Session ID from URL param - if provided, load this session; if null, start blank */
     initialSessionId?: string | null
@@ -53,6 +64,7 @@ export function useSessionManager(
     options: UseSessionManagerOptions = {},
 ): UseSessionManagerReturn {
     const { initialSessionId } = options
+    const dict = useDictionary()
     const [sessions, setSessions] = useState<SessionMetadata[]>([])
     const [currentSessionId, setCurrentSessionId] = useState<string | null>(
         null,
@@ -163,9 +175,15 @@ export function useSessionManager(
         handleSessionIdChange()
     }, [initialSessionId, isAvailable])
 
-    // Refresh sessions on window focus (multi-tab sync)
+    // Refresh sessions on window focus (multi-tab sync), at most once per interval
+    const lastFocusRefreshRef = useRef(0)
     useEffect(() => {
         const handleFocus = () => {
+            const now = Date.now()
+            if (now - lastFocusRefreshRef.current < FOCUS_REFRESH_INTERVAL_MS) {
+                return
+            }
+            lastFocusRefreshRef.current = now
             refreshSessions()
         }
         window.addEventListener("focus", handleFocus)
@@ -238,6 +256,8 @@ export function useSessionManager(
             ) {
                 return
             }
+            // Nothing can be stored without IndexedDB
+            if (!isIndexedDBAvailable()) return
 
             if (!currentSession) {
                 // Create a new session if none exists
@@ -250,7 +270,12 @@ export function useSessionManager(
                     diagramHistory: data.diagramHistory,
                     title: extractTitle(data.messages),
                 }
-                await saveSession(newSession)
+                // Without a stored session, keep no session id (it would end
+                // up in the URL and point to nothing after a reload)
+                if (!(await saveSession(newSession))) {
+                    notifySaveFailed(dict.errors.sessionSaveFailed)
+                    return
+                }
                 await enforceSessionLimit()
                 setCurrentSession(newSession)
                 setCurrentSessionId(newSession.id)
@@ -277,7 +302,10 @@ export function useSessionManager(
                         : currentSession.title,
             }
 
-            await saveSession(updatedSession)
+            if (!(await saveSession(updatedSession))) {
+                notifySaveFailed(dict.errors.sessionSaveFailed)
+                return
+            }
             setCurrentSession(updatedSession)
 
             // Update sessions list metadata
@@ -298,7 +326,7 @@ export function useSessionManager(
                 ),
             )
         },
-        [currentSession, currentSessionId, refreshSessions],
+        [currentSession, currentSessionId, refreshSessions, dict],
     )
 
     // Clear current session state (for starting fresh without loading another session)

hooks/use-validate-diagram.ts

@@ -6,6 +6,7 @@
 
 import { experimental_useObject as useObject } from "@ai-sdk/react"
 import { useCallback, useRef } from "react"
+import { getSelectedAIConfig } from "@/hooks/use-model-config"
 import { getApiEndpoint } from "@/lib/base-path"
 import {
     type ValidationResult,
@@ -39,6 +40,8 @@ export function useValidateDiagram(options: UseValidateDiagramOptions = {}) {
     const { object, submit, isLoading, error, stop } = useObject({
         api: getApiEndpoint("/api/validate-diagram"),
         schema: ValidationResultSchema,
+        // Resolved per request so a changed access code is picked up
+        headers: () => ({ "x-access-code": getSelectedAIConfig().accessCode }),
         onFinish: ({
             object,
             error: finishError,

instrumentation.ts

@@ -1,7 +1,17 @@
 import { LangfuseSpanProcessor } from "@langfuse/otel"
 import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node"
 
-export function register() {
+export async function register() {
+    // Overlay admin settings file onto process.env before anything reads config
+    if (process.env.NEXT_RUNTIME === "nodejs") {
+        try {
+            const { applyToEnv } = await import("@/lib/admin/settings")
+            applyToEnv()
+        } catch (err) {
+            console.error("[admin-settings] Failed to apply settings:", err)
+        }
+    }
+
     // Skip telemetry if Langfuse env vars are not configured
     if (!process.env.LANGFUSE_PUBLIC_KEY || !process.env.LANGFUSE_SECRET_KEY) {
         console.warn(

lib/access-code.ts

@@ -0,0 +1,22 @@
+/**
+ * Check the x-access-code header against ACCESS_CODE_LIST.
+ * Returns a 401 response to send back when the check fails, or null when the
+ * request may continue (including when no access codes are configured).
+ */
+export function checkAccessCode(req: Request): Response | null {
+    const accessCodes =
+        process.env.ACCESS_CODE_LIST?.split(",")
+            .map((code) => code.trim())
+            .filter(Boolean) || []
+    if (accessCodes.length === 0) return null
+
+    const accessCodeHeader = req.headers.get("x-access-code")
+    if (accessCodeHeader && accessCodes.includes(accessCodeHeader)) return null
+
+    return Response.json(
+        {
+            error: "Invalid or missing access code. Please configure it in Settings.",
+        },
+        { status: 401 },
+    )
+}

lib/admin/auth.ts

@@ -0,0 +1,37 @@
+import { timingSafeEqual } from "crypto"
+
+// Shared auth for admin API routes: compares x-admin-password header
+// against the ADMIN_PASSWORD env var. Unset password = panel disabled.
+export function checkAdminAuth(req: Request): Response | null {
+    const password = process.env.ADMIN_PASSWORD
+    if (!password) {
+        return Response.json(
+            {
+                error: "Admin panel is disabled. Set the ADMIN_PASSWORD environment variable to enable it.",
+            },
+            { status: 403 },
+        )
+    }
+    const provided = req.headers.get("x-admin-password") || ""
+    const a = Buffer.from(provided)
+    const b = Buffer.from(password)
+    if (a.length !== b.length || !timingSafeEqual(a, b)) {
+        return Response.json(
+            { error: "Invalid admin password" },
+            { status: 401 },
+        )
+    }
+    return null
+}
+
+export interface MaskedSecret {
+    isSet: true
+    hint: string
+}
+
+export function maskSecret(value: string): MaskedSecret {
+    return {
+        isSet: true,
+        hint: value.length > 8 ? `…${value.slice(-4)}` : "••••",
+    }
+}

lib/admin/providers.ts

@@ -0,0 +1,315 @@
+import { z } from "zod"
+import {
+    ProviderNameSchema,
+    type ServerModelsConfig,
+    slugify,
+} from "@/lib/server-model-config"
+import {
+    FIXED_CRED_PROVIDERS,
+    PROVIDER_INFO,
+    type ProviderName,
+} from "@/lib/types/model-config"
+import { type MaskedSecret, maskSecret } from "./auth"
+import { loadSettings } from "./settings"
+
+// Admin-configured providers, mirroring the user ModelConfigDialog's data
+// model but stored server-side (settings.json, ADMIN_PROVIDERS key).
+//
+// They COEXIST with an env-based AI_MODELS_CONFIG / ai-models.json:
+// loadRawServerModelsConfig() merges the env baseline with the panel's
+// providers at read time, so .env stays authoritative for its own entries.
+// Panel credentials are written to ADMIN_-prefixed env vars (wired up via
+// apiKeyEnv/baseUrlEnv) so they never shadow standard vars like
+// OPENAI_API_KEY that env-based entries may rely on.
+
+export const ADMIN_PROVIDERS_KEY = "ADMIN_PROVIDERS"
+
+// A secret field in transit: plaintext string (new value) or an
+// {isSet} marker meaning "keep the stored value".
+const SecretInputSchema = z
+    .union([z.string(), z.object({ isSet: z.literal(true), hint: z.string() })])
+    .optional()
+
+export const AdminProviderSchema = z.object({
+    id: z.string().min(1),
+    provider: ProviderNameSchema,
+    name: z.string().optional(),
+    apiKey: SecretInputSchema,
+    baseUrl: z.string().optional(),
+    awsAccessKeyId: SecretInputSchema,
+    awsSecretAccessKey: SecretInputSchema,
+    awsRegion: z.string().optional(),
+    vertexApiKey: SecretInputSchema,
+    models: z.array(z.string().min(1)),
+    isDefault: z.boolean().optional(),
+})
+
+export const AdminProvidersSchema = z.array(AdminProviderSchema)
+
+// Stored shape: secrets are plain strings (never {isSet} markers, which
+// only exist in transit). Used to validate ADMIN_PROVIDERS on load so a
+// hand-edited/corrupted value can't slip a marker object past maskSecret.
+const StoredAdminProviderSchema = AdminProviderSchema.extend({
+    apiKey: z.string().optional(),
+    awsAccessKeyId: z.string().optional(),
+    awsSecretAccessKey: z.string().optional(),
+    vertexApiKey: z.string().optional(),
+})
+
+export type AdminProviderInput = z.infer<typeof AdminProviderSchema>
+
+// Stored form: secrets are plain strings
+export interface StoredAdminProvider {
+    id: string
+    provider: ProviderName
+    name?: string
+    apiKey?: string
+    baseUrl?: string
+    awsAccessKeyId?: string
+    awsSecretAccessKey?: string
+    awsRegion?: string
+    vertexApiKey?: string
+    models: string[]
+    isDefault?: boolean
+}
+
+const SECRET_FIELDS = [
+    "apiKey",
+    "awsAccessKeyId",
+    "awsSecretAccessKey",
+    "vertexApiKey",
+] as const
+
+// ADMIN_-prefixed env var names for instance `index` (0-based) of a provider
+function credEnvNames(
+    provider: ProviderName,
+    index: number,
+): { key?: string; url?: string } {
+    if (FIXED_CRED_PROVIDERS.includes(provider) || provider === "edgeone") {
+        return {}
+    }
+    const prefix =
+        provider === "gateway" ? "AI_GATEWAY" : provider.toUpperCase()
+    const suffix = index === 0 ? "" : `_${index + 1}`
+    return {
+        key: `ADMIN_${prefix}_API_KEY${suffix}`,
+        url: `ADMIN_${prefix}_BASE_URL${suffix}`,
+    }
+}
+
+export function loadAdminProviders(): StoredAdminProvider[] {
+    const raw = loadSettings()[ADMIN_PROVIDERS_KEY]
+    if (!raw) return []
+    try {
+        const parsed = JSON.parse(raw)
+        if (!Array.isArray(parsed)) return []
+        // Validate each entry's shape — a malformed/hand-edited value must
+        // not reach runtime code that assumes provider/models exist.
+        return parsed.flatMap((entry) => {
+            const result = StoredAdminProviderSchema.safeParse(entry)
+            return result.success ? [result.data as StoredAdminProvider] : []
+        })
+    } catch {
+        console.error("[admin-providers] Failed to parse stored providers")
+        return []
+    }
+}
+
+export type MaskedAdminProvider = Omit<
+    StoredAdminProvider,
+    (typeof SECRET_FIELDS)[number]
+> & {
+    apiKey?: MaskedSecret
+    awsAccessKeyId?: MaskedSecret
+    awsSecretAccessKey?: MaskedSecret
+    vertexApiKey?: MaskedSecret
+}
+
+export function maskAdminProviders(
+    list: StoredAdminProvider[],
+): MaskedAdminProvider[] {
+    return list.map((p) => {
+        const masked: MaskedAdminProvider = { ...p } as MaskedAdminProvider
+        for (const field of SECRET_FIELDS) {
+            const value = p[field]
+            masked[field] = value ? maskSecret(value) : undefined
+        }
+        return masked
+    })
+}
+
+// Resolve {isSet} markers in incoming secrets against the stored list
+export function mergeSecrets(
+    incoming: AdminProviderInput[],
+    stored: StoredAdminProvider[],
+): StoredAdminProvider[] {
+    const storedById = new Map(stored.map((p) => [p.id, p]))
+    return incoming.map((p) => {
+        const prev = storedById.get(p.id)
+        const merged = { ...p } as StoredAdminProvider
+        for (const field of SECRET_FIELDS) {
+            const value = p[field]
+            if (typeof value === "string") {
+                merged[field] = value || undefined
+            } else if (value?.isSet) {
+                merged[field] = prev?.[field]
+            } else {
+                merged[field] = undefined
+            }
+        }
+        return merged
+    })
+}
+
+function displayName(p: StoredAdminProvider): string {
+    return p.name?.trim() || PROVIDER_INFO[p.provider].label
+}
+
+export function validateAdminProviders(
+    list: StoredAdminProvider[],
+    envConfig: ServerModelsConfig | null = null,
+): string | null {
+    const envProviders = envConfig?.providers ?? []
+    for (const single of FIXED_CRED_PROVIDERS) {
+        if (list.filter((p) => p.provider === single).length > 1) {
+            return `Only one ${PROVIDER_INFO[single].label} provider is supported (its credentials use fixed environment variables).`
+        }
+        // Its credentials are global; a panel instance would silently
+        // override the credentials env-configured models rely on
+        if (
+            list.some((p) => p.provider === single) &&
+            envProviders.some((p) => p.provider === single)
+        ) {
+            return `${PROVIDER_INFO[single].label} is already configured in AI_MODELS_CONFIG / ai-models.json and shares global credentials. Manage it via the environment configuration instead.`
+        }
+    }
+    // Server model ids are built from the slugified name, so names must
+    // stay distinct after slugifying ("OpenAI" and "openai" would collide)
+    const names = list.map((p) => displayName(p))
+    const slugs = names.map(slugify)
+    if (new Set(slugs).size !== slugs.length) {
+        return "Provider display names must be unique (ignoring case and punctuation)."
+    }
+    const envSlugs = new Set(envProviders.map((p) => slugify(p.name)))
+    const clash = names.find((_, i) => envSlugs.has(slugs[i]))
+    if (clash) {
+        return `"${clash}" is already defined in AI_MODELS_CONFIG / ai-models.json. Use a different display name.`
+    }
+    if (list.filter((p) => p.isDefault).length > 1) {
+        return "Only one provider can be the default."
+    }
+    return null
+}
+
+// The panel's contribution to the server models config, derived at read
+// time and merged with the env baseline by loadRawServerModelsConfig().
+export function adminProvidersToConfig(
+    list: StoredAdminProvider[],
+): ServerModelsConfig {
+    const config: ServerModelsConfig = { providers: [] }
+    const indexByProvider = new Map<ProviderName, number>()
+    for (const p of list) {
+        const index = indexByProvider.get(p.provider) ?? 0
+        indexByProvider.set(p.provider, index + 1)
+        if (p.models.length === 0) continue
+        const env = credEnvNames(p.provider, index)
+        config.providers.push({
+            name: displayName(p),
+            provider: p.provider,
+            models: p.models,
+            ...(env.key && p.apiKey ? { apiKeyEnv: env.key } : {}),
+            ...(env.url && p.baseUrl ? { baseUrlEnv: env.url } : {}),
+            ...(p.isDefault ? { default: true } : {}),
+        })
+    }
+    return config
+}
+
+// Settings updates derived from the provider list: credential env vars,
+// the stored list itself, and AI_PROVIDER/AI_MODEL when a default is set.
+// Keys derived from `previous` but absent now are set to null (removed,
+// falling back to the environment).
+export function deriveEnvUpdates(
+    list: StoredAdminProvider[],
+    previous: StoredAdminProvider[],
+): Record<string, string | null> {
+    const updates: Record<string, string | null> = {}
+
+    // Clear everything the previous list owned, then overwrite below
+    for (const key of derivedEnvKeys(previous)) updates[key] = null
+
+    const indexByProvider = new Map<ProviderName, number>()
+    for (const p of list) {
+        const index = indexByProvider.get(p.provider) ?? 0
+        indexByProvider.set(p.provider, index + 1)
+
+        if (p.provider === "bedrock") {
+            // ADMIN_ names keep the standard AWS_* vars untouched, so other
+            // AWS clients (e.g. the DynamoDB quota table) keep their own
+            // credentials instead of picking up the panel's Bedrock keys
+            if (p.awsAccessKeyId)
+                updates.ADMIN_AWS_ACCESS_KEY_ID = p.awsAccessKeyId
+            if (p.awsSecretAccessKey)
+                updates.ADMIN_AWS_SECRET_ACCESS_KEY = p.awsSecretAccessKey
+            if (p.awsRegion) updates.ADMIN_AWS_REGION = p.awsRegion
+        } else if (p.provider === "vertexai") {
+            if (p.vertexApiKey) updates.GOOGLE_VERTEX_API_KEY = p.vertexApiKey
+            if (p.baseUrl) updates.GOOGLE_VERTEX_BASE_URL = p.baseUrl
+        } else if (p.provider === "ollama") {
+            if (p.apiKey) updates.OLLAMA_API_KEY = p.apiKey
+            if (p.baseUrl) updates.OLLAMA_BASE_URL = p.baseUrl
+        } else {
+            const env = credEnvNames(p.provider, index)
+            if (env.key && p.apiKey) updates[env.key] = p.apiKey
+            if (env.url && p.baseUrl) updates[env.url] = p.baseUrl
+        }
+    }
+
+    updates[ADMIN_PROVIDERS_KEY] = list.length > 0 ? JSON.stringify(list) : null
+
+    // The panel's default also becomes the server-wide default model;
+    // without one, the env-configured default applies.
+    const defaultEntry = list.find((p) => p.isDefault && p.models.length > 0)
+    if (defaultEntry) {
+        updates.AI_PROVIDER = defaultEntry.provider
+        updates.AI_MODEL = defaultEntry.models[0]
+    }
+
+    return updates
+}
+
+// Every settings key the panel may have written for a given list.
+// AI_MODELS_CONFIG is included to clean up values written by older
+// versions of the panel (it is no longer written).
+function derivedEnvKeys(list: StoredAdminProvider[]): string[] {
+    const keys = new Set<string>([
+        "AI_MODELS_CONFIG",
+        "AI_PROVIDER",
+        "AI_MODEL",
+    ])
+    const indexByProvider = new Map<ProviderName, number>()
+    for (const p of list) {
+        const index = indexByProvider.get(p.provider) ?? 0
+        indexByProvider.set(p.provider, index + 1)
+        if (p.provider === "bedrock") {
+            keys.add("ADMIN_AWS_ACCESS_KEY_ID")
+            keys.add("ADMIN_AWS_SECRET_ACCESS_KEY")
+            keys.add("ADMIN_AWS_REGION")
+            // Written by older versions; listed so the next save clears them
+            keys.add("AWS_ACCESS_KEY_ID")
+            keys.add("AWS_SECRET_ACCESS_KEY")
+            keys.add("AWS_REGION")
+        } else if (p.provider === "vertexai") {
+            keys.add("GOOGLE_VERTEX_API_KEY")
+            keys.add("GOOGLE_VERTEX_BASE_URL")
+        } else if (p.provider === "ollama") {
+            keys.add("OLLAMA_API_KEY")
+            keys.add("OLLAMA_BASE_URL")
+        } else {
+            const env = credEnvNames(p.provider, index)
+            if (env.key) keys.add(env.key)
+            if (env.url) keys.add(env.url)
+        }
+    }
+    return [...keys]
+}

lib/admin/settings-registry.ts

@@ -0,0 +1,229 @@
+// Declarative registry of the general env vars editable in the admin panel.
+// Drives both server-side validation (app/api/admin/settings) and UI
+// rendering (app/[lang]/admin). Keys are exactly the env var names.
+//
+// AI providers and models are managed separately in the panel's Models
+// section (lib/admin/providers.ts), not here.
+//
+// Not listed here (and therefore rejected by the API):
+// - NEXT_PUBLIC_* vars: baked into the client bundle at build time
+// - ADMIN_PASSWORD / SETTINGS_FILE: bootstrap values, env-only to avoid lockout
+// - Per-provider reasoning/thinking tuning vars: env-only (see env.example)
+
+export type SettingType = "string" | "secret" | "number" | "boolean" | "enum"
+
+export interface SettingDef {
+    key: string
+    group: string
+    type: SettingType
+    label: string
+    description?: string
+    options?: string[]
+    min?: number
+    max?: number
+    placeholder?: string
+    // Built-in default applied at runtime when the value is unset, so the UI
+    // can reflect actual behavior (e.g. ALLOW_PRIVATE_URLS defaults to "true").
+    default?: string
+    // Value is only picked up at process start (module-load readers)
+    restartRequired?: boolean
+}
+
+export interface SettingGroup {
+    id: string
+    title: string
+    description: string
+    // Optional sections gated by an on/off switch in the panel; fields are
+    // grayed out until enabled. Starts on when any field is already set.
+    toggleable?: boolean
+}
+
+export const SETTING_GROUPS: SettingGroup[] = [
+    {
+        id: "generation",
+        title: "Generation",
+        description: "Output parameters applied to all chat requests.",
+    },
+    {
+        id: "access",
+        title: "Access Control",
+        description: "Restrict who can use this deployment.",
+    },
+    {
+        id: "features",
+        title: "Features",
+        description: "Optional features and security toggles.",
+    },
+    {
+        id: "observability",
+        title: "Observability",
+        description: "Langfuse tracing for LLM calls.",
+        toggleable: true,
+    },
+    {
+        id: "quota",
+        title: "Quota & Rate Limits",
+        description:
+            "Per-IP usage limits. Enforcement requires a DynamoDB table.",
+        toggleable: true,
+    },
+]
+
+export const SETTINGS_REGISTRY: SettingDef[] = [
+    // ── Generation ───────────────────────────────────────────────────
+    {
+        key: "TEMPERATURE",
+        group: "generation",
+        type: "number",
+        label: "Temperature",
+        description:
+            "Leave unset for reasoning models that reject temperature.",
+        min: 0,
+        max: 2,
+    },
+    {
+        key: "MAX_OUTPUT_TOKENS",
+        group: "generation",
+        type: "number",
+        label: "Max Output Tokens",
+        min: 1,
+    },
+
+    // ── Access Control ───────────────────────────────────────────────
+    {
+        key: "ACCESS_CODE_LIST",
+        group: "access",
+        type: "string",
+        label: "Access Codes",
+        description:
+            "Comma-separated list. Users must enter one to chat. Empty = open access.",
+        placeholder: "code1,code2",
+    },
+
+    // ── Features ─────────────────────────────────────────────────────
+    {
+        key: "ENABLE_VLM_VALIDATION",
+        group: "features",
+        type: "boolean",
+        label: "VLM Diagram Validation",
+        description:
+            "Visually validate generated diagrams with a vision model.",
+    },
+    {
+        key: "VALIDATION_MODEL",
+        group: "features",
+        type: "string",
+        label: "Validation Model",
+        description: "Falls back to the default AI model when empty.",
+    },
+    {
+        key: "VALIDATION_TIMEOUT",
+        group: "features",
+        type: "number",
+        label: "Validation Timeout (ms)",
+        min: 1000,
+    },
+    {
+        key: "ENABLE_HISTORY_XML_REPLACE",
+        group: "features",
+        type: "boolean",
+        label: "History XML Compression",
+        description: "Replace old diagram XML in history with placeholders.",
+    },
+    {
+        key: "ALLOW_PRIVATE_URLS",
+        group: "features",
+        type: "boolean",
+        label: "Allow Private URLs",
+        description:
+            "Turn off to block requests to private IPs and internal hostnames (SSRF protection).",
+        // Unset means allowed at runtime (ssrf-protection: !== "false")
+        default: "true",
+    },
+
+    // ── Observability ────────────────────────────────────────────────
+    {
+        key: "LANGFUSE_PUBLIC_KEY",
+        group: "observability",
+        type: "string",
+        label: "Langfuse Public Key",
+        placeholder: "pk-lf-…",
+        restartRequired: true,
+    },
+    {
+        key: "LANGFUSE_SECRET_KEY",
+        group: "observability",
+        type: "secret",
+        label: "Langfuse Secret Key",
+        restartRequired: true,
+    },
+    {
+        key: "LANGFUSE_BASEURL",
+        group: "observability",
+        type: "string",
+        label: "Langfuse Base URL",
+        placeholder: "https://cloud.langfuse.com",
+        restartRequired: true,
+    },
+
+    // ── Quota ────────────────────────────────────────────────────────
+    {
+        key: "DAILY_REQUEST_LIMIT",
+        group: "quota",
+        type: "number",
+        label: "Daily Request Limit",
+        description: "Per IP per day.",
+        min: 1,
+    },
+    {
+        key: "DAILY_TOKEN_LIMIT",
+        group: "quota",
+        type: "number",
+        label: "Daily Token Limit",
+        description: "Per IP per day.",
+        min: 1,
+    },
+    {
+        key: "TPM_LIMIT",
+        group: "quota",
+        type: "number",
+        label: "Tokens Per Minute",
+        min: 1,
+    },
+    {
+        key: "DYNAMODB_QUOTA_TABLE",
+        group: "quota",
+        type: "string",
+        label: "DynamoDB Table",
+        description: "Quota enforcement is disabled when empty.",
+        restartRequired: true,
+    },
+    {
+        key: "DYNAMODB_REGION",
+        group: "quota",
+        type: "string",
+        label: "DynamoDB Region",
+        placeholder: "ap-northeast-1",
+        restartRequired: true,
+    },
+    {
+        key: "QUOTA_TIMEZONE",
+        group: "quota",
+        type: "string",
+        label: "Quota Timezone",
+        description: "Timezone for the daily reset boundary.",
+        placeholder: "UTC",
+        restartRequired: true,
+    },
+]
+
+export const SETTINGS_BY_KEY: Map<string, SettingDef> = new Map(
+    SETTINGS_REGISTRY.map((def) => [def.key, def]),
+)
+
+export const SETTINGS_BY_GROUP: Map<string, SettingDef[]> = new Map(
+    SETTING_GROUPS.map((g) => [
+        g.id,
+        SETTINGS_REGISTRY.filter((d) => d.group === g.id),
+    ]),
+)

lib/admin/settings.ts

@@ -0,0 +1,149 @@
+import fs from "fs"
+import path from "path"
+
+// File-based admin settings, overlaid onto process.env (dotenv-style).
+// Precedence: settings file > env var > built-in default.
+// Keys are exactly the env var names.
+
+interface SettingsFile {
+    version: 1
+    values: Record<string, string>
+}
+
+interface SettingsState {
+    // Original env values snapshotted before the first overlay, so removing
+    // a key from the settings file restores the env default. null = was unset.
+    originalEnv: Record<string, string | null>
+    // Keys currently overlaid, so we can restore ones removed from the file.
+    overlaidKeys: Set<string>
+    cachedSettings: Record<string, string> | null
+}
+
+// Kept on globalThis because the build can load this module more than once
+// (instrumentation.ts and the API routes get separate copies); per-module
+// state would make a route forget what instrumentation overlaid at startup.
+const globalState = globalThis as typeof globalThis & {
+    __adminSettingsState?: SettingsState
+}
+globalState.__adminSettingsState ??= {
+    originalEnv: {},
+    overlaidKeys: new Set(),
+    cachedSettings: null,
+}
+const state = globalState.__adminSettingsState
+
+export function getSettingsPath(): string {
+    const custom = process.env.SETTINGS_FILE
+    if (custom && custom.trim().length > 0) return custom
+    return path.join(process.cwd(), "data", "settings.json")
+}
+
+export function loadSettings(): Record<string, string> {
+    if (state.cachedSettings) return state.cachedSettings
+    try {
+        const raw = fs.readFileSync(getSettingsPath(), "utf8")
+        const parsed = JSON.parse(raw) as SettingsFile
+        // Keep only string values — a hand-edited or corrupted file could
+        // hold null/arrays/numbers that would otherwise be overlaid onto
+        // process.env and coerce to junk like "[object Object]".
+        const values: Record<string, string> = {}
+        const rawValues =
+            parsed &&
+            typeof parsed.values === "object" &&
+            parsed.values &&
+            !Array.isArray(parsed.values)
+                ? parsed.values
+                : {}
+        for (const [key, value] of Object.entries(rawValues)) {
+            if (typeof value === "string") values[key] = value
+        }
+        state.cachedSettings = values
+    } catch (err: any) {
+        if (err?.code !== "ENOENT") {
+            console.error("[admin-settings] Failed to read settings file:", err)
+        }
+        state.cachedSettings = {}
+    }
+    return state.cachedSettings
+}
+
+export function applyToEnv(): void {
+    const values = loadSettings()
+    const { originalEnv } = state
+
+    // Restore env for keys that were overlaid before but are now gone
+    for (const key of state.overlaidKeys) {
+        if (!(key in values)) {
+            const original = originalEnv[key]
+            if (original === null) delete process.env[key]
+            else process.env[key] = original
+        }
+    }
+
+    for (const [key, value] of Object.entries(values)) {
+        if (!(key in originalEnv)) {
+            originalEnv[key] = process.env[key] ?? null
+        }
+        process.env[key] = value
+    }
+
+    state.overlaidKeys = new Set(Object.keys(values))
+}
+
+// The effective env value if the file entry were removed (for fallback display)
+export function getEnvFallback(key: string): string | null {
+    if (state.overlaidKeys.has(key)) return state.originalEnv[key] ?? null
+    return process.env[key] ?? null
+}
+
+// Whether a key's current value comes from the file, the environment, or is unset
+export function getValueSource(key: string): "file" | "env" | "default" {
+    if (key in loadSettings()) return "file"
+    return getEnvFallback(key) !== null ? "env" : "default"
+}
+
+export function saveSettings(updates: Record<string, string | null>): void {
+    const current = { ...loadSettings() }
+    for (const [key, value] of Object.entries(updates)) {
+        if (value === null) delete current[key]
+        else current[key] = value
+    }
+
+    const filePath = getSettingsPath()
+    fs.mkdirSync(path.dirname(filePath), { recursive: true })
+    const tmpPath = `${filePath}.tmp`
+    const data: SettingsFile = { version: 1, values: current }
+    fs.writeFileSync(tmpPath, JSON.stringify(data, null, 2), { mode: 0o600 })
+    fs.renameSync(tmpPath, filePath)
+
+    state.cachedSettings = current
+    applyToEnv()
+}
+
+let writableCache: boolean | null = null
+
+export function isSettingsWritable(): boolean {
+    if (writableCache !== null) return writableCache
+    try {
+        const dir = path.dirname(getSettingsPath())
+        fs.mkdirSync(dir, { recursive: true })
+        fs.accessSync(dir, fs.constants.W_OK)
+        writableCache = true
+    } catch {
+        writableCache = false
+    }
+    return writableCache
+}
+
+// Test-only: reset module state
+export function _resetForTests(): void {
+    state.cachedSettings = null
+    writableCache = null
+    for (const key of state.overlaidKeys) {
+        const original = state.originalEnv[key]
+        if (original === null) delete process.env[key]
+        else if (original !== undefined) process.env[key] = original
+    }
+    state.overlaidKeys = new Set()
+    state.originalEnv = {}
+}

lib/ai-providers.ts

@@ -6,13 +6,20 @@ import { createGateway, gateway } from "@ai-sdk/gateway"
 import { createGoogleGenerativeAI, google } from "@ai-sdk/google"
 import { createVertex } from "@ai-sdk/google-vertex"
 import { createOpenAI, openai } from "@ai-sdk/openai"
+import { aihubmix, createAihubmix } from "@aihubmix/ai-sdk-provider"
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers"
 import { createOpenRouter } from "@openrouter/ai-sdk-provider"
 import { createOllama, ollama } from "ollama-ai-provider-v2"
+import {
+    adminProvidersToConfig,
+    loadAdminProviders,
+} from "@/lib/admin/providers"
 import { PROVIDER_INFO, type ProviderName } from "@/lib/types/model-config"
 
 export type { ProviderName }
 
+export const AIHUBMIX_APP_CODE = "MSBS9675"
+
 interface ModelConfig {
     model: any
     providerOptions?: any
@@ -29,6 +36,7 @@ export const SINGLE_SYSTEM_PROVIDERS = new Set<ProviderName>([
     "kimi",
     "qiniu",
     "novita",
+    "mimo",
 ])
 
 /**
@@ -57,6 +65,18 @@ export function normalizeMiniMaxBaseURL(rawUrl: string): {
     return { baseURL, isAnthropicCompatible }
 }
 
+export function isAihubmixStandardBaseURL(
+    rawUrl: string | null | undefined,
+): boolean {
+    if (!rawUrl) return true
+
+    const baseURL = rawUrl.replace(/\/+$/, "")
+    return (
+        baseURL === "https://aihubmix.com" ||
+        baseURL === "https://aihubmix.com/v1"
+    )
+}
+
 export interface ClientOverrides {
     provider?: string | null
     baseUrl?: string | null
@@ -86,6 +106,7 @@ const ALLOWED_CLIENT_PROVIDERS: ProviderName[] = [
     "azure",
     "bedrock",
     "openrouter",
+    "aihubmix",
     "deepseek",
     "siliconflow",
     "sglang",
@@ -100,6 +121,8 @@ const ALLOWED_CLIENT_PROVIDERS: ProviderName[] = [
     "kimi",
     "minimax",
     "novita",
+    "mimo",
+    "atlascloud",
 ]
 
 // Bedrock provider options for Anthropic beta features
@@ -513,6 +536,7 @@ function buildProviderOptions(
 
         case "deepseek":
         case "openrouter":
+        case "aihubmix":
         case "siliconflow":
         case "sglang":
         case "gateway":
@@ -523,7 +547,9 @@ function buildProviderOptions(
         case "qwen":
         case "kimi":
         case "qiniu":
-        case "novita": {
+        case "novita":
+        case "atlascloud":
+        case "mimo": {
             // These providers don't have reasoning configs in AI SDK yet
             // Gateway passes through to underlying providers which handle their own configs
             break
@@ -537,7 +563,7 @@ function buildProviderOptions(
 }
 
 // Map of provider to required environment variable
-const PROVIDER_ENV_VARS: Record<ProviderName, string | null> = {
+export const PROVIDER_ENV_VARS: Record<ProviderName, string | null> = {
     bedrock: null, // AWS SDK auto-uses IAM role on AWS, or env vars locally
     openai: "OPENAI_API_KEY",
     anthropic: "ANTHROPIC_API_KEY",
@@ -546,6 +572,7 @@ const PROVIDER_ENV_VARS: Record<ProviderName, string | null> = {
     azure: "AZURE_API_KEY",
     ollama: null, // No credentials needed for local Ollama
     openrouter: "OPENROUTER_API_KEY",
+    aihubmix: "AIHUBMIX_API_KEY",
     deepseek: "DEEPSEEK_API_KEY",
     siliconflow: "SILICONFLOW_API_KEY",
     sglang: "SGLANG_API_KEY",
@@ -559,6 +586,8 @@ const PROVIDER_ENV_VARS: Record<ProviderName, string | null> = {
     kimi: "KIMI_API_KEY",
     minimax: "MINIMAX_API_KEY",
     novita: "NOVITA_API_KEY",
+    mimo: "MIMO_API_KEY",
+    atlascloud: "ATLASCLOUD_API_KEY",
 }
 
 /**
@@ -573,7 +602,15 @@ function detectProvider(): ProviderName | null {
             // Skip ollama - it doesn't require credentials
             continue
         }
-        if (process.env[envVar]) {
+        // Anthropic accepts ANTHROPIC_AUTH_TOKEN (Bearer auth) as alternative to ANTHROPIC_API_KEY
+        const hasCredential =
+            provider === "anthropic"
+                ? !!(
+                      process.env.ANTHROPIC_API_KEY ||
+                      process.env.ANTHROPIC_AUTH_TOKEN
+                  )
+                : !!process.env[envVar]
+        if (hasCredential) {
             // Azure requires additional config (baseURL or resourceName)
             if (provider === "azure") {
                 const hasBaseUrl = !!process.env.AZURE_BASE_URL
@@ -615,13 +652,26 @@ function validateProviderCredentials(
         return
     }
 
-    // Use custom env var name if provided, otherwise use default
-    const requiredVar = customApiKeyEnv || PROVIDER_ENV_VARS[provider]
-    if (requiredVar && !process.env[requiredVar]) {
-        throw new Error(
-            `${requiredVar} environment variable is required for ${provider} provider. ` +
-                `Please set it in your .env.local file.`,
+    // Anthropic accepts ANTHROPIC_AUTH_TOKEN (Bearer auth) as alternative to ANTHROPIC_API_KEY
+    if (provider === "anthropic" && !customApiKeyEnv) {
+        const hasCredential = !!(
+            process.env.ANTHROPIC_API_KEY || process.env.ANTHROPIC_AUTH_TOKEN
         )
+        if (!hasCredential) {
+            throw new Error(
+                `Either ANTHROPIC_API_KEY or ANTHROPIC_AUTH_TOKEN environment variable is required for anthropic provider. ` +
+                    `Please set one in your .env.local file.`,
+            )
+        }
+    } else {
+        // Use custom env var name if provided, otherwise use default
+        const requiredVar = customApiKeyEnv || PROVIDER_ENV_VARS[provider]
+        if (requiredVar && !process.env[requiredVar]) {
+            throw new Error(
+                `${requiredVar} environment variable is required for ${provider} provider. ` +
+                    `Please set it in your .env.local file.`,
+            )
+        }
     }
 
     // Azure requires either AZURE_BASE_URL or AZURE_RESOURCE_NAME in addition to API key
@@ -641,7 +691,7 @@ function validateProviderCredentials(
  * Get the AI model based on environment variables
  *
  * Environment variables:
- * - AI_PROVIDER: The provider to use (bedrock, openai, anthropic, google, azure, ollama, openrouter, deepseek, siliconflow, sglang, gateway, modelscope)
+ * - AI_PROVIDER: The provider to use (bedrock, openai, anthropic, google, azure, ollama, openrouter, aihubmix, deepseek, siliconflow, sglang, gateway, modelscope)
  * - AI_MODEL: The model ID/name for the selected provider
  *
  * Provider-specific env vars:
@@ -653,6 +703,7 @@ function validateProviderCredentials(
  * - AWS_REGION, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY: AWS Bedrock credentials
  * - OLLAMA_BASE_URL: Ollama server URL (optional, defaults to https://ollama.com/api)
  * - OPENROUTER_API_KEY: OpenRouter API key
+ * - AIHUBMIX_API_KEY: AIHubMix API key
  * - DEEPSEEK_API_KEY: DeepSeek API key
  * - DEEPSEEK_BASE_URL: DeepSeek endpoint (optional)
  * - SILICONFLOW_API_KEY: SiliconFlow API key
@@ -689,8 +740,10 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
             (overrides?.provider === "vertexai" && overrides?.vertexApiKey))
     )
 
-    // Use client override if provided, otherwise fall back to env vars
-    const modelId = overrides?.modelId || process.env.AI_MODEL
+    // Use client override if provided, otherwise fall back to env vars.
+    // AI_MODEL may be comma-separated (multi-model fallback); pick the first.
+    const envModel = process.env.AI_MODEL?.split(",")[0]?.trim() || undefined
+    const modelId = overrides?.modelId || envModel
 
     if (!modelId) {
         if (isClientOverride) {
@@ -740,6 +793,7 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
                         `- GOOGLE_GENERATIVE_AI_API_KEY for Google\n` +
                         `- AWS_ACCESS_KEY_ID for Bedrock\n` +
                         `- OPENROUTER_API_KEY for OpenRouter\n` +
+                        `- AIHUBMIX_API_KEY for AIHubMix\n` +
                         `- AZURE_API_KEY for Azure\n` +
                         `- SILICONFLOW_API_KEY for SiliconFlow\n` +
                         `- SGLANG_API_KEY for SGLang\n` +
@@ -774,8 +828,16 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
             // Use client-provided credentials if available, otherwise fall back to IAM/env vars
             const hasClientCredentials =
                 overrides?.awsAccessKeyId && overrides?.awsSecretAccessKey
+            // Keys from the admin panel. The ADMIN_ names keep them out of the
+            // default AWS credential chain, which other clients such as the
+            // DynamoDB quota manager use with their own credentials.
+            const adminAccessKeyId = process.env.ADMIN_AWS_ACCESS_KEY_ID
+            const adminSecretAccessKey = process.env.ADMIN_AWS_SECRET_ACCESS_KEY
             const bedrockRegion =
-                overrides?.awsRegion || process.env.AWS_REGION || "us-west-2"
+                overrides?.awsRegion ||
+                process.env.ADMIN_AWS_REGION ||
+                process.env.AWS_REGION ||
+                "us-west-2"
 
             const bedrockProvider = hasClientCredentials
                 ? createAmazonBedrock({
@@ -786,10 +848,16 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
                           sessionToken: overrides.awsSessionToken,
                       }),
                   })
-                : createAmazonBedrock({
-                      region: bedrockRegion,
-                      credentialProvider: fromNodeProviderChain(),
-                  })
+                : adminAccessKeyId && adminSecretAccessKey
+                  ? createAmazonBedrock({
+                        region: bedrockRegion,
+                        accessKeyId: adminAccessKeyId,
+                        secretAccessKey: adminSecretAccessKey,
+                    })
+                  : createAmazonBedrock({
+                        region: bedrockRegion,
+                        credentialProvider: fromNodeProviderChain(),
+                    })
             model = bedrockProvider(modelId)
             // Add Anthropic beta options if using Claude models via Bedrock
             if (modelId.includes("anthropic.claude")) {
@@ -822,8 +890,9 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
                 // for compatibility (most proxies don't support /responses endpoint)
                 const customOpenAI = createOpenAI({ apiKey, baseURL })
                 model = customOpenAI.chat(modelId)
-            } else if (overrides?.apiKey) {
-                // Custom API key but official OpenAI endpoint, use Responses API
+            } else if (overrides?.apiKey || overrides?.apiKeyEnv) {
+                // Custom API key (the client's, or a server model's own env var)
+                // but official OpenAI endpoint, use Responses API
                 // to support reasoning for gpt-5, o1, o3, o4 models
                 const customOpenAI = createOpenAI({ apiKey })
                 model = customOpenAI(modelId)
@@ -845,8 +914,16 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
                 serverBaseUrl,
                 "https://api.anthropic.com/v1",
             )
+            // Anthropic supports two auth methods (mutually exclusive):
+            // - apiKey: sends as `x-api-key` header
+            // - authToken: sends as `Authorization: Bearer <token>` header
+            // Prefer apiKey if present (including client overrides); fall back
+            // to ANTHROPIC_AUTH_TOKEN env var only when no apiKey is available.
+            const authToken = !apiKey
+                ? process.env.ANTHROPIC_AUTH_TOKEN
+                : undefined
             const customProvider = createAnthropic({
-                apiKey,
+                ...(authToken ? { authToken } : { apiKey }),
                 baseURL,
                 headers: ANTHROPIC_BETA_HEADERS,
             })
@@ -870,7 +947,9 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
                 overrides?.baseUrl,
                 serverBaseUrl,
             )
-            if (baseURL || overrides?.apiKey) {
+            // The default instance only reads GOOGLE_GENERATIVE_AI_API_KEY, so a
+            // server model's own env var (apiKeyEnv) needs a custom instance too
+            if (baseURL || overrides?.apiKey || overrides?.apiKeyEnv) {
                 const customGoogle = createGoogleGenerativeAI({
                     apiKey,
                     ...(baseURL && { baseURL }),
@@ -883,8 +962,11 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
         }
         case "vertexai": {
             // Express Mode: Use API key for authentication
-            const vertexApiKey =
-                overrides?.vertexApiKey || process.env.GOOGLE_VERTEX_API_KEY
+            // SECURITY: a client base URL only ever gets the client's key, so the
+            // server's GOOGLE_VERTEX_API_KEY is never sent to a client-chosen host
+            const vertexApiKey = overrides?.baseUrl
+                ? overrides.vertexApiKey
+                : overrides?.vertexApiKey || process.env.GOOGLE_VERTEX_API_KEY
 
             if (!vertexApiKey) {
                 throw new Error(
@@ -893,9 +975,13 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
                 )
             }
 
-            // Support custom base URL from env or client override
-            const baseURL =
-                overrides?.baseUrl || process.env.GOOGLE_VERTEX_BASE_URL
+            // Support custom base URL from env or client override.
+            // A client key only goes to the client's URL or the official one.
+            const baseURL = resolveBaseURL(
+                overrides?.vertexApiKey,
+                overrides?.baseUrl,
+                process.env.GOOGLE_VERTEX_BASE_URL,
+            )
 
             const vertexProvider = createVertex({
                 apiKey: vertexApiKey,
@@ -974,6 +1060,42 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
             break
         }
 
+        case "aihubmix": {
+            const apiKey = resolveApiKey(overrides, "AIHUBMIX_API_KEY")
+            const serverBaseUrl = resolveBaseUrlEnv(
+                overrides,
+                "AIHUBMIX_BASE_URL",
+            )
+            const baseURL = resolveBaseURL(
+                overrides?.apiKey,
+                overrides?.baseUrl,
+                serverBaseUrl,
+                PROVIDER_INFO.aihubmix.defaultBaseUrl,
+            )
+            const defaultBaseURL = PROVIDER_INFO.aihubmix.defaultBaseUrl
+
+            if (
+                isAihubmixStandardBaseURL(baseURL) ||
+                baseURL === defaultBaseURL
+            ) {
+                const aihubmixProvider =
+                    overrides?.apiKey || apiKey
+                        ? createAihubmix({
+                              apiKey,
+                              appCode: AIHUBMIX_APP_CODE,
+                          })
+                        : aihubmix
+                model = aihubmixProvider(modelId)
+            } else {
+                const aihubmixCompatibleProvider = createOpenAI({
+                    apiKey,
+                    baseURL,
+                })
+                model = aihubmixCompatibleProvider.chat(modelId)
+            }
+            break
+        }
+
         case "deepseek": {
             const apiKey = resolveApiKey(overrides, "DEEPSEEK_API_KEY")
             const serverBaseUrl = resolveBaseUrlEnv(
@@ -985,7 +1107,7 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
                 overrides?.baseUrl,
                 serverBaseUrl,
             )
-            if (baseURL || overrides?.apiKey) {
+            if (baseURL || overrides?.apiKey || overrides?.apiKeyEnv) {
                 const customDeepSeek = createDeepSeek({
                     apiKey,
                     ...(baseURL && { baseURL }),
@@ -1147,7 +1269,7 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
             )
             // Only use custom configuration if explicitly set (local dev or custom Gateway)
             // Otherwise undefined → AI SDK uses Vercel default (https://ai-gateway.vercel.sh/v1/ai) + OIDC
-            if (baseURL || overrides?.apiKey) {
+            if (baseURL || overrides?.apiKey || overrides?.apiKeyEnv) {
                 const customGateway = createGateway({
                     apiKey,
                     ...(baseURL && { baseURL }),
@@ -1259,11 +1381,28 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
             break
         }
 
+        case "mimo": {
+            const apiKey = resolveApiKey(overrides, "MIMO_API_KEY")
+            const baseURL = resolveBaseURL(
+                overrides?.apiKey,
+                overrides?.baseUrl,
+                resolveBaseUrlEnv(overrides, "MIMO_BASE_URL"),
+                PROVIDER_INFO.mimo?.defaultBaseUrl,
+            )
+            // Use createDeepSeek to properly handle reasoning_content for MiMo
+            // thinking models (e.g., mimo-v2.5-pro). MiMo's API requires
+            // reasoning_content to be passed back during multi-turn tool calls
+            // (returns 400 otherwise), same convention as DeepSeek and Kimi.
+            const mimoProvider = createDeepSeek({ apiKey, baseURL })
+            model = mimoProvider(modelId)
+            break
+        }
+
         case "glm":
         case "qwen":
         case "qiniu":
-        case "kimi":
-        case "novita": {
+        case "novita":
+        case "atlascloud": {
             const envVar = PROVIDER_ENV_VARS[provider]
             if (!envVar) {
                 throw new Error(
@@ -1288,9 +1427,26 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
             break
         }
 
+        case "kimi": {
+            const apiKey = resolveApiKey(overrides, "KIMI_API_KEY")
+            const baseURL = resolveBaseURL(
+                overrides?.apiKey,
+                overrides?.baseUrl,
+                resolveBaseUrlEnv(overrides, "KIMI_BASE_URL"),
+                PROVIDER_INFO.kimi?.defaultBaseUrl,
+            )
+            // Use createDeepSeek to properly handle reasoning_content for Kimi
+            // thinking models (e.g., kimi-k2.6). Kimi's API uses the same
+            // reasoning_content field as DeepSeek, so this provider correctly
+            // captures and replays reasoning in multi-turn conversations.
+            const customProvider = createDeepSeek({ apiKey, baseURL })
+            model = customProvider(modelId)
+            break
+        }
+
         default:
             throw new Error(
-                `Unknown AI provider: ${provider}. Supported providers: bedrock, openai, anthropic, google, azure, ollama, openrouter, deepseek, siliconflow, sglang, gateway, edgeone, doubao, modelscope, glm, qwen, qiniu, kimi, minimax, novita`,
+                `Unknown AI provider: ${provider}. Supported providers: bedrock, openai, anthropic, google, azure, ollama, openrouter, aihubmix, deepseek, siliconflow, sglang, gateway, edgeone, doubao, modelscope, glm, qwen, qiniu, kimi, minimax, novita, mimo, atlascloud`,
             )
     }
 
@@ -1302,6 +1458,36 @@ export function getAIModel(overrides?: ClientOverrides): ModelConfig {
     return { model, providerOptions, headers, modelId, provider }
 }
 
+/**
+ * Whether the call is paid for by the server's own credentials (env keys or
+ * IAM role) rather than credentials sent with the request. Mirrors which key
+ * each branch of getAIModel ends up using.
+ */
+export function usesServerCredentials(
+    provider: ProviderName,
+    overrides?: ClientOverrides,
+): boolean {
+    switch (provider) {
+        case "bedrock":
+            return !(overrides?.awsAccessKeyId && overrides?.awsSecretAccessKey)
+        case "vertexai":
+            return !overrides?.vertexApiKey
+        case "edgeone":
+            // The platform's own endpoint, no key involved
+            return false
+        case "ollama":
+            // Only a server key costs money; a keyless local server or the
+            // client's own server does not
+            return (
+                !overrides?.baseUrl &&
+                !overrides?.apiKey &&
+                !!(overrides?.apiKeyEnv || process.env.OLLAMA_API_KEY)
+            )
+        default:
+            return !overrides?.apiKey
+    }
+}
+
 /**
  * Check if a model supports prompt caching.
  * Currently only Claude models on Bedrock support prompt caching.
@@ -1316,75 +1502,19 @@ export function supportsPromptCaching(modelId: string): boolean {
     )
 }
 
-/**
- * Check if a model supports image/vision input.
- * Some models silently drop image parts without error (AI SDK warning only).
- */
-export function supportsImageInput(modelId: string): boolean {
-    const lowerModelId = modelId.toLowerCase()
-
-    // Helper to check if model has vision capability indicator
-    const hasVisionIndicator =
-        lowerModelId.includes("vision") || lowerModelId.includes("vl")
-
-    // Models that DON'T support image/vision input (unless vision variant)
-    // Kimi K2 doesn't support images, but K2.5 does
-    // Only block kimi-k2 specifically, not other Kimi models
-    if (
-        (lowerModelId.includes("kimi-k2") ||
-            lowerModelId.includes("kimi_k2")) &&
-        !hasVisionIndicator &&
-        !lowerModelId.includes("2.5") &&
-        !lowerModelId.includes("k2.5")
-    ) {
-        return false
-    }
-
-    // Moonshot text models (moonshot-v1 series are text-only)
-    if (lowerModelId.includes("moonshot-v1") && !hasVisionIndicator) {
-        return false
-    }
-
-    // MiniMax text models (MiniMax-M2.x series are text-only)
-    if (lowerModelId.includes("minimax") && !hasVisionIndicator) {
-        return false
-    }
-
-    // DeepSeek text models (not vision variants)
-    if (lowerModelId.includes("deepseek") && !hasVisionIndicator) {
-        return false
-    }
-
-    // Qwen text models (not vision variants like qwen-vl)
-    // qwen3.5-plus is a vision model
-    if (
-        lowerModelId.includes("qwen") &&
-        !hasVisionIndicator &&
-        !lowerModelId.includes("qwen3.5-plus") &&
-        !lowerModelId.includes("qwen3.5-flash")
-    ) {
-        return false
-    }
-
-    // GLM text models (not vision variants)
-    // GLM vision models: glm-4v, glm-4v-9b, glm-4.1v-9b-thinking
-    if (lowerModelId.includes("glm") && !hasVisionIndicator) {
-        if (!/[\d.]v/.test(lowerModelId)) {
-            return false
-        }
-    }
-
-    // Default: assume model supports images
-    return true
-}
-
 /**
  * Get the AI model for diagram validation.
  * Uses VALIDATION_MODEL env var if set, otherwise falls back to AI_MODEL.
- * Throws if the model doesn't support image input.
+ *
+ * Note: we no longer guess whether the model supports image input from its
+ * name — that heuristic misfired on newer models (see issue #874). If a
+ * configured validation model can't handle images, the API call simply errors
+ * and the validate-diagram route falls back to "valid".
  */
 export function getValidationModel(): ReturnType<typeof getAIModel>["model"] {
-    const modelId = process.env.VALIDATION_MODEL || process.env.AI_MODEL
+    // AI_MODEL may be comma-separated (multi-model fallback); pick the first.
+    const envFallback = process.env.AI_MODEL?.split(",")[0]?.trim() || undefined
+    const modelId = process.env.VALIDATION_MODEL || envFallback
 
     if (!modelId) {
         throw new Error(
@@ -1392,12 +1522,17 @@ export function getValidationModel(): ReturnType<typeof getAIModel>["model"] {
         )
     }
 
-    if (!supportsImageInput(modelId)) {
-        throw new Error(
-            `Validation requires a vision-capable model. Model "${modelId}" does not support image input.`,
-        )
-    }
+    // A default set in the admin panel becomes AI_PROVIDER/AI_MODEL, but its key
+    // lives in an ADMIN_-prefixed env var. Point at it the way the chat route
+    // does for server models, or the standard env var is required instead.
+    const panelDefault = adminProvidersToConfig(
+        loadAdminProviders(),
+    ).providers.find((p) => p.default && p.provider === process.env.AI_PROVIDER)
 
-    const { model } = getAIModel({ modelId })
+    const { model } = getAIModel({
+        modelId,
+        apiKeyEnv: panelDefault?.apiKeyEnv,
+        baseUrlEnv: panelDefault?.baseUrlEnv,
+    })
     return model
 }

lib/aihubmix-models.ts

@@ -0,0 +1,79 @@
+export const AIHUBMIX_MODELS_ENDPOINT = "https://aihubmix.com/api/v1/models"
+
+const NON_CHAT_MODEL_TYPES = new Set([
+    "embedding",
+    "image_generation",
+    "rerank",
+    "transcription",
+    "tts",
+    "video",
+])
+
+type AihubmixModelListPayload = {
+    data?: unknown
+}
+
+type AihubmixModelRecord = {
+    model_id?: unknown
+    types?: unknown
+}
+
+function getModelTypes(types: unknown): Set<string> {
+    if (typeof types !== "string") {
+        return new Set()
+    }
+
+    return new Set(
+        types
+            .split(",")
+            .map((type) => type.trim())
+            .filter(Boolean),
+    )
+}
+
+function isChatModel(record: AihubmixModelRecord): record is {
+    model_id: string
+    types: string
+} {
+    if (typeof record.model_id !== "string" || !record.model_id.trim()) {
+        return false
+    }
+
+    const types = getModelTypes(record.types)
+    if (!types.has("llm")) {
+        return false
+    }
+
+    return !Array.from(NON_CHAT_MODEL_TYPES).some((type) => types.has(type))
+}
+
+export function extractAihubmixModelIds(payload: unknown): string[] {
+    const data = (payload as AihubmixModelListPayload)?.data
+    if (!Array.isArray(data)) {
+        return []
+    }
+
+    const seen = new Set<string>()
+    const modelIds: string[] = []
+
+    for (const item of data) {
+        if (!item || typeof item !== "object") {
+            continue
+        }
+
+        const record = item as AihubmixModelRecord
+        if (!isChatModel(record)) {
+            continue
+        }
+
+        const modelId = record.model_id.trim()
+        if (seen.has(modelId)) {
+            continue
+        }
+
+        seen.add(modelId)
+        modelIds.push(modelId)
+    }
+
+    return modelIds
+}

lib/cached-responses.ts

@@ -1,6 +1,8 @@
 export interface CachedResponse {
     promptText: string
     hasImage: boolean
+    // Name of the bundled example file the prompt is sent with
+    fileName?: string
     xml: string
 }
 
@@ -254,6 +256,7 @@ export const CACHED_EXAMPLE_RESPONSES: CachedResponse[] = [
     {
         promptText: "Replicate this in aws style",
         hasImage: true,
+        fileName: "architecture.png",
         xml: `<mxCell id="2" value="AWS" style="sketch=0;outlineConnect=0;gradientColor=none;html=1;whiteSpace=wrap;fontSize=12;fontStyle=0;container=1;pointerEvents=0;collapsible=0;recursiveResize=0;shape=mxgraph.aws4.group;grIcon=mxgraph.aws4.group_aws_cloud;strokeColor=#232F3E;fillColor=none;verticalAlign=top;align=left;spacingLeft=30;fontColor=#232F3E;dashed=0;rounded=1;arcSize=5;" vertex="1" parent="1">
     <mxGeometry x="340" y="40" width="880" height="520" as="geometry"/>
   </mxCell>
@@ -318,6 +321,7 @@ export const CACHED_EXAMPLE_RESPONSES: CachedResponse[] = [
     {
         promptText: "Replicate this flowchart.",
         hasImage: true,
+        fileName: "example.png",
         xml: `<mxCell id="2" value="Lamp doesn't work" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#ffcccc;strokeColor=#000000;strokeWidth=2;fontSize=18;fontStyle=0;" vertex="1" parent="1">
     <mxGeometry x="140" y="40" width="180" height="60" as="geometry"/>
   </mxCell>
@@ -379,6 +383,7 @@ export const CACHED_EXAMPLE_RESPONSES: CachedResponse[] = [
     {
         promptText: "Summarize this paper as a diagram",
         hasImage: true,
+        fileName: "chain-of-thought.txt",
         xml: `<mxCell id="title_bg" parent="1"
                     style="rounded=1;whiteSpace=wrap;html=1;fillColor=#1a237e;strokeColor=none;arcSize=8;"
                     value="" vertex="1">
@@ -879,14 +884,19 @@ export const CACHED_EXAMPLE_RESPONSES: CachedResponse[] = [
     },
 ]
 
+// Examples that come with a file only match when that exact example file is
+// attached, so a user's own file with the same prompt still goes to the model.
+// Callers that can't tell file names (the server) only get text-only examples.
 export function findCachedResponse(
     promptText: string,
     hasImage: boolean,
+    fileName?: string,
 ): CachedResponse | undefined {
     return CACHED_EXAMPLE_RESPONSES.find(
         (c) =>
             c.promptText === promptText &&
             c.hasImage === hasImage &&
+            (!c.fileName || c.fileName === fileName) &&
             c.xml !== "",
     )
 }

lib/chat-helpers.ts

@@ -6,25 +6,37 @@ export const MAX_FILE_SIZE = 2 * 1024 * 1024 // 2MB
 export const MAX_FILES = 5
 
 // Helper function to validate file parts in messages
+// Checks every message, since history is sent to the model too
 export function validateFileParts(messages: any[]): {
     valid: boolean
     error?: string
 } {
-    const lastMessage = messages[messages.length - 1]
-    const fileParts =
-        lastMessage?.parts?.filter((p: any) => p.type === "file") || []
+    for (const message of messages) {
+        const fileParts =
+            message?.parts?.filter((p: any) => p.type === "file") || []
 
-    if (fileParts.length > MAX_FILES) {
-        return {
-            valid: false,
-            error: `Too many files. Maximum ${MAX_FILES} allowed.`,
+        if (fileParts.length > MAX_FILES) {
+            return {
+                valid: false,
+                error: `Too many files. Maximum ${MAX_FILES} allowed.`,
+            }
         }
-    }
 
-    for (const filePart of fileParts) {
-        // Data URLs format: data:image/png;base64,<data>
-        // Base64 increases size by ~33%, so we check the decoded size
-        if (filePart.url?.startsWith("data:")) {
+        for (const filePart of fileParts) {
+            // The client sends files inline. Any other URL would be downloaded
+            // by the server (AI SDK does that for models without URL support).
+            if (
+                typeof filePart.url !== "string" ||
+                !filePart.url.startsWith("data:")
+            ) {
+                return {
+                    valid: false,
+                    error: "Files must be uploaded inline as data URLs.",
+                }
+            }
+
+            // Data URLs format: data:image/png;base64,<data>
+            // Base64 increases size by ~33%, so we check the decoded size
             const base64Data = filePart.url.split(",")[1]
             if (base64Data) {
                 const sizeInBytes = Math.ceil((base64Data.length * 3) / 4)
@@ -42,48 +54,89 @@ export function validateFileParts(messages: any[]): {
 }
 
 // Helper function to check if diagram is minimal/empty
+// Empty means no mxCell besides the root cells "0" and "1". Cells drawn in
+// draw.io get random ids, so checking for id="2" is not enough.
 export function isMinimalDiagram(xml: string): boolean {
-    const stripped = xml.replace(/\s/g, "")
-    return !stripped.includes('id="2"')
+    return !/<mxCell\b[^>]*\bid="(?![01]")/.test(xml)
+}
+
+// A tool-call input providers accept: a non-empty JSON object
+function isValidToolInput(input: unknown): boolean {
+    return !!input && typeof input === "object" && Object.keys(input).length > 0
 }
 
 // Helper function to replace historical tool call XML with placeholders
 // This reduces token usage and forces LLM to rely on the current diagram XML (source of truth)
-// Also fixes invalid/undefined inputs from interrupted streaming
+// Tool calls with invalid inputs are left for dropInvalidToolCalls to remove
 export function replaceHistoricalToolInputs(messages: any[]): any[] {
     return messages.map((msg) => {
         if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
             return msg
         }
-        const replacedContent = msg.content
-            .map((part: any) => {
-                if (part.type === "tool-call") {
-                    const toolName = part.toolName
-                    // Fix invalid/undefined inputs from interrupted streaming
-                    if (
-                        !part.input ||
-                        typeof part.input !== "object" ||
-                        Object.keys(part.input).length === 0
-                    ) {
-                        // Skip tool calls with invalid inputs entirely
-                        return null
-                    }
-                    if (
-                        toolName === "display_diagram" ||
-                        toolName === "edit_diagram"
-                    ) {
-                        return {
-                            ...part,
-                            input: {
-                                placeholder:
-                                    "[XML content replaced - see current diagram XML in system context]",
-                            },
-                        }
-                    }
+        const replacedContent = msg.content.map((part: any) => {
+            if (
+                part.type === "tool-call" &&
+                isValidToolInput(part.input) &&
+                (part.toolName === "display_diagram" ||
+                    part.toolName === "edit_diagram")
+            ) {
+                return {
+                    ...part,
+                    input: {
+                        placeholder:
+                            "[XML content replaced - see current diagram XML in system context]",
+                    },
                 }
-                return part
-            })
-            .filter(Boolean) // Remove null entries (invalid tool calls)
+            }
+            return part
+        })
         return { ...msg, content: replacedContent }
     })
 }
+
+// Remove tool-calls with invalid inputs (from failed repair or interrupted streaming),
+// together with their tool-results: providers reject a result whose call is missing.
+// Messages left empty are removed too (Bedrock rejects empty content arrays).
+export function dropInvalidToolCalls(messages: any[]): any[] {
+    const droppedIds = new Set<string>()
+    return messages
+        .map((msg) => {
+            if (!Array.isArray(msg.content)) return msg
+            const content = msg.content.filter((part: any) => {
+                if (
+                    msg.role === "assistant" &&
+                    part.type === "tool-call" &&
+                    !isValidToolInput(part.input)
+                ) {
+                    console.warn(
+                        `[chat-helpers] Dropping tool-call with invalid input:`,
+                        { toolName: part.toolName, input: part.input },
+                    )
+                    droppedIds.add(part.toolCallId)
+                    return false
+                }
+                // Results always come after their call, so the id is known by now
+                return !(
+                    part.type === "tool-result" &&
+                    droppedIds.has(part.toolCallId)
+                )
+            })
+            return { ...msg, content }
+        })
+        .filter((msg) => !Array.isArray(msg.content) || msg.content.length > 0)
+}
+
+// Fix common LLM JSON mistakes in tool-call input before jsonrepair runs
+export function fixToolInputJson(input: string): string {
+    return (
+        input
+            // Inconsistent quote escaping in XML attributes inside JSON strings:
+            // y="-20\" (opening quote unescaped, closing escaped) becomes y=\"-20\".
+            // Must run before the key fix below, which would rewrite the `="`.
+            .replace(/(\w+)="([^"]*?)\\"/g, '$1=\\"$2\\"')
+            // `:=` instead of `: `
+            .replace(/:=/g, ": ")
+            // `"key"= "` instead of `"key": "`, only for JSON keys
+            .replace(/"(\w+)"\s*=\s*"/g, '"$1": "')
+    )
+}

lib/drawio-themes.ts

@@ -0,0 +1,17 @@
+export const DRAWIO_THEMES = [
+    "kennedy",
+    "atlas",
+    "dark",
+    "min",
+    "sketch",
+    "simple",
+] as const
+
+export type DrawioTheme = (typeof DRAWIO_THEMES)[number]
+
+export function isDrawioTheme(value: unknown): value is DrawioTheme {
+    return (
+        typeof value === "string" &&
+        (DRAWIO_THEMES as readonly string[]).includes(value)
+    )
+}

lib/i18n/dictionaries/en.json

@@ -34,7 +34,8 @@
         "glm": "GLM",
         "qwen": "Qwen",
         "kimi": "Kimi",
-        "qiniu": "Qiniu"
+        "qiniu": "Qiniu",
+        "mimo": "MiMo (Xiaomi)"
     },
     "chat": {
         "placeholder": "Describe your diagram or upload a file...",
@@ -76,8 +77,7 @@
         "creativeDescription": "Draw something fun and creative",
         "cachedNote": "Examples are cached for instant response",
         "mcpServer": "MCP Server",
-        "mcpDescription": "Use in Claude Desktop, VS Code & Cursor",
-        "preview": "PREVIEW"
+        "mcpDescription": "Use in Claude Desktop, VS Code & Cursor"
     },
     "settings": {
         "title": "Settings",
@@ -103,10 +103,12 @@
         "theme": "Theme",
         "themeDescription": "Dark/Light mode for interface and DrawIO canvas.",
         "drawioStyle": "DrawIO Style",
-        "drawioStyleDescription": "Canvas style:",
-        "switchTo": "Switch to",
-        "minimal": "Minimal",
-        "sketch": "Sketch",
+        "drawioStyleDescription": "Canvas style",
+        "themeDefault": "Default",
+        "themeDark": "Dark",
+        "themeMinimal": "Minimal",
+        "themeSketch": "Sketch",
+        "themeSimple": "Simple",
         "diagramStyle": "Diagram Style",
         "diagramStyleDescription": "Toggle between minimal and styled diagram output.",
         "sendShortcut": "Send Shortcut",
@@ -130,6 +132,8 @@
         "customSystemMessage": "Custom System Message",
         "customSystemMessageDescription": "Add custom instructions appended to the AI's system prompt.",
         "customSystemMessagePlaceholder": "e.g., Always use blue color scheme for diagrams...",
+        "maxOutputTokens": "Max Output Tokens",
+        "maxOutputTokensDescription": "Budget for one reply, shared by thinking and the diagram XML. Raise it if the AI keeps thinking and no diagram appears. Leave empty for the default.",
         "panelVisibility": "Lobby Panels",
         "panelVisibilityDescription": "Choose which panels to show on the chat lobby.",
         "showRecentChats": "Recent Chats",
@@ -184,7 +188,8 @@
         "failedToExport": "Error fetching chart data",
         "failedToLoadExample": "Error loading example image",
         "failedToRecordFeedback": "Failed to record your feedback. Please try again.",
-        "storageUpdateFailed": "Chat cleared but browser storage could not be updated"
+        "storageUpdateFailed": "Chat cleared but browser storage could not be updated",
+        "sessionSaveFailed": "Could not save this chat. Browser storage may be full: delete old chats from history and try again."
     },
     "quota": {
         "dailyLimit": "Daily Quota Reached",
@@ -370,6 +375,7 @@
         "baseUrlWithExample": "Base URL (optional, e.g. {example})",
         "customEndpoint": "Custom endpoint URL",
         "minimaxBaseUrlHint": "Use /anthropic for Anthropic-compatible API (recommended), or /v1 for OpenAI-compatible API",
+        "mimoBaseUrlHint": "Default works with pay-as-you-go keys (sk-...). Token Plan subscribers (tp-... keys) must set https://token-plan-cn.xiaomimimo.com/v1",
         "models": "Models",
         "customModelId": "Custom model ID...",
         "allAdded": "All added",
@@ -401,6 +407,152 @@
         "showUnvalidatedModels": "Show unvalidated models",
         "allModelsShown": "All models are shown (including unvalidated)",
         "unvalidatedModelWarning": "This model has not been validated",
-        "serverDefaultModel": "Server default model"
+        "serverDefaultModel": "Server default model",
+        "showValue": "Show value",
+        "hideValue": "Hide value"
+    },
+    "admin": {
+        "title": "Admin Settings",
+        "loginPrompt": "Enter the admin password (the ADMIN_PASSWORD environment variable) to manage server settings.",
+        "password": "Password",
+        "signIn": "Sign In",
+        "signingIn": "Signing In…",
+        "loginFailed": "Login failed",
+        "precedence": "File overrides env · env overrides defaults",
+        "notWritable": "The settings file is not writable on this deployment (serverless platforms have no persistent disk). Settings are shown read-only — configure via environment variables instead.",
+        "settingGroups": "Setting groups",
+        "enabled": "Enabled",
+        "disabled": "Disabled",
+        "enableGroup": "Enable {group}",
+        "unsavedChanges": "Unsaved changes",
+        "saved": "Settings saved. Changes apply immediately.",
+        "saveFailed": "Save failed. Check your connection and try again.",
+        "invalidSettings": "Some settings are invalid.",
+        "discard": "Discard",
+        "saveChanges": "Save Changes",
+        "saving": "Saving…",
+        "sourceSaved": "Saved",
+        "sourceEnv": "Env",
+        "sourceSavedTitle": "Set in the admin settings file",
+        "sourceEnvTitle": "Set by an environment variable",
+        "restartRequired": "Restart Required",
+        "modified": "Modified",
+        "notSet": "Not set",
+        "savedReplace": "Saved ({hint}) — type to replace",
+        "showValue": "Show value",
+        "hideValue": "Hide value",
+        "removeValue": "Remove value",
+        "removeValueTitle": "Remove the stored value",
+        "resetToDefault": "Reset to default",
+        "models": "Models",
+        "modelsDescription": "Server-side providers and models available to all users — no personal API key needed. The default provider's first model is used when users don't pick one.",
+        "addProviderHint": "Add a provider to offer server-side models to all users.",
+        "selectProviderHint": "Select or add a provider to configure its credentials and models.",
+        "addProviderToOfferModels": "Add at least one model to expose this provider to users.",
+        "managedViaEnv": "(managed via env)",
+        "envReadOnly": "Defined in AI_MODELS_CONFIG / ai-models.json — read-only here. Edit the environment configuration to change it.",
+        "defaultModel": "Default Model",
+        "noModelsConfigured": "No models configured",
+        "modelCount": "{count} model",
+        "modelCountPlural": "{count} models",
+        "default": "Default",
+        "setAsDefault": "Set as default provider",
+        "defaultProvider": "Default provider",
+        "modelIdPlaceholder": "Model ID…",
+        "addModel": "Add model",
+        "suggested": "Suggested",
+        "test": "Test",
+        "testOk": "OK ({ms}ms)",
+        "testFailed": "Failed",
+        "removeModel": "Remove {model}",
+        "deleteProviderTitle": "Delete {name}?",
+        "deleteProviderDesc": "Its credentials and models will be removed from the server after you save.",
+        "cancel": "Cancel",
+        "delete": "Delete",
+        "groups": {
+            "generation": {
+                "title": "Generation",
+                "description": "Output parameters applied to all chat requests."
+            },
+            "access": {
+                "title": "Access Control",
+                "description": "Restrict who can use this deployment."
+            },
+            "features": {
+                "title": "Features",
+                "description": "Optional features and security toggles."
+            },
+            "observability": {
+                "title": "Observability",
+                "description": "Langfuse tracing for LLM calls."
+            },
+            "quota": {
+                "title": "Quota & Rate Limits",
+                "description": "Per-IP usage limits. Enforcement requires a DynamoDB table."
+            }
+        },
+        "settings": {
+            "TEMPERATURE": {
+                "label": "Temperature",
+                "description": "Leave unset for reasoning models that reject temperature."
+            },
+            "MAX_OUTPUT_TOKENS": {
+                "label": "Max Output Tokens"
+            },
+            "ACCESS_CODE_LIST": {
+                "label": "Access Codes",
+                "description": "Comma-separated list. Users must enter one to chat. Empty = open access."
+            },
+            "ENABLE_VLM_VALIDATION": {
+                "label": "VLM Diagram Validation",
+                "description": "Visually validate generated diagrams with a vision model."
+            },
+            "VALIDATION_MODEL": {
+                "label": "Validation Model",
+                "description": "Falls back to the default AI model when empty."
+            },
+            "VALIDATION_TIMEOUT": {
+                "label": "Validation Timeout (ms)"
+            },
+            "ENABLE_HISTORY_XML_REPLACE": {
+                "label": "History XML Compression",
+                "description": "Replace old diagram XML in history with placeholders."
+            },
+            "ALLOW_PRIVATE_URLS": {
+                "label": "Allow Private URLs",
+                "description": "Turn off to block requests to private IPs and internal hostnames (SSRF protection)."
+            },
+            "LANGFUSE_PUBLIC_KEY": {
+                "label": "Langfuse Public Key"
+            },
+            "LANGFUSE_SECRET_KEY": {
+                "label": "Langfuse Secret Key"
+            },
+            "LANGFUSE_BASEURL": {
+                "label": "Langfuse Base URL"
+            },
+            "DAILY_REQUEST_LIMIT": {
+                "label": "Daily Request Limit",
+                "description": "Per IP per day."
+            },
+            "DAILY_TOKEN_LIMIT": {
+                "label": "Daily Token Limit",
+                "description": "Per IP per day."
+            },
+            "TPM_LIMIT": {
+                "label": "Tokens Per Minute"
+            },
+            "DYNAMODB_QUOTA_TABLE": {
+                "label": "DynamoDB Table",
+                "description": "Quota enforcement is disabled when empty."
+            },
+            "DYNAMODB_REGION": {
+                "label": "DynamoDB Region"
+            },
+            "QUOTA_TIMEZONE": {
+                "label": "Quota Timezone",
+                "description": "Timezone for the daily reset boundary."
+            }
+        }
     }
 }

lib/i18n/dictionaries/ja.json

@@ -34,7 +34,8 @@
         "glm": "GLM",
         "qwen": "Qwen",
         "kimi": "Kimi",
-        "qiniu": "Qiniu"
+        "qiniu": "Qiniu",
+        "mimo": "MiMo (Xiaomi)"
     },
     "chat": {
         "placeholder": "ダイアグラムを説明するか、ファイルをアップロード...",
@@ -76,8 +77,7 @@
         "creativeDescription": "楽しくてクリエイティブなものを描く",
         "cachedNote": "例はキャッシュされ、即座に応答します",
         "mcpServer": "MCP サーバー",
-        "mcpDescription": "Claude Desktop、VS Code、Cursor で使用",
-        "preview": "プレビュー"
+        "mcpDescription": "Claude Desktop、VS Code、Cursor で使用"
     },
     "settings": {
         "title": "設定",
@@ -103,10 +103,12 @@
         "theme": "テーマ",
         "themeDescription": "インターフェースと DrawIO キャンバスのダーク/ライトモード。",
         "drawioStyle": "DrawIO スタイル",
-        "drawioStyleDescription": "キャンバススタイル：",
-        "switchTo": "切り替え",
-        "minimal": "ミニマル",
-        "sketch": "スケッチ",
+        "drawioStyleDescription": "キャンバススタイル",
+        "themeDefault": "デフォルト",
+        "themeDark": "ダーク",
+        "themeMinimal": "ミニマル",
+        "themeSketch": "スケッチ",
+        "themeSimple": "シンプル",
         "diagramStyle": "ダイアグラムスタイル",
         "diagramStyleDescription": "ミニマルとスタイル付きの出力を切り替えます。",
         "sendShortcut": "送信ショートカット",
@@ -130,6 +132,8 @@
         "customSystemMessage": "カスタムシステムメッセージ",
         "customSystemMessageDescription": "AIのシステムプロンプトに追加されるカスタム指示を入力します。",
         "customSystemMessagePlaceholder": "例：ダイアグラムには常に青色のカラースキームを使用...",
+        "maxOutputTokens": "最大出力トークン数",
+        "maxOutputTokensDescription": "1回の応答の予算で、思考過程とダイアグラムの XML が共有します。AI が考え続けてダイアグラムが生成されない場合は大きくしてください。空欄ならデフォルト値を使います。",
         "panelVisibility": "ロビーパネル",
         "panelVisibilityDescription": "チャットロビーに表示するパネルを選択します。",
         "showRecentChats": "最近のチャット",
@@ -184,7 +188,8 @@
         "failedToExport": "チャートデータの取得エラー",
         "failedToLoadExample": "例の画像の読み込みエラー",
         "failedToRecordFeedback": "フィードバックの記録に失敗しました。もう一度お試しください。",
-        "storageUpdateFailed": "チャットはクリアされましたが、ブラウザストレージを更新できませんでした"
+        "storageUpdateFailed": "チャットはクリアされましたが、ブラウザストレージを更新できませんでした",
+        "sessionSaveFailed": "このチャットを保存できませんでした。ブラウザのストレージがいっぱいの可能性があります。履歴から古いチャットを削除して、もう一度お試しください。"
     },
     "quota": {
         "dailyLimit": "1日の割当量に達しました",
@@ -324,6 +329,7 @@
         "baseUrlWithExample": "ベース URL（オプション、例: {example}）",
         "customEndpoint": "カスタムエンドポイント URL",
         "minimaxBaseUrlHint": "/anthropic で Anthropic 互換 API（推奨）、または /v1 で OpenAI 互換 API を使用",
+        "mimoBaseUrlHint": "デフォルトは従量課金キー（sk-...）用です。Token Plan 加入者（tp-... キー）は https://token-plan-cn.xiaomimimo.com/v1 を設定してください",
         "models": "モデル",
         "customModelId": "カスタムモデル ID...",
         "allAdded": "すべて追加済み",
@@ -355,7 +361,9 @@
         "showUnvalidatedModels": "未検証のモデルを表示",
         "allModelsShown": "すべてのモデルを表示（未検証を含む）",
         "unvalidatedModelWarning": "このモデルは検証されていません",
-        "serverDefaultModel": "サーバーデフォルトモデル"
+        "serverDefaultModel": "サーバーデフォルトモデル",
+        "showValue": "値を表示",
+        "hideValue": "値を非表示"
     },
     "templates": {
         "title": "マイテンプレート",
@@ -402,5 +410,149 @@
         "importNoFile": "JSON ファイルを選択してください",
         "importFailed": "インポートに失敗しました：{error}",
         "importSuccess": "{imported} 件インポート、{skipped} 件の重複をスキップしました"
+    },
+    "admin": {
+        "title": "管理者設定",
+        "loginPrompt": "サーバー設定を管理するには、管理者パスワード（ADMIN_PASSWORD 環境変数）を入力してください。",
+        "password": "パスワード",
+        "signIn": "ログイン",
+        "signingIn": "ログイン中…",
+        "loginFailed": "ログインに失敗しました",
+        "precedence": "ファイルが環境変数を上書き · 環境変数がデフォルトを上書き",
+        "notWritable": "このデプロイ環境では設定ファイルに書き込めません（サーバーレス環境には永続ディスクがありません）。設定は読み取り専用で表示されます——代わりに環境変数で構成してください。",
+        "settingGroups": "設定グループ",
+        "enabled": "有効",
+        "disabled": "無効",
+        "enableGroup": "{group} を有効化",
+        "unsavedChanges": "未保存の変更があります",
+        "saved": "設定を保存しました。変更は即座に反映されます。",
+        "saveFailed": "保存に失敗しました。接続を確認して再試行してください。",
+        "invalidSettings": "一部の設定が無効です。",
+        "discard": "破棄",
+        "saveChanges": "変更を保存",
+        "saving": "保存中…",
+        "sourceSaved": "保存済み",
+        "sourceEnv": "環境変数",
+        "sourceSavedTitle": "管理者設定ファイルで設定",
+        "sourceEnvTitle": "環境変数で設定",
+        "restartRequired": "再起動が必要",
+        "modified": "変更済み",
+        "notSet": "未設定",
+        "savedReplace": "保存済み（{hint}）——入力して置き換え",
+        "showValue": "値を表示",
+        "hideValue": "値を非表示",
+        "removeValue": "値を削除",
+        "removeValueTitle": "保存された値を削除",
+        "resetToDefault": "デフォルトに戻す",
+        "models": "モデル",
+        "modelsDescription": "全ユーザーが利用できるサーバー側のプロバイダーとモデル——個人の API キーは不要です。ユーザーがモデルを選択しない場合、デフォルトプロバイダーの最初のモデルが使用されます。",
+        "addProviderHint": "プロバイダーを追加して、全ユーザーにサーバー側モデルを提供します。",
+        "selectProviderHint": "プロバイダーを選択または追加して、その資格情報とモデルを構成します。",
+        "addProviderToOfferModels": "ユーザーにこのプロバイダーを公開するには、モデルを少なくとも 1 つ追加してください。",
+        "managedViaEnv": "（環境変数で管理）",
+        "envReadOnly": "AI_MODELS_CONFIG / ai-models.json で定義——ここでは読み取り専用です。変更するには環境構成を編集してください。",
+        "defaultModel": "デフォルトモデル",
+        "noModelsConfigured": "モデルが構成されていません",
+        "modelCount": "{count} 個のモデル",
+        "modelCountPlural": "{count} 個のモデル",
+        "default": "デフォルト",
+        "setAsDefault": "デフォルトプロバイダーに設定",
+        "defaultProvider": "デフォルトプロバイダー",
+        "modelIdPlaceholder": "モデル ID…",
+        "addModel": "モデルを追加",
+        "suggested": "おすすめ",
+        "test": "テスト",
+        "testOk": "正常（{ms}ms）",
+        "testFailed": "失敗",
+        "removeModel": "{model} を削除",
+        "deleteProviderTitle": "{name} を削除しますか？",
+        "deleteProviderDesc": "保存後、その資格情報とモデルはサーバーから削除されます。",
+        "cancel": "キャンセル",
+        "delete": "削除",
+        "groups": {
+            "generation": {
+                "title": "生成",
+                "description": "すべてのチャットリクエストに適用される出力パラメーター。"
+            },
+            "access": {
+                "title": "アクセス制御",
+                "description": "このデプロイを使用できるユーザーを制限します。"
+            },
+            "features": {
+                "title": "機能",
+                "description": "オプション機能とセキュリティの切り替え。"
+            },
+            "observability": {
+                "title": "オブザーバビリティ",
+                "description": "LLM 呼び出しの Langfuse トレース。"
+            },
+            "quota": {
+                "title": "クォータとレート制限",
+                "description": "IP ごとの使用制限。強制には DynamoDB テーブルが必要です。"
+            }
+        },
+        "settings": {
+            "TEMPERATURE": {
+                "label": "温度",
+                "description": "温度を受け付けない推論モデルの場合は未設定のままにしてください。"
+            },
+            "MAX_OUTPUT_TOKENS": {
+                "label": "最大出力トークン数"
+            },
+            "ACCESS_CODE_LIST": {
+                "label": "アクセスコード",
+                "description": "カンマ区切りのリスト。チャットにはいずれかの入力が必要です。空 = オープンアクセス。"
+            },
+            "ENABLE_VLM_VALIDATION": {
+                "label": "VLM 図検証",
+                "description": "ビジョンモデルで生成された図を視覚的に検証します。"
+            },
+            "VALIDATION_MODEL": {
+                "label": "検証モデル",
+                "description": "空の場合はデフォルトの AI モデルにフォールバックします。"
+            },
+            "VALIDATION_TIMEOUT": {
+                "label": "検証タイムアウト（ms）"
+            },
+            "ENABLE_HISTORY_XML_REPLACE": {
+                "label": "履歴 XML 圧縮",
+                "description": "履歴内の古い図 XML をプレースホルダーで置き換えます。"
+            },
+            "ALLOW_PRIVATE_URLS": {
+                "label": "プライベート URL を許可",
+                "description": "オフにすると、プライベート IP や内部ホスト名へのリクエストをブロックします（SSRF 保護）。"
+            },
+            "LANGFUSE_PUBLIC_KEY": {
+                "label": "Langfuse Public Key"
+            },
+            "LANGFUSE_SECRET_KEY": {
+                "label": "Langfuse Secret Key"
+            },
+            "LANGFUSE_BASEURL": {
+                "label": "Langfuse Base URL"
+            },
+            "DAILY_REQUEST_LIMIT": {
+                "label": "1 日あたりのリクエスト上限",
+                "description": "IP ごと 1 日あたり。"
+            },
+            "DAILY_TOKEN_LIMIT": {
+                "label": "1 日あたりのトークン上限",
+                "description": "IP ごと 1 日あたり。"
+            },
+            "TPM_LIMIT": {
+                "label": "1 分あたりのトークン数"
+            },
+            "DYNAMODB_QUOTA_TABLE": {
+                "label": "DynamoDB テーブル",
+                "description": "空の場合、クォータの強制は無効になります。"
+            },
+            "DYNAMODB_REGION": {
+                "label": "DynamoDB リージョン"
+            },
+            "QUOTA_TIMEZONE": {
+                "label": "クォータタイムゾーン",
+                "description": "1 日のリセット境界に使用するタイムゾーン。"
+            }
+        }
     }
 }

lib/i18n/dictionaries/zh-Hant.json

@@ -34,7 +34,8 @@
         "glm": "GLM",
         "qwen": "Qwen",
         "kimi": "Kimi",
-        "qiniu": "Qiniu"
+        "qiniu": "Qiniu",
+        "mimo": "MiMo (小米)"
     },
     "chat": {
         "placeholder": "描述您的圖表或上傳檔案...",
@@ -76,8 +77,7 @@
         "creativeDescription": "繪製有趣且富有創意的內容",
         "cachedNote": "範例已快取，可即時回應",
         "mcpServer": "MCP 伺服器",
-        "mcpDescription": "在 Claude Desktop、VS Code 和 Cursor 中使用",
-        "preview": "預覽"
+        "mcpDescription": "在 Claude Desktop、VS Code 和 Cursor 中使用"
     },
     "settings": {
         "title": "設定",
@@ -103,10 +103,12 @@
         "theme": "主題",
         "themeDescription": "介面和 DrawIO 畫布的深色/淺色模式。",
         "drawioStyle": "DrawIO 樣式",
-        "drawioStyleDescription": "畫布樣式：",
-        "switchTo": "切換到",
-        "minimal": "簡約",
-        "sketch": "草圖",
+        "drawioStyleDescription": "畫布樣式",
+        "themeDefault": "預設",
+        "themeDark": "深色",
+        "themeMinimal": "簡約",
+        "themeSketch": "草圖",
+        "themeSimple": "簡單",
         "diagramStyle": "圖表樣式",
         "diagramStyleDescription": "切換簡約與精緻圖表輸出模式。",
         "sendShortcut": "傳送快捷鍵",
@@ -130,6 +132,8 @@
         "customSystemMessage": "自訂系統訊息",
         "customSystemMessageDescription": "新增自訂指示，將附加到 AI 的系統提示末尾。",
         "customSystemMessagePlaceholder": "例如：圖表始終使用藍色配色方案...",
+        "maxOutputTokens": "最大輸出 token 數",
+        "maxOutputTokensDescription": "單次回覆的額度，思考過程與圖表 XML 共用。若 AI 一直在思考卻沒有產生圖表，請將它調大。留空則使用預設值。",
         "panelVisibility": "大廳面板",
         "panelVisibilityDescription": "選擇在聊天大廳顯示哪些面板。",
         "showRecentChats": "最近聊天",
@@ -184,7 +188,8 @@
         "failedToExport": "取得圖表資料時出錯",
         "failedToLoadExample": "載入範例圖片時出錯",
         "failedToRecordFeedback": "記錄您的回饋失敗。請重試。",
-        "storageUpdateFailed": "聊天已清除，但無法更新瀏覽器儲存空間"
+        "storageUpdateFailed": "聊天已清除，但無法更新瀏覽器儲存空間",
+        "sessionSaveFailed": "無法儲存這個對話。瀏覽器儲存空間可能已滿，請在歷史紀錄裡刪除舊對話後重試。"
     },
     "quota": {
         "dailyLimit": "已達每日配額",
@@ -370,6 +375,7 @@
         "baseUrlWithExample": "基礎 URL（可選，例如 {example}）",
         "customEndpoint": "自訂端點 URL",
         "minimaxBaseUrlHint": "使用 /anthropic 端點為 Anthropic 相容 API（推薦），或使用 /v1 端點為 OpenAI 相容 API",
+        "mimoBaseUrlHint": "預設地址適用於按量付費金鑰（sk-...）。Token Plan 訂閱用戶（tp-... 金鑰）請設定為 https://token-plan-cn.xiaomimimo.com/v1",
         "models": "模型",
         "customModelId": "自訂模型 ID...",
         "allAdded": "已全部新增",
@@ -401,6 +407,152 @@
         "showUnvalidatedModels": "顯示未驗證的模型",
         "allModelsShown": "顯示所有模型（包括未驗證的）",
         "unvalidatedModelWarning": "此模型尚未驗證",
-        "serverDefaultModel": "伺服器預設模型"
+        "serverDefaultModel": "伺服器預設模型",
+        "showValue": "顯示值",
+        "hideValue": "隱藏值"
+    },
+    "admin": {
+        "title": "管理員設定",
+        "loginPrompt": "輸入管理員密碼（即 ADMIN_PASSWORD 環境變數）以管理伺服器設定。",
+        "password": "密碼",
+        "signIn": "登入",
+        "signingIn": "正在登入…",
+        "loginFailed": "登入失敗",
+        "precedence": "檔案覆蓋環境變數 · 環境變數覆蓋預設值",
+        "notWritable": "此部署環境下設定檔不可寫入（無伺服器平台沒有持久化磁碟）。設定以唯讀方式顯示——請改用環境變數進行設定。",
+        "settingGroups": "設定分組",
+        "enabled": "已啟用",
+        "disabled": "已停用",
+        "enableGroup": "啟用 {group}",
+        "unsavedChanges": "有未儲存的變更",
+        "saved": "設定已儲存，變更立即生效。",
+        "saveFailed": "儲存失敗。請檢查網路連線後重試。",
+        "invalidSettings": "部分設定無效。",
+        "discard": "捨棄",
+        "saveChanges": "儲存變更",
+        "saving": "正在儲存…",
+        "sourceSaved": "已儲存",
+        "sourceEnv": "環境變數",
+        "sourceSavedTitle": "在管理員設定檔中設定",
+        "sourceEnvTitle": "透過環境變數設定",
+        "restartRequired": "需要重新啟動",
+        "modified": "已修改",
+        "notSet": "未設定",
+        "savedReplace": "已儲存（{hint}）——輸入以取代",
+        "showValue": "顯示值",
+        "hideValue": "隱藏值",
+        "removeValue": "移除值",
+        "removeValueTitle": "移除已儲存的值",
+        "resetToDefault": "重設為預設",
+        "models": "模型",
+        "modelsDescription": "面向所有使用者的伺服器端 provider 與模型——無需個人 API 金鑰。當使用者未選擇模型時，使用預設 provider 的第一個模型。",
+        "addProviderHint": "新增一個 provider，為所有使用者提供伺服器端模型。",
+        "selectProviderHint": "選擇或新增一個 provider 以設定其憑證和模型。",
+        "addProviderToOfferModels": "至少新增一個模型，才能向使用者開放此 provider。",
+        "managedViaEnv": "（透過環境變數管理）",
+        "envReadOnly": "在 AI_MODELS_CONFIG / ai-models.json 中定義——此處唯讀。請編輯環境設定以變更。",
+        "defaultModel": "預設模型",
+        "noModelsConfigured": "未設定模型",
+        "modelCount": "{count} 個模型",
+        "modelCountPlural": "{count} 個模型",
+        "default": "預設",
+        "setAsDefault": "設為預設 provider",
+        "defaultProvider": "預設 provider",
+        "modelIdPlaceholder": "模型 ID…",
+        "addModel": "新增模型",
+        "suggested": "推薦",
+        "test": "測試",
+        "testOk": "正常（{ms} 毫秒）",
+        "testFailed": "失敗",
+        "removeModel": "移除 {model}",
+        "deleteProviderTitle": "刪除 {name}？",
+        "deleteProviderDesc": "儲存後，其憑證和模型將從伺服器上移除。",
+        "cancel": "取消",
+        "delete": "刪除",
+        "groups": {
+            "generation": {
+                "title": "生成",
+                "description": "套用於所有聊天請求的輸出參數。"
+            },
+            "access": {
+                "title": "存取控制",
+                "description": "限制誰可以使用此部署。"
+            },
+            "features": {
+                "title": "功能",
+                "description": "選用功能和安全開關。"
+            },
+            "observability": {
+                "title": "可觀測性",
+                "description": "對 LLM 呼叫進行 Langfuse 追蹤。"
+            },
+            "quota": {
+                "title": "配額與速率限制",
+                "description": "按 IP 的用量限制。強制執行需要 DynamoDB 表。"
+            }
+        },
+        "settings": {
+            "TEMPERATURE": {
+                "label": "溫度",
+                "description": "對於拒絕溫度參數的推理模型，請留空。"
+            },
+            "MAX_OUTPUT_TOKENS": {
+                "label": "最大輸出 token 數"
+            },
+            "ACCESS_CODE_LIST": {
+                "label": "存取碼",
+                "description": "以逗號分隔的清單。使用者需輸入其中之一才能聊天。留空 = 開放存取。"
+            },
+            "ENABLE_VLM_VALIDATION": {
+                "label": "VLM 圖表驗證",
+                "description": "使用視覺模型對產生的圖表進行視覺化驗證。"
+            },
+            "VALIDATION_MODEL": {
+                "label": "驗證模型",
+                "description": "留空時回退到預設 AI 模型。"
+            },
+            "VALIDATION_TIMEOUT": {
+                "label": "驗證逾時（毫秒）"
+            },
+            "ENABLE_HISTORY_XML_REPLACE": {
+                "label": "歷史 XML 壓縮",
+                "description": "用占位符取代歷史記錄中的舊圖表 XML。"
+            },
+            "ALLOW_PRIVATE_URLS": {
+                "label": "允許私有 URL",
+                "description": "關閉以阻擋對私有 IP 和內部主機名的請求（SSRF 防護）。"
+            },
+            "LANGFUSE_PUBLIC_KEY": {
+                "label": "Langfuse Public Key"
+            },
+            "LANGFUSE_SECRET_KEY": {
+                "label": "Langfuse Secret Key"
+            },
+            "LANGFUSE_BASEURL": {
+                "label": "Langfuse Base URL"
+            },
+            "DAILY_REQUEST_LIMIT": {
+                "label": "每日請求上限",
+                "description": "每個 IP 每天。"
+            },
+            "DAILY_TOKEN_LIMIT": {
+                "label": "每日 token 上限",
+                "description": "每個 IP 每天。"
+            },
+            "TPM_LIMIT": {
+                "label": "每分鐘 token 數"
+            },
+            "DYNAMODB_QUOTA_TABLE": {
+                "label": "DynamoDB 表",
+                "description": "留空時配額強制執行被停用。"
+            },
+            "DYNAMODB_REGION": {
+                "label": "DynamoDB 區域"
+            },
+            "QUOTA_TIMEZONE": {
+                "label": "配額時區",
+                "description": "每日重置邊界所用的時區。"
+            }
+        }
     }
 }

lib/i18n/dictionaries/zh.json

@@ -34,7 +34,8 @@
         "glm": "GLM",
         "qwen": "Qwen",
         "kimi": "Kimi",
-        "qiniu": "Qiniu"
+        "qiniu": "Qiniu",
+        "mimo": "MiMo (小米)"
     },
     "chat": {
         "placeholder": "描述您的图表或上传文件...",
@@ -76,8 +77,7 @@
         "creativeDescription": "绘制有趣且富有创意的内容",
         "cachedNote": "示例已缓存，可即时响应",
         "mcpServer": "MCP 服务器",
-        "mcpDescription": "在 Claude Desktop、VS Code 和 Cursor 中使用",
-        "preview": "预览"
+        "mcpDescription": "在 Claude Desktop、VS Code 和 Cursor 中使用"
     },
     "settings": {
         "title": "设置",
@@ -103,10 +103,12 @@
         "theme": "主题",
         "themeDescription": "界面和 DrawIO 画布的深色/浅色模式。",
         "drawioStyle": "DrawIO 样式",
-        "drawioStyleDescription": "画布样式：",
-        "switchTo": "切换到",
-        "minimal": "简约",
-        "sketch": "草图",
+        "drawioStyleDescription": "画布样式",
+        "themeDefault": "默认",
+        "themeDark": "深色",
+        "themeMinimal": "简约",
+        "themeSketch": "草图",
+        "themeSimple": "简单",
         "diagramStyle": "图表样式",
         "diagramStyleDescription": "切换简约与精致图表输出模式。",
         "sendShortcut": "发送快捷键",
@@ -130,6 +132,8 @@
         "customSystemMessage": "自定义系统消息",
         "customSystemMessageDescription": "添加自定义指令，将附加到 AI 的系统提示末尾。",
         "customSystemMessagePlaceholder": "例如：图表始终使用蓝色配色方案...",
+        "maxOutputTokens": "最大输出 token 数",
+        "maxOutputTokensDescription": "单次回复的额度，思考过程和图表 XML 共用。如果 AI 一直在思考却没有生成图表，请把它调大。留空则使用默认值。",
         "panelVisibility": "大厅面板",
         "panelVisibilityDescription": "选择在聊天大厅显示哪些面板。",
         "showRecentChats": "最近聊天",
@@ -184,7 +188,8 @@
         "failedToExport": "获取图表数据时出错",
         "failedToLoadExample": "加载示例图片时出错",
         "failedToRecordFeedback": "记录您的反馈失败。请重试。",
-        "storageUpdateFailed": "聊天已清除，但无法更新浏览器存储"
+        "storageUpdateFailed": "聊天已清除，但无法更新浏览器存储",
+        "sessionSaveFailed": "无法保存这个对话。浏览器存储空间可能已满，请在历史记录里删除旧对话后重试。"
     },
     "quota": {
         "dailyLimit": "已达每日配额",
@@ -370,6 +375,7 @@
         "baseUrlWithExample": "基础 URL（可选，例如 {example}）",
         "customEndpoint": "自定义端点 URL",
         "minimaxBaseUrlHint": "使用 /anthropic 端点为 Anthropic 兼容 API（推荐），或使用 /v1 端点为 OpenAI 兼容 API",
+        "mimoBaseUrlHint": "默认地址适用于按量付费密钥（sk-...）。Token Plan 订阅用户（tp-... 密钥）请设置为 https://token-plan-cn.xiaomimimo.com/v1",
         "models": "模型",
         "customModelId": "自定义模型 ID...",
         "allAdded": "已全部添加",
@@ -401,6 +407,152 @@
         "showUnvalidatedModels": "显示未验证的模型",
         "allModelsShown": "显示所有模型（包括未验证的）",
         "unvalidatedModelWarning": "此模型尚未验证",
-        "serverDefaultModel": "服务器默认模型"
+        "serverDefaultModel": "服务器默认模型",
+        "showValue": "显示值",
+        "hideValue": "隐藏值"
+    },
+    "admin": {
+        "title": "管理员设置",
+        "loginPrompt": "输入管理员密码（即 ADMIN_PASSWORD 环境变量）以管理服务器设置。",
+        "password": "密码",
+        "signIn": "登录",
+        "signingIn": "正在登录…",
+        "loginFailed": "登录失败",
+        "precedence": "文件覆盖环境变量 · 环境变量覆盖默认值",
+        "notWritable": "此部署环境下设置文件不可写（无服务器平台没有持久化磁盘）。设置以只读方式显示——请改用环境变量进行配置。",
+        "settingGroups": "设置分组",
+        "enabled": "已启用",
+        "disabled": "已禁用",
+        "enableGroup": "启用 {group}",
+        "unsavedChanges": "有未保存的更改",
+        "saved": "设置已保存，更改立即生效。",
+        "saveFailed": "保存失败。请检查网络连接后重试。",
+        "invalidSettings": "部分设置无效。",
+        "discard": "放弃",
+        "saveChanges": "保存更改",
+        "saving": "正在保存…",
+        "sourceSaved": "已保存",
+        "sourceEnv": "环境变量",
+        "sourceSavedTitle": "在管理员设置文件中设置",
+        "sourceEnvTitle": "通过环境变量设置",
+        "restartRequired": "需要重启",
+        "modified": "已修改",
+        "notSet": "未设置",
+        "savedReplace": "已保存（{hint}）——输入以替换",
+        "showValue": "显示值",
+        "hideValue": "隐藏值",
+        "removeValue": "移除值",
+        "removeValueTitle": "移除已保存的值",
+        "resetToDefault": "恢复默认",
+        "models": "模型",
+        "modelsDescription": "面向所有用户的服务端 provider 和模型——无需个人 API 密钥。当用户未选择模型时，使用默认 provider 的第一个模型。",
+        "addProviderHint": "添加一个 provider，为所有用户提供服务端模型。",
+        "selectProviderHint": "选择或添加一个 provider 以配置其凭证和模型。",
+        "addProviderToOfferModels": "至少添加一个模型，才能向用户开放此 provider。",
+        "managedViaEnv": "（通过环境变量管理）",
+        "envReadOnly": "在 AI_MODELS_CONFIG / ai-models.json 中定义——此处只读。请编辑环境配置以更改。",
+        "defaultModel": "默认模型",
+        "noModelsConfigured": "未配置模型",
+        "modelCount": "{count} 个模型",
+        "modelCountPlural": "{count} 个模型",
+        "default": "默认",
+        "setAsDefault": "设为默认 provider",
+        "defaultProvider": "默认 provider",
+        "modelIdPlaceholder": "模型 ID…",
+        "addModel": "添加模型",
+        "suggested": "推荐",
+        "test": "测试",
+        "testOk": "正常（{ms} 毫秒）",
+        "testFailed": "失败",
+        "removeModel": "移除 {model}",
+        "deleteProviderTitle": "删除 {name}？",
+        "deleteProviderDesc": "保存后，其凭证和模型将从服务器上移除。",
+        "cancel": "取消",
+        "delete": "删除",
+        "groups": {
+            "generation": {
+                "title": "生成",
+                "description": "应用于所有聊天请求的输出参数。"
+            },
+            "access": {
+                "title": "访问控制",
+                "description": "限制谁可以使用此部署。"
+            },
+            "features": {
+                "title": "功能",
+                "description": "可选功能和安全开关。"
+            },
+            "observability": {
+                "title": "可观测性",
+                "description": "对 LLM 调用进行 Langfuse 追踪。"
+            },
+            "quota": {
+                "title": "配额与速率限制",
+                "description": "按 IP 的用量限制。强制执行需要 DynamoDB 表。"
+            }
+        },
+        "settings": {
+            "TEMPERATURE": {
+                "label": "温度",
+                "description": "对于拒绝温度参数的推理模型，请留空。"
+            },
+            "MAX_OUTPUT_TOKENS": {
+                "label": "最大输出 token 数"
+            },
+            "ACCESS_CODE_LIST": {
+                "label": "访问码",
+                "description": "以逗号分隔的列表。用户需输入其中之一才能聊天。留空 = 开放访问。"
+            },
+            "ENABLE_VLM_VALIDATION": {
+                "label": "VLM 图表验证",
+                "description": "使用视觉模型对生成的图表进行可视化验证。"
+            },
+            "VALIDATION_MODEL": {
+                "label": "验证模型",
+                "description": "留空时回退到默认 AI 模型。"
+            },
+            "VALIDATION_TIMEOUT": {
+                "label": "验证超时（毫秒）"
+            },
+            "ENABLE_HISTORY_XML_REPLACE": {
+                "label": "历史 XML 压缩",
+                "description": "用占位符替换历史记录中的旧图表 XML。"
+            },
+            "ALLOW_PRIVATE_URLS": {
+                "label": "允许私有 URL",
+                "description": "关闭以阻止对私有 IP 和内部主机名的请求（SSRF 防护）。"
+            },
+            "LANGFUSE_PUBLIC_KEY": {
+                "label": "Langfuse Public Key"
+            },
+            "LANGFUSE_SECRET_KEY": {
+                "label": "Langfuse Secret Key"
+            },
+            "LANGFUSE_BASEURL": {
+                "label": "Langfuse Base URL"
+            },
+            "DAILY_REQUEST_LIMIT": {
+                "label": "每日请求上限",
+                "description": "每个 IP 每天。"
+            },
+            "DAILY_TOKEN_LIMIT": {
+                "label": "每日 token 上限",
+                "description": "每个 IP 每天。"
+            },
+            "TPM_LIMIT": {
+                "label": "每分钟 token 数"
+            },
+            "DYNAMODB_QUOTA_TABLE": {
+                "label": "DynamoDB 表",
+                "description": "留空时配额强制执行被禁用。"
+            },
+            "DYNAMODB_REGION": {
+                "label": "DynamoDB 区域"
+            },
+            "QUOTA_TIMEZONE": {
+                "label": "配额时区",
+                "description": "每日重置边界所用的时区。"
+            }
+        }
     }
 }

lib/langfuse.ts

@@ -51,8 +51,15 @@ export function setTraceOutput(output: string) {
     if (!isLangfuseEnabled()) return
 
     updateActiveTrace({ output })
+    endTrace()
+}
+
+// End the observe() wrapper span (AI SDK creates its own child spans with usage).
+// It uses endOnExit: false, so every request path has to end it, or the trace
+// is never exported: stream finish, stream error/abort, and early returns.
+export function endTrace() {
+    if (!isLangfuseEnabled()) return
 
-    // End the observe() wrapper span (AI SDK creates its own child spans with usage)
     const activeSpan = api.trace.getActiveSpan()
     if (activeSpan) {
         activeSpan.end()

lib/output-token-limit.ts

@@ -0,0 +1,224 @@
+import { wrapLanguageModel } from "ai"
+
+type WrappedModel = ReturnType<typeof wrapLanguageModel>
+
+/**
+ * Default output budget for a chat turn.
+ *
+ * This has to cover thinking + prose + the tool call, because reasoning models
+ * spend it in that order. Measured on deepseek-v4-flash: refining an existing
+ * diagram burned 16000 tokens on thinking alone and the request ended with
+ * finishReason "length" before display_diagram was ever called (issue #924).
+ * 64000 leaves room for the plan and the XML in one turn.
+ */
+export const DEFAULT_MAX_OUTPUT_TOKENS = 64000
+
+/** Ceiling for the user-supplied override, to catch typos like an extra zero. */
+export const MAX_OUTPUT_TOKENS_LIMIT = 200000
+
+/**
+ * Below this a diagram cannot come out whole, so a retry would just produce
+ * truncated XML instead of the provider's error. Better to surface the error.
+ */
+const MIN_USABLE_OUTPUT_TOKENS = 1024
+
+/**
+ * Retry budget when a rejection names the budget parameter but no number we can
+ * read. It is the default from before 64000, which these providers ran with.
+ */
+const FALLBACK_OUTPUT_TOKENS = 16000
+
+/** Status codes that can carry a complaint about the requested budget. */
+const BUDGET_REJECTION_STATUSES = new Set([400, 422])
+
+function usableLimit(value: number): number | null {
+    return value >= MIN_USABLE_OUTPUT_TOKENS ? value : null
+}
+
+/** Message and body of an error that may be about the budget, or null. */
+function rejectionText(error: unknown): string | null {
+    const err = error as {
+        message?: unknown
+        responseBody?: unknown
+        statusCode?: unknown
+    }
+
+    // An auth or rate-limit failure is not about the budget, so leave it alone.
+    if (
+        typeof err?.statusCode === "number" &&
+        !BUDGET_REJECTION_STATUSES.has(err.statusCode)
+    ) {
+        return null
+    }
+
+    const text = [
+        typeof err?.message === "string" ? err.message : "",
+        typeof err?.responseBody === "string" ? err.responseBody : "",
+    ].join(" ")
+
+    return text.trim() ? text : null
+}
+
+/**
+ * A budget this large exceeds what some models accept. Providers reject it with a
+ * 400 that names the real limit, so we parse the number out and retry once
+ * instead of failing the turn.
+ *
+ * Formats seen in the wild:
+ * - Bedrock: "The maximum tokens you requested exceeds the model limit of 4096."
+ * - OpenRouter: "This endpoint's maximum context length is 64000 tokens. However,
+ *   you requested about 64025 tokens (25 of text input, 64000 in the output)."
+ *   Note this one is an input+output ceiling, so the input has to be subtracted.
+ *   vLLM and SGLang send the same kind of ceiling, with the input written as
+ *   "6000 in the messages", "has 6000 input tokens" or "6000 tokens from the input".
+ * - Anthropic: "max_tokens: 200000 > 64000, which is the maximum allowed..."
+ * - OpenAI: "This model supports at most 16384 completion tokens"
+ * - Volcengine Ark: "The parameter `max_tokens` specified in the request are not
+ *   valid: integer above maximum value, expected a value <= 32768, but got 64000"
+ * - DashScope: "Range of max_tokens should be [1, 8192]"
+ *
+ * Every pattern names tokens explicitly. A generic one (an earlier draft matched
+ * "lower than N") would reinterpret unrelated failures, and retrying on a bogus
+ * number turns a readable error into an empty diagram.
+ */
+function readCeiling(text: string): number | null {
+    // Combined input+output ceiling: subtract the input the provider counted,
+    // plus a small margin because its estimate is approximate.
+    const context = text.match(/maximum context length (?:is|of) (\d+)/i)
+    if (context) {
+        const input =
+            text.match(/(\d+) of text input/i) ||
+            text.match(/(\d+) in the messages/i) ||
+            text.match(/(\d+) tokens from the input/i) ||
+            text.match(/(\d+) input tokens/i)
+        return Number(context[1]) - (input ? Number(input[1]) : 0) - 1024
+    }
+
+    const output =
+        text.match(/model limit of (\d+)/i) ||
+        text.match(/> (\d+), which is the maximum/i) ||
+        text.match(/at most (\d+) completion tokens/i) ||
+        text.match(/max_\w*tokens.*?expected a value (?:<=|\\u003c=) (\d+)/i) ||
+        text.match(/Range of max_tokens should be \[1,\s*(\d+)\]/i)
+
+    return output ? Number(output[1]) : null
+}
+
+/** The usable output ceiling named in a rejection, or null. */
+export function parseOutputTokenLimit(error: unknown): number | null {
+    const text = rejectionText(error)
+    const ceiling = text ? readCeiling(text) : null
+    return ceiling === null ? null : usableLimit(ceiling)
+}
+
+/**
+ * Thinking budget the provider adds on top of maxOutputTokens. Bedrock and
+ * Anthropic send maxOutputTokens + budgetTokens as max_tokens, so a ceiling in
+ * their rejection covers both.
+ */
+function thinkingBudget(providerOptions: unknown): number {
+    const options = providerOptions as
+        | {
+              bedrock?: {
+                  reasoningConfig?: { type?: string; budgetTokens?: unknown }
+              }
+              anthropic?: {
+                  thinking?: { type?: string; budgetTokens?: unknown }
+              }
+          }
+        | undefined
+    const config =
+        options?.bedrock?.reasoningConfig ?? options?.anthropic?.thinking
+    return config?.type === "enabled" && typeof config.budgetTokens === "number"
+        ? config.budgetTokens
+        : 0
+}
+
+/**
+ * The budget to retry with after a rejection, or null to surface the error.
+ */
+export function retryOutputTokens(
+    error: unknown,
+    params: { maxOutputTokens?: number; providerOptions?: unknown },
+): number | null {
+    const requested = params.maxOutputTokens
+    const text = rejectionText(error)
+    if (!requested || !text) return null
+
+    const ceiling = readCeiling(text)
+    if (ceiling !== null) {
+        // The ceiling applies to what was actually sent, thinking included,
+        // so the retry has to leave room for the thinking too.
+        const thinking = thinkingBudget(params.providerOptions)
+        if (ceiling >= requested + thinking) return null
+        return usableLimit(ceiling - thinking)
+    }
+
+    // Names the budget parameter, but in a format we cannot read a number from
+    if (/max_\w*tokens/i.test(text) && requested > FALLBACK_OUTPUT_TOKENS) {
+        return FALLBACK_OUTPUT_TOKENS
+    }
+    return null
+}
+
+/**
+ * Retry the stream once with a smaller budget when the provider rejects the
+ * requested one. Without this, raising the default breaks every model whose
+ * ceiling is below it (measured: bedrock claude-3-haiku 4096, nova-lite 10000,
+ * openrouter deepseek-r1 64000 shared with the input).
+ */
+export function withOutputTokenLimitFallback(
+    model: WrappedModel,
+): WrappedModel {
+    return wrapLanguageModel({
+        model,
+        middleware: {
+            specificationVersion: "v3",
+            async wrapStream({ doStream, params, model: inner }) {
+                try {
+                    return await doStream()
+                } catch (error) {
+                    const retry = retryOutputTokens(error, params)
+                    if (!retry) throw error
+
+                    console.warn(
+                        `[maxOutputTokens] ${params.maxOutputTokens} rejected, retrying with ${retry}`,
+                    )
+                    return await inner.doStream({
+                        ...params,
+                        maxOutputTokens: retry,
+                    })
+                }
+            },
+        },
+    })
+}
+
+function validBudget(value: string | null | undefined): number | null {
+    const parsed = Number(value)
+    return Number.isInteger(parsed) &&
+        parsed > 0 &&
+        parsed <= MAX_OUTPUT_TOKENS_LIMIT
+        ? parsed
+        : null
+}
+
+/**
+ * Resolve the output budget: user setting (sent as a header so it works in the
+ * desktop app too), then server env, then the default. Both sources go through
+ * the same validation, so a typo in either falls back instead of reaching the
+ * provider.
+ *
+ * On the server's credentials the user setting can only lower the server value,
+ * so MAX_OUTPUT_TOKENS keeps capping what the server pays for.
+ */
+export function resolveMaxOutputTokens(
+    headerValue: string | null,
+    usesServerCredentials: boolean,
+): number {
+    const header = validBudget(headerValue)
+    const server =
+        validBudget(process.env.MAX_OUTPUT_TOKENS) ?? DEFAULT_MAX_OUTPUT_TOKENS
+    if (header === null) return server
+    return usesServerCredentials ? Math.min(header, server) : header
+}

lib/pdf-utils.ts

@@ -1,4 +1,4 @@
-import { extractText, getDocumentProxy } from "unpdf"
+import { extractText } from "unpdf"
 
 // Maximum characters allowed for extracted text (configurable via env)
 const DEFAULT_MAX_EXTRACTED_CHARS = 150000 // 150k chars
@@ -14,6 +14,7 @@ const TEXT_EXTENSIONS = [
     ".json",
     ".csv",
     ".xml",
+    ".svg",
     ".html",
     ".css",
     ".js",
@@ -43,8 +44,10 @@ const TEXT_EXTENSIONS = [
  */
 export async function extractPdfText(file: File): Promise<string> {
     const buffer = await file.arrayBuffer()
-    const pdf = await getDocumentProxy(new Uint8Array(buffer))
-    const { text } = await extractText(pdf, { mergePages: true })
+    // Pass raw bytes so unpdf destroys the PDF document when it is done
+    const { text } = await extractText(new Uint8Array(buffer), {
+        mergePages: true,
+    })
     return text as string
 }
 

lib/server-model-config.ts

@@ -47,11 +47,14 @@ export interface FlattenedServerModel {
 
 /**
  * Convert provider name to URL-safe slug for use in model ID
- * e.g., "OpenAI Production" → "openai-production"
+ * 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.
  */
-function slugify(name: string): string {
+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, "")
 }
@@ -62,7 +65,54 @@ function getConfigPath(): string {
     return path.join(process.cwd(), "ai-models.json")
 }
 
-export async function loadRawServerModelsConfig(): Promise<ServerModelsConfig | null> {
+/**
+ * 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) {
@@ -85,15 +135,51 @@ export async function loadRawServerModelsConfig(): Promise<ServerModelsConfig |
         const json = JSON.parse(jsonStr)
         return ServerModelsConfigSchema.parse(json)
     } catch (err: any) {
-        if (err?.code === "ENOENT") {
+        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 ai-models.json:",
+            "[server-model-config] Failed to load admin providers:",
             err,
         )
-        return null
     }
+
+    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<
@@ -106,6 +192,7 @@ export async function loadFlattenedServerModels(): Promise<
     const defaultModelId = process.env.AI_MODEL
 
     const flattened: FlattenedServerModel[] = []
+    const seenIds = new Set<string>()
 
     for (const p of cfg.providers) {
         const providerLabel =
@@ -116,6 +203,16 @@ export async function loadFlattenedServerModels(): Promise<
 
         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

lib/session-storage.ts

@@ -1,5 +1,6 @@
 import { type DBSchema, type IDBPDatabase, openDB } from "idb"
 import { nanoid } from "nanoid"
+import { toast } from "sonner"
 import type { Template } from "./template-storage"
 
 // Constants
@@ -58,36 +59,10 @@ interface ChatSessionDB extends DBSchema {
 
 // Database singleton
 let dbPromise: Promise<IDBPDatabase<ChatSessionDB>> | null = null
-const resetDBPromise = () => {
-    dbPromise = null
-}
-
-const isClosingError = (error: unknown): boolean => {
-    return (
-        error instanceof DOMException &&
-        error.name === "InvalidStateError" &&
-        /closing/i.test(error.message)
-    )
-}
-
-const withDB = async <T>(
-    action: (db: IDBPDatabase<ChatSessionDB>) => Promise<T>,
-): Promise<T> => {
-    try {
-        const db = await getDB()
-        return await action(db)
-    } catch (error) {
-        if (isClosingError(error)) {
-            resetDBPromise()
-            const db = await getDB()
-            return await action(db)
-        }
-        throw error
-    }
-}
 
 async function getDB(): Promise<IDBPDatabase<ChatSessionDB>> {
     if (!dbPromise) {
+        // A failed or lost connection is not cached: the next call reopens it
         dbPromise = openDB<ChatSessionDB>(DB_NAME, DB_VERSION, {
             upgrade(db, oldVersion) {
                 if (oldVersion < 1) {
@@ -115,23 +90,29 @@ async function getDB(): Promise<IDBPDatabase<ChatSessionDB>> {
                     }
                 }
             },
-            terminated() {
-                resetDBPromise()
+            blocked() {
+                // An older tab keeps the DB open, so the upgrade has to wait
+                toast.warning(
+                    "Please close other tabs of this app to finish updating chat storage.",
+                    { id: "idb-upgrade-blocked", duration: 10000 },
+                )
             },
+            blocking(_currentVersion, _blockedVersion, event) {
+                // Another tab needs to upgrade the DB: close our connection so
+                // it is not stuck, and reopen on the next call
+                const db = event.target as IDBDatabase
+                db.close()
+                dbPromise = null
+            },
+            terminated() {
+                // The browser closed the connection (e.g. Safari after a long
+                // time in the background)
+                dbPromise = null
+            },
+        }).catch((error) => {
+            dbPromise = null
+            throw error
         })
-        dbPromise
-            .then((db) => {
-                db.onversionchange = () => {
-                    db.close()
-                    resetDBPromise()
-                }
-                db.onclose = () => {
-                    resetDBPromise()
-                }
-            })
-            .catch(() => {
-                resetDBPromise()
-            })
     }
     return dbPromise
 }
@@ -146,46 +127,31 @@ export function isIndexedDBAvailable(): boolean {
     }
 }
 
-// Check if IndexedDB is actually usable (not just present).
-// Note: Do NOT close the db here - getDB() returns a shared singleton connection
-// that other code depends on.
-export async function isIndexedDBUsable(): Promise<boolean> {
-    if (!isIndexedDBAvailable()) return false
-    try {
-        await getDB()
-        return true
-    } catch {
-        return false
-    }
-}
-
 // CRUD Operations
 export async function getAllSessionMetadata(): Promise<SessionMetadata[]> {
     if (!isIndexedDBAvailable()) return []
     try {
-        return await withDB(async (db) => {
-            const tx = db.transaction(STORE_NAME, "readonly")
-            const index = tx.store.index("by-updated")
-            const metadata: SessionMetadata[] = []
+        const db = await getDB()
+        const tx = db.transaction(STORE_NAME, "readonly")
+        const index = tx.store.index("by-updated")
+        const metadata: SessionMetadata[] = []
 
-            // Use cursor to read only metadata fields (avoids loading full messages/XML)
-            let cursor = await index.openCursor(null, "prev") // newest first
-            while (cursor) {
-                const s = cursor.value
-                metadata.push({
-                    id: s.id,
-                    title: s.title,
-                    createdAt: s.createdAt,
-                    updatedAt: s.updatedAt,
-                    messageCount: s.messages.length,
-                    hasDiagram:
-                        !!s.diagramXml && s.diagramXml.trim().length > 0,
-                    thumbnailDataUrl: s.thumbnailDataUrl,
-                })
-                cursor = await cursor.continue()
-            }
-            return metadata
-        })
+        // Use cursor to read only metadata fields (avoids loading full messages/XML)
+        let cursor = await index.openCursor(null, "prev") // newest first
+        while (cursor) {
+            const s = cursor.value
+            metadata.push({
+                id: s.id,
+                title: s.title,
+                createdAt: s.createdAt,
+                updatedAt: s.updatedAt,
+                messageCount: s.messages.length,
+                hasDiagram: !!s.diagramXml && s.diagramXml.trim().length > 0,
+                thumbnailDataUrl: s.thumbnailDataUrl,
+            })
+            cursor = await cursor.continue()
+        }
+        return metadata
     } catch (error) {
         console.error("Failed to get session metadata:", error)
         return []
@@ -195,56 +161,36 @@ export async function getAllSessionMetadata(): Promise<SessionMetadata[]> {
 export async function getSession(id: string): Promise<ChatSession | null> {
     if (!isIndexedDBAvailable()) return null
     try {
-        return await withDB(async (db) => {
-            return (await db.get(STORE_NAME, id)) || null
-        })
+        const db = await getDB()
+        return (await db.get(STORE_NAME, id)) || null
     } catch (error) {
         console.error("Failed to get session:", error)
         return null
     }
 }
 
+// Returns false on failure (e.g. storage quota exceeded). Other sessions are
+// never deleted automatically; the caller tells the user instead.
 export async function saveSession(session: ChatSession): Promise<boolean> {
     if (!isIndexedDBAvailable()) return false
     try {
-        await withDB(async (db) => {
-            await db.put(STORE_NAME, session)
-        })
+        const db = await getDB()
+        await db.put(STORE_NAME, session)
         return true
     } catch (error) {
-        // Handle quota exceeded
-        if (
-            error instanceof DOMException &&
-            error.name === "QuotaExceededError"
-        ) {
-            console.warn("Storage quota exceeded, deleting oldest session...")
-            await deleteOldestSession()
-            // Retry once
-            try {
-                await withDB(async (db) => {
-                    await db.put(STORE_NAME, session)
-                })
-                return true
-            } catch (retryError) {
-                console.error(
-                    "Failed to save session after cleanup:",
-                    retryError,
-                )
-                return false
-            }
-        } else {
-            console.error("Failed to save session:", error)
-            return false
-        }
+        console.error("Failed to save session:", error)
+        // Reopen the connection next time in case it was lost (Safari reports
+        // "Connection to Indexed Database server lost" without closing it)
+        dbPromise = null
+        return false
     }
 }
 
 export async function deleteSession(id: string): Promise<void> {
     if (!isIndexedDBAvailable()) return
     try {
-        await withDB(async (db) => {
-            await db.delete(STORE_NAME, id)
-        })
+        const db = await getDB()
+        await db.delete(STORE_NAME, id)
     } catch (error) {
         console.error("Failed to delete session:", error)
     }
@@ -253,9 +199,8 @@ export async function deleteSession(id: string): Promise<void> {
 export async function getSessionCount(): Promise<number> {
     if (!isIndexedDBAvailable()) return 0
     try {
-        return await withDB(async (db) => {
-            return await db.count(STORE_NAME)
-        })
+        const db = await getDB()
+        return await db.count(STORE_NAME)
     } catch (error) {
         console.error("Failed to get session count:", error)
         return 0
@@ -265,15 +210,14 @@ export async function getSessionCount(): Promise<number> {
 export async function deleteOldestSession(): Promise<void> {
     if (!isIndexedDBAvailable()) return
     try {
-        await withDB(async (db) => {
-            const tx = db.transaction(STORE_NAME, "readwrite")
-            const index = tx.store.index("by-updated")
-            const cursor = await index.openCursor()
-            if (cursor) {
-                await cursor.delete()
-            }
-            await tx.done
-        })
+        const db = await getDB()
+        const tx = db.transaction(STORE_NAME, "readwrite")
+        const index = tx.store.index("by-updated")
+        const cursor = await index.openCursor()
+        if (cursor) {
+            await cursor.delete()
+        }
+        await tx.done
     } catch (error) {
         console.error("Failed to delete oldest session:", error)
     }

lib/ssrf-protection.ts

@@ -2,62 +2,116 @@
  * SSRF (Server-Side Request Forgery) protection utilities
  */
 
+import { lookup } from "node:dns/promises"
+
 /**
- * Check if URL points to private/internal network
- * Blocks: localhost, private IPs, link-local, AWS metadata service
+ * Check if an IP address (IPv4 or IPv6) belongs to a private/internal range.
+ * Works for both user-supplied literal IPs and DNS-resolved addresses.
  */
-export function isPrivateUrl(urlString: string): boolean {
+function isPrivateIp(ip: string): boolean {
+    const addr = ip.toLowerCase().replace(/^\[|\]$/g, "")
+
+    // IPv6
+    if (addr.includes(":")) {
+        if (addr === "::1" || addr === "::") return true
+        // unique-local (fc00::/7) and IPv4-mapped (::ffff:0:0/96)
+        if (
+            addr.startsWith("fc") ||
+            addr.startsWith("fd") ||
+            addr.startsWith("::ffff:")
+        ) {
+            return true
+        }
+        // link-local (fe80::/10)
+        const linkLocal = addr.match(/^fe([0-9a-f]{2}):/)
+        if (linkLocal) {
+            const high = parseInt(linkLocal[1], 16)
+            if (high >= 0x80 && high <= 0xbf) return true
+        }
+        return false
+    }
+
+    // IPv4
+    const ipv4Match = addr.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/)
+    if (ipv4Match) {
+        const [, a, b] = ipv4Match.map(Number)
+        if (a === 10) return true // 10.0.0.0/8
+        if (a === 172 && b >= 16 && b <= 31) return true // 172.16.0.0/12
+        if (a === 192 && b === 168) return true // 192.168.0.0/16
+        if (a === 169 && b === 254) return true // 169.254.0.0/16 (link-local)
+        if (a === 127) return true // 127.0.0.0/8 (loopback)
+        if (a === 0) return true // 0.0.0.0/8
+        if (a === 100 && b >= 64 && b <= 127) return true // 100.64.0.0/10 (CGNAT, used by some cloud internal networks)
+    }
+
+    return false
+}
+
+/**
+ * String-only check against well-known private hostnames and literal IPs.
+ * Fast path that avoids a DNS lookup for obvious cases.
+ */
+function isPrivateHostname(hostname: string): boolean {
+    const host = hostname
+        .toLowerCase()
+        .replace(/^\[|\]$/g, "")
+        .replace(/\.$/, "")
+
+    if (
+        host === "localhost" ||
+        host === "127.0.0.1" ||
+        host === "::1" ||
+        host === "::"
+    ) {
+        return true
+    }
+
+    if (host === "169.254.169.254" || host === "metadata.google.internal") {
+        return true
+    }
+
+    if (
+        host.endsWith(".local") ||
+        host.endsWith(".internal") ||
+        host.endsWith(".localhost")
+    ) {
+        return true
+    }
+
+    // Literal IP supplied directly in the URL
+    return isPrivateIp(host)
+}
+
+/**
+ * Check if URL points to private/internal network.
+ * Blocks: localhost, private IPs, link-local, AWS metadata service.
+ *
+ * Resolves the hostname via DNS and validates every returned address, so
+ * public-looking names that map to internal IPs (e.g. "127-0-0-1.sslip.io")
+ * are caught even though they pass the string-only check.
+ */
+export async function isPrivateUrl(urlString: string): Promise<boolean> {
     try {
         const url = new URL(urlString)
-        const hostname = url.hostname.toLowerCase()
+        const hostname = url.hostname
 
-        // Block localhost
-        if (
-            hostname === "localhost" ||
-            hostname === "127.0.0.1" ||
-            hostname === "::1"
-        ) {
-            return true
-        }
+        // Fast path: obvious string matches and literal IPs.
+        if (isPrivateHostname(hostname)) return true
 
-        // Block AWS/cloud metadata endpoints
-        if (
-            hostname === "169.254.169.254" ||
-            hostname === "metadata.google.internal"
-        ) {
-            return true
-        }
-
-        // Check for private IPv4 ranges
-        const ipv4Match = hostname.match(
-            /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/,
-        )
-        if (ipv4Match) {
-            const [, a, b] = ipv4Match.map(Number)
-            if (a === 10) return true // 10.0.0.0/8
-            if (a === 172 && b >= 16 && b <= 31) return true // 172.16.0.0/12
-            if (a === 192 && b === 168) return true // 192.168.0.0/16
-            if (a === 169 && b === 254) return true // 169.254.0.0/16 (link-local)
-            if (a === 127) return true // 127.0.0.0/8 (loopback)
-        }
-
-        // Block common internal hostnames
-        if (
-            hostname.endsWith(".local") ||
-            hostname.endsWith(".internal") ||
-            hostname.endsWith(".localhost")
-        ) {
-            return true
-        }
-
-        return false
+        // Resolve DNS and reject if any address is private.
+        const stripped = hostname.replace(/^\[|\]$/g, "").replace(/\.$/, "")
+        const addresses = await lookup(stripped, { all: true })
+        return addresses.some(({ address }) => isPrivateIp(address))
     } catch {
-        return true // Invalid URL - block it
+        return true // Invalid URL or DNS failure - block it
     }
 }
 
 /**
  * Whether private URLs are allowed (defaults to true)
  * Set ALLOW_PRIVATE_URLS=false to block private URLs
+ * Read per call so admin-panel changes apply without restart
  */
-export const allowPrivateUrls = process.env.ALLOW_PRIVATE_URLS !== "false"
+export function allowPrivateUrls(): boolean {
+    return process.env.ALLOW_PRIVATE_URLS !== "false"
+}

lib/storage.ts

@@ -31,6 +31,9 @@ export const STORAGE_KEYS = {
     // Custom system message
     customSystemMessage: "next-ai-draw-io-custom-system-message",
 
+    // Output token budget per turn (empty = server default)
+    maxOutputTokens: "next-ai-draw-io-max-output-tokens",
+
     // Panel visibility
     showRecentChats: "next-ai-draw-io-show-recent-chats",
     showMyTemplates: "next-ai-draw-io-show-my-templates",

lib/system-prompts.ts

@@ -41,7 +41,7 @@ parameters: {
 tool name: edit_diagram
 description: Edit specific parts of the EXISTING diagram. Use this when making small targeted changes like adding/removing elements, changing labels, or adjusting properties. This is more efficient than regenerating the entire diagram.
 parameters: {
-  edits: Array<{search: string, replace: string}>
+  operations: Array<{operation: "update" | "add" | "delete", cell_id: string, new_xml?: string}>
 }
 ---Tool3---
 tool name: append_diagram

lib/template-storage.ts

@@ -2,8 +2,8 @@ import { type DBSchema, type IDBPDatabase, openDB } from "idb"
 import { nanoid } from "nanoid"
 
 // Constants
-const DB_NAME = "next-ai-drawio"
-const DB_VERSION = 2
+const DB_NAME = "next-ai-drawio-templates"
+const DB_VERSION = 1
 const STORE_NAME = "templates"
 
 // Types
@@ -34,14 +34,6 @@ export type TemplateCreateInput = Pick<Template, "prompt"> &
     >
 
 interface TemplateDB extends DBSchema {
-    sessions: {
-        key: string
-        value: {
-            id: string
-            [key: string]: unknown
-        }
-        indexes: { "by-updated": number }
-    }
     templates: {
         key: string
         value: Template
@@ -65,47 +57,12 @@ export function generateDefaultTitle(prompt: string): string {
 
 // Database singleton
 let dbPromise: Promise<IDBPDatabase<TemplateDB>> | null = null
-const resetDBPromise = () => {
-    dbPromise = null
-}
-
-const isClosingError = (error: unknown): boolean => {
-    return (
-        error instanceof DOMException &&
-        error.name === "InvalidStateError" &&
-        /closing/i.test(error.message)
-    )
-}
-
-const withDB = async <T>(
-    action: (db: IDBPDatabase<TemplateDB>) => Promise<T>,
-): Promise<T> => {
-    try {
-        const db = await getDB()
-        return await action(db)
-    } catch (error) {
-        if (isClosingError(error)) {
-            resetDBPromise()
-            const db = await getDB()
-            return await action(db)
-        }
-        throw error
-    }
-}
 
 async function getDB(): Promise<IDBPDatabase<TemplateDB>> {
     if (!dbPromise) {
         dbPromise = openDB<TemplateDB>(DB_NAME, DB_VERSION, {
             upgrade(db, oldVersion) {
                 if (oldVersion < 1) {
-                    if (!db.objectStoreNames.contains("sessions")) {
-                        const sessionStore = db.createObjectStore("sessions", {
-                            keyPath: "id",
-                        })
-                        sessionStore.createIndex("by-updated", "updatedAt")
-                    }
-                }
-                if (oldVersion < 2) {
                     if (!db.objectStoreNames.contains(STORE_NAME)) {
                         const templateStore = db.createObjectStore(STORE_NAME, {
                             keyPath: "id",
@@ -117,23 +74,7 @@ async function getDB(): Promise<IDBPDatabase<TemplateDB>> {
                     }
                 }
             },
-            terminated() {
-                resetDBPromise()
-            },
         })
-        dbPromise
-            .then((db) => {
-                db.onversionchange = () => {
-                    db.close()
-                    resetDBPromise()
-                }
-                db.onclose = () => {
-                    resetDBPromise()
-                }
-            })
-            .catch(() => {
-                resetDBPromise()
-            })
     }
     return dbPromise
 }
@@ -153,10 +94,9 @@ export function isIndexedDBAvailable(): boolean {
 export async function getAllTemplates(): Promise<Template[]> {
     if (!isIndexedDBAvailable()) return []
     try {
-        return await withDB(async (db) => {
-            const templates = await db.getAll(STORE_NAME)
-            return sortTemplates(templates)
-        })
+        const db = await getDB()
+        const templates = await db.getAll(STORE_NAME)
+        return sortTemplates(templates)
     } catch (error) {
         console.error("Failed to get templates:", error)
         return []
@@ -166,9 +106,8 @@ export async function getAllTemplates(): Promise<Template[]> {
 export async function getTemplate(id: string): Promise<Template | null> {
     if (!isIndexedDBAvailable()) return null
     try {
-        return await withDB(async (db) => {
-            return (await db.get(STORE_NAME, id)) || null
-        })
+        const db = await getDB()
+        return (await db.get(STORE_NAME, id)) || null
     } catch (error) {
         console.error("Failed to get template:", error)
         return null
@@ -198,9 +137,8 @@ export async function createTemplate(
     }
 
     try {
-        await withDB(async (db) => {
-            await db.put(STORE_NAME, template)
-        })
+        const db = await getDB()
+        await db.put(STORE_NAME, template)
         return template
     } catch (error) {
         console.error("Failed to create template:", error)
@@ -214,20 +152,19 @@ export async function updateTemplate(
 ): Promise<Template | null> {
     if (!isIndexedDBAvailable()) return null
     try {
-        return await withDB(async (db) => {
-            const existing = await db.get(STORE_NAME, id)
-            if (!existing) return null
+        const db = await getDB()
+        const existing = await db.get(STORE_NAME, id)
+        if (!existing) return null
 
-            const updated: Template = {
-                ...existing,
-                ...updates,
-                id: existing.id,
-                createdAt: existing.createdAt,
-                updatedAt: Date.now(),
-            }
-            await db.put(STORE_NAME, updated)
-            return updated
-        })
+        const updated: Template = {
+            ...existing,
+            ...updates,
+            id: existing.id,
+            createdAt: existing.createdAt,
+            updatedAt: Date.now(),
+        }
+        await db.put(STORE_NAME, updated)
+        return updated
     } catch (error) {
         console.error("Failed to update template:", error)
         return null
@@ -237,9 +174,8 @@ export async function updateTemplate(
 export async function deleteTemplate(id: string): Promise<boolean> {
     if (!isIndexedDBAvailable()) return false
     try {
-        await withDB(async (db) => {
-            await db.delete(STORE_NAME, id)
-        })
+        const db = await getDB()
+        await db.delete(STORE_NAME, id)
         return true
     } catch (error) {
         console.error("Failed to delete template:", error)
@@ -253,25 +189,24 @@ export async function duplicateTemplate(
 ): Promise<Template | null> {
     if (!isIndexedDBAvailable()) return null
     try {
-        return await withDB(async (db) => {
-            const existing = await db.get(STORE_NAME, id)
-            if (!existing) return null
+        const db = await getDB()
+        const existing = await db.get(STORE_NAME, id)
+        if (!existing) return null
 
-            const now = Date.now()
-            const duplicate: Template = {
-                ...existing,
-                id: nanoid(),
-                title: `${existing.title} ${copySuffix}`,
-                createdAt: now,
-                updatedAt: now,
-                clickCount: 0,
-                runCount: 0,
-                lastUsedAt: 0,
-                pinned: false,
-            }
-            await db.put(STORE_NAME, duplicate)
-            return duplicate
-        })
+        const now = Date.now()
+        const duplicate: Template = {
+            ...existing,
+            id: nanoid(),
+            title: `${existing.title} ${copySuffix}`,
+            createdAt: now,
+            updatedAt: now,
+            clickCount: 0,
+            runCount: 0,
+            lastUsedAt: 0,
+            pinned: false,
+        }
+        await db.put(STORE_NAME, duplicate)
+        return duplicate
     } catch (error) {
         console.error("Failed to duplicate template:", error)
         return null
@@ -283,13 +218,12 @@ export async function duplicateTemplate(
 export async function incrementClickCount(id: string): Promise<void> {
     if (!isIndexedDBAvailable()) return
     try {
-        await withDB(async (db) => {
-            const template = await db.get(STORE_NAME, id)
-            if (!template) return
-            template.clickCount += 1
-            template.updatedAt = Date.now()
-            await db.put(STORE_NAME, template)
-        })
+        const db = await getDB()
+        const template = await db.get(STORE_NAME, id)
+        if (!template) return
+        template.clickCount += 1
+        template.updatedAt = Date.now()
+        await db.put(STORE_NAME, template)
     } catch (error) {
         console.error("Failed to increment click count:", error)
     }
@@ -298,15 +232,14 @@ export async function incrementClickCount(id: string): Promise<void> {
 export async function incrementRunCount(id: string): Promise<void> {
     if (!isIndexedDBAvailable()) return
     try {
-        await withDB(async (db) => {
-            const template = await db.get(STORE_NAME, id)
-            if (!template) return
-            const now = Date.now()
-            template.runCount += 1
-            template.lastUsedAt = now
-            template.updatedAt = now
-            await db.put(STORE_NAME, template)
-        })
+        const db = await getDB()
+        const template = await db.get(STORE_NAME, id)
+        if (!template) return
+        const now = Date.now()
+        template.runCount += 1
+        template.lastUsedAt = now
+        template.updatedAt = now
+        await db.put(STORE_NAME, template)
     } catch (error) {
         console.error("Failed to increment run count:", error)
     }
@@ -439,9 +372,8 @@ export async function importTemplates(
             pinned: typeof t.pinned === "boolean" ? t.pinned : false,
         }
         try {
-            await withDB(async (db) => {
-                await db.put(STORE_NAME, newTemplate)
-            })
+            const db = await getDB()
+            await db.put(STORE_NAME, newTemplate)
             existingKeys.add(key)
             imported++
         } catch (error) {

lib/types/model-config.ts

@@ -9,6 +9,7 @@ export type ProviderName =
     | "bedrock"
     | "ollama"
     | "openrouter"
+    | "aihubmix"
     | "deepseek"
     | "siliconflow"
     | "sglang"
@@ -22,6 +23,8 @@ export type ProviderName =
     | "kimi"
     | "minimax"
     | "novita"
+    | "mimo"
+    | "atlascloud"
 
 // Individual model configuration
 export interface ModelConfig {
@@ -85,6 +88,15 @@ export interface FlattenedModel {
     baseUrlEnv?: string
 }
 
+// Providers whose server credentials live in fixed env vars
+// (AWS_ACCESS_KEY_ID, GOOGLE_VERTEX_API_KEY, OLLAMA_API_KEY) with no
+// apiKeyEnv redirection support — their credentials are global
+export const FIXED_CRED_PROVIDERS: ProviderName[] = [
+    "bedrock",
+    "vertexai",
+    "ollama",
+]
+
 // Map provider names to models.dev logo names
 export const PROVIDER_LOGO_MAP: Record<string, string> = {
     openai: "openai",
@@ -93,6 +105,7 @@ export const PROVIDER_LOGO_MAP: Record<string, string> = {
     azure: "azure",
     bedrock: "amazon-bedrock",
     openrouter: "openrouter",
+    aihubmix: "aihubmix",
     deepseek: "deepseek",
     siliconflow: "siliconflow",
     sglang: "openai", // SGLang is OpenAI-compatible
@@ -103,6 +116,8 @@ export const PROVIDER_LOGO_MAP: Record<string, string> = {
     modelscope: "modelscope",
     minimax: "minimax",
     novita: "novita",
+    mimo: "xiaomi",
+    atlascloud: "openai",
 }
 
 // Provider metadata
@@ -136,6 +151,10 @@ export const PROVIDER_INFO: Record<
         label: "OpenRouter",
         defaultBaseUrl: "https://openrouter.ai/api/v1",
     },
+    aihubmix: {
+        label: "AIHubMix",
+        defaultBaseUrl: "https://aihubmix.com/v1",
+    },
     deepseek: {
         label: "DeepSeek",
         defaultBaseUrl: "https://api.deepseek.com/v1",
@@ -185,183 +204,253 @@ export const PROVIDER_INFO: Record<
         label: "Novita AI",
         defaultBaseUrl: "https://api.novita.ai/openai",
     },
+    mimo: {
+        label: "MiMo (Xiaomi)",
+        defaultBaseUrl: "https://api.xiaomimimo.com/v1",
+    },
+    atlascloud: {
+        label: "Atlas Cloud",
+        defaultBaseUrl: "https://api.atlascloud.ai/v1",
+    },
 }
 
 // Suggested models per provider for quick add
 export const SUGGESTED_MODELS: Partial<Record<ProviderName, string[]>> = {
     openai: [
-        "gpt-5.2-pro",
-        "gpt-5.2-chat-latest",
-        "gpt-5.2",
-        "gpt-5.1-codex-mini",
-        "gpt-5.1-codex",
-        "gpt-5.1-chat-latest",
-        "gpt-5.1",
-        "gpt-5-pro",
-        "gpt-5",
-        "gpt-5-mini",
-        "gpt-5-nano",
-        "gpt-5-codex",
-        "gpt-5-chat-latest",
+        "gpt-5.5-pro",
+        "gpt-5.5",
+        "gpt-5.4-pro",
+        "gpt-5.4",
+        "gpt-5.4-mini",
+        "gpt-5.4-nano",
+        "gpt-5-codex-mini",
         "gpt-4.1",
         "gpt-4.1-mini",
-        "gpt-4.1-nano",
         "gpt-4o",
         "gpt-4o-mini",
     ],
     anthropic: [
-        // Claude 4.5 series (latest)
-        "claude-opus-4-5-20250514",
-        "claude-sonnet-4-5-20250514",
-        // Claude 4 series
-        "claude-opus-4-20250514",
-        "claude-sonnet-4-20250514",
+        // Claude 4.8 / 4.7 / 4.6 series (latest, dateless pinned IDs)
+        "claude-opus-4-8",
+        "claude-sonnet-4-6",
+        "claude-haiku-4-5",
+        "claude-opus-4-7",
+        "claude-opus-4-6",
+        // Claude 4.5 series
+        "claude-sonnet-4-5-20250929",
+        "claude-opus-4-5-20251101",
         // Claude 3.7 series
         "claude-3-7-sonnet-20250219",
         // Claude 3.5 series
         "claude-3-5-sonnet-20241022",
         "claude-3-5-haiku-20241022",
-        // Claude 3 series
-        "claude-3-opus-20240229",
-        "claude-3-sonnet-20240229",
-        "claude-3-haiku-20240307",
     ],
     google: [
+        // Gemini 3 series
+        "gemini-3.1-pro",
+        "gemini-3.5-flash",
+        "gemini-3-flash",
+        "gemini-3.1-flash-lite",
         // Gemini 2.5 series
         "gemini-2.5-pro",
         "gemini-2.5-flash",
-        "gemini-2.5-flash-preview-05-20",
-        // Gemini 2.0 series
-        "gemini-2.0-flash",
-        "gemini-2.0-flash-exp",
-        "gemini-2.0-flash-lite",
-        // Gemini 1.5 series
-        "gemini-1.5-pro",
-        "gemini-1.5-flash",
-        // Legacy
-        "gemini-pro",
+        "gemini-2.5-flash-lite",
     ],
     vertexai: [
+        // Gemini 3 series
+        "gemini-3.1-pro-preview",
+        "gemini-3.5-flash",
+        "gemini-3-flash-preview",
+        "gemini-3.1-flash-lite",
         // Gemini 2.5 series
         "gemini-2.5-pro",
         "gemini-2.5-flash",
-        // Gemini 2.0 series
-        "gemini-2.0-flash",
-        "gemini-2.0-flash-exp",
-        // Gemini 1.5 series
-        "gemini-1.5-pro",
-        "gemini-1.5-flash",
+        "gemini-2.5-flash-lite",
+    ],
+    azure: [
+        "gpt-5.5",
+        "gpt-5.4",
+        "gpt-5.1",
+        "gpt-5",
+        "gpt-5-mini",
+        "gpt-4.1",
+        "gpt-4o",
+        "gpt-4o-mini",
+        "o3",
+        "o4-mini",
     ],
-    azure: ["gpt-4o", "gpt-4o-mini", "gpt-4-turbo", "gpt-4", "gpt-35-turbo"],
     bedrock: [
         // Anthropic Claude
-        "anthropic.claude-opus-4-5-20250514-v1:0",
-        "anthropic.claude-sonnet-4-5-20250514-v1:0",
+        "anthropic.claude-opus-4-8",
+        "anthropic.claude-opus-4-7",
+        "anthropic.claude-sonnet-4-6",
+        "anthropic.claude-opus-4-6-v1",
+        "anthropic.claude-opus-4-5-20251101-v1:0",
+        "anthropic.claude-sonnet-4-5-20250929-v1:0",
+        "anthropic.claude-haiku-4-5-20251001-v1:0",
+        "anthropic.claude-opus-4-1-20250805-v1:0",
         "anthropic.claude-opus-4-20250514-v1:0",
         "anthropic.claude-sonnet-4-20250514-v1:0",
-        "anthropic.claude-3-7-sonnet-20250219-v1:0",
-        "anthropic.claude-3-5-sonnet-20241022-v2:0",
         "anthropic.claude-3-5-haiku-20241022-v1:0",
-        "anthropic.claude-3-opus-20240229-v1:0",
-        "anthropic.claude-3-sonnet-20240229-v1:0",
-        "anthropic.claude-3-haiku-20240307-v1:0",
         // Amazon Nova
+        "amazon.nova-2-lite-v1:0",
+        "amazon.nova-premier-v1:0",
         "amazon.nova-pro-v1:0",
         "amazon.nova-lite-v1:0",
         "amazon.nova-micro-v1:0",
         // Meta Llama
+        "meta.llama4-maverick-17b-instruct-v1:0",
+        "meta.llama4-scout-17b-instruct-v1:0",
         "meta.llama3-3-70b-instruct-v1:0",
-        "meta.llama3-1-405b-instruct-v1:0",
-        "meta.llama3-1-70b-instruct-v1:0",
         // Mistral
-        "mistral.mistral-large-2411-v1:0",
-        "mistral.mistral-small-2503-v1:0",
+        "mistral.mistral-large-3-675b-instruct",
+        "mistral.pixtral-large-2502-v1:0",
     ],
     openrouter: [
         // Anthropic
-        "anthropic/claude-sonnet-4",
-        "anthropic/claude-opus-4",
-        "anthropic/claude-3.5-sonnet",
-        "anthropic/claude-3.5-haiku",
+        "anthropic/claude-opus-4.8",
+        "anthropic/claude-sonnet-4.6",
+        "anthropic/claude-haiku-4.5",
         // OpenAI
-        "openai/gpt-4o",
+        "openai/gpt-5.5",
+        "openai/gpt-5.4",
+        "openai/gpt-5.4-mini",
         "openai/gpt-4o-mini",
-        "openai/o1",
-        "openai/o3-mini",
         // Google
-        "google/gemini-2.5-pro",
-        "google/gemini-2.5-flash",
-        "google/gemini-2.0-flash-exp:free",
+        "google/gemini-3.1-pro-preview",
+        "google/gemini-3.5-flash",
+        "google/gemini-2.5-flash-lite",
+        // xAI
+        "x-ai/grok-4.3",
         // Meta Llama
+        "meta-llama/llama-4-maverick",
+        "meta-llama/llama-4-scout",
         "meta-llama/llama-3.3-70b-instruct",
-        "meta-llama/llama-3.1-405b-instruct",
-        "meta-llama/llama-3.1-70b-instruct",
         // DeepSeek
-        "deepseek/deepseek-chat",
-        "deepseek/deepseek-r1",
+        "deepseek/deepseek-v4-pro",
+        "deepseek/deepseek-v3.2",
         // Qwen
-        "qwen/qwen-2.5-72b-instruct",
+        "qwen/qwen3.7-max",
+        "qwen/qwen3-coder",
+        // MiniMax
+        "minimax/minimax-m3",
+    ],
+    aihubmix: [
+        // Fallback list. The settings UI loads the live model list from AIHubMix when available.
+        // Anthropic Claude
+        "claude-fable-5",
+        "claude-opus-4-8",
+        "claude-sonnet-4-6",
+        // OpenAI
+        "gpt-5.5",
+        "gpt-5.5-pro",
+        "gpt-5.4",
+        // Google Gemini
+        "gemini-3.5-flash",
+        "gemini-3.1-pro-preview",
+        "gemini-3-flash-preview",
+        // DeepSeek
+        "deepseek-v4-pro",
+        "deepseek-v4-flash",
+        // Qwen
+        "qwen3.7-max",
+        "qwen3-coder-next",
+        // Z.ai
+        "glm-5.1",
+        // Moonshot AI
+        "kimi-k2.6",
+        // MiniMax
+        "minimax-m3",
+        // xAI
+        "grok-4.3",
+        // Baidu
+        "ernie-5.1",
+        // Mistral
+        "mistral-large-3",
+        // Meta
+        "llama-4-maverick",
+    ],
+    deepseek: [
+        "deepseek-v4-pro",
+        "deepseek-v4-flash",
+        "deepseek-chat",
+        "deepseek-reasoner",
     ],
-    deepseek: ["deepseek-chat", "deepseek-reasoner", "deepseek-coder"],
     siliconflow: [
         // DeepSeek
-        "deepseek-ai/DeepSeek-V3",
-        "deepseek-ai/DeepSeek-R1",
-        "deepseek-ai/DeepSeek-V2.5",
+        "deepseek-ai/DeepSeek-V4-Pro",
+        "deepseek-ai/DeepSeek-V4-Flash",
+        "deepseek-ai/DeepSeek-V3.2",
+        // MiniMax
+        "MiniMaxAI/MiniMax-M3",
+        // Moonshot
+        "moonshotai/Kimi-K2.6",
+        // Z.ai
+        "zai-org/GLM-5",
         // Qwen
-        "Qwen/Qwen2.5-72B-Instruct",
-        "Qwen/Qwen2.5-32B-Instruct",
-        "Qwen/Qwen2.5-Coder-32B-Instruct",
-        "Qwen/Qwen2.5-7B-Instruct",
-        "Qwen/Qwen2-VL-72B-Instruct",
-        "qwen3.5-plus",
+        "Qwen/Qwen3.6-35B-A3B",
+        "Qwen/Qwen3-Coder-480B-A35B-Instruct",
+        "Qwen/Qwen3-30B-A3B-Instruct-2507",
+        "Qwen/Qwen3-VL-32B-Instruct",
+        // OpenAI open-weights
+        "openai/gpt-oss-120b",
     ],
     sglang: [
         // SGLang is OpenAI-compatible, models depend on deployment
         "default",
     ],
     gateway: [
-        "openai/gpt-4o",
-        "openai/gpt-4o-mini",
-        "anthropic/claude-sonnet-4-5",
-        "anthropic/claude-3-5-sonnet",
-        "google/gemini-2.0-flash",
+        "openai/gpt-5.5",
+        "anthropic/claude-opus-4.7",
+        "google/gemini-3.1-pro-preview",
+        "xai/grok-4.3",
+        "anthropic/claude-sonnet-4.6",
+        "anthropic/claude-haiku-4.5",
+        "openai/gpt-5.4-mini",
     ],
     edgeone: ["@tx/deepseek-ai/deepseek-v32"],
     doubao: [
-        // ByteDance Doubao models
-        "doubao-1.5-thinking-pro-250415",
-        "doubao-1.5-thinking-pro-m-250428",
-        "doubao-1.5-pro-32k-250115",
-        "doubao-1.5-pro-256k-250115",
-        "doubao-pro-32k-241215",
-        "doubao-pro-256k-241215",
+        // ByteDance Doubao models (Volcengine Ark IDs use dash form)
+        "doubao-seed-2-0-pro-260215",
+        "doubao-seed-2-0-lite-260428",
+        "doubao-seed-2-0-mini-260428",
+        "doubao-seed-1-8-251228",
+        "doubao-seed-1-6-251015",
+        "doubao-seed-1-6-flash-250828",
+        "doubao-seed-1-6-vision-250815",
+        "doubao-1-5-pro-32k-250115",
+        "doubao-1-5-lite-32k-250115",
     ],
     modelscope: [
+        // DeepSeek
+        "deepseek-ai/DeepSeek-V4-Pro",
+        "deepseek-ai/DeepSeek-V3.2",
+        "deepseek-ai/DeepSeek-R1-0528",
+        "deepseek-ai/DeepSeek-R1",
         // Qwen
-        "Qwen/Qwen2.5-72B-Instruct",
-        "Qwen/Qwen2.5-32B-Instruct",
         "Qwen/Qwen3-235B-A22B-Instruct-2507",
         "Qwen/Qwen3-VL-235B-A22B-Instruct",
+        "Qwen/Qwen3-Coder-30B-A3B-Instruct",
         "Qwen/Qwen3-32B",
-        "qwen3.5-plus",
-        // DeepSeek
-        "deepseek-ai/DeepSeek-R1-0528",
-        "deepseek-ai/DeepSeek-V3.2",
+        "Qwen/Qwen2.5-72B-Instruct",
     ],
     minimax: [
         // MiniMax models (Anthropic-compatible API)
+        "MiniMax-M3",
         "MiniMax-M2.7",
         "MiniMax-M2.7-highspeed",
         "MiniMax-M2.5",
-        "MiniMax-M2.5-highspeed",
     ],
     novita: [
         // Novita AI models (OpenAI-compatible API)
-        "moonshotai/kimi-k2.5",
-        "zai-org/glm-5",
-        "minimax/minimax-m2.5",
+        "minimax/minimax-m3",
+        "deepseek/deepseek-v4-pro",
+        "zai-org/glm-5.1",
+        "moonshotai/kimi-k2.6",
+        "deepseek/deepseek-v4-flash",
     ],
+    mimo: ["mimo-v2.5-pro", "mimo-v2.5"],
+    atlascloud: ["qwen/qwen3.5-flash", "deepseek-ai/deepseek-v4-pro"],
 }
 
 // Helper to generate UUID

lib/url-utils.ts

@@ -1,5 +1,6 @@
 import { z } from "zod"
 import { getApiEndpoint } from "@/lib/base-path"
+import { STORAGE_KEYS } from "@/lib/storage"
 
 export interface UrlData {
     url: string
@@ -18,7 +19,11 @@ const UrlResponseSchema = z.object({
 export async function extractUrlContent(url: string): Promise<UrlData> {
     const response = await fetch(getApiEndpoint("/api/parse-url"), {
         method: "POST",
-        headers: { "Content-Type": "application/json" },
+        headers: {
+            "Content-Type": "application/json",
+            "x-access-code":
+                localStorage.getItem(STORAGE_KEYS.accessCode) || "",
+        },
         body: JSON.stringify({ url }),
     })
 

lib/use-file-processor.tsx

@@ -27,78 +27,72 @@ export function useFileProcessor() {
     const handleFileChange = async (newFiles: File[]) => {
         setFiles(newFiles)
 
-        // Extract text immediately for new PDF/text files
-        for (const file of newFiles) {
-            const needsExtraction =
-                (isPdfFile(file) || isTextFile(file)) && !pdfData.has(file)
-            if (needsExtraction) {
-                // Mark as extracting
-                setPdfData((prev) => {
-                    const next = new Map(prev)
-                    next.set(file, {
-                        text: "",
-                        charCount: 0,
-                        isExtracting: true,
-                    })
-                    return next
-                })
+        const pending = newFiles.filter(
+            (file) =>
+                (isPdfFile(file) || isTextFile(file)) && !pdfData.has(file),
+        )
 
-                // Extract text asynchronously
-                try {
-                    let text: string
-                    if (isPdfFile(file)) {
-                        text = await extractPdfText(file)
-                    } else {
-                        text = await extractTextFileContent(file)
-                    }
+        // Before any await: drop data for removed files and mark every new
+        // file as extracting, so queued files also block sending
+        setPdfData((prev) => {
+            const next = new Map<File, FileData>()
+            for (const file of newFiles) {
+                const existing = prev.get(file)
+                if (existing) next.set(file, existing)
+            }
+            for (const file of pending) {
+                next.set(file, { text: "", charCount: 0, isExtracting: true })
+            }
+            return next
+        })
 
-                    // Check character limit
-                    if (text.length > MAX_EXTRACTED_CHARS) {
-                        const limitK = MAX_EXTRACTED_CHARS / 1000
-                        toast.error(
-                            `${file.name}: Content exceeds ${limitK}k character limit (${(text.length / 1000).toFixed(1)}k chars)`,
-                        )
-                        setPdfData((prev) => {
-                            const next = new Map(prev)
-                            next.delete(file)
-                            return next
-                        })
-                        // Remove the file from the list
-                        setFiles((prev) => prev.filter((f) => f !== file))
-                        continue
-                    }
+        // Extract one file at a time
+        for (const file of pending) {
+            try {
+                let text: string
+                if (isPdfFile(file)) {
+                    text = await extractPdfText(file)
+                } else {
+                    text = await extractTextFileContent(file)
+                }
 
-                    setPdfData((prev) => {
-                        const next = new Map(prev)
-                        next.set(file, {
-                            text,
-                            charCount: text.length,
-                            isExtracting: false,
-                        })
-                        return next
-                    })
-                } catch (error) {
-                    console.error("Failed to extract text:", error)
-                    toast.error(`Failed to read file: ${file.name}`)
+                // Check character limit
+                if (text.length > MAX_EXTRACTED_CHARS) {
+                    const limitK = MAX_EXTRACTED_CHARS / 1000
+                    toast.error(
+                        `${file.name}: Content exceeds ${limitK}k character limit (${(text.length / 1000).toFixed(1)}k chars)`,
+                    )
                     setPdfData((prev) => {
                         const next = new Map(prev)
                         next.delete(file)
                         return next
                     })
+                    // Remove the file from the list
+                    setFiles((prev) => prev.filter((f) => f !== file))
+                    continue
                 }
+
+                setPdfData((prev) => {
+                    // The file was removed while extracting
+                    if (!prev.has(file)) return prev
+                    const next = new Map(prev)
+                    next.set(file, {
+                        text,
+                        charCount: text.length,
+                        isExtracting: false,
+                    })
+                    return next
+                })
+            } catch (error) {
+                console.error("Failed to extract text:", error)
+                toast.error(`Failed to read file: ${file.name}`)
+                setPdfData((prev) => {
+                    const next = new Map(prev)
+                    next.delete(file)
+                    return next
+                })
             }
         }
-
-        // Clean up pdfData for removed files
-        setPdfData((prev) => {
-            const next = new Map(prev)
-            for (const key of prev.keys()) {
-                if (!newFiles.includes(key)) {
-                    next.delete(key)
-                }
-            }
-            return next
-        })
     }
 
     return {

lib/utils.ts

@@ -76,6 +76,17 @@ export function isMxCellXmlComplete(xml: string | undefined | null): boolean {
     // No valid ending found at all
     if (lastValidEnd === -1) return false
 
+    // If the last mxCell has no </mxCell> after it, it must be self-closing.
+    // Otherwise the trailing "/>" belongs to a child such as <mxGeometry .../>
+    // and the output was cut off before the cell was closed.
+    const lastCellStart = trimmed.lastIndexOf("<mxCell")
+    if (
+        lastCellStart > lastMxCellClose &&
+        !/^<mxCell\b[^<]*\/>/.test(trimmed.slice(lastCellStart))
+    ) {
+        return false
+    }
+
     // Check what comes after the last valid ending
     // For />: add 2 chars, for </mxCell>: add 9 chars
     const endOffset = lastMxCellClose > lastSelfClose ? 9 : 2
@@ -95,36 +106,12 @@ export function isMxCellXmlComplete(xml: string | undefined | null): boolean {
 export function extractCompleteMxCells(xml: string | undefined | null): string {
     if (!xml) return ""
 
-    const completeCells: Array<{ index: number; text: string }> = []
+    // Match self-closing <mxCell ... /> or <mxCell ...>...</mxCell>, in document order.
+    // The lazy [^>]*? tries "/>" first, so a self-closing cell never swallows
+    // the following cells up to the next </mxCell>.
+    const cellPattern = /<mxCell\b[^>]*?(?:\/>|>[\s\S]*?<\/mxCell>)/g
 
-    // Match self-closing mxCell tags: <mxCell ... />
-    // Also match mxCell with nested mxGeometry: <mxCell ...>...<mxGeometry .../></mxCell>
-    const selfClosingPattern = /<mxCell\s+[^>]*\/>/g
-    const nestedPattern = /<mxCell\s+[^>]*>[\s\S]*?<\/mxCell>/g
-
-    // Find all self-closing mxCell elements
-    let match: RegExpExecArray | null
-    while ((match = selfClosingPattern.exec(xml)) !== null) {
-        completeCells.push({ index: match.index, text: match[0] })
-    }
-
-    // Find all mxCell elements with nested content (like mxGeometry)
-    while ((match = nestedPattern.exec(xml)) !== null) {
-        completeCells.push({ index: match.index, text: match[0] })
-    }
-
-    // Sort by position to maintain order
-    completeCells.sort((a, b) => a.index - b.index)
-
-    // Remove duplicates (a self-closing match might overlap with nested match)
-    const seen = new Set<number>()
-    const uniqueCells = completeCells.filter((cell) => {
-        if (seen.has(cell.index)) return false
-        seen.add(cell.index)
-        return true
-    })
-
-    return uniqueCells.map((c) => c.text).join("\n")
+    return (xml.match(cellPattern) || []).join("\n")
 }
 
 // ============================================================================
@@ -487,6 +474,31 @@ export interface ApplyOperationsResult {
     errors: OperationError[]
 }
 
+/**
+ * draw.io wraps cells that have links, tooltips or custom data in
+ * <object>/<UserObject>, and the wrapper carries the id instead of the mxCell.
+ */
+function getCellWrapper(cell: Element): Element | null {
+    const parent = cell.parentElement
+    return parent?.tagName === "object" || parent?.tagName === "UserObject"
+        ? parent
+        : null
+}
+
+/** Id of a cell, read from its wrapper when the mxCell has none */
+function getCellId(cell: Element): string | null {
+    return (
+        cell.getAttribute("id") ||
+        getCellWrapper(cell)?.getAttribute("id") ||
+        null
+    )
+}
+
+/** Element to replace or remove for a cell (the wrapper if there is one) */
+function getCellNode(cell: Element): Element {
+    return getCellWrapper(cell) || cell
+}
+
 /**
  * Apply diagram operations (update/add/delete) using ID-based lookup.
  * This replaces the text-matching approach with direct DOM manipulation.
@@ -535,12 +547,14 @@ export function applyDiagramOperations(
         }
     }
 
-    // Build a map of cell IDs to elements
+    // Build a map of cell IDs to elements (wrapper elements for wrapped cells)
     const cellMap = new Map<string, Element>()
     root.querySelectorAll("mxCell").forEach((cell) => {
-        const id = cell.getAttribute("id")
-        if (id) cellMap.set(id, cell)
+        const id = getCellId(cell)
+        if (id) cellMap.set(id, getCellNode(cell))
     })
+    // Cells removed by delete operations in this batch
+    const deletedIds = new Set<string>()
 
     // Process each operation
     for (const op of operations) {
@@ -580,7 +594,7 @@ export function applyDiagramOperations(
             }
 
             // Validate ID matches
-            const newCellId = newCell.getAttribute("id")
+            const newCellId = getCellId(newCell)
             if (newCellId !== op.cell_id) {
                 errors.push({
                     type: "update",
@@ -590,8 +604,8 @@ export function applyDiagramOperations(
                 continue
             }
 
-            // Import and replace the node
-            const importedNode = doc.importNode(newCell, true)
+            // Import and replace the node (with its wrapper, if any)
+            const importedNode = doc.importNode(getCellNode(newCell), true)
             existingCell.parentNode?.replaceChild(importedNode, existingCell)
 
             // Update the map with the new element
@@ -632,7 +646,7 @@ export function applyDiagramOperations(
             }
 
             // Validate ID matches
-            const newCellId = newCell.getAttribute("id")
+            const newCellId = getCellId(newCell)
             if (newCellId !== op.cell_id) {
                 errors.push({
                     type: "add",
@@ -642,8 +656,8 @@ export function applyDiagramOperations(
                 continue
             }
 
-            // Import and append the node
-            const importedNode = doc.importNode(newCell, true)
+            // Import and append the node (with its wrapper, if any)
+            const importedNode = doc.importNode(getCellNode(newCell), true)
             root.appendChild(importedNode)
 
             // Add to map
@@ -661,8 +675,15 @@ export function applyDiagramOperations(
 
             const existingCell = cellMap.get(op.cell_id)
             if (!existingCell) {
-                // Cell not found - might have been cascade-deleted by a previous operation
-                // Skip silently instead of erroring (AI may redundantly list children/edges)
+                // Cells cascade-deleted earlier in this batch are skipped silently
+                // (AI may redundantly list children/edges)
+                if (!deletedIds.has(op.cell_id)) {
+                    errors.push({
+                        type: "delete",
+                        cellId: op.cell_id,
+                        message: `Cell with id="${op.cell_id}" not found`,
+                    })
+                }
                 continue
             }
 
@@ -679,7 +700,7 @@ export function applyDiagramOperations(
                     `mxCell[parent="${cellId}"]`,
                 )
                 children.forEach((child) => {
-                    const childId = child.getAttribute("id")
+                    const childId = getCellId(child)
                     if (childId && childId !== "0" && childId !== "1") {
                         collectDescendants(childId)
                     }
@@ -696,7 +717,7 @@ export function applyDiagramOperations(
                     `mxCell[source="${cellId}"], mxCell[target="${cellId}"]`,
                 )
                 referencingEdges.forEach((edge) => {
-                    const edgeId = edge.getAttribute("id")
+                    const edgeId = getCellId(edge)
                     // Protect root cells from being added via edge references
                     if (edgeId && edgeId !== "0" && edgeId !== "1") {
                         // Recurse to collect edge's children (like labels)
@@ -718,6 +739,7 @@ export function applyDiagramOperations(
                 if (cell) {
                     cell.parentNode?.removeChild(cell)
                     cellMap.delete(cellId)
+                    deletedIds.add(cellId)
                 }
             }
         }
@@ -758,24 +780,89 @@ function checkDuplicateAttributes(xml: string): string | null {
     return null
 }
 
-/** Check for duplicate IDs in XML */
-function checkDuplicateIds(xml: string): string | null {
-    const idPattern = /\bid\s*=\s*["']([^"']+)["']/gi
+/** Matches one <diagram> page of a document (the last one may be unclosed) */
+const PAGE_PATTERN = /<diagram\b[\s\S]*?(?:<\/diagram>|$)/g
+
+const ID_ATTR_PATTERN = /\bid\s*=\s*["']([^"']+)["']/gi
+
+/**
+ * Split XML into pages. Ids only need to be unique within a page: every
+ * page of a multi-page document has its own root cells "0" and "1".
+ */
+function splitPages(xml: string): string[] {
+    return xml.match(PAGE_PATTERN) || [xml]
+}
+
+/** Ids that appear more than once, with their counts */
+function findDuplicateIds(xml: string): Map<string, number> {
     const ids = new Map<string, number>()
-    let idMatch
-    while ((idMatch = idPattern.exec(xml)) !== null) {
-        const id = idMatch[1]
-        ids.set(id, (ids.get(id) || 0) + 1)
+    for (const match of xml.matchAll(ID_ATTR_PATTERN)) {
+        ids.set(match[1], (ids.get(match[1]) || 0) + 1)
     }
-    const duplicateIds = Array.from(ids.entries())
-        .filter(([, count]) => count > 1)
-        .map(([id, count]) => `'${id}' (${count}x)`)
-    if (duplicateIds.length > 0) {
-        return `Invalid XML: Found duplicate ID(s): ${duplicateIds.slice(0, 3).join(", ")}. All id attributes must be unique.`
+    return new Map(Array.from(ids).filter(([, count]) => count > 1))
+}
+
+/** Check for duplicate IDs in XML (per page) */
+function checkDuplicateIds(xml: string): string | null {
+    for (const page of splitPages(xml)) {
+        const duplicateIds = Array.from(findDuplicateIds(page)).map(
+            ([id, count]) => `'${id}' (${count}x)`,
+        )
+        if (duplicateIds.length > 0) {
+            return `Invalid XML: Found duplicate ID(s): ${duplicateIds.slice(0, 3).join(", ")}. All id attributes must be unique.`
+        }
     }
     return null
 }
 
+/** Rename repeated ids in one page (keeps the first occurrence) */
+function renameDuplicateIds(xml: string): { xml: string; renamed: number } {
+    const duplicateIds = findDuplicateIds(xml)
+    if (duplicateIds.size === 0) return { xml, renamed: 0 }
+
+    const idCounters = new Map<string, number>()
+    const renamedXml = xml.replace(ID_ATTR_PATTERN, (match, id) => {
+        if (!duplicateIds.has(id)) return match
+
+        const count = idCounters.get(id) || 0
+        idCounters.set(id, count + 1)
+
+        if (count === 0) return match // Keep first occurrence
+
+        // Rename subsequent occurrences (the id sits just before the closing quote)
+        return `${match.slice(0, -id.length - 1)}${id}_dup${count}${match.slice(-1)}`
+    })
+    return { xml: renamedXml, renamed: duplicateIds.size }
+}
+
+/**
+ * Returns a function telling whether a position is inside a quoted attribute
+ * value. Positions must be queried in increasing order: the scan resumes where
+ * it stopped instead of starting over, which keeps large documents fast.
+ */
+function createQuoteTracker(str: string): (pos: number) => boolean {
+    let i = 0
+    let inQuote = false
+    let quoteChar = ""
+    return (pos: number) => {
+        for (; i < pos && i < str.length; i++) {
+            const c = str[i]
+            if (inQuote) {
+                if (c === quoteChar) inQuote = false
+            } else if (c === '"' || c === "'") {
+                // Only quotes that follow "=" open an attribute value
+                let j = i - 1
+                while (j >= 0 && /\s/.test(str[j])) j--
+                if (j >= 0 && str[j] === "=") {
+                    inQuote = true
+                    quoteChar = c
+                }
+            }
+        }
+        return inQuote
+    }
+}
+
 /** Check for tag mismatches using parsed tags */
 function checkTagMismatches(xml: string): string | null {
     const xmlWithoutComments = xml.replace(/<!--[\s\S]*?-->/g, "")
@@ -1088,13 +1175,19 @@ export function autoFixXml(xml: string): { fixed: string; fixes: string[] } {
     // 3b. Fix malformed attribute values where &quot; is used as delimiter instead of actual quotes
     // Pattern: attr=&quot;value&quot; should become attr="value" (the &quot; was meant to be the quote delimiter)
     // This commonly happens with dashPattern=&quot;1 1;&quot;
-    const malformedQuotePattern = /(\s[a-zA-Z][a-zA-Z0-9_:-]*)=&quot;/
-    if (malformedQuotePattern.test(fixed)) {
-        // Replace =&quot; with =" and trailing &quot; before next attribute or tag end with "
-        fixed = fixed.replace(
-            /(\s[a-zA-Z][a-zA-Z0-9_:-]*)=&quot;([^&]*?)&quot;/g,
-            '$1="$2"',
-        )
+    // Matches inside another attribute value are kept: rich text labels like
+    // value="&lt;font color=&quot;#ff0000&quot;&gt;..." are valid.
+    const isInsideQuotesFor3b = createQuoteTracker(fixed)
+    let malformedQuotesFixed = false
+    fixed = fixed.replace(
+        /(\s[a-zA-Z][a-zA-Z0-9_:-]*)=&quot;([^&]*?)&quot;/g,
+        (match: string, attr: string, value: string, offset: number) => {
+            if (isInsideQuotesFor3b(offset)) return match
+            malformedQuotesFixed = true
+            return `${attr}="${value}"`
+        },
+    )
+    if (malformedQuotesFixed) {
         fixes.push(
             'Fixed malformed attribute quotes (=&quot;...&quot; to ="...")',
         )
@@ -1108,9 +1201,11 @@ export function autoFixXml(xml: string): { fixed: string; fixes: string[] } {
     }
 
     // 3d. Fix missing space between attributes like vertex="1"parent="1"
-    const missingSpacePattern = /("[^"]*")([a-zA-Z][a-zA-Z0-9_:-]*=)/g
+    // Requires name=" right after the quote, so the opening quote of a value
+    // such as style="rounded=1;..." is not mistaken for a closing one.
+    const missingSpacePattern = /"([a-zA-Z_:][\w:.-]*=")/g
     if (missingSpacePattern.test(fixed)) {
-        fixed = fixed.replace(/("[^"]*")([a-zA-Z][a-zA-Z0-9_:-]*=)/g, "$1 $2")
+        fixed = fixed.replace(missingSpacePattern, '" $1')
         fixes.push("Added missing space between attributes")
     }
 
@@ -1240,32 +1335,13 @@ export function autoFixXml(xml: string): { fixed: string; fixes: string[] } {
         "mxPoint",
         "Array",
         "Object",
+        // Wrappers of cells with links, tooltips or custom data
+        "object",
+        "UserObject",
         "mxRectangle",
     ])
 
-    // Helper: Check if a position is inside a quoted attribute value
-    // by counting unescaped quotes before that position
-    const isInsideQuotes = (str: string, pos: number): boolean => {
-        let inQuote = false
-        let quoteChar = ""
-        for (let i = 0; i < pos && i < str.length; i++) {
-            const c = str[i]
-            if (inQuote) {
-                if (c === quoteChar) inQuote = false
-            } else if (c === '"' || c === "'") {
-                // Check if this quote is part of an attribute (preceded by =)
-                // Look back for = sign
-                let j = i - 1
-                while (j >= 0 && /\s/.test(str[j])) j--
-                if (j >= 0 && str[j] === "=") {
-                    inQuote = true
-                    quoteChar = c
-                }
-            }
-        }
-        return inQuote
-    }
-
+    const isInsideQuotesFor8c = createQuoteTracker(fixed)
     const foreignTagPattern = /<\/?([a-zA-Z][a-zA-Z0-9_]*)[^>]*>/g
     let foreignMatch
     const foreignTags = new Set<string>()
@@ -1280,7 +1356,7 @@ export function autoFixXml(xml: string): { fixed: string; fixes: string[] } {
         // Skip if this is a valid draw.io tag
         if (validDrawioTags.has(tagName)) continue
         // Skip if this tag is inside a quoted attribute value
-        if (isInsideQuotes(fixed, foreignMatch.index)) continue
+        if (isInsideQuotesFor8c(foreignMatch.index)) continue
 
         foreignTags.add(tagName)
         foreignTagPositions.push({
@@ -1352,10 +1428,11 @@ export function autoFixXml(xml: string): { fixed: string; fixes: string[] } {
     >()
     // Match full tags to detect self-closing by checking if ends with />
     const fullTagPattern = /<(\/?[a-zA-Z][a-zA-Z0-9]*)[^>]*>/g
+    const isInsideQuotesFor10b = createQuoteTracker(fixed)
     let tagCountMatch
     while ((tagCountMatch = fullTagPattern.exec(fixed)) !== null) {
         // Skip tags inside quoted attribute values (e.g., value="<b>Title</b>")
-        if (isInsideQuotes(fixed, tagCountMatch.index)) continue
+        if (isInsideQuotesFor10b(tagCountMatch.index)) continue
 
         const fullMatch = tagCountMatch[0] // e.g., "<mxCell .../>" or "</mxCell>"
         const tagPart = tagCountMatch[1] // e.g., "mxCell" or "/mxCell"
@@ -1445,125 +1522,112 @@ export function autoFixXml(xml: string): { fixed: string; fixes: string[] } {
     // 11. Fix nested mxCell by flattening
     // Pattern A: <mxCell id="X">...<mxCell id="X">...</mxCell></mxCell> (duplicate ID)
     // Pattern B: <mxCell id="X">...<mxCell id="Y">...</mxCell></mxCell> (different ID - true nesting)
-    const lines = fixed.split("\n")
-    let newLines: string[] = []
-    let nestedFixed = 0
-    let extraClosingToRemove = 0
+    // These passes work line by line and would break valid cells written on a
+    // single line, so each one runs only when cells are really nested.
+    if (checkNestedMxCells(fixed)) {
+        const lines = fixed.split("\n")
+        const newLines: string[] = []
+        let nestedFixed = 0
+        let extraClosingToRemove = 0
 
-    // First pass: fix duplicate ID nesting (same as before)
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i]
-        const nextLine = lines[i + 1]
+        // First pass: fix duplicate ID nesting (same as before)
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i]
+            const nextLine = lines[i + 1]
 
-        // Check if current line and next line are both mxCell opening tags with same ID
-        if (
-            nextLine &&
-            /<mxCell\s/.test(line) &&
-            /<mxCell\s/.test(nextLine) &&
-            !line.includes("/>") &&
-            !nextLine.includes("/>")
-        ) {
-            const id1 = line.match(/\bid\s*=\s*["']([^"']+)["']/)?.[1]
-            const id2 = nextLine.match(/\bid\s*=\s*["']([^"']+)["']/)?.[1]
+            // Check if current line and next line are both mxCell opening tags with same ID
+            if (
+                nextLine &&
+                /<mxCell\s/.test(line) &&
+                /<mxCell\s/.test(nextLine) &&
+                !line.includes("/>") &&
+                !nextLine.includes("/>")
+            ) {
+                const id1 = line.match(/\bid\s*=\s*["']([^"']+)["']/)?.[1]
+                const id2 = nextLine.match(/\bid\s*=\s*["']([^"']+)["']/)?.[1]
 
-            if (id1 && id1 === id2) {
-                nestedFixed++
-                extraClosingToRemove++ // Need to remove one </mxCell> later
-                continue // Skip this duplicate opening line
+                if (id1 && id1 === id2) {
+                    nestedFixed++
+                    extraClosingToRemove++ // Need to remove one </mxCell> later
+                    continue // Skip this duplicate opening line
+                }
             }
-        }
 
-        // Remove extra </mxCell> if we have pending removals
-        if (extraClosingToRemove > 0 && /^\s*<\/mxCell>\s*$/.test(line)) {
-            extraClosingToRemove--
-            continue // Skip this closing tag
-        }
-
-        newLines.push(line)
-    }
-
-    if (nestedFixed > 0) {
-        fixed = newLines.join("\n")
-        fixes.push(`Flattened ${nestedFixed} duplicate-ID nested mxCell(s)`)
-    }
-
-    // Second pass: fix true nesting (different IDs)
-    // Insert </mxCell> before nested child to close parent
-    const lines2 = fixed.split("\n")
-    newLines = []
-    let trueNestedFixed = 0
-    let cellDepth = 0
-    let pendingCloseRemoval = 0
-
-    for (let i = 0; i < lines2.length; i++) {
-        const line = lines2[i]
-        const trimmed = line.trim()
-
-        // Track mxCell depth
-        const isOpenCell = /<mxCell\s/.test(trimmed) && !trimmed.endsWith("/>")
-        const isCloseCell = trimmed === "</mxCell>"
-
-        if (isOpenCell) {
-            if (cellDepth > 0) {
-                // Found nested cell - insert closing tag for parent before this line
-                const indent = line.match(/^(\s*)/)?.[1] || ""
-                newLines.push(indent + "</mxCell>")
-                trueNestedFixed++
-                pendingCloseRemoval++ // Need to remove one </mxCell> later
+            // Remove extra </mxCell> if we have pending removals
+            if (extraClosingToRemove > 0 && /^\s*<\/mxCell>\s*$/.test(line)) {
+                extraClosingToRemove--
+                continue // Skip this closing tag
             }
-            cellDepth = 1 // Reset to 1 since we just opened a new cell
+
             newLines.push(line)
-        } else if (isCloseCell) {
-            if (pendingCloseRemoval > 0) {
-                pendingCloseRemoval--
-                // Skip this extra closing tag
+        }
+
+        if (nestedFixed > 0) {
+            fixed = newLines.join("\n")
+            fixes.push(`Flattened ${nestedFixed} duplicate-ID nested mxCell(s)`)
+        }
+    }
+
+    if (checkNestedMxCells(fixed)) {
+        // Second pass: fix true nesting (different IDs)
+        // Insert </mxCell> before nested child to close parent
+        const lines2 = fixed.split("\n")
+        const newLines: string[] = []
+        let trueNestedFixed = 0
+        let cellDepth = 0
+        let pendingCloseRemoval = 0
+
+        for (let i = 0; i < lines2.length; i++) {
+            const line = lines2[i]
+            const trimmed = line.trim()
+
+            // Track mxCell depth
+            const isOpenCell =
+                /<mxCell\s/.test(trimmed) && !trimmed.endsWith("/>")
+            const isCloseCell = trimmed === "</mxCell>"
+
+            if (isOpenCell) {
+                if (cellDepth > 0) {
+                    // Found nested cell - insert closing tag for parent before this line
+                    const indent = line.match(/^(\s*)/)?.[1] || ""
+                    newLines.push(indent + "</mxCell>")
+                    trueNestedFixed++
+                    pendingCloseRemoval++ // Need to remove one </mxCell> later
+                }
+                cellDepth = 1 // Reset to 1 since we just opened a new cell
+                newLines.push(line)
+            } else if (isCloseCell) {
+                if (pendingCloseRemoval > 0) {
+                    pendingCloseRemoval--
+                    // Skip this extra closing tag
+                } else {
+                    cellDepth = Math.max(0, cellDepth - 1)
+                    newLines.push(line)
+                }
             } else {
-                cellDepth = Math.max(0, cellDepth - 1)
                 newLines.push(line)
             }
-        } else {
-            newLines.push(line)
+        }
+
+        if (trueNestedFixed > 0) {
+            fixed = newLines.join("\n")
+            fixes.push(`Fixed ${trueNestedFixed} true nested mxCell(s)`)
         }
     }
 
-    if (trueNestedFixed > 0) {
-        fixed = newLines.join("\n")
-        fixes.push(`Fixed ${trueNestedFixed} true nested mxCell(s)`)
+    // 12. Fix duplicate IDs by appending suffix, page by page (ids such as the
+    // root cells "0" and "1" legitimately repeat across pages)
+    let renamedIds = 0
+    const renamePage = (page: string) => {
+        const { xml: renamed, renamed: count } = renameDuplicateIds(page)
+        renamedIds += count
+        return renamed
     }
-
-    // 12. Fix duplicate IDs by appending suffix
-    const seenIds = new Map<string, number>()
-    const duplicateIds: string[] = []
-
-    // First pass: find duplicates
-    const idPattern = /\bid\s*=\s*["']([^"']+)["']/gi
-    let idMatch
-    while ((idMatch = idPattern.exec(fixed)) !== null) {
-        const id = idMatch[1]
-        seenIds.set(id, (seenIds.get(id) || 0) + 1)
-    }
-
-    // Find which IDs are duplicated
-    for (const [id, count] of seenIds) {
-        if (count > 1) duplicateIds.push(id)
-    }
-
-    // Second pass: rename duplicates (keep first occurrence, rename others)
-    if (duplicateIds.length > 0) {
-        const idCounters = new Map<string, number>()
-        fixed = fixed.replace(/\bid\s*=\s*["']([^"']+)["']/gi, (match, id) => {
-            if (!duplicateIds.includes(id)) return match
-
-            const count = idCounters.get(id) || 0
-            idCounters.set(id, count + 1)
-
-            if (count === 0) return match // Keep first occurrence
-
-            // Rename subsequent occurrences
-            const newId = `${id}_dup${count}`
-            return match.replace(id, newId)
-        })
-        fixes.push(`Renamed ${duplicateIds.length} duplicate ID(s)`)
+    fixed = /<diagram\b/.test(fixed)
+        ? fixed.replace(PAGE_PATTERN, renamePage)
+        : renamePage(fixed)
+    if (renamedIds > 0) {
+        fixes.push(`Renamed ${renamedIds} duplicate ID(s)`)
     }
 
     // 9. Fix empty id attributes by generating unique IDs
@@ -1673,6 +1737,11 @@ export function validateAndFixXml(xml: string): {
     }
 }
 
+/**
+ * Decode an xmlsvg export (SVG data URL) into uncompressed diagram XML.
+ * Only the first page is returned; for the full multi-page document use the
+ * autosaved chartXML instead.
+ */
 export function extractDiagramXML(xml_svg_string: string): string {
     try {
         // 1. Parse the SVG string (using built-in DOMParser in a browser-like environment)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "next-ai-draw-io",
-    "version": "0.4.14",
+    "version": "0.4.16",
     "license": "Apache-2.0",
     "private": true,
     "main": "dist-electron/main/index.js",
@@ -40,18 +40,19 @@
         "@ai-sdk/google-vertex": "^4.0.16",
         "@ai-sdk/openai": "^3.0.0",
         "@ai-sdk/react": "^3.0.1",
+        "@aihubmix/ai-sdk-provider": "^2.1.0",
         "@aws-sdk/client-dynamodb": "^3.957.0",
         "@aws-sdk/credential-providers": "^3.943.0",
         "@extractus/article-extractor": "^8.0.18",
-        "@formatjs/intl-localematcher": "^0.8.0",
+        "@formatjs/intl-localematcher": "^0.9.0",
         "@langfuse/client": "^4.4.9",
         "@langfuse/otel": "^4.4.4",
         "@langfuse/tracing": "^4.4.9",
         "@next/third-parties": "^16.0.6",
         "@opennextjs/cloudflare": "^1.17.1",
-        "@openrouter/ai-sdk-provider": "^1.5.4",
+        "@openrouter/ai-sdk-provider": "^2.0.0",
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/exporter-trace-otlp-http": "^0.214.0",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.222.0",
         "@opentelemetry/sdk-trace-node": "^2.2.0",
         "@radix-ui/react-alert-dialog": "^1.1.15",
         "@radix-ui/react-collapsible": "^1.1.12",
@@ -77,7 +78,7 @@
         "nanoid": "^5.0.0",
         "negotiator": "^1.0.0",
         "next": "^16.0.7",
-        "ollama-ai-provider-v2": "^2.0.0",
+        "ollama-ai-provider-v2": "^3.0.0",
         "pako": "^2.1.0",
         "prism-react-renderer": "^2.4.1",
         "react": "^19.1.2",
@@ -108,7 +109,7 @@
     },
     "devDependencies": {
         "@anthropic-ai/tokenizer": "^0.0.4",
-        "@biomejs/biome": "2.4.10",
+        "@biomejs/biome": "2.5.7",
         "@playwright/test": "^1.57.0",
         "@tailwindcss/postcss": "^4",
         "@tailwindcss/typography": "^0.5.19",
@@ -127,8 +128,8 @@
         "cross-env": "^10.1.0",
         "electron": "^39.2.7",
         "electron-builder": "^26.0.12",
-        "esbuild": "^0.27.2",
-        "eslint": "9.39.4",
+        "esbuild": "^0.28.0",
+        "eslint": "9.39.5",
         "eslint-config-next": "16.1.6",
         "husky": "^9.1.7",
         "jsdom": "^27.4.0",