feat: replace ai-cad with official HiCAD workspace

.env.example

@@ -9,13 +9,6 @@
 # Generate with: openssl rand -base64 32
 AUTH_SECRET=replace-with-random-secret
 
-# Stable pepper for user Access Key hashes. Generate independently from AUTH_SECRET.
-ACCESS_KEY_PEPPER=replace-with-random-secret
-
-# Authorizes trusted third-party services to provision user-scoped MCP keys.
-# Must contain at least 32 characters. Never expose it to end users or browsers.
-MCP_KEY_PROVISIONING_SECRET=replace-with-random-secret
-
 # Public application URL. Required for production and self-hosted Auth.js.
 AUTH_URL=https://your-domain.com
 NEXTAUTH_URL=https://your-domain.com

.gitignore

@@ -11,8 +11,6 @@ coverage
 
 # next.js
 .next/
-.next-build/
-.next-previous/
 out/
 build
 

SECURITY_IMPROVEMENTS_SUMMARY.md

@@ -144,10 +144,18 @@ log.error("Operation failed", error, { userId: "123" });
 #### 7. 修复 service 层错误吞没
 **风险等级**: 🟡 中等风险  
 **改动**:
+- `services/ai-cad/index.ts`: 完全重写，所有 catch 块现在记录错误
 - `services/canvas/index.ts`: 添加 logger 导入和辅助函数（未全部迁移）
 
 **潜在问题**:
 - `handleError(err, context, fallbackMessage)` 参数顺序与之前不同
+- 如果有其他代码依赖 ai-cad service 的错误格式，可能受影响
+
+**测试建议**:
+```bash
+# 触发一个 AI-CAD 错误（如无效的 workspace ID）
+# 检查日志是否包含完整错误堆栈
+```
 
 ---
 

app/(admin)/settings/_components/local-ai-sections/image-pipeline-sections.tsx

@@ -75,8 +75,6 @@ export function LocalAiImagePipelineSections({
   aiWashConfig,
   setAiWashConfig,
   aiWashModeIconUploading,
-  canvasLocalEditConfig,
-  setCanvasLocalEditConfig,
   extendConfig,
   setExtendConfig,
   watermarkRemoveConfig,
@@ -105,7 +103,6 @@ export function LocalAiImagePipelineSections({
   handleMoveEnhanceProPreset,
   handleAiWashModeIconUpload,
   handleSaveAiWashConfig,
-  handleSaveCanvasLocalEditConfig,
   handleSaveExtendConfig,
   handleSaveWatermarkRemoveConfig,
   handleSaveAngleEditConfig,
@@ -159,15 +156,12 @@ export function LocalAiImagePipelineSections({
               },
               {
                 label:
-                  rmbgConfig.provider === "vip98k"
-                    ? "服务商 Key 已配置"
-                    : rmbgConfig.apiKey ||
+                  rmbgConfig.apiKey ||
                   rmbgConfig.photoroomApiKey ||
                   rmbgConfig.aosApiKey
                     ? "Key 已配置"
                     : "Key 待配置",
                 tone:
-                  rmbgConfig.provider === "vip98k" ||
                   rmbgConfig.apiKey ||
                   rmbgConfig.photoroomApiKey ||
                   rmbgConfig.aosApiKey
@@ -182,26 +176,7 @@ export function LocalAiImagePipelineSections({
         {/* 服务提供商选择 */}
         <div className="space-y-3">
           <Label>抠图服务提供商</Label>
-          <div className="grid grid-cols-1 gap-4 md:grid-cols-4">
-            <div
-              className={`relative flex cursor-pointer items-center gap-3 rounded-lg border p-4 transition-all hover:bg-accent ${
-                rmbgConfig.provider === "vip98k"
-                  ? "border-primary bg-accent ring-1 ring-primary"
-                  : ""
-              }`}
-              onClick={() => setRmbgConfig({ ...rmbgConfig, provider: "vip98k" })}
-            >
-              <div
-                className={`flex h-4 w-4 shrink-0 items-center justify-center rounded-full border border-primary ${
-                  rmbgConfig.provider === "vip98k"
-                    ? "bg-primary text-primary-foreground"
-                    : "bg-transparent"
-                }`}
-              >
-                {rmbgConfig.provider === "vip98k" && <Check className="h-3 w-3" />}
-              </div>
-              <p className="font-medium text-sm leading-none">VIP98K 统一服务</p>
-            </div>
+          <div className="grid grid-cols-1 gap-4 md:grid-cols-3">
             <div
               className={`relative flex cursor-pointer items-center gap-3 rounded-lg border p-4 transition-all hover:bg-accent ${
                 rmbgConfig.provider === "rmbg"
@@ -288,13 +263,6 @@ export function LocalAiImagePipelineSections({
 
         <Separator />
 
-        {rmbgConfig.provider === "vip98k" && (
-          <div className="rounded-lg border bg-muted/40 p-4 text-sm">
-            使用 VIP98K 的 remove-background 模型。API Key 从“AI 模型设置”中的
-            VIP98K 服务商读取，不会在此重复保存。
-          </div>
-        )}
-
         {/* RMBG 配置 */}
         {rmbgConfig.provider === "rmbg" && (
           <>
@@ -500,7 +468,7 @@ export function LocalAiImagePipelineSections({
       <LocalAiSectionShell
         description={
           <>
-            配置图片变清晰服务，用于画图标注功能中的图片增强处理。
+            配置图片变清晰API，用于画图标注功能中的图片增强处理。支持主API和备用API切换。
           </>
         }
         expanded={isLocalAiSectionExpanded("enhance")}
@@ -510,21 +478,17 @@ export function LocalAiImagePipelineSections({
           <LocalAiSectionSummary
             items={[
               {
-                label: enhanceConfig.provider === "vip98k"
-                  ? "VIP98K"
-                  : enhanceConfig.useBackupApi
+                label: enhanceConfig.useBackupApi
                   ? "备用 Real-ESRGAN"
                   : "主 API",
                 tone: "neutral",
               },
               {
                 label:
-                  enhanceConfig.provider === "vip98k" ||
                   enhanceConfig.apiKey || enhanceConfig.backupApiKey
                     ? "Key 已配置"
                     : "Key 待配置",
                 tone:
-                  enhanceConfig.provider === "vip98k" ||
                   enhanceConfig.apiKey || enhanceConfig.backupApiKey
                     ? "enabled"
                     : "warning",
@@ -534,13 +498,6 @@ export function LocalAiImagePipelineSections({
         }
         title="变清晰API配置"
       >
-        {enhanceConfig.provider === "vip98k" ? (
-          <div className="rounded-lg border bg-muted/40 p-4 text-sm">
-            使用 VIP98K 的 enhance 模型，默认 4 倍增强。API Key 从“AI 模型设置”中的
-            VIP98K 服务商读取。
-          </div>
-        ) : (
-          <>
         {/* API切换开关 */}
         <div className="flex items-center justify-between rounded-lg border p-4">
           <div className="space-y-0.5">
@@ -789,8 +746,6 @@ export function LocalAiImagePipelineSections({
             </div>
           </>
         )}
-          </>
-        )}
 
         <Button onClick={handleSaveEnhanceConfig}>
           <Save className="mr-2 h-4 w-4" /> 保存配置
@@ -1466,112 +1421,6 @@ export function LocalAiImagePipelineSections({
       </Button>
       </LocalAiSectionShell>
 
-      <LocalAiSectionShell
-        description={
-          <>
-            配置无限画布图片“局部编辑”和“比例调整”后端优先使用的生图模型。为空时仍沿用旧的 AI详情默认模型或用户当前选择，避免影响已有流程。
-          </>
-        }
-        expanded={isLocalAiSectionExpanded("canvas-local-edit")}
-        id="local-ai-section-canvas-local-edit"
-        onToggle={() => toggleLocalAiSection("canvas-local-edit")}
-        summary={
-          <LocalAiSectionSummary
-            items={[
-              {
-                label: canvasLocalEditConfig.modelId
-                  ? "普通局部编辑已指定"
-                  : "普通局部编辑继承默认",
-                tone: canvasLocalEditConfig.modelId ? "enabled" : "neutral",
-              },
-              {
-                label: canvasLocalEditConfig.scaleAdjustModelId
-                  ? "比例调整已指定"
-                  : "比例调整兼容旧默认",
-                tone: canvasLocalEditConfig.scaleAdjustModelId
-                  ? "enabled"
-                  : "neutral",
-              },
-            ]}
-          />
-        }
-        title="局部编辑模型配置"
-      >
-        <div className="grid gap-4 md:grid-cols-2">
-          <div className="space-y-2">
-            <Label htmlFor="canvasLocalEditModel">普通局部编辑默认模型</Label>
-            <Select
-              onValueChange={(value) =>
-                setCanvasLocalEditConfig((prev) => ({
-                  ...prev,
-                  modelId: value === "__none__" ? "" : value,
-                }))
-              }
-              value={canvasLocalEditConfig.modelId || "__none__"}
-            >
-              <SelectTrigger id="canvasLocalEditModel">
-                <SelectValue placeholder="不指定时使用当前模型或系统默认" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="__none__">不指定，沿用当前模型/系统默认</SelectItem>
-                {availableImageModels.length > 0 ? (
-                  availableImageModels.map((model) => (
-                    <SelectItem key={model.id} value={model.modelId}>
-                      {formatAiWashModelOptionLabel(model)}
-                    </SelectItem>
-                  ))
-                ) : (
-                  <SelectItem disabled value="__empty__">
-                    暂无可用生图模型，请先到 AI 模型里启用
-                  </SelectItem>
-                )}
-              </SelectContent>
-            </Select>
-            <div className="text-muted-foreground text-xs">
-              适用于手动画框并填写提示词的局部编辑。
-            </div>
-          </div>
-
-          <div className="space-y-2">
-            <Label htmlFor="canvasScaleAdjustModel">比例调整/目标框模型</Label>
-            <Select
-              onValueChange={(value) =>
-                setCanvasLocalEditConfig((prev) => ({
-                  ...prev,
-                  scaleAdjustModelId: value === "__none__" ? "" : value,
-                }))
-              }
-              value={canvasLocalEditConfig.scaleAdjustModelId || "__none__"}
-            >
-              <SelectTrigger id="canvasScaleAdjustModel">
-                <SelectValue placeholder="不指定时兼容旧 AI详情默认模型" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="__none__">不指定，兼容旧 AI详情默认模型</SelectItem>
-                {availableImageModels.length > 0 ? (
-                  availableImageModels.map((model) => (
-                    <SelectItem key={model.id} value={model.modelId}>
-                      {formatAiWashModelOptionLabel(model)}
-                    </SelectItem>
-                  ))
-                ) : (
-                  <SelectItem disabled value="__empty__">
-                    暂无可用生图模型，请先到 AI 模型里启用
-                  </SelectItem>
-                )}
-              </SelectContent>
-            </Select>
-            <div className="text-muted-foreground text-xs">
-              适用于截图中“局部编辑/比例”按钮，把商品缩放到青色目标框的流程。
-            </div>
-          </div>
-        </div>
-
-        <Button onClick={handleSaveCanvasLocalEditConfig}>
-          <Save className="mr-2 h-4 w-4" /> 保存局部编辑模型配置
-        </Button>
-      </LocalAiSectionShell>
-
       <LocalAiSectionShell
         description={
           <>
@@ -2366,7 +2215,7 @@ export function LocalAiImagePipelineSections({
       <LocalAiSectionShell
         description={
           <>
-            配置图像拓展服务，用于画图标注功能中的图像智能扩展处理
+            配置阿里云Dashscope图像拓展API，用于画图标注功能中的图像智能扩展处理
           </>
         }
         expanded={isLocalAiSectionExpanded("extend")}
@@ -2376,14 +2225,8 @@ export function LocalAiImagePipelineSections({
           <LocalAiSectionSummary
             items={[
               {
-                label:
-                  extendConfig.provider === "vip98k" || extendConfig.apiKey
-                    ? "Key 已配置"
-                    : "Key 待配置",
-                tone:
-                  extendConfig.provider === "vip98k" || extendConfig.apiKey
-                    ? "enabled"
-                    : "warning",
+                label: extendConfig.apiKey ? "Key 已配置" : "Key 待配置",
+                tone: extendConfig.apiKey ? "enabled" : "warning",
               },
               {
                 label: `${extendConfig.xScale}x / ${extendConfig.yScale}x`,
@@ -2394,12 +2237,6 @@ export function LocalAiImagePipelineSections({
         }
         title="图像拓展API配置"
       >
-        {extendConfig.provider === "vip98k" ? (
-          <div className="rounded-lg border bg-muted/40 p-4 text-sm">
-            使用 VIP98K 的 image-expansion 模型。API Key 从“AI 模型设置”中的
-            VIP98K 服务商读取，仅在这里维护扩展比例。
-          </div>
-        ) : (
         <div className="space-y-2">
           <Label htmlFor="extendApiKey">API密钥 *</Label>
           <Input
@@ -2416,7 +2253,6 @@ export function LocalAiImagePipelineSections({
             sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
           </div>
         </div>
-        )}
         <div className="grid grid-cols-2 gap-4">
           <div className="space-y-2">
             <Label htmlFor="extendXScale">X轴放大倍数 *</Label>

app/(admin)/settings/_components/local-ai-sections/model3d-sections.tsx

@@ -916,8 +916,8 @@ export function LocalAiModel3dSections({
       <LocalAiSectionShell
         description={
           <>
-            配置官方 HiCAD 使用的 KittyCAD / Zoo 服务，保存后写入数据库 AI
-            提供商配置。
+            配置 AI-CAD 页面后续接入的 KittyCAD / Zoo Text-to-CAD
+            服务，保存后写入数据库 AI 提供商配置。
           </>
         }
         expanded={isLocalAiSectionExpanded("kittycad-cad")}
@@ -1003,7 +1003,7 @@ export function LocalAiModel3dSections({
           <div className="space-y-0.5">
             <Label className="text-sm">启用 KittyCAD CAD</Label>
             <div className="text-muted-foreground text-xs">
-              关闭后 HiCAD 将无法连接 Zoo 建模和 AI 助手服务
+              关闭后 AI-CAD 页面将无法切换到外部 CAD 服务
             </div>
           </div>
           <div className="flex items-center gap-2">

app/(admin)/settings/_lib/local-ai-sections.ts

@@ -12,7 +12,6 @@ export const DEFAULT_LOCAL_AI_EXPANDED_SECTIONS: Record<string, boolean> = {
   rmbg: false,
   enhance: false,
   "enhance-pro": false,
-  "canvas-local-edit": false,
   "ai-wash": false,
   extend: false,
   "watermark-remove": false,

app/(admin)/settings/_lib/types.ts

@@ -1,7 +1,6 @@
 import type { LucideIcon } from "lucide-react";
 import type { Dispatch, DragEvent, ReactNode, SetStateAction } from "react";
 import type { CanvasImageTaskQueueConfig } from "@/lib/canvas/image-task-config";
-import type { CanvasLocalEditConfig } from "@/lib/canvas/local-edit-config";
 import type { AiWashConfig } from "@/lib/ai-wash/config";
 import type {
   EnhanceProKreaConfig,
@@ -89,10 +88,6 @@ export type AdminAiProvider = {
     | "fal-image"
     | "snapgen-image"
     | "openai-image"
-    | "bananaimage"
-    | "visionary"
-    | "atlascloud"
-    | "vip98k"
     | "stepfun-image"
     | "midjourney"
     | "fal-video"
@@ -249,7 +244,7 @@ export type EnhanceProKeyRow = {
 };
 
 export type RmbgConfig = {
-  provider: "vip98k" | "rmbg" | "photoroom" | "aoscdn";
+  provider: "rmbg" | "photoroom" | "aoscdn";
   apiUrl: string;
   apiKey: string;
   photoroomApiKey: string;
@@ -261,7 +256,6 @@ export type RmbgConfig = {
 };
 
 export type EnhanceConfig = {
-  provider: "vip98k" | "legacy";
   apiUrl: string;
   apiKey: string;
   type: string;
@@ -274,7 +268,6 @@ export type EnhanceConfig = {
 };
 
 export type ExtendConfig = {
-  provider: "vip98k" | "dashscope";
   apiKey: string;
   xScale: string;
   yScale: string;
@@ -334,8 +327,6 @@ export type LocalAiImagePipelineSectionsProps = LocalAiSectionControlProps & {
   aiWashConfig: AiWashConfig;
   setAiWashConfig: Dispatch<SetStateAction<AiWashConfig>>;
   aiWashModeIconUploading: boolean;
-  canvasLocalEditConfig: CanvasLocalEditConfig;
-  setCanvasLocalEditConfig: Dispatch<SetStateAction<CanvasLocalEditConfig>>;
   extendConfig: ExtendConfig;
   setExtendConfig: Dispatch<SetStateAction<ExtendConfig>>;
   watermarkRemoveConfig: WatermarkRemoveConfig;
@@ -378,7 +369,6 @@ export type LocalAiImagePipelineSectionsProps = LocalAiSectionControlProps & {
   handleMoveEnhanceProPreset: (fromIndex: number, toIndex: number) => void;
   handleAiWashModeIconUpload: (file: File) => Promise<void>;
   handleSaveAiWashConfig: AsyncAction;
-  handleSaveCanvasLocalEditConfig: AsyncAction;
   handleSaveExtendConfig: AsyncAction;
   handleSaveWatermarkRemoveConfig: AsyncAction;
   handleSaveAngleEditConfig: AsyncAction;

app/(chat)/ai-cad/page.tsx

@@ -3,9 +3,9 @@ import path from "node:path";
 import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 import { auth } from "@/app/(auth)/auth";
+import { ZooDesignStudioFrame } from "@/components/ai-cad/zoo-design-studio-frame";
 
-const ZOO_MODELING_APP_SRC =
-  "/vendor/zoo-modeling-app/index.html?v=f2b345db-eng1";
+const ZOO_MODELING_APP_SRC = "/vendor/zoo-modeling-app/index.html";
 
 export const dynamic = "force-dynamic";
 export const metadata: Metadata = {
@@ -23,22 +23,11 @@ export default async function AiCadPage() {
     path.join(process.cwd(), "public/vendor/zoo-modeling-app/index.html")
   );
 
-  if (isReady) {
-    redirect(ZOO_MODELING_APP_SRC);
-  }
-
   return (
-    <main className="flex h-svh w-full items-center justify-center bg-[#10100e] p-6 text-[#f8f6ef]">
-      <section className="w-full max-w-xl rounded-lg border border-[#3a352c] bg-[#171510] p-6 shadow-2xl">
-        <h1 className="font-semibold text-lg">HiCAD 官方前端尚未构建</h1>
-        <p className="mt-2 text-[#d3cabb] text-sm leading-6">
-          请运行
-          <code className="mx-1 rounded bg-white/10 px-1.5 py-0.5">
-            pnpm zoo-modeling-app:vendor
-          </code>
-          生成官方前端，然后刷新本页。
-        </p>
-      </section>
-    </main>
+    <ZooDesignStudioFrame
+      isReady={isReady}
+      sourceLabel="HiCAD"
+      src={ZOO_MODELING_APP_SRC}
+    />
   );
 }

app/(chat)/api/chat/_lib/image-failover.ts

@@ -15,10 +15,6 @@ export const IMAGE_FAILOVER_PROVIDER_ALLOWLIST = new Set([
   "fal-image",
   "snapgen-image",
   "openai-image",
-  "bananaimage",
-  "visionary",
-  "atlascloud",
-  "vip98k",
   "stepfun-image",
   "runway",
   "krea",
@@ -247,10 +243,6 @@ export function getImageFailoverConvertProvider(providerType?: string | null) {
     case "fal-image":
     case "snapgen-image":
     case "openai-image":
-    case "bananaimage":
-    case "visionary":
-    case "atlascloud":
-    case "vip98k":
     case "stepfun-image":
     case "midjourney":
     case "runway":

app/(chat)/api/chat/_lib/image-media.ts

@@ -524,10 +524,6 @@ export async function convertMessagesWithImages(
     normalizedProviderType === "fal-image" ||
     normalizedProviderType === "snapgen-image" ||
     normalizedProviderType === "openai-image" ||
-    normalizedProviderType === "bananaimage" ||
-    normalizedProviderType === "visionary" ||
-    normalizedProviderType === "atlascloud" ||
-    normalizedProviderType === "vip98k" ||
     normalizedProviderType === "stepfun-image" ||
     normalizedProviderType === "midjourney" ||
     normalizedProviderType === "runway" ||

app/(chat)/api/chat/_lib/stream.ts

@@ -7,7 +7,6 @@ import type {
   ResolvedTargetAssets,
 } from "@/lib/ai/context-memory/types";
 import type { CanvasViewOperationPlan } from "@/types/canvas/agent-protocol";
-import type { CanvasCapabilityClientCommand } from "@/lib/canvas/capabilities/client-command";
 import { generateUUID } from "@/lib/utils";
 
 const chatApiLogger = createLogger("chat.stream");
@@ -188,10 +187,6 @@ function normalizeImageLoadingProviderType(providerType?: string | null): string
     normalized === "fal-image" ||
     normalized === "snapgen-image" ||
     normalized === "openai-image" ||
-    normalized === "bananaimage" ||
-    normalized === "visionary" ||
-    normalized === "atlascloud" ||
-    normalized === "vip98k" ||
     normalized === "stepfun-image" ||
     normalized === "midjourney" ||
     normalized === "runway" ||
@@ -426,19 +421,6 @@ export function writeCanvasViewOperationChunk(
   );
 }
 
-export function writeCanvasCapabilityCommandChunk(
-  writer: StreamWriter,
-  command: CanvasCapabilityClientCommand,
-  label: string
-) {
-  writeStructuredDataChunk(
-    writer,
-    "data-canvasCapabilityCommand",
-    command,
-    label
-  );
-}
-
 type AgentTargetLockRefPreview = {
   url: string;
   title?: string;

app/(chat)/api/chat/route.ts

@@ -90,10 +90,6 @@ import {
   hasCanvasAgentPanViewIntent,
 } from "@/lib/canvas/agent-view-pan";
 import { buildCanvasAgentDirectWritebackPlan } from "@/lib/canvas/agent-direct-writeback";
-import {
-  createCanvasCapabilityTools,
-  getCanvasCapabilityToolNames,
-} from "@/lib/canvas/capabilities/ai-sdk-tools";
 import {
   getCanvasAgentOperationErrorMessage,
   normalizeCanvasAgentOperationErrorCode,
@@ -396,7 +392,6 @@ import {
   writeAgentTargetLockChunk,
   writeAssistantTextChunk,
   writeCanvasMediaChunk,
-  writeCanvasCapabilityCommandChunk,
   writeCanvasOperationChunk,
   writeCanvasViewOperationChunk,
   writeImageGenerationStatusChunk,
@@ -5745,53 +5740,44 @@ export async function POST(request: Request) {
             );
             const assistantMessageId = generateUUID();
 
-            try {
-              await saveMessages({
-                messages: [
-                  {
-                    id: assistantMessageId,
-                    chatId: id,
-                    role: "assistant",
-                    parts: [{ type: "text", text: assistantText }],
-                    attachments: [],
-                    createdAt: new Date(),
-                    videoStorageStatus: null,
-                    temporaryVideoUrl: null,
-                    permanentVideoUrl: null,
-                    archivedAt: null,
-                    videoMetadata: null,
-                  },
-                ],
-              });
-
-              await saveGeneratedImages(
-                assistantText,
-                session.user.id,
-                id,
-                assistantMessageId,
-                params.promptForPersistence || baseReplacementPrompt,
-                resolvedModelRef,
+            await saveMessages({
+              messages: [
                 {
-                  sourceAssetIds,
-                  sourceImageUrls: params.sourceImageUrls,
-                  relationType: "edited_from",
-                  sourceType: "detail_replacement",
-                  projectId: contextPayload?.projectId || null,
-                  userPrompt: requestTextContent,
-                  optimizedPrompt: params.promptForPersistence || baseReplacementPrompt,
-                  requestedImageCount: 1,
-                  aspectRatio: resolvedAspectRatio,
-                  imageSize: persistedImageSize,
+                  id: assistantMessageId,
+                  chatId: id,
+                  role: "assistant",
+                  parts: [{ type: "text", text: assistantText }],
+                  attachments: [],
+                  createdAt: new Date(),
+                  videoStorageStatus: null,
+                  temporaryVideoUrl: null,
+                  permanentVideoUrl: null,
+                  archivedAt: null,
+                  videoMetadata: null,
                 },
-              );
-            } catch (persistError) {
-              chatApiLogger.warn("[Chat API] Failed to persist direct detail replacement result; streaming response anyway:", {
-                chatId: id,
-                referenceId: params.reference.id,
-                referenceLabel: params.reference.label,
-                error: persistError,
-              });
-            }
+              ],
+            });
+
+            await saveGeneratedImages(
+              assistantText,
+              session.user.id,
+              id,
+              assistantMessageId,
+              params.promptForPersistence || baseReplacementPrompt,
+              resolvedModelRef,
+              {
+                sourceAssetIds,
+                sourceImageUrls: params.sourceImageUrls,
+                relationType: "edited_from",
+                sourceType: "detail_replacement",
+                projectId: contextPayload?.projectId || null,
+                userPrompt: requestTextContent,
+                optimizedPrompt: params.promptForPersistence || baseReplacementPrompt,
+                requestedImageCount: 1,
+                aspectRatio: resolvedAspectRatio,
+                imageSize: persistedImageSize,
+              },
+            );
 
             writeAssistantTextChunk(
               writer,
@@ -5819,7 +5805,6 @@ export async function POST(request: Request) {
               Array.from(replacementReferences.entries()),
               AGENT_REPLACEMENT_PARALLEL_WORKER_COUNT,
               async ([referenceIndex, reference]) => {
-              const itemStartedAt = Date.now();
               if (reference.passthrough === true) {
                 const referenceSourceImageUrls = Array.from(
                   new Set([
@@ -5840,29 +5825,9 @@ export async function POST(request: Request) {
                   streamLabel: "agent-mode:image:detail-replacement:item-passthrough",
                 });
                 successCount += 1;
-                chatApiLogger.info("[Chat API] Direct detail replacement item passthrough completed:", {
-                  referenceIndex: referenceIndex + 1,
-                  totalReferences: replacementReferences.length,
-                  referenceLabel: reference.label,
-                  elapsedMs: Date.now() - itemStartedAt,
-                });
                 return;
               }
 
-              const fallbackSourceImageUrls = Array.from(
-                new Set([
-                  ...productInputImageUrls,
-                  ...(modelInputImageUrl ? [modelInputImageUrl] : []),
-                  ...(reference.rerunReferenceImages || [])
-                    .map((image) => String(image.url || "").trim())
-                    .filter((url) => /^https?:\/\//i.test(url))
-                    .slice(0, 6),
-                  reference.imageUrl,
-                ]),
-              );
-
-              try {
-              const planningStartedAt = Date.now();
               const replacementExecutionPlan = await analyzeReplacementExecutionPlan({
                 modeType: "detail_replacement",
                 replacementStrategy: detailReplacementStrategy,
@@ -5877,12 +5842,10 @@ export async function POST(request: Request) {
                 planningRuntime: replacementScenePlanningRuntime,
                 models: replacementVisionModels,
               });
-              const planningElapsedMs = Date.now() - planningStartedAt;
               chatApiLogger.info("[Chat API] Direct detail replacement reference decision:", {
                 referenceIndex: referenceIndex + 1,
                 totalReferences: replacementReferences.length,
                 referenceLabel: reference.label,
-                planningElapsedMs,
                 shouldReplace: replacementExecutionPlan.shouldReplace,
                 reason: replacementExecutionPlan.reason,
                 detectionSource: replacementExecutionPlan.detectionSource,
@@ -5992,12 +5955,7 @@ export async function POST(request: Request) {
                 hasPromptPackBlock: replacementPrompt.includes("【必须生效的前置场景词包】"),
               });
 
-              let generationStartedAt = 0;
-              let generationElapsedMs: number | null = null;
-              let normalizeStartedAt = 0;
-              let normalizeElapsedMs: number | null = null;
               try {
-                generationStartedAt = Date.now();
                 const result = await generateCanvasImage({
                   prompt: replacementPrompt,
                   negativePrompt: effectiveImageParams?.negativePrompt,
@@ -6037,7 +5995,6 @@ export async function POST(request: Request) {
                         }
                       : undefined,
                 });
-                generationElapsedMs = Date.now() - generationStartedAt;
                 resolvedModelDisplayName = result.model || resolvedModelDisplayName;
                 const firstImage = result.images[0];
                 if (!firstImage) {
@@ -6047,7 +6004,6 @@ export async function POST(request: Request) {
                 let finalImage = firstImage;
                 let finalImageSizeLabel: string = resolvedImageSize;
                 try {
-                  normalizeStartedAt = Date.now();
                   const normalizedImage = await normalizeReplacementResultImage({
                     generatedImageUrl: firstImage.originalUrl,
                     generatedThumbnailUrl: firstImage.thumbnailUrl,
@@ -6061,11 +6017,7 @@ export async function POST(request: Request) {
                     thumbnailUrl: normalizedImage.thumbnailUrl || normalizedImage.originalUrl,
                   };
                   finalImageSizeLabel = normalizedImage.imageSize;
-                  normalizeElapsedMs = Date.now() - normalizeStartedAt;
                 } catch (normalizeError) {
-                  if (normalizeStartedAt > 0 && normalizeElapsedMs === null) {
-                    normalizeElapsedMs = Date.now() - normalizeStartedAt;
-                  }
                   chatApiLogger.warn("[Chat API] Failed to normalize direct detail replacement output:", {
                       referenceLabel: reference.label,
                       referenceImageUrl: reference.imageUrl,
@@ -6083,22 +6035,6 @@ export async function POST(request: Request) {
                   }
                 }
 
-                chatApiLogger.info("[Chat API] Direct detail replacement image generation completed:", {
-                  referenceIndex: referenceIndex + 1,
-                  totalReferences: replacementReferences.length,
-                  referenceLabel: reference.label,
-                  modelDisplayName: resolvedModelDisplayName,
-                  resultImageSize: finalImageSizeLabel,
-                  sourceImageCount: sourceImageUrls.length,
-                  generationAspectRatio,
-                  pageKind: replacementExecutionPlan.scenePlan.pageKind,
-                  generationRoute: replacementExecutionPlan.scenePlan.generationRoute,
-                  promptPackPolicy: replacementExecutionPlan.scenePlan.promptPackPolicy,
-                  elapsedMs: Date.now() - itemStartedAt,
-                  planningElapsedMs,
-                  generationElapsedMs,
-                  normalizeElapsedMs,
-                });
                 await emitReplacementResultMessage({
                   reference,
                   image: finalImage,
@@ -6110,16 +6046,9 @@ export async function POST(request: Request) {
                 });
                 successCount += 1;
               } catch (replacementItemError) {
-                if (generationStartedAt > 0 && generationElapsedMs === null) {
-                  generationElapsedMs = Date.now() - generationStartedAt;
-                }
                 chatApiLogger.error("[Chat API] Direct detail replacement item failed:", {
                   referenceIndex,
                   referenceLabel: reference.label,
-                  elapsedMs: Date.now() - itemStartedAt,
-                  planningElapsedMs,
-                  generationElapsedMs,
-                  normalizeElapsedMs,
                   error: replacementItemError,
                 });
                 await emitReplacementResultMessage({
@@ -6139,30 +6068,6 @@ export async function POST(request: Request) {
                 });
                 successCount += 1;
               }
-              } catch (replacementPlanError) {
-                chatApiLogger.error("[Chat API] Direct detail replacement item failed before generation:", {
-                  referenceIndex,
-                  referenceLabel: reference.label,
-                  elapsedMs: Date.now() - itemStartedAt,
-                  error: replacementPlanError,
-                });
-                await emitReplacementResultMessage({
-                  reference,
-                  bodyText: `生成失败，当前先沿用参考图：${
-                    replacementPlanError instanceof Error
-                      ? replacementPlanError.message
-                      : "请稍后重试"
-                  }`,
-                  image: {
-                    originalUrl: reference.imageUrl,
-                    thumbnailUrl: reference.imageUrl,
-                  },
-                  modelDisplayName: null,
-                  sourceImageUrls: fallbackSourceImageUrls,
-                  streamLabel: "agent-mode:image:detail-replacement:item-fallback",
-                });
-                successCount += 1;
-              }
             });
           } finally {
             stopKeepalive();
@@ -7811,17 +7716,6 @@ export async function POST(request: Request) {
     const directAgentExecution = directAgentToolContext?.execution || null;
     const directAgentToolTargetImageUrls = directAgentToolContext?.targetImageUrls || [];
     const directAgentToolTargetImageUrl = directAgentToolContext?.targetImageUrl || null;
-    const selectedCanvasImageNodeIds = (
-      requestCanvasAgentContext?.selectedNodes || []
-    )
-      .filter((node) => node.type === "image")
-      .map((node) => node.nodeId)
-      .filter(Boolean);
-    const shouldUseCanvasCapabilityToolLoop = Boolean(
-      contextPayload?.source === "canvas" &&
-        contextPayload.projectId &&
-        selectedCanvasImageNodeIds.length > 0
-    );
 
     if (
       shouldRunAgentConversation &&
@@ -8371,7 +8265,6 @@ export async function POST(request: Request) {
       shouldRunAgentConversation &&
       !smartAutoNeedsClarification &&
       directAgentExecution &&
-      !shouldUseCanvasCapabilityToolLoop &&
       isDirectAgentImageEditToolName(directAgentExecution.toolName)
     ) {
       const directAgentToolCapability = directAgentExecution.capability;
@@ -8818,14 +8711,6 @@ export async function POST(request: Request) {
       agentIdentityInstruction,
       recentDialogueSystemContext,
       baseConversationSystemPrompt,
-      shouldUseCanvasCapabilityToolLoop
-        ? [
-            "当前请求来自无限画布，且用户已明确选中图片节点。",
-            "涉及选中图片的识别、编辑、生成、3D、改名、批注或删除时，必须调用已提供的画布能力工具，不得只用文字声称完成。",
-            "可以连续调用多个工具；下一步要处理上一步结果时，把上一步返回的 createdNodeIds 作为 nodeIds。",
-            "只有工具返回成功后才能告诉用户已完成；若工具返回 interactive，说明已在画布打开对应交互界面并等待用户操作。",
-          ].join("\n")
-        : "",
     ]
       .filter(Boolean)
       .join("\n\n");
@@ -9219,10 +9104,6 @@ export async function POST(request: Request) {
                   "fal-image": 4,
                   "snapgen-image": 5,
                   "openai-image": 6,
-                  bananaimage: 7,
-                  visionary: 7,
-                  atlascloud: 7,
-                  vip98k: 7,
                   "stepfun-image": 7,
                   "grsai-gpt-image": 8,
                   runway: 9,
@@ -9614,10 +9495,6 @@ export async function POST(request: Request) {
         "fal-image",
         "snapgen-image",
         "openai-image",
-        "bananaimage",
-        "visionary",
-        "atlascloud",
-        "vip98k",
         "stepfun-image",
         "midjourney",
         "runway",
@@ -9840,14 +9717,6 @@ export async function POST(request: Request) {
                       ? "snapgen-image"
                     : (languageModel as any).provider === "openai-image"
                       ? "openai-image"
-                    : (languageModel as any).provider === "bananaimage"
-                      ? "bananaimage"
-                    : (languageModel as any).provider === "visionary"
-                      ? "visionary"
-                    : (languageModel as any).provider === "atlascloud"
-                      ? "atlascloud"
-                    : (languageModel as any).provider === "vip98k"
-                      ? "vip98k"
                     : (languageModel as any).provider === "stepfun-image"
                       ? "stepfun-image"
                       : (languageModel as any).provider === "midjourney"
@@ -9951,10 +9820,6 @@ export async function POST(request: Request) {
                   "fal-image": 4,
                   "snapgen-image": 5,
                   "openai-image": 6,
-                  bananaimage: 7,
-                  visionary: 7,
-                  atlascloud: 7,
-                  vip98k: 7,
                   "stepfun-image": 7,
                   runway: 8,
                   krea: 9,
@@ -9998,14 +9863,6 @@ export async function POST(request: Request) {
                             ? "snapgen-image"
                           : candidate.provider.type === "openai-image"
                             ? "openai-image"
-                          : candidate.provider.type === "bananaimage"
-                            ? "bananaimage"
-                          : candidate.provider.type === "visionary"
-                            ? "visionary"
-                          : candidate.provider.type === "atlascloud"
-                            ? "atlascloud"
-                          : candidate.provider.type === "vip98k"
-                            ? "vip98k"
                           : candidate.provider.type === "stepfun-image"
                             ? "stepfun-image"
                             : candidate.provider.type === "midjourney"
@@ -10392,10 +10249,6 @@ export async function POST(request: Request) {
                   "fal-image": 3,
                   "snapgen-image": 4,
                   "openai-image": 5,
-                  bananaimage: 6,
-                  visionary: 6,
-                  atlascloud: 6,
-                  vip98k: 6,
                   "stepfun-image": 6,
                   runway: 7,
                   krea: 8,
@@ -10440,14 +10293,6 @@ export async function POST(request: Request) {
                             ? "snapgen-image"
                           : candidate.provider.type === "openai-image"
                             ? "openai-image"
-                          : candidate.provider.type === "bananaimage"
-                            ? "bananaimage"
-                          : candidate.provider.type === "visionary"
-                            ? "visionary"
-                          : candidate.provider.type === "atlascloud"
-                            ? "atlascloud"
-                          : candidate.provider.type === "vip98k"
-                            ? "vip98k"
                           : candidate.provider.type === "stepfun-image"
                             ? "stepfun-image"
                             : candidate.provider.type === "midjourney"
@@ -10661,7 +10506,7 @@ export async function POST(request: Request) {
 
     // ========== 千问/FAL/RUXA 视频生成独立处理 ==========
     if (
-      ["qianwen-video", "fal-video", "ruxa-video", "runway", "krea", "bltcy-video", "vip98k"].includes((languageModel as any).provider) &&
+      ["qianwen-video", "fal-video", "ruxa-video", "runway", "krea", "bltcy-video"].includes((languageModel as any).provider) &&
       typeof (languageModel as any).doGenerate === "function"
     ) {
       const currentVideoProvider = (languageModel as any).provider as
@@ -10670,8 +10515,7 @@ export async function POST(request: Request) {
         | "ruxa-video"
         | "runway"
         | "krea"
-        | "bltcy-video"
-        | "vip98k";
+        | "bltcy-video";
       chatApiLogger.info(`[Chat API] Using ${currentVideoProvider} video generation`);
       
       const videoGenerationStream = createUIMessageStream({
@@ -11094,52 +10938,6 @@ export async function POST(request: Request) {
           chatApiLogger.info("[Smart Auto Mode] 🚫 generateVideo tool disabled (manual video mode not selected)");
         }
 
-        if (
-          contextPayload?.source === "canvas" &&
-          contextPayload.projectId &&
-          selectedCanvasImageNodeIds.length > 0
-        ) {
-          const canvasCapabilityTools = await createCanvasCapabilityTools({
-            projectId: contextPayload.projectId,
-            selectedNodeIds: selectedCanvasImageNodeIds,
-            userId: session.user.id,
-            requestHeaders: request.headers,
-            requestUrl: request.url,
-            defaultModelId: finalModelId,
-            destructiveConfirmed: isCanvasOperationConfirmText(requestTextContent),
-            callbacks: {
-              onClientCommand: (command, capability) => {
-                writeCanvasCapabilityCommandChunk(
-                  dataStream as unknown as StreamWriter,
-                  command,
-                  `canvas-capability:${capability.id}:client-command`
-                );
-              },
-              onResult: (runtimeResult, capability) => {
-                if (!runtimeResult.operation) return;
-                writeCanvasOperationChunk(
-                  dataStream as unknown as StreamWriter,
-                  {
-                    projectId: contextPayload.projectId!,
-                    operationId: runtimeResult.task.requestId,
-                    operation: capability.id,
-                    status: "applied",
-                    createdNodeIds: runtimeResult.operation.createdNodeIds,
-                    createdNodeIdsByMediaItemId:
-                      runtimeResult.operation.createdNodeIdsByMediaItemId,
-                    updatedNodeIds: runtimeResult.operation.updatedNodeIds,
-                    canvasRevision: runtimeResult.operation.canvasRevision,
-                    message: `${capability.title}已完成`,
-                  },
-                  `canvas-capability:${capability.id}:operation`
-                );
-              },
-            },
-          });
-          Object.assign(tools, canvasCapabilityTools);
-          activeTools.push(...getCanvasCapabilityToolNames(canvasCapabilityTools));
-        }
-
         chatApiLogger.info("[Chat API] Calling streamText with model:", (languageModel as any).modelId, (languageModel as any).provider); // 调试日志
         chatApiLogger.info("[Chat API] Provider type:", (languageModel as any).provider); // 调试日志
 
@@ -11324,10 +11122,6 @@ export async function POST(request: Request) {
                   "fal-image": 4,
                   "snapgen-image": 5,
                   "openai-image": 6,
-                  bananaimage: 7,
-                  visionary: 7,
-                  atlascloud: 7,
-                  vip98k: 7,
                   "stepfun-image": 7,
                   runway: 8,
                   krea: 9,
@@ -11374,14 +11168,6 @@ export async function POST(request: Request) {
                             ? "snapgen-image"
                           : candidate.provider.type === "openai-image"
                             ? "openai-image"
-                          : candidate.provider.type === "bananaimage"
-                            ? "bananaimage"
-                          : candidate.provider.type === "visionary"
-                            ? "visionary"
-                          : candidate.provider.type === "atlascloud"
-                            ? "atlascloud"
-                          : candidate.provider.type === "vip98k"
-                            ? "vip98k"
                           : candidate.provider.type === "stepfun-image"
                             ? "stepfun-image"
                             : candidate.provider.type === "midjourney"
@@ -12139,13 +11925,9 @@ export async function POST(request: Request) {
           model: languageModel,
           system: effectiveConversationSystemPrompt,
           messages: convertedMessages,
-          stopWhen: stepCountIs(shouldUseCanvasCapabilityToolLoop ? 8 : 5),
+          stopWhen: stepCountIs(5),
           experimental_activeTools:
-            (finalModelId === "chat-model-reasoning" &&
-              !shouldUseCanvasCapabilityToolLoop) ||
-            isVolcanoVideoModel
-              ? []
-              : activeTools,
+            finalModelId === "chat-model-reasoning" || isVolcanoVideoModel ? [] : activeTools,
           experimental_transform: shouldDisableSmoothStream
             ? undefined
             : smoothStream({ chunking: "word" }),

app/(chat)/api/chat/schema.ts

@@ -48,7 +48,6 @@ const imageParamsSchema = z.object({
   aspectRatio: z.string().optional(),
   imageSize: z.preprocess(normalizeImageSizeInput, z.enum(imageSizeValues).optional()),
   imageCount: z.number().min(1).max(10).optional(),
-  quality: z.enum(["auto", "low", "medium", "high"]).optional(),
   // 阿里生图专用参数
   size: z.string().optional(),           // 自定义分辨率，如 "1024*1024"
   negativePrompt: z.string().optional(), // 反向提示词

app/(chat)/api/files/direct-upload/route.ts

@@ -3,7 +3,6 @@ import {
   CompleteMultipartUploadCommand,
   CreateMultipartUploadCommand,
   HeadObjectCommand,
-  ListPartsCommand,
   PutObjectCommand,
   UploadPartCommand,
 } from "@aws-sdk/client-s3";
@@ -22,22 +21,12 @@ import {
   maybeEnqueueStorageMigrationTask,
   resolveS3UploadTarget,
 } from "@/lib/storage/service";
-import {
-  getOpenClawChatFileContentType,
-  isOpenClawChatFolderFileAllowed,
-  OPENCLAW_CHAT_FILE_MAX_BYTES,
-  OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE,
-  OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE,
-  OPENCLAW_CHAT_VIDEO_MAX_BYTES,
-  OPENCLAW_CHAT_VIDEO_UPLOAD_PURPOSE,
-} from "@/lib/openclaw-chat/media-attachments";
 
 const logger = createLogger("direct-upload-api");
-const DIRECT_UPLOAD_MAX_BYTES = OPENCLAW_CHAT_FILE_MAX_BYTES;
-const DIRECT_UPLOAD_MEDIA_MAX_BYTES = 500 * 1024 * 1024;
+const DIRECT_UPLOAD_MAX_BYTES = 500 * 1024 * 1024;
 const MULTIPART_THRESHOLD_BYTES = 50 * 1024 * 1024;
 const DEFAULT_PART_SIZE_BYTES = 8 * 1024 * 1024;
-const PRESIGNED_URL_EXPIRES_SECONDS = 6 * 60 * 60;
+const PRESIGNED_URL_EXPIRES_SECONDS = 15 * 60;
 const DIRECT_UPLOAD_PREFIX = "uploads/direct";
 
 function elapsedMs(startedAt: number) {
@@ -50,13 +39,6 @@ const allowedDirectUploadTypes = new Set([
   "image/png",
   "image/webp",
 ]);
-const allowedOpenClawVideoUploadTypes = new Set([
-  "video/mp4",
-  "video/quicktime",
-  "video/webm",
-  "video/x-m4v",
-  "video/x-matroska",
-]);
 
 const InitiateSchema = z.object({
   action: z.literal("initiate"),
@@ -86,18 +68,6 @@ const CompleteSchema = z.object({
   clientUploadId: z.string().max(128).optional(),
 });
 
-const ResumeSchema = z.object({
-  action: z.literal("resume"),
-  key: z.string().min(1).max(512),
-  uploadId: z.string().min(1).max(512),
-  filename: z.string().min(1).max(256),
-  contentType: z.string().min(1).max(128),
-  size: z.number().int().positive().max(DIRECT_UPLOAD_MAX_BYTES),
-  partSize: z.number().int().min(5 * 1024 * 1024).max(128 * 1024 * 1024),
-  purpose: z.string().max(64).optional(),
-  clientUploadId: z.string().max(128).optional(),
-});
-
 const AbortSchema = z.object({
   action: z.literal("abort"),
   key: z.string().min(1).max(512),
@@ -107,7 +77,6 @@ const AbortSchema = z.object({
 
 const RequestSchema = z.discriminatedUnion("action", [
   InitiateSchema,
-  ResumeSchema,
   CompleteSchema,
   AbortSchema,
 ]);
@@ -135,49 +104,19 @@ function assertUserOwnedKey(key: string, userId: string) {
   const normalized = String(key || "").replace(/^\/+/, "");
   const prefix = `${userUploadPrefix(userId)}/`;
   if (!normalized.startsWith(prefix)) {
-    const error = new Error("Invalid upload object key");
-    error.name = "InvalidUploadObjectKeyError";
-    throw error;
+    throw new Error("Invalid upload object key");
   }
   return normalized;
 }
 
-function isAllowedDirectUpload(
-  contentType: string,
-  purpose: string | undefined,
-  filename: string
-) {
-  return (
-    allowedDirectUploadTypes.has(contentType) ||
-    (purpose === OPENCLAW_CHAT_VIDEO_UPLOAD_PURPOSE &&
-      allowedOpenClawVideoUploadTypes.has(contentType)) ||
-    (purpose === OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE &&
-      Boolean(
-        getOpenClawChatFileContentType({ name: filename, type: contentType })
-      )) ||
-    (purpose === OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE &&
-      isOpenClawChatFolderFileAllowed({ name: filename, type: contentType }))
-  );
-}
-
-function getPurposeMaxBytes(purpose?: string) {
-  if (purpose === OPENCLAW_CHAT_VIDEO_UPLOAD_PURPOSE) {
-    return OPENCLAW_CHAT_VIDEO_MAX_BYTES;
-  }
-  if (
-    purpose === OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE ||
-    purpose === OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE
-  ) {
-    return DIRECT_UPLOAD_MAX_BYTES;
-  }
-  return DIRECT_UPLOAD_MEDIA_MAX_BYTES;
+function isAllowedDirectUpload(contentType: string) {
+  return allowedDirectUploadTypes.has(contentType);
 }
 
 function computePartSize(size: number) {
   if (size <= 100 * 1024 * 1024) return DEFAULT_PART_SIZE_BYTES;
-  if (size <= 500 * 1024 * 1024) return 16 * 1024 * 1024;
-  if (size <= 1024 * 1024 * 1024) return 32 * 1024 * 1024;
-  return 64 * 1024 * 1024;
+  if (size <= 300 * 1024 * 1024) return 12 * 1024 * 1024;
+  return 16 * 1024 * 1024;
 }
 
 async function createPartUrls(params: {
@@ -185,24 +124,24 @@ async function createPartUrls(params: {
   bucket: string;
   key: string;
   uploadId: string;
-  partNumbers: number[];
+  partCount: number;
 }) {
-  return Promise.all(
-    params.partNumbers.map(async (partNumber) => {
-      const command = new UploadPartCommand({
-        Bucket: params.bucket,
-        Key: params.key,
-        UploadId: params.uploadId,
-        PartNumber: partNumber,
-      });
-      return {
-        partNumber,
-        url: await getSignedUrl(params.client, command, {
-          expiresIn: PRESIGNED_URL_EXPIRES_SECONDS,
-        }),
-      };
-    })
-  );
+  const urls = [];
+  for (let partNumber = 1; partNumber <= params.partCount; partNumber += 1) {
+    const command = new UploadPartCommand({
+      Bucket: params.bucket,
+      Key: params.key,
+      UploadId: params.uploadId,
+      PartNumber: partNumber,
+    });
+    urls.push({
+      partNumber,
+      url: await getSignedUrl(params.client, command, {
+        expiresIn: PRESIGNED_URL_EXPIRES_SECONDS,
+      }),
+    });
+  }
+  return urls;
 }
 
 export async function POST(request: Request) {
@@ -265,7 +204,7 @@ export async function POST(request: Request) {
         payload.filename
       );
 
-      if (!isAllowedDirectUpload(contentType, payload.purpose, payload.filename)) {
+      if (!isAllowedDirectUpload(contentType)) {
         logger.warn("unsupported_direct_upload_type", {
           contentType,
           filenameExtension: payload.filename.toLowerCase().split(".").pop() || null,
@@ -274,19 +213,10 @@ export async function POST(request: Request) {
           clientUploadId: payload.clientUploadId || null,
         });
         return NextResponse.json(
-          {
-            error:
-              "直传仅支持图片、Claw 视频、压缩包、表格和文件夹清单",
-          },
+          { error: "Direct upload only supports JPG, PNG and WebP images" },
           { status: 400 }
         );
       }
-      if (payload.size > getPurposeMaxBytes(payload.purpose)) {
-        return NextResponse.json(
-          { error: `文件不能超过 ${getPurposeMaxBytes(payload.purpose) / 1024 / 1024}MB` },
-          { status: 413 }
-        );
-      }
 
       const displayName = sanitizeDisplayName(payload.filename);
       const key = buildStorageObjectKey(
@@ -294,13 +224,7 @@ export async function POST(request: Request) {
         userUploadPrefix(session.user.id)
       );
 
-      const multipartThreshold =
-        payload.purpose === OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE ||
-        payload.purpose === OPENCLAW_CHAT_VIDEO_UPLOAD_PURPOSE ||
-        payload.purpose === OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE
-          ? DEFAULT_PART_SIZE_BYTES
-          : MULTIPART_THRESHOLD_BYTES;
-      if (payload.size < multipartThreshold) {
+      if (payload.size < MULTIPART_THRESHOLD_BYTES) {
         const presignStartedAt = Date.now();
         const command = new PutObjectCommand({
           Bucket: bucket,
@@ -360,7 +284,7 @@ export async function POST(request: Request) {
         bucket,
         key,
         uploadId,
-        partNumbers: Array.from({ length: partCount }, (_, index) => index + 1),
+        partCount,
       });
       logger.info("direct_upload_multipart_prepared", {
         elapsedMs: elapsedMs(multipartStartedAt),
@@ -384,98 +308,6 @@ export async function POST(request: Request) {
       });
     }
 
-    if (payload.action === "resume") {
-      const key = assertUserOwnedKey(payload.key, session.user.id);
-      const contentType = normalizeContentType(payload.contentType, payload.filename);
-      if (!isAllowedDirectUpload(contentType, payload.purpose, payload.filename)) {
-        return NextResponse.json({ error: "不支持续传该文件类型" }, { status: 400 });
-      }
-      if (payload.size > getPurposeMaxBytes(payload.purpose)) {
-        return NextResponse.json({ error: "文件超过允许的上传大小" }, { status: 413 });
-      }
-      const expectedPartSize = computePartSize(payload.size);
-      if (payload.partSize !== expectedPartSize) {
-        return NextResponse.json(
-          { error: "续传分片参数已失效，请重新开始上传", code: "RESUME_SESSION_EXPIRED" },
-          { status: 409 }
-        );
-      }
-
-      try {
-        const listed = await client.send(
-          new ListPartsCommand({
-            Bucket: bucket,
-            Key: key,
-            UploadId: payload.uploadId,
-            MaxParts: 1000,
-          })
-        );
-        const uploadedParts = (listed.Parts || []).flatMap((part) => {
-          if (!part.ETag || typeof part.PartNumber !== "number") return [];
-          return [
-            {
-              ETag: part.ETag,
-              PartNumber: part.PartNumber,
-              size: Number(part.Size || 0),
-            },
-          ];
-        });
-        const uploadedPartNumbers = new Set(
-          uploadedParts.map((part) => part.PartNumber)
-        );
-        const partCount = Math.ceil(payload.size / expectedPartSize);
-        const missingPartNumbers = Array.from(
-          { length: partCount },
-          (_, index) => index + 1
-        ).filter((partNumber) => !uploadedPartNumbers.has(partNumber));
-        const parts = await createPartUrls({
-          client,
-          bucket,
-          key,
-          uploadId: payload.uploadId,
-          partNumbers: missingPartNumbers,
-        });
-
-        logger.info("direct_upload_multipart_resumed", {
-          totalElapsedMs: elapsedMs(requestStartedAt),
-          size: payload.size,
-          uploadedPartCount: uploadedParts.length,
-          missingPartCount: missingPartNumbers.length,
-          clientUploadId: payload.clientUploadId || null,
-        });
-        return NextResponse.json({
-          mode: "multipart",
-          key,
-          uploadId: payload.uploadId,
-          partSize: expectedPartSize,
-          partCount,
-          parts,
-          uploadedParts,
-          resumed: true,
-          expiresIn: PRESIGNED_URL_EXPIRES_SECONDS,
-          clientUploadId: payload.clientUploadId || null,
-        });
-      } catch (error) {
-        const head = await client
-          .send(new HeadObjectCommand({ Bucket: bucket, Key: key }))
-          .catch(() => null);
-        if (head?.ContentLength === payload.size) {
-          return NextResponse.json({
-            mode: "completed",
-            key,
-            clientUploadId: payload.clientUploadId || null,
-          });
-        }
-        logger.warn("direct_upload_resume_session_missing", error, {
-          clientUploadId: payload.clientUploadId || null,
-        });
-        return NextResponse.json(
-          { error: "续传会话已失效，请重新开始上传", code: "RESUME_SESSION_EXPIRED" },
-          { status: 409 }
-        );
-      }
-    }
-
     if (payload.action === "abort") {
       const key = assertUserOwnedKey(payload.key, session.user.id);
       const abortStartedAt = Date.now();
@@ -496,18 +328,12 @@ export async function POST(request: Request) {
 
     const key = assertUserOwnedKey(payload.key, session.user.id);
     const contentType = normalizeContentType(payload.contentType, payload.filename);
-    if (!isAllowedDirectUpload(contentType, payload.purpose, payload.filename)) {
+    if (!isAllowedDirectUpload(contentType)) {
       return NextResponse.json(
-        {
-          error:
-            "直传仅支持图片、Claw 视频、压缩包、表格和文件夹清单",
-        },
+        { error: "Direct upload only supports JPG, PNG and WebP images" },
         { status: 400 }
       );
     }
-    if (payload.size > getPurposeMaxBytes(payload.purpose)) {
-      return NextResponse.json({ error: "文件超过允许的上传大小" }, { status: 413 });
-    }
 
     if (payload.uploadId) {
       const completeMultipartStartedAt = Date.now();
@@ -553,10 +379,8 @@ export async function POST(request: Request) {
 
     const actualSize =
       typeof head.ContentLength === "number" ? head.ContentLength : null;
-    if (actualSize !== null && actualSize !== payload.size) {
-      throw new Error(
-        `Uploaded object size mismatch: expected ${payload.size}, received ${actualSize}`
-      );
+    if (actualSize !== null && actualSize <= 0) {
+      throw new Error("Uploaded object is empty");
     }
 
     const url = buildS3PublicUrl(target.config, key);
@@ -565,43 +389,15 @@ export async function POST(request: Request) {
     const assetStartedAt = Date.now();
     const asset = await upsertMediaAsset({
       userId: session.user.id,
-      mediaType:
-        payload.purpose === OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE ||
-        payload.purpose === OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE
-          ? "file"
-          : resolvedContentType.startsWith("video/")
-            ? "video"
-            : "image",
-      sourceType:
-        payload.purpose === OPENCLAW_CHAT_VIDEO_UPLOAD_PURPOSE
-          ? "openclaw_chat_video_upload"
-          : payload.purpose === OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE
-            ? "openclaw_chat_file_upload"
-            : payload.purpose === OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE
-              ? "openclaw_chat_folder_file_upload"
-            : "upload",
+      mediaType: "image",
+      sourceType: "upload",
       status: "ready",
       originalUrl: url,
-      previewUrl:
-        payload.purpose === OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE ||
-        payload.purpose === OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE
-          ? null
-          : url,
-      thumbnailUrl:
-        payload.purpose === OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE ||
-        payload.purpose === OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE
-          ? null
-          : url,
+      previewUrl: url,
+      thumbnailUrl: url,
       mimeType: resolvedContentType,
       displayName: payload.filename,
-      sourceTable:
-        payload.purpose === OPENCLAW_CHAT_VIDEO_UPLOAD_PURPOSE
-          ? "openclaw_chat_video_upload"
-          : payload.purpose === OPENCLAW_CHAT_FILE_UPLOAD_PURPOSE
-            ? "openclaw_chat_file_upload"
-            : payload.purpose === OPENCLAW_CHAT_FOLDER_UPLOAD_PURPOSE
-              ? "openclaw_chat_folder_file_upload"
-            : "direct_upload",
+      sourceTable: "direct_upload",
       metadata: {
         pathname: key,
         size: actualSize ?? payload.size,
@@ -648,13 +444,7 @@ export async function POST(request: Request) {
         error: "Direct upload failed",
         details: error instanceof Error ? error.message : String(error),
       },
-      {
-        status:
-          error instanceof Error &&
-          error.name === "InvalidUploadObjectKeyError"
-            ? 403
-            : 500,
-      }
+      { status: 500 }
     );
   }
 }

app/(chat)/api/files/upload/route.ts

@@ -7,7 +7,6 @@ import { upsertMediaAsset } from "@/lib/db/queries";
 import { isSiteAdminType } from "@/lib/middleware/admin";
 import { getContentType, uploadFile } from "@/lib/storage/service";
 import { createLogger } from "@/lib/observability/logger";
-import { OPENCLAW_CHAT_VIDEO_UPLOAD_PURPOSE } from "@/lib/openclaw-chat/media-attachments";
 
 const logger = createLogger("upload-api");
 const ALLOWED_UPLOAD_IMAGE_TYPES = new Set([
@@ -15,32 +14,12 @@ const ALLOWED_UPLOAD_IMAGE_TYPES = new Set([
   "image/jpg",
   "image/png",
   "image/webp",
-  "image/avif",
-  "image/tiff",
-  "image/x-tiff",
   "image/svg+xml",
   "image/heic",
   "image/heif",
 ]);
-const ALLOWED_ATLASCLOUD_VIDEO_TYPES = new Set([
-  "video/mp4",
-  "video/quicktime",
-  "video/webm",
-]);
-const ALLOWED_OPENCLAW_VIDEO_TYPES = new Set([
-  "video/mp4",
-  "video/quicktime",
-  "video/webm",
-  "video/x-m4v",
-  "video/x-matroska",
-]);
 
 const HEIC_UPLOAD_TYPES = new Set(["image/heic", "image/heif"]);
-const SHARP_COMPATIBILITY_UPLOAD_TYPES = new Set([
-  "image/avif",
-  "image/tiff",
-  "image/x-tiff",
-]);
 
 function normalizeUploadContentType(contentType: string, filename: string) {
   const normalized = contentType.trim().toLowerCase();
@@ -56,16 +35,8 @@ function createUnsupportedImageTypeMessage(contentType: string, filename: string
   if (contentType === "image/heic" || contentType === "image/heif" || extension === "heic" || extension === "heif") {
     return "HEIC/HEIF 图片转码失败，请在手机相册中导出为 JPG/PNG 后再上传。";
   }
-  if (
-    SHARP_COMPATIBILITY_UPLOAD_TYPES.has(contentType) ||
-    extension === "avif" ||
-    extension === "tif" ||
-    extension === "tiff"
-  ) {
-    return "AVIF/TIFF 图片转码失败，请导出为 JPG/PNG 后再上传。";
-  }
 
-  return "图片格式不支持，请上传 JPG、PNG、WebP、HEIC、AVIF 或 TIFF 图片。";
+  return "File type should be JPEG, PNG, WebP or SVG";
 }
 
 function isHeicUpload(contentType: string, filename: string) {
@@ -77,20 +48,10 @@ function isHeicUpload(contentType: string, filename: string) {
   );
 }
 
-function isSharpCompatibilityUpload(contentType: string, filename: string) {
-  const extension = filename.toLowerCase().split(".").pop() || "";
-  return (
-    SHARP_COMPATIBILITY_UPLOAD_TYPES.has(contentType) ||
-    extension === "avif" ||
-    extension === "tif" ||
-    extension === "tiff"
-  );
-}
-
 function toJpegFilename(filename: string) {
   const trimmed = filename.trim() || `upload-${Date.now()}`;
-  if (/\.(avif|heic|heif|tif|tiff)$/i.test(trimmed)) {
-    return trimmed.replace(/\.(avif|heic|heif|tif|tiff)$/i, ".jpg");
+  if (/\.(heic|heif)$/i.test(trimmed)) {
+    return trimmed.replace(/\.(heic|heif)$/i, ".jpg");
   }
   if (/\.[a-z0-9]+$/i.test(trimmed)) {
     return trimmed.replace(/\.[a-z0-9]+$/i, ".jpg");
@@ -110,21 +71,6 @@ async function convertHeicToJpeg(buffer: Buffer): Promise<Buffer> {
   }
   return Buffer.from(output);
 }
-
-async function convertSharpCompatibilityImageToJpeg(
-  buffer: Buffer
-): Promise<Buffer> {
-  const sharp = (await import("sharp")).default;
-  return sharp(buffer, { animated: false, failOn: "none" })
-    .rotate()
-    .flatten({ background: "#ffffff" })
-    .jpeg({
-      quality: 92,
-      mozjpeg: true,
-      progressive: true,
-    })
-    .toBuffer();
-}
 /**
  * 使用Sharp智能优化图片（保持原格式）
  * 策略：避免双重压缩，只在需要时优化
@@ -251,12 +197,6 @@ export async function POST(request: Request) {
     let filename = originalFilename;
     let contentType = originalContentType;
     const uploadPurpose = String(formData.get("purpose") || "");
-    const isAtlasCloudReferenceVideo =
-      uploadPurpose === "canvas-video-process" &&
-      ALLOWED_ATLASCLOUD_VIDEO_TYPES.has(contentType);
-    const isOpenClawChatVideoUpload =
-      uploadPurpose === OPENCLAW_CHAT_VIDEO_UPLOAD_PURPOSE &&
-      ALLOWED_OPENCLAW_VIDEO_TYPES.has(contentType);
     const clientUploadId =
       String(formData.get("clientUploadId") || "").trim() || null;
     const isSvgUpload = contentType === "image/svg+xml";
@@ -287,11 +227,7 @@ export async function POST(request: Request) {
       return NextResponse.json({ error: errorMessage }, { status: 400 });
     }
 
-    if (
-      !ALLOWED_UPLOAD_IMAGE_TYPES.has(contentType) &&
-      !isAtlasCloudReferenceVideo &&
-      !isOpenClawChatVideoUpload
-    ) {
+    if (!ALLOWED_UPLOAD_IMAGE_TYPES.has(contentType)) {
       const errorMessage = createUnsupportedImageTypeMessage(contentType, filename);
       logger.warn("[Upload API] Unsupported upload content type", {
         contentType,
@@ -341,38 +277,6 @@ export async function POST(request: Request) {
             { status: 400 }
           );
         }
-      } else if (isSharpCompatibilityUpload(contentType, filename)) {
-        try {
-          const convertedBuffer =
-            await convertSharpCompatibilityImageToJpeg(uploadBuffer);
-          logger.info("[Upload API] Compatibility image converted to JPEG", {
-            clientUploadId,
-            originalContentType: contentType,
-            originalSize: uploadBuffer.length,
-            convertedSize: convertedBuffer.length,
-          });
-          uploadBuffer = convertedBuffer;
-          filename = toJpegFilename(filename);
-          convertedFrom = contentType;
-          contentType = "image/jpeg";
-        } catch (conversionError) {
-          logger.warn("[Upload API] Compatibility image conversion failed", {
-            clientUploadId,
-            contentType,
-            size: uploadBuffer.length,
-            error:
-              conversionError instanceof Error
-                ? conversionError.message
-                : String(conversionError),
-          });
-          return NextResponse.json(
-            {
-              error: createUnsupportedImageTypeMessage(contentType, filename),
-              clientUploadId,
-            },
-            { status: 400 }
-          );
-        }
       }
 
       if (uploadPurpose === "agent-workflow-preview" && contentType !== "image/svg+xml") {
@@ -457,32 +361,18 @@ export async function POST(request: Request) {
       try {
         const asset = await upsertMediaAsset({
           userId: session.user.id,
-          mediaType:
-            isAtlasCloudReferenceVideo || isOpenClawChatVideoUpload
-              ? "video"
-              : "image",
-          sourceType: isOpenClawChatVideoUpload
-            ? "openclaw_chat_video_upload"
-            : "upload",
+          mediaType: "image",
+          sourceType: "upload",
           status: "ready",
           originalUrl: data.url,
-          previewUrl:
-            isAtlasCloudReferenceVideo || isOpenClawChatVideoUpload
-              ? null
-              : data.url,
-          thumbnailUrl:
-            isAtlasCloudReferenceVideo || isOpenClawChatVideoUpload
-              ? null
-              : data.url,
+          previewUrl: data.url,
+          thumbnailUrl: data.url,
           mimeType: data.contentType || contentType || null,
           displayName: filename,
-          sourceTable: isOpenClawChatVideoUpload
-            ? "openclaw_chat_video_upload"
-            : "upload",
+          sourceTable: "upload",
           metadata: {
             pathname: data.pathname,
             size: optimizedBuffer.length,
-            purpose: uploadPurpose || null,
             clientUploadId,
             convertedFrom,
           },

app/api/admin/ai-models/route.ts

@@ -33,11 +33,6 @@ const imageGenConfigSchema = z.object({
   supportsNegativePrompt: z.boolean().optional(),
   supportsWatermark: z.boolean().optional(),
   supportsSeed: z.boolean().optional(),
-  supportsQuality: z.boolean().optional(),
-  supportedAspectRatios: z.array(z.string().min(1).max(32)).max(32).optional(),
-  supportedImageSizes: z.array(z.string().min(1).max(32)).max(32).optional(),
-  maxReferenceImages: z.number().min(0).max(64).optional(),
-  maxVideoReferences: z.number().min(0).max(16).optional(),
   ruxaTaskInputMode: z
     .enum(["size-image", "resolution-based"])
     .optional(),
@@ -50,7 +45,6 @@ const imageGenConfigSchema = z.object({
   creditCostPerVideoByResolution: z.record(z.string(), z.number().min(0).max(100000)).optional(),
   enableLoadingPlaceholder: z.boolean().optional(),
   loadingColor: z.string().optional(),
-  vip98k: z.record(z.string(), z.unknown()).optional(),
 }).optional();
 
 const capabilitiesSchema = z.record(z.string(), z.unknown()).nullable().optional();

app/api/admin/ai-providers/route.ts

@@ -9,7 +9,6 @@ import {
 } from "@/lib/db/queries";
 import { ChatSDKError } from "@/lib/errors";
 import { BLTCY_VIDEO_BASE_URL, isBltcyVideoBaseUrl } from "@/lib/ai/bltcy-video-models";
-import { VIP98K_BASE_URL } from "@/lib/ai/vip98k-models";
 import { clearScopedSiteSettingsCache } from "@/lib/site-settings/public-cache";
 
 const providerTypes = [
@@ -33,10 +32,6 @@ const providerTypes = [
   "fal-image",
   "snapgen-image",
   "openai-image",
-  "bananaimage",
-  "visionary",
-  "atlascloud",
-  "vip98k",
   "stepfun-image",
   "midjourney",
   "fal-video",
@@ -78,15 +73,11 @@ const RUXA_VIDEO_BASE_URL = "https://api.ruxa.ai";
 const RUXA_IMAGE_BASE_URL = "https://api.ruxa.ai";
 const SNAPGEN_IMAGE_BASE_URL = "https://api.snapgen.ai";
 const OPENAI_IMAGE_BASE_URL = "https://api.openai.com/v1";
-const BANANAIMAGE_BASE_URL = "https://bananaimage.aigenmedia.art";
-const VISIONARY_BASE_URL = "https://api.visionary.beer";
-const ATLASCLOUD_BASE_URL = "https://api.atlascloud.ai";
-const VIP98K_PROVIDER_BASE_URL = VIP98K_BASE_URL;
 const STEPFUN_IMAGE_BASE_URL = "https://api.stepfun.com";
 const BFL_IMAGE_BASE_URL = "https://api.bfl.ai";
 const MIDJOURNEY_BASE_URL = "https://your-midjourney-api.example.com";
 const TRIPO_3D_BASE_URL = "https://api.tripo3d.ai/v2/openapi";
-const WORLDLABS_3D_BASE_URL = "https://api.vip98k.com";
+const WORLDLABS_3D_BASE_URL = "https://api.worldlabs.ai";
 const KITTYCAD_CAD_BASE_URL = "https://api.zoo.dev";
 const RUNWAY_BASE_URL = "https://api.dev.runwayml.com";
 const KREA_BASE_URL = "https://api.krea.ai";
@@ -246,14 +237,6 @@ export async function POST(request: Request) {
               ? data.baseUrl || SNAPGEN_IMAGE_BASE_URL
             : data.type === "openai-image"
               ? data.baseUrl || OPENAI_IMAGE_BASE_URL
-            : data.type === "bananaimage"
-              ? data.baseUrl || BANANAIMAGE_BASE_URL
-            : data.type === "visionary"
-              ? data.baseUrl || VISIONARY_BASE_URL
-            : data.type === "atlascloud"
-              ? data.baseUrl || ATLASCLOUD_BASE_URL
-            : data.type === "vip98k"
-              ? data.baseUrl || VIP98K_PROVIDER_BASE_URL
             : data.type === "stepfun-image"
               ? data.baseUrl || STEPFUN_IMAGE_BASE_URL
             : data.type === "midjourney"
@@ -316,12 +299,6 @@ export async function PUT(request: Request) {
       ...data,
       apiKey: normalizedApiKey,
       type: normalizeProviderTypeForStorage(data.type),
-      baseUrl:
-        data.baseUrl !== undefined
-          ? data.baseUrl
-          : data.type === "vip98k"
-            ? VIP98K_PROVIDER_BASE_URL
-            : undefined,
       updatedBy: session.user.id,
     });
 

app/api/admin/atlascloud-models/route.ts

@@ -1,182 +0,0 @@
-import { and, eq } from "drizzle-orm";
-import { NextResponse } from "next/server";
-import {
-  fetchAtlasCloudModelPresets,
-  resolveAtlasCloudDisplayName,
-  shouldInsertMissingAtlasCloudPreset,
-} from "@/lib/ai/atlascloud-models";
-import { db } from "@/lib/db";
-import { getAiProviderById } from "@/lib/db/queries";
-import { type AiModel, aiModel } from "@/lib/db/schema";
-import { requireAdmin } from "@/lib/middleware/admin";
-
-export const runtime = "nodejs";
-export const maxDuration = 300;
-
-export async function GET() {
-  try {
-    await requireAdmin();
-    const result = await fetchAtlasCloudModelPresets();
-    return NextResponse.json({
-      presets: result.presets,
-      errors: result.errors.length > 0 ? result.errors : undefined,
-      counts: {
-        total: result.catalogCount,
-        available: result.presets.length,
-        failed: result.errors.length,
-      },
-    });
-  } catch (error) {
-    console.error("[Atlas Cloud Models API] GET error:", error);
-    return NextResponse.json(
-      {
-        error:
-          error instanceof Error
-            ? error.message
-            : "Failed to fetch Atlas Cloud models",
-      },
-      { status: 500 }
-    );
-  }
-}
-
-export async function POST(request: Request) {
-  try {
-    await requireAdmin();
-    const body = await request.json();
-    const providerId = String(body?.providerId || "").trim();
-    const requestedModelIds = Array.isArray(body?.modelIds)
-      ? new Set(
-          body.modelIds.map((item: unknown) => String(item || "").trim()).filter(Boolean)
-        )
-      : null;
-    if (!providerId) {
-      return NextResponse.json({ error: "Provider ID is required" }, { status: 400 });
-    }
-
-    const provider = await getAiProviderById({ id: providerId });
-    if (!provider || provider.type !== "atlascloud") {
-      return NextResponse.json(
-        { error: "Provider must be an Atlas Cloud provider" },
-        { status: 400 }
-      );
-    }
-
-    const catalog = await fetchAtlasCloudModelPresets();
-    const presets = requestedModelIds
-      ? catalog.presets.filter((preset) => requestedModelIds.has(preset.modelId))
-      : catalog.presets;
-    const addedModels: AiModel[] = [];
-    const updatedModels: AiModel[] = [];
-    const errors = [...catalog.errors];
-    const providerModels = await db.query.aiModel.findMany({
-      where: eq(aiModel.providerId, providerId),
-    });
-    const existingByModelId = new Map(
-      providerModels.map((model) => [model.modelId, model])
-    );
-    const existingMediaKinds = new Set(
-      providerModels.map((model) => {
-        const capabilities = model.capabilities as Record<string, unknown> | null;
-        return String(capabilities?.mediaType || "image");
-      })
-    );
-    let preservedDeletedCount = 0;
-
-    for (const preset of presets) {
-      try {
-        const existing = existingByModelId.get(preset.modelId);
-        const presetCapabilities = preset.capabilities as Record<string, unknown>;
-        const mediaKind = String(presetCapabilities.mediaType || "image");
-        if (
-          !existing &&
-          !shouldInsertMissingAtlasCloudPreset(existingMediaKinds, mediaKind)
-        ) {
-          preservedDeletedCount += 1;
-          continue;
-        }
-        const values = {
-          displayName: resolveAtlasCloudDisplayName(
-            existing?.displayName,
-            preset.displayName,
-            preset.modelId
-          ),
-          avatarUrl: preset.avatarUrl || null,
-          description: preset.description,
-          supportsVision: preset.supportsVision,
-          supportsImageGen: preset.supportsImageGen,
-          sortOrder: existing?.sortOrder ?? preset.sortOrder,
-          capabilities: preset.capabilities,
-          defaultParams: preset.defaultParams,
-          imageGenConfig: preset.imageGenConfig,
-          updatedAt: new Date(),
-        };
-
-        if (existing) {
-          const [updated] = await db
-            .update(aiModel)
-            .set(values)
-            .where(
-              and(
-                eq(aiModel.providerId, providerId),
-                eq(aiModel.modelId, preset.modelId)
-              )
-            )
-            .returning();
-          if (updated) updatedModels.push(updated);
-        } else {
-          const [created] = await db
-            .insert(aiModel)
-            .values({
-              providerId,
-              modelId: preset.modelId,
-              ...values,
-              isEnabled: true,
-              isHidden: false,
-              isDefault: false,
-              isSubModel: false,
-              parentModelId: null,
-            })
-            .returning();
-          if (created) addedModels.push(created);
-        }
-      } catch (error) {
-        console.error(
-          `[Atlas Cloud Models API] Failed to sync ${preset.modelId}:`,
-          error
-        );
-        errors.push({
-          modelId: preset.modelId,
-          error: error instanceof Error ? error.message : "Sync failed",
-        });
-      }
-    }
-
-    return NextResponse.json({
-      success: true,
-      addedCount: addedModels.length,
-      updatedCount: updatedModels.length,
-      addedModels,
-      updatedModels,
-      errors: errors.length > 0 ? errors : undefined,
-      counts: {
-        requested: presets.length,
-        total: catalog.catalogCount,
-        available: catalog.presets.length,
-        skippedUnsupported: catalog.skipped.length,
-        preservedDeleted: preservedDeletedCount,
-      },
-    });
-  } catch (error) {
-    console.error("[Atlas Cloud Models API] POST error:", error);
-    return NextResponse.json(
-      {
-        error:
-          error instanceof Error
-            ? error.message
-            : "Failed to sync Atlas Cloud models",
-      },
-      { status: 500 }
-    );
-  }
-}

app/api/admin/bananaimage-models/route.ts

@@ -1,128 +0,0 @@
-import { and, eq } from "drizzle-orm";
-import { NextResponse } from "next/server";
-import { BANANAIMAGE_MODEL_PRESETS } from "@/lib/ai/bananaimage-models";
-import { db } from "@/lib/db";
-import { getAiProviderById } from "@/lib/db/queries";
-import { type AiModel, aiModel } from "@/lib/db/schema";
-import { requireAdmin } from "@/lib/middleware/admin";
-
-export async function GET() {
-  try {
-    await requireAdmin();
-    return NextResponse.json({
-      presets: BANANAIMAGE_MODEL_PRESETS,
-      counts: { total: BANANAIMAGE_MODEL_PRESETS.length },
-    });
-  } catch (error: any) {
-    console.error("[BananaImage Models API] GET error:", error);
-    return NextResponse.json(
-      { error: error.message || "Failed to fetch BananaImage model presets" },
-      { status: 500 }
-    );
-  }
-}
-
-export async function POST(request: Request) {
-  try {
-    await requireAdmin();
-    const body = await request.json();
-    const providerId = String(body?.providerId || "").trim();
-    const modelIds = Array.isArray(body?.modelIds)
-      ? body.modelIds
-          .map((item: unknown) => String(item || "").trim())
-          .filter(Boolean)
-      : null;
-
-    if (!providerId) {
-      return NextResponse.json({ error: "Provider ID is required" }, { status: 400 });
-    }
-
-    const provider = await getAiProviderById({ id: providerId });
-    if (!provider || provider.type !== "bananaimage") {
-      return NextResponse.json(
-        { error: "Provider must be a BananaImage provider" },
-        { status: 400 }
-      );
-    }
-
-    const presets = modelIds
-      ? BANANAIMAGE_MODEL_PRESETS.filter((preset) => modelIds.includes(preset.modelId))
-      : BANANAIMAGE_MODEL_PRESETS;
-    const addedModels: AiModel[] = [];
-    const updatedModels: AiModel[] = [];
-    const errors: { modelId: string; error: string }[] = [];
-
-    for (const preset of presets) {
-      try {
-        const existing = await db.query.aiModel.findFirst({
-          where: and(
-            eq(aiModel.providerId, providerId),
-            eq(aiModel.modelId, preset.modelId)
-          ),
-        });
-        const values = {
-          displayName: preset.displayName,
-          description: preset.description,
-          supportsVision: preset.supportsVision,
-          supportsImageGen: preset.supportsImageGen,
-          isEnabled: true,
-          isHidden: false,
-          sortOrder: preset.sortOrder,
-          capabilities: preset.capabilities || null,
-          defaultParams: preset.defaultParams || null,
-          imageGenConfig: preset.imageGenConfig || null,
-        };
-
-        if (existing) {
-          const [updated] = await db
-            .update(aiModel)
-            .set(values)
-            .where(
-              and(
-                eq(aiModel.providerId, providerId),
-                eq(aiModel.modelId, preset.modelId)
-              )
-            )
-            .returning();
-          if (updated) updatedModels.push(updated);
-          continue;
-        }
-
-        const [created] = await db
-          .insert(aiModel)
-          .values({
-            providerId,
-            modelId: preset.modelId,
-            ...values,
-            isDefault: false,
-            isSubModel: false,
-            parentModelId: null,
-          })
-          .returning();
-        if (created) addedModels.push(created);
-      } catch (error: any) {
-        console.error(`[BananaImage Models API] Failed to sync ${preset.modelId}:`, error);
-        errors.push({
-          modelId: preset.modelId,
-          error: error.message || "Sync failed",
-        });
-      }
-    }
-
-    return NextResponse.json({
-      success: true,
-      addedCount: addedModels.length,
-      updatedCount: updatedModels.length,
-      addedModels,
-      updatedModels,
-      errors: errors.length > 0 ? errors : undefined,
-      counts: { requested: presets.length, total: BANANAIMAGE_MODEL_PRESETS.length },
-    });
-  } catch (error: any) {
-    console.error("[BananaImage Models API] POST error:", error);
-    return NextResponse.json(
-      { error: error.message || "Failed to sync BananaImage models" },
-      { status: 500 }
-    );
-  }
-}

app/api/admin/settings/route.ts

@@ -53,10 +53,6 @@ import {
   CANVAS_IMAGE_TASK_QUEUE_CONFIG_KEY,
   normalizeCanvasImageTaskQueueConfig,
 } from "@/lib/canvas/image-task-config";
-import {
-  CANVAS_LOCAL_EDIT_CONFIG_KEY,
-  normalizeCanvasLocalEditConfig,
-} from "@/lib/canvas/local-edit-config";
 import {
   DINGTALK_ROBOT_NOTIFICATION_CONFIG_KEY,
   normalizeDingTalkRobotNotificationConfig,
@@ -130,12 +126,6 @@ export async function GET(request: Request) {
           setting: setting ? { ...setting, value } : { key, value },
         });
       }
-      if (key === CANVAS_LOCAL_EDIT_CONFIG_KEY) {
-        const value = normalizeCanvasLocalEditConfig(setting?.value);
-        return Response.json({
-          setting: setting ? { ...setting, value } : { key, value },
-        });
-      }
       if (key === DINGTALK_ROBOT_NOTIFICATION_CONFIG_KEY) {
         const value = normalizeDingTalkRobotNotificationConfig(setting?.value);
         return Response.json({
@@ -379,10 +369,6 @@ export async function POST(request: Request) {
       nextValue = normalizeCanvasImageTaskQueueConfig(value);
     }
 
-    if (key === CANVAS_LOCAL_EDIT_CONFIG_KEY) {
-      nextValue = normalizeCanvasLocalEditConfig(value);
-    }
-
     if (key === DINGTALK_ROBOT_NOTIFICATION_CONFIG_KEY) {
       nextValue = normalizeDingTalkRobotNotificationConfig(value);
     }

app/api/admin/vip98k-models/route.ts

@@ -1,213 +0,0 @@
-import { and, eq } from "drizzle-orm";
-import { NextResponse } from "next/server";
-import {
-  fetchVip98kModelPresets,
-  type Vip98kModelPreset,
-} from "@/lib/ai/vip98k-models";
-import { db } from "@/lib/db";
-import { getAiProviderById } from "@/lib/db/queries";
-import { aiModel, type AiModel } from "@/lib/db/schema";
-import { requireAdmin } from "@/lib/middleware/admin";
-
-export const runtime = "nodejs";
-export const maxDuration = 300;
-
-function summarizeByType(presets: Vip98kModelPreset[]) {
-  return presets.reduce<Record<string, number>>((acc, preset) => {
-    const type = String(preset.type || "model");
-    acc[type] = (acc[type] || 0) + 1;
-    return acc;
-  }, {});
-}
-
-export async function GET(request: Request) {
-  try {
-    await requireAdmin();
-    const { searchParams } = new URL(request.url);
-    const providerId = String(searchParams.get("providerId") || "").trim();
-    if (!providerId) {
-      return NextResponse.json(
-        { error: "Provider ID is required to fetch VIP98K catalog" },
-        { status: 400 },
-      );
-    }
-
-    const provider = await getAiProviderById({ id: providerId });
-    if (!provider || provider.type !== "vip98k") {
-      return NextResponse.json(
-        { error: "Provider must be a VIP98K provider" },
-        { status: 400 },
-      );
-    }
-
-    const presets = await fetchVip98kModelPresets({
-      baseURL: provider.baseUrl,
-      apiKey: provider.apiKey,
-    });
-    return NextResponse.json({
-      presets,
-      counts: {
-        total: presets.length,
-        byType: summarizeByType(presets),
-      },
-    });
-  } catch (error) {
-    console.error("[VIP98K Models API] GET error:", error);
-    return NextResponse.json(
-      {
-        error:
-          error instanceof Error
-            ? error.message
-            : "Failed to fetch VIP98K models",
-      },
-      { status: 500 },
-    );
-  }
-}
-
-export async function POST(request: Request) {
-  try {
-    await requireAdmin();
-    const body = await request.json();
-    const providerId = String(body?.providerId || "").trim();
-    const requestedModelIds = Array.isArray(body?.modelIds)
-      ? new Set(
-          body.modelIds.map((item: unknown) => String(item || "").trim()).filter(Boolean),
-        )
-      : null;
-    const preserveDeletedModels = body?.preserveDeletedModels !== false;
-    if (!providerId) {
-      return NextResponse.json({ error: "Provider ID is required" }, { status: 400 });
-    }
-
-    const provider = await getAiProviderById({ id: providerId });
-    if (!provider || provider.type !== "vip98k") {
-      return NextResponse.json(
-        { error: "Provider must be a VIP98K provider" },
-        { status: 400 },
-      );
-    }
-
-    const catalogPresets = await fetchVip98kModelPresets({
-      baseURL: provider.baseUrl,
-      apiKey: provider.apiKey,
-    });
-    const existingModels = await db.query.aiModel.findMany({
-      where: eq(aiModel.providerId, providerId),
-    });
-    const existingModelIds = new Set(existingModels.map((model) => model.modelId));
-    const preserveExistingCatalog =
-      requestedModelIds === null &&
-      preserveDeletedModels &&
-      existingModels.length > 0;
-    const presets = requestedModelIds
-      ? catalogPresets.filter((preset) => requestedModelIds.has(preset.modelId))
-      : preserveExistingCatalog
-        ? catalogPresets.filter((preset) => existingModelIds.has(preset.modelId))
-        : catalogPresets;
-
-    const addedModels: AiModel[] = [];
-    const updatedModels: AiModel[] = [];
-    const disabledModels: AiModel[] = [];
-    const errors: Array<{ modelId: string; error: string }> = [];
-
-    if (requestedModelIds === null) {
-      const catalogModelIds = new Set(catalogPresets.map((preset) => preset.modelId));
-      for (const existing of existingModels) {
-        if (catalogModelIds.has(existing.modelId)) continue;
-        const [disabled] = await db
-          .update(aiModel)
-          .set({ isEnabled: false, isHidden: true, updatedAt: new Date() })
-          .where(eq(aiModel.id, existing.id))
-          .returning();
-        if (disabled) disabledModels.push(disabled);
-      }
-    }
-
-    for (const preset of presets) {
-      try {
-        const existing = await db.query.aiModel.findFirst({
-          where: and(
-            eq(aiModel.providerId, providerId),
-            eq(aiModel.modelId, preset.modelId),
-          ),
-        });
-        const values = {
-          displayName: preset.displayName,
-          avatarUrl: null,
-          description: preset.description,
-          supportsVision: preset.supportsVision,
-          supportsImageGen: preset.supportsImageGen,
-          isEnabled:
-            requestedModelIds !== null ? true : (existing?.isEnabled ?? true),
-          isHidden: preset.isHidden,
-          sortOrder: preset.sortOrder,
-          capabilities: preset.capabilities,
-          defaultParams: preset.defaultParams,
-          imageGenConfig: preset.imageGenConfig,
-          updatedAt: new Date(),
-        };
-
-        if (existing) {
-          const [updated] = await db
-            .update(aiModel)
-            .set(values)
-            .where(
-              and(
-                eq(aiModel.providerId, providerId),
-                eq(aiModel.modelId, preset.modelId),
-              ),
-            )
-            .returning();
-          if (updated) updatedModels.push(updated);
-        } else {
-          const [created] = await db
-            .insert(aiModel)
-            .values({
-              providerId,
-              modelId: preset.modelId,
-              ...values,
-              isDefault: false,
-              isSubModel: false,
-              parentModelId: null,
-            })
-            .returning();
-          if (created) addedModels.push(created);
-        }
-      } catch (error) {
-        console.error(`[VIP98K Models API] Failed to sync ${preset.modelId}:`, error);
-        errors.push({
-          modelId: preset.modelId,
-          error: error instanceof Error ? error.message : "Sync failed",
-        });
-      }
-    }
-
-    return NextResponse.json({
-      success: true,
-      addedCount: addedModels.length,
-      updatedCount: updatedModels.length,
-      disabledCount: disabledModels.length,
-      addedModels,
-      updatedModels,
-      disabledModelIds: disabledModels.map((model) => model.modelId),
-      errors: errors.length > 0 ? errors : undefined,
-      counts: {
-        requested: presets.length,
-        total: catalogPresets.length,
-        byType: summarizeByType(catalogPresets),
-      },
-    });
-  } catch (error) {
-    console.error("[VIP98K Models API] POST error:", error);
-    return NextResponse.json(
-      {
-        error:
-          error instanceof Error
-            ? error.message
-            : "Failed to sync VIP98K models",
-      },
-      { status: 500 },
-    );
-  }
-}

app/api/admin/visionary-models/route.ts

@@ -1,139 +0,0 @@
-import { and, eq } from "drizzle-orm";
-import { NextResponse } from "next/server";
-import { VISIONARY_MODEL_PRESETS } from "@/lib/ai/visionary-models";
-import { db } from "@/lib/db";
-import { getAiProviderById } from "@/lib/db/queries";
-import { type AiModel, aiModel } from "@/lib/db/schema";
-import { requireAdmin } from "@/lib/middleware/admin";
-
-export async function GET() {
-  try {
-    await requireAdmin();
-    return NextResponse.json({
-      presets: VISIONARY_MODEL_PRESETS,
-      counts: { total: VISIONARY_MODEL_PRESETS.length },
-    });
-  } catch (error: any) {
-    console.error("[Visionary Models API] GET error:", error);
-    return NextResponse.json(
-      { error: error.message || "Failed to fetch Visionary model presets" },
-      { status: 500 }
-    );
-  }
-}
-
-export async function POST(request: Request) {
-  try {
-    await requireAdmin();
-    const body = await request.json();
-    const providerId = String(body?.providerId || "").trim();
-    const modelIds = Array.isArray(body?.modelIds)
-      ? body.modelIds
-          .map((item: unknown) => String(item || "").trim())
-          .filter(Boolean)
-      : null;
-
-    if (!providerId) {
-      return NextResponse.json(
-        { error: "Provider ID is required" },
-        { status: 400 }
-      );
-    }
-
-    const provider = await getAiProviderById({ id: providerId });
-    if (!provider || provider.type !== "visionary") {
-      return NextResponse.json(
-        { error: "Provider must be a Visionary provider" },
-        { status: 400 }
-      );
-    }
-
-    const presets = modelIds
-      ? VISIONARY_MODEL_PRESETS.filter((preset) =>
-          modelIds.includes(preset.modelId)
-        )
-      : VISIONARY_MODEL_PRESETS;
-    const addedModels: AiModel[] = [];
-    const updatedModels: AiModel[] = [];
-    const errors: { modelId: string; error: string }[] = [];
-
-    for (const preset of presets) {
-      try {
-        const existing = await db.query.aiModel.findFirst({
-          where: and(
-            eq(aiModel.providerId, providerId),
-            eq(aiModel.modelId, preset.modelId)
-          ),
-        });
-        const values = {
-          displayName: preset.displayName,
-          description: preset.description,
-          supportsVision: preset.supportsVision,
-          supportsImageGen: preset.supportsImageGen,
-          isEnabled: true,
-          isHidden: false,
-          sortOrder: preset.sortOrder,
-          capabilities: preset.capabilities || null,
-          defaultParams: preset.defaultParams || null,
-          imageGenConfig: preset.imageGenConfig || null,
-        };
-
-        if (existing) {
-          const [updated] = await db
-            .update(aiModel)
-            .set(values)
-            .where(
-              and(
-                eq(aiModel.providerId, providerId),
-                eq(aiModel.modelId, preset.modelId)
-              )
-            )
-            .returning();
-          if (updated) updatedModels.push(updated);
-          continue;
-        }
-
-        const [created] = await db
-          .insert(aiModel)
-          .values({
-            providerId,
-            modelId: preset.modelId,
-            ...values,
-            isDefault: false,
-            isSubModel: false,
-            parentModelId: null,
-          })
-          .returning();
-        if (created) addedModels.push(created);
-      } catch (error: any) {
-        console.error(
-          `[Visionary Models API] Failed to sync ${preset.modelId}:`,
-          error
-        );
-        errors.push({
-          modelId: preset.modelId,
-          error: error.message || "Sync failed",
-        });
-      }
-    }
-
-    return NextResponse.json({
-      success: true,
-      addedCount: addedModels.length,
-      updatedCount: updatedModels.length,
-      addedModels,
-      updatedModels,
-      errors: errors.length > 0 ? errors : undefined,
-      counts: {
-        requested: presets.length,
-        total: VISIONARY_MODEL_PRESETS.length,
-      },
-    });
-  } catch (error: any) {
-    console.error("[Visionary Models API] POST error:", error);
-    return NextResponse.json(
-      { error: error.message || "Failed to sync Visionary models" },
-      { status: 500 }
-    );
-  }
-}

app/api/ai-cad/modeling/command/route.ts

@@ -0,0 +1,122 @@
+import { randomUUID } from "node:crypto";
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import {
+  getKittyCadModelingCommandError,
+  isKittyCadModelingCommandSuccessful,
+  sendKittyCadModelingCommand,
+  takeKittyCadModelingSnapshot,
+} from "@/lib/kittycad/modeling-session";
+
+export const runtime = "nodejs";
+export const maxDuration = 60;
+
+type ModelingCommandRequest = {
+  captureSnapshot?: boolean;
+  cmd?: Record<string, unknown>;
+  cmdId?: string;
+  sessionId?: string;
+  snapshotFormat?: "jpeg" | "png";
+};
+
+function readOptionalRecord(value: unknown) {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
+export async function POST(request: Request) {
+  try {
+    const session = await auth();
+    if (!session?.user?.id) {
+      return NextResponse.json(
+        { success: false, error: "未登录" },
+        { status: 401 }
+      );
+    }
+
+    const body = (await request.json()) as ModelingCommandRequest;
+    const sessionId = String(body.sessionId || "").trim();
+    if (!sessionId) {
+      return NextResponse.json(
+        { success: false, error: "缺少官方建模会话 ID" },
+        { status: 400 }
+      );
+    }
+
+    const cmd = readOptionalRecord(body.cmd);
+    const cmdType = String(cmd?.type || "").trim();
+    if (!cmd || !cmdType) {
+      return NextResponse.json(
+        { success: false, error: "缺少有效的官方建模命令" },
+        { status: 400 }
+      );
+    }
+
+    const cmdId = String(body.cmdId || "").trim() || randomUUID();
+    const response = await sendKittyCadModelingCommand({
+      cmd: {
+        ...cmd,
+        type: cmdType,
+      },
+      cmdId,
+      sessionId,
+    });
+
+    if (!isKittyCadModelingCommandSuccessful(response)) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: getKittyCadModelingCommandError(response),
+          payload: response.errors || null,
+        },
+        { status: 400 }
+      );
+    }
+
+    let snapshotUrl: string | null = null;
+    let snapshotError: string | null = null;
+
+    const shouldCaptureSnapshot =
+      body.captureSnapshot === true && cmdType !== "take_snapshot";
+
+    if (cmdType === "take_snapshot") {
+      const contents = String(response.resp?.data?.contents || "").trim();
+      const snapshotFormat = body.snapshotFormat || "png";
+      snapshotUrl = contents
+        ? `data:${snapshotFormat === "jpeg" ? "image/jpeg" : "image/png"};base64,${contents}`
+        : null;
+    } else if (shouldCaptureSnapshot) {
+      try {
+        const snapshot = await takeKittyCadModelingSnapshot({
+          format: body.snapshotFormat || "png",
+          sessionId,
+        });
+        snapshotUrl = snapshot.snapshotUrl;
+      } catch (error) {
+        snapshotError =
+          error instanceof Error ? error.message : "获取官方建模快照失败";
+      }
+    }
+
+    return NextResponse.json({
+      success: true,
+      data: {
+        raw: response,
+        requestId: response.request_id || cmdId,
+        responseData: response.resp?.data || null,
+        responseType: response.resp?.type || cmdType,
+        snapshotError,
+        snapshotUrl,
+      },
+    });
+  } catch (error) {
+    return NextResponse.json(
+      {
+        success: false,
+        error: error instanceof Error ? error.message : "发送官方建模命令失败",
+      },
+      { status: 500 }
+    );
+  }
+}

app/api/ai-cad/modeling/session/[sessionId]/route.ts

@@ -0,0 +1,48 @@
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import { closeKittyCadModelingSession } from "@/lib/kittycad/modeling-session";
+
+export const runtime = "nodejs";
+export const maxDuration = 60;
+
+type RouteParams = {
+  params: Promise<{
+    sessionId: string;
+  }>;
+};
+
+export async function DELETE(_request: Request, { params }: RouteParams) {
+  try {
+    const session = await auth();
+    if (!session?.user?.id) {
+      return NextResponse.json(
+        { success: false, error: "未登录" },
+        { status: 401 }
+      );
+    }
+
+    const { sessionId } = await params;
+    const normalizedSessionId = String(sessionId || "").trim();
+    if (!normalizedSessionId) {
+      return NextResponse.json(
+        { success: false, error: "缺少 sessionId" },
+        { status: 400 }
+      );
+    }
+
+    const result = await closeKittyCadModelingSession(normalizedSessionId);
+
+    return NextResponse.json({
+      success: true,
+      data: result,
+    });
+  } catch (error) {
+    return NextResponse.json(
+      {
+        success: false,
+        error: error instanceof Error ? error.message : "关闭官方建模会话失败",
+      },
+      { status: 500 }
+    );
+  }
+}

app/api/ai-cad/modeling/session/route.ts

@@ -0,0 +1,33 @@
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import { createKittyCadModelingSession } from "@/lib/kittycad/modeling-session";
+
+export const runtime = "nodejs";
+export const maxDuration = 60;
+
+export async function POST() {
+  try {
+    const session = await auth();
+    if (!session?.user?.id) {
+      return NextResponse.json(
+        { success: false, error: "未登录" },
+        { status: 401 }
+      );
+    }
+
+    const modelingSession = await createKittyCadModelingSession();
+
+    return NextResponse.json({
+      success: true,
+      data: modelingSession,
+    });
+  } catch (error) {
+    return NextResponse.json(
+      {
+        success: false,
+        error: error instanceof Error ? error.message : "创建官方建模会话失败",
+      },
+      { status: 500 }
+    );
+  }
+}

app/api/ai-cad/provider/route.ts

@@ -0,0 +1,27 @@
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import { findKittyCadProviderConfig } from "@/lib/kittycad/server";
+
+export const runtime = "nodejs";
+
+export async function GET() {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json(
+      { success: false, error: "未登录" },
+      { status: 401 }
+    );
+  }
+
+  const config = await findKittyCadProviderConfig();
+
+  return NextResponse.json({
+    success: true,
+    data: {
+      configured: Boolean(config),
+      source: config?.source || "none",
+      providerName: config?.providerName || null,
+      baseUrl: config?.baseUrl || null,
+    },
+  });
+}

app/api/ai-cad/tasks/[taskId]/route.ts

@@ -0,0 +1,467 @@
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import { KittyCadApiError, kittyCadRequest } from "@/lib/kittycad/client";
+import { getKittyCadProviderConfig } from "@/lib/kittycad/server";
+import { uploadFile } from "@/lib/storage/service";
+
+export const runtime = "nodejs";
+export const maxDuration = 60;
+
+type KittyCadTaskResponse = {
+  id?: string;
+  status?: string;
+  outputs?: Record<string, string> | null;
+  error?: string | null;
+  code?: string | null;
+  prompt?: string | null;
+  conversation_id?: string | null;
+  model_version?: string | null;
+  output_format?: string | null;
+};
+
+type KittyCadAsyncOperationResponse = KittyCadTaskResponse & {
+  type?: string | null;
+};
+
+type ArchivedFile = {
+  sourceHash: string;
+  archivedUrl: string;
+};
+
+type RouteParams = {
+  params: Promise<{ taskId: string }>;
+};
+
+function getArchiveCache() {
+  const globalState = globalThis as Record<string, unknown>;
+  if (!globalState.__kittyCadAssetArchiveCache) {
+    globalState.__kittyCadAssetArchiveCache = new Map<string, ArchivedFile>();
+  }
+  return globalState.__kittyCadAssetArchiveCache as Map<string, ArchivedFile>;
+}
+
+function getArchiveInflight() {
+  const globalState = globalThis as Record<string, unknown>;
+  if (!globalState.__kittyCadAssetArchiveInflight) {
+    globalState.__kittyCadAssetArchiveInflight = new Map<
+      string,
+      Promise<string | null>
+    >();
+  }
+  return globalState.__kittyCadAssetArchiveInflight as Map<
+    string,
+    Promise<string | null>
+  >;
+}
+
+function mapKittyCadStatus(status: unknown) {
+  const normalized = String(status || "")
+    .trim()
+    .toLowerCase();
+  if (!normalized) {
+    return "queued" as const;
+  }
+  if (
+    normalized === "queued" ||
+    normalized === "pending" ||
+    normalized === "created" ||
+    normalized === "submitted"
+  ) {
+    return "queued" as const;
+  }
+  if (
+    normalized === "running" ||
+    normalized === "processing" ||
+    normalized === "in_progress" ||
+    normalized === "working" ||
+    normalized === "generating"
+  ) {
+    return "running" as const;
+  }
+  if (
+    normalized === "completed" ||
+    normalized === "success" ||
+    normalized === "succeeded" ||
+    normalized === "done" ||
+    normalized === "finished"
+  ) {
+    return "success" as const;
+  }
+  if (normalized === "cancelled" || normalized === "canceled") {
+    return "cancelled" as const;
+  }
+  if (normalized === "expired" || normalized === "timed_out") {
+    return "expired" as const;
+  }
+  if (normalized === "banned" || normalized === "blocked") {
+    return "banned" as const;
+  }
+  if (
+    normalized === "failed" ||
+    normalized === "error" ||
+    normalized === "errored"
+  ) {
+    return "failed" as const;
+  }
+  return "unknown" as const;
+}
+
+function getFileExtension(filename: string) {
+  const normalized = String(filename || "")
+    .trim()
+    .toLowerCase();
+  const cleanName = normalized.split("?")[0]?.split("#")[0] || normalized;
+  const segments = cleanName.split(".");
+  return segments.length > 1 ? segments.at(-1) || "" : "";
+}
+
+function isImageExtension(extension: string) {
+  return ["png", "jpg", "jpeg", "webp", "gif"].includes(extension);
+}
+
+function pickPreferredModelFile(files: Array<{ name: string; url: string }>) {
+  const preferredOrder = ["glb", "gltf", "obj", "stl", "step", "stp"];
+  for (const extension of preferredOrder) {
+    const matched = files.find(
+      (item) => getFileExtension(item.name) === extension
+    );
+    if (matched) {
+      return matched;
+    }
+  }
+  return null;
+}
+
+function pickPreviewImageFile(files: Array<{ name: string; url: string }>) {
+  return (
+    files.find((item) => isImageExtension(getFileExtension(item.name))) || null
+  );
+}
+
+function extractOutputEntries(task: KittyCadTaskResponse) {
+  return Object.entries(task.outputs || {}).filter(
+    (entry): entry is [string, string] =>
+      typeof entry[0] === "string" &&
+      entry[0].trim().length > 0 &&
+      typeof entry[1] === "string" &&
+      entry[1].trim().length > 0
+  );
+}
+
+async function enrichTextToCadOutputs(params: {
+  config: Awaited<ReturnType<typeof getKittyCadProviderConfig>>;
+  task: KittyCadTaskResponse;
+  taskId: string;
+}) {
+  if (extractOutputEntries(params.task).length > 0) {
+    return params.task;
+  }
+
+  try {
+    const asyncOperation = await kittyCadRequest<KittyCadAsyncOperationResponse>(
+      params.config,
+      {
+        method: "GET",
+        path: `/async/operations/${encodeURIComponent(params.taskId)}`,
+      }
+    );
+
+    if (extractOutputEntries(asyncOperation).length === 0) {
+      return params.task;
+    }
+
+    return {
+      ...params.task,
+      ...asyncOperation,
+      code: asyncOperation.code || params.task.code || null,
+      conversation_id:
+        asyncOperation.conversation_id || params.task.conversation_id || null,
+      model_version:
+        asyncOperation.model_version || params.task.model_version || null,
+      output_format:
+        asyncOperation.output_format || params.task.output_format || null,
+      outputs: asyncOperation.outputs,
+      prompt: asyncOperation.prompt || params.task.prompt || null,
+    } satisfies KittyCadTaskResponse;
+  } catch (error) {
+    console.warn("[KittyCADStatus] async output fallback failed", {
+      taskId: params.taskId,
+      error: error instanceof Error ? error.message : String(error),
+    });
+    return params.task;
+  }
+}
+
+function createClientSafeTaskOutput(task: KittyCadTaskResponse) {
+  const outputEntries = extractOutputEntries(task);
+  const outputSummary = Object.fromEntries(
+    outputEntries.map(([name, base64]) => [
+      name,
+      {
+        base64Length: base64.length,
+        extension: getFileExtension(name) || null,
+      },
+    ])
+  );
+
+  return {
+    ...task,
+    outputs: outputSummary,
+  };
+}
+
+async function archiveOutputIfNeeded(params: {
+  taskId: string;
+  filename: string;
+  base64: string;
+}) {
+  const normalizedFilename = String(params.filename || "").trim();
+  const normalizedBase64 = String(params.base64 || "").trim();
+  if (!normalizedFilename || !normalizedBase64) {
+    return null;
+  }
+
+  const cacheKey = `${params.taskId}:${normalizedFilename}`;
+  const cache = getArchiveCache();
+  const cached = cache.get(cacheKey);
+  if (cached && cached.sourceHash === normalizedBase64) {
+    return cached.archivedUrl;
+  }
+
+  const inflight = getArchiveInflight();
+  const existingTask = inflight.get(cacheKey);
+  if (existingTask) {
+    return (await existingTask) || null;
+  }
+
+  const archiveTask = (async () => {
+    try {
+      const binary = Buffer.from(normalizedBase64, "base64");
+      if (binary.byteLength <= 0) {
+        throw new Error("KittyCAD 输出文件为空");
+      }
+      const arrayBuffer = Uint8Array.from(binary).buffer;
+
+      const safeFilename =
+        normalizedFilename.replace(/[^\w.-]+/g, "-") || "kittycad-output.bin";
+      const uploaded = await uploadFile(
+        `kittycad-${params.taskId}-${safeFilename}`,
+        arrayBuffer
+      );
+      cache.set(cacheKey, {
+        sourceHash: normalizedBase64,
+        archivedUrl: uploaded.url,
+      });
+      return uploaded.url;
+    } catch (error) {
+      console.error("[KittyCADArchive] failed", {
+        taskId: params.taskId,
+        filename: normalizedFilename,
+        error: error instanceof Error ? error.message : String(error),
+      });
+      return null;
+    } finally {
+      inflight.delete(cacheKey);
+    }
+  })();
+
+  inflight.set(cacheKey, archiveTask);
+  return await archiveTask;
+}
+
+async function archiveTextOutputIfNeeded(params: {
+  taskId: string;
+  filename: string;
+  content: string;
+}) {
+  const normalizedFilename = String(params.filename || "").trim();
+  const normalizedContent = String(params.content || "");
+  if (!normalizedFilename || !normalizedContent.trim()) {
+    return null;
+  }
+
+  const cacheKey = `${params.taskId}:${normalizedFilename}`;
+  const cache = getArchiveCache();
+  const cached = cache.get(cacheKey);
+  if (cached && cached.sourceHash === normalizedContent) {
+    return cached.archivedUrl;
+  }
+
+  const inflight = getArchiveInflight();
+  const existingTask = inflight.get(cacheKey);
+  if (existingTask) {
+    return (await existingTask) || null;
+  }
+
+  const archiveTask = (async () => {
+    try {
+      const arrayBuffer = Uint8Array.from(
+        new TextEncoder().encode(normalizedContent)
+      ).buffer;
+      const safeFilename =
+        normalizedFilename.replace(/[^\w.-]+/g, "-") || "kittycad-output.kcl";
+      const uploaded = await uploadFile(
+        `kittycad-${params.taskId}-${safeFilename}`,
+        arrayBuffer
+      );
+      cache.set(cacheKey, {
+        sourceHash: normalizedContent,
+        archivedUrl: uploaded.url,
+      });
+      return uploaded.url;
+    } catch (error) {
+      console.error("[KittyCADArchive:text] failed", {
+        taskId: params.taskId,
+        filename: normalizedFilename,
+        error: error instanceof Error ? error.message : String(error),
+      });
+      return null;
+    } finally {
+      inflight.delete(cacheKey);
+    }
+  })();
+
+  inflight.set(cacheKey, archiveTask);
+  return await archiveTask;
+}
+
+export async function GET(_request: Request, { params }: RouteParams) {
+  try {
+    const session = await auth();
+    if (!session?.user?.id) {
+      return NextResponse.json(
+        { success: false, error: "未登录" },
+        { status: 401 }
+      );
+    }
+
+    const { taskId } = await params;
+    const normalizedTaskId = String(taskId || "").trim();
+    if (!normalizedTaskId) {
+      return NextResponse.json(
+        { success: false, error: "缺少 taskId" },
+        { status: 400 }
+      );
+    }
+
+    const config = await getKittyCadProviderConfig();
+    let result = await kittyCadRequest<KittyCadTaskResponse>(config, {
+      method: "GET",
+      path: `/user/text-to-cad/${encodeURIComponent(normalizedTaskId)}`,
+    });
+
+    const status = mapKittyCadStatus(result.status);
+    if (status !== "success") {
+      return NextResponse.json({
+        success: true,
+        data: {
+          taskId: normalizedTaskId,
+          type: "cad",
+          status,
+          progress: status === "running" ? 65 : null,
+          errorMessage: result.error || null,
+          conversationId: result.conversation_id || null,
+          modelVersion: result.model_version || null,
+          outputFormat: result.output_format || null,
+          output: createClientSafeTaskOutput(result),
+        },
+      });
+    }
+
+    result = await enrichTextToCadOutputs({
+      config,
+      task: result,
+      taskId: normalizedTaskId,
+    });
+
+    const outputEntries = extractOutputEntries(result);
+
+    const archivedEntries = await Promise.all(
+      outputEntries.map(async ([name, base64]) => {
+        const archivedUrl = await archiveOutputIfNeeded({
+          taskId: normalizedTaskId,
+          filename: name,
+          base64,
+        });
+        return archivedUrl ? { name, url: archivedUrl } : null;
+      })
+    );
+
+    const archivedFiles = archivedEntries.filter(
+      (item): item is { name: string; url: string } =>
+        Boolean(item?.name && item?.url)
+    );
+
+    const hasArchivedKclFile = archivedFiles.some(
+      (item) => getFileExtension(item.name) === "kcl"
+    );
+    if (
+      !hasArchivedKclFile &&
+      typeof result.code === "string" &&
+      result.code.trim()
+    ) {
+      const archivedCodeUrl = await archiveTextOutputIfNeeded({
+        taskId: normalizedTaskId,
+        filename: "main.kcl",
+        content: result.code,
+      });
+      if (archivedCodeUrl) {
+        archivedFiles.push({
+          name: "main.kcl",
+          url: archivedCodeUrl,
+        });
+      }
+    }
+
+    const modelFile = pickPreferredModelFile(archivedFiles);
+    const previewImageFile = pickPreviewImageFile(archivedFiles);
+    const downloadUrls = Object.fromEntries(
+      archivedFiles.map((item) => [item.name, item.url])
+    );
+    const codeFile =
+      archivedFiles.find((item) => getFileExtension(item.name) === "kcl") ||
+      null;
+
+    return NextResponse.json({
+      success: true,
+      data: {
+        taskId: normalizedTaskId,
+        type: "cad",
+        status: "success",
+        progress: 100,
+        modelUrl:
+          modelFile &&
+          ["glb", "gltf"].includes(getFileExtension(modelFile.name))
+            ? modelFile.url
+            : null,
+        previewImageUrl: previewImageFile?.url || null,
+        errorMessage: result.error || null,
+        conversationId: result.conversation_id || null,
+        modelVersion: result.model_version || null,
+        outputFormat: result.output_format || null,
+        codeUrl: codeFile?.url || null,
+        downloadUrls,
+        output: createClientSafeTaskOutput(result),
+      },
+    });
+  } catch (error) {
+    if (error instanceof KittyCadApiError) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: error.message,
+          payload: error.payload,
+        },
+        { status: error.httpStatus || 502 }
+      );
+    }
+
+    return NextResponse.json(
+      {
+        success: false,
+        error: error instanceof Error ? error.message : "查询 AI-CAD 任务失败",
+      },
+      { status: 500 }
+    );
+  }
+}

app/api/ai-cad/tasks/route.ts

@@ -0,0 +1,331 @@
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import {
+  consumeUserPoints,
+  getPointsSystemConfig,
+  getUserById,
+} from "@/lib/db/queries";
+import { KittyCadApiError, kittyCadRequest } from "@/lib/kittycad/client";
+import { getKittyCadProviderConfig } from "@/lib/kittycad/server";
+
+export const runtime = "nodejs";
+export const maxDuration = 60;
+
+type CreateAiCadTaskRequest = {
+  prompt?: string;
+  outputFormat?: string;
+  projectName?: string;
+  iterationSourceTaskId?: string;
+  sourceCode?: string;
+  sourceRanges?: Record<string, unknown>[];
+};
+
+type KittyCadCreateResponse = {
+  id?: string;
+  status?: string;
+  conversation_id?: string | null;
+  model_version?: string | null;
+  output_format?: string | null;
+};
+
+type KittyCadSourceTaskResponse = {
+  code?: string | null;
+  outputs?: Record<string, string> | null;
+};
+
+type KittyCadIterationResponse = {
+  id?: string;
+  status?: string;
+  conversation_id?: string | null;
+  model_version?: string | null;
+  output_format?: string | null;
+};
+
+function getFileExtension(filename: string) {
+  const normalized = String(filename || "")
+    .trim()
+    .toLowerCase();
+  const cleanName = normalized.split("?")[0]?.split("#")[0] || normalized;
+  const segments = cleanName.split(".");
+  return segments.length > 1 ? segments.at(-1) || "" : "";
+}
+
+function decodeBase64Text(value: unknown) {
+  const normalized = String(value || "").trim();
+  if (!normalized) {
+    return null;
+  }
+
+  try {
+    const decoded = Buffer.from(normalized, "base64").toString("utf8").trim();
+    return decoded || null;
+  } catch (_error) {
+    return null;
+  }
+}
+
+function extractSourceCodeFromTask(task: KittyCadSourceTaskResponse) {
+  const directCode = String(task.code || "").trim();
+  if (directCode) {
+    return directCode;
+  }
+
+  const kclOutputEntry = Object.entries(task.outputs || {}).find(
+    (entry): entry is [string, string] =>
+      typeof entry[0] === "string" &&
+      entry[0].trim().length > 0 &&
+      getFileExtension(entry[0]) === "kcl" &&
+      typeof entry[1] === "string" &&
+      entry[1].trim().length > 0
+  );
+
+  if (!kclOutputEntry) {
+    return null;
+  }
+
+  return decodeBase64Text(kclOutputEntry[1]);
+}
+
+function mapKittyCadStatus(status: unknown) {
+  const normalized = String(status || "")
+    .trim()
+    .toLowerCase();
+  if (!normalized) {
+    return "queued" as const;
+  }
+  if (
+    normalized === "queued" ||
+    normalized === "pending" ||
+    normalized === "created" ||
+    normalized === "submitted"
+  ) {
+    return "queued" as const;
+  }
+  if (
+    normalized === "running" ||
+    normalized === "processing" ||
+    normalized === "in_progress" ||
+    normalized === "working" ||
+    normalized === "generating"
+  ) {
+    return "running" as const;
+  }
+  if (
+    normalized === "completed" ||
+    normalized === "success" ||
+    normalized === "succeeded" ||
+    normalized === "done" ||
+    normalized === "finished"
+  ) {
+    return "success" as const;
+  }
+  if (normalized === "cancelled" || normalized === "canceled") {
+    return "cancelled" as const;
+  }
+  if (normalized === "expired" || normalized === "timed_out") {
+    return "expired" as const;
+  }
+  if (normalized === "banned" || normalized === "blocked") {
+    return "banned" as const;
+  }
+  if (
+    normalized === "failed" ||
+    normalized === "error" ||
+    normalized === "errored"
+  ) {
+    return "failed" as const;
+  }
+  return "unknown" as const;
+}
+
+export async function POST(request: Request) {
+  try {
+    const session = await auth();
+    if (!session?.user?.id) {
+      return NextResponse.json(
+        { success: false, error: "未登录" },
+        { status: 401 }
+      );
+    }
+
+    const body = (await request.json()) as CreateAiCadTaskRequest;
+    const prompt = String(body.prompt || "").trim();
+
+    const pointsConfig = await getPointsSystemConfig();
+    const unitCost = Number.isFinite(Number(pointsConfig.creditCostPer3DModel))
+      ? Math.max(0, Math.round(Number(pointsConfig.creditCostPer3DModel)))
+      : 0;
+
+    if (
+      pointsConfig.enabled &&
+      unitCost > 0 &&
+      pointsConfig.blockOnInsufficient !== false
+    ) {
+      const userData = await getUserById({ id: session.user.id });
+      if (!userData?.isHighVip) {
+        const currentBalance = Math.max(
+          0,
+          Number(userData?.pointsBalance || 0)
+        );
+        if (currentBalance < unitCost) {
+          return NextResponse.json(
+            {
+              success: false,
+              error: "积分不足",
+              code: "insufficient_points",
+              message: `积分不足，当前余额 ${currentBalance}，本次预计消耗 ${unitCost}。`,
+              balance: currentBalance,
+              expectedCost: unitCost,
+              unitCost,
+            },
+            { status: 402 }
+          );
+        }
+      }
+    }
+
+    const outputFormat =
+      String(body.outputFormat || "glb")
+        .trim()
+        .toLowerCase() || "glb";
+    const normalizedProjectName = String(body.projectName || "").trim();
+    const iterationSourceTaskId = String(
+      body.iterationSourceTaskId || ""
+    ).trim();
+    const sourceCode = String(body.sourceCode || "");
+    const normalizedSourceCode = sourceCode.trim();
+    const sourceRanges = Array.isArray(body.sourceRanges)
+      ? body.sourceRanges.filter(
+          (item): item is Record<string, unknown> =>
+            Boolean(item) && typeof item === "object" && !Array.isArray(item)
+        )
+      : [];
+    const config = await getKittyCadProviderConfig();
+    const generationMode =
+      iterationSourceTaskId || normalizedSourceCode ? "iterate" : "create";
+
+    if (generationMode === "create" && !prompt) {
+      return NextResponse.json(
+        { success: false, error: "请输入 CAD 描述" },
+        { status: 400 }
+      );
+    }
+
+    const iterationPrompt =
+      prompt || "Apply the edited KCL source and rebuild the CAD model.";
+    const result =
+      generationMode === "iterate"
+        ? await (async () => {
+            const originalSourceCode =
+              normalizedSourceCode ||
+              (await (async () => {
+                if (!iterationSourceTaskId) {
+                  return null;
+                }
+
+                const sourceTask =
+                  await kittyCadRequest<KittyCadSourceTaskResponse>(config, {
+                    method: "GET",
+                    path: `/user/text-to-cad/${encodeURIComponent(iterationSourceTaskId)}`,
+                  });
+                return extractSourceCodeFromTask(sourceTask);
+              })());
+
+            if (!originalSourceCode) {
+              throw new KittyCadApiError({
+                message:
+                  "当前参考版本缺少可继续编辑的 KCL 源码，请先等待该版本完成，或重新选择一个 KittyCAD 版本。",
+                httpStatus: 409,
+              });
+            }
+
+            return kittyCadRequest<KittyCadIterationResponse>(config, {
+              method: "POST",
+              path: "/ml/text-to-cad/iteration",
+              json: {
+                original_source_code: originalSourceCode,
+                prompt: iterationPrompt,
+                source_ranges: sourceRanges,
+                ...(normalizedProjectName
+                  ? { project_name: normalizedProjectName }
+                  : {}),
+              },
+            });
+          })()
+        : await kittyCadRequest<KittyCadCreateResponse>(config, {
+            method: "POST",
+            path: `/ai/text-to-cad/${encodeURIComponent(outputFormat)}?kcl=true`,
+            json: {
+              prompt,
+              ...(normalizedProjectName
+                ? { project_name: normalizedProjectName }
+                : {}),
+            },
+          });
+
+    const taskId = String(result.id || "").trim();
+    if (!taskId) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: "KittyCAD 返回缺少任务 ID",
+          raw: result,
+        },
+        { status: 502 }
+      );
+    }
+
+    if (pointsConfig.enabled && unitCost > 0) {
+      try {
+        await consumeUserPoints({
+          userId: session.user.id,
+          amount: unitCost,
+          reason: "model3d_generation",
+          modelId: "kittycad-cad",
+          note:
+            generationMode === "iterate"
+              ? "AI-CAD 连续迭代消耗积分"
+              : "AI-CAD 生成消耗积分",
+        });
+      } catch (error) {
+        console.error("[Points] Failed to consume AI-CAD points:", error);
+      }
+    }
+
+    return NextResponse.json({
+      success: true,
+      data: {
+        taskId,
+        status: mapKittyCadStatus(result.status),
+        conversationId: result.conversation_id || null,
+        modelVersion: result.model_version || null,
+        outputFormat:
+          generationMode === "iterate"
+            ? result.output_format || null
+            : result.output_format || outputFormat,
+        generationMode,
+        sourceTaskId: iterationSourceTaskId || null,
+        raw: result,
+      },
+    });
+  } catch (error) {
+    if (error instanceof KittyCadApiError) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: error.message,
+          payload: error.payload,
+        },
+        { status: error.httpStatus || 502 }
+      );
+    }
+
+    return NextResponse.json(
+      {
+        success: false,
+        error: error instanceof Error ? error.message : "创建 AI-CAD 任务失败",
+      },
+      { status: 500 }
+    );
+  }
+}

app/api/ai-cad/workspace-utils.ts

@@ -0,0 +1,195 @@
+import type { AiCadWorkspace } from "@/lib/db/schema";
+
+type CadGenerationProvider = "kittycad-cad" | "tripo-3d";
+
+const FINAL_TASK_STATUS = new Set([
+  "success",
+  "failed",
+  "banned",
+  "expired",
+  "cancelled",
+  "unknown",
+]);
+
+const DEFAULT_VIEWER_SETTINGS = {
+  cameraPreset: "iso",
+  envPreset: "studio",
+  lightIntensity: 1.1,
+  autoRotate: true,
+  showGrid: true,
+  wireframe: false,
+} as const;
+
+type WorkspaceVersionLike = {
+  status?: unknown;
+  prompt?: unknown;
+};
+
+export type UpdateAiCadWorkspaceRequest = {
+  name?: string;
+  prompt?: string;
+  generationProvider?: string;
+  modelVersion?: string;
+  viewerSettings?: unknown;
+  messages?: unknown;
+  versions?: unknown;
+  activeVersionId?: string | null;
+};
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function getWorkspaceVersions(value: unknown): WorkspaceVersionLike[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  return value.filter((item): item is WorkspaceVersionLike => isRecord(item));
+}
+
+export function normalizeViewerSettings(
+  value: unknown
+): Record<string, unknown> {
+  if (!isRecord(value)) {
+    return { ...DEFAULT_VIEWER_SETTINGS };
+  }
+
+  return {
+    cameraPreset:
+      value.cameraPreset === "top" ||
+      value.cameraPreset === "front" ||
+      value.cameraPreset === "right" ||
+      value.cameraPreset === "iso"
+        ? value.cameraPreset
+        : DEFAULT_VIEWER_SETTINGS.cameraPreset,
+    envPreset:
+      typeof value.envPreset === "string" && value.envPreset.trim()
+        ? value.envPreset
+        : DEFAULT_VIEWER_SETTINGS.envPreset,
+    lightIntensity:
+      typeof value.lightIntensity === "number" &&
+      Number.isFinite(value.lightIntensity)
+        ? value.lightIntensity
+        : DEFAULT_VIEWER_SETTINGS.lightIntensity,
+    autoRotate:
+      typeof value.autoRotate === "boolean"
+        ? value.autoRotate
+        : DEFAULT_VIEWER_SETTINGS.autoRotate,
+    showGrid:
+      typeof value.showGrid === "boolean"
+        ? value.showGrid
+        : DEFAULT_VIEWER_SETTINGS.showGrid,
+    wireframe:
+      typeof value.wireframe === "boolean"
+        ? value.wireframe
+        : DEFAULT_VIEWER_SETTINGS.wireframe,
+  };
+}
+
+export function normalizeJsonRecordArray(
+  value: unknown
+): Record<string, unknown>[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  return value.filter((item): item is Record<string, unknown> =>
+    isRecord(item)
+  );
+}
+
+export function normalizeWorkspaceName(
+  value: unknown,
+  fallbackName = "AI-CAD 工作台"
+) {
+  return typeof value === "string" && value.trim()
+    ? value.trim()
+    : fallbackName;
+}
+
+export function normalizeWorkspacePayload(body: UpdateAiCadWorkspaceRequest): {
+  name?: string;
+  prompt: string;
+  generationProvider: CadGenerationProvider;
+  modelVersion: string;
+  viewerSettings: Record<string, unknown>;
+  messages: Record<string, unknown>[];
+  versions: Record<string, unknown>[];
+  activeVersionId: string | null;
+} {
+  return {
+    ...(typeof body.name === "string" && body.name.trim()
+      ? { name: body.name.trim() }
+      : {}),
+    prompt: String(body.prompt || ""),
+    generationProvider:
+      body.generationProvider === "tripo-3d" ? "tripo-3d" : "kittycad-cad",
+    modelVersion:
+      typeof body.modelVersion === "string" && body.modelVersion.trim()
+        ? body.modelVersion
+        : "Turbo-v1.0-20250506",
+    viewerSettings: normalizeViewerSettings(body.viewerSettings),
+    messages: normalizeJsonRecordArray(body.messages),
+    versions: normalizeJsonRecordArray(body.versions),
+    activeVersionId:
+      typeof body.activeVersionId === "string" && body.activeVersionId.trim()
+        ? body.activeVersionId
+        : null,
+  };
+}
+
+export function buildDefaultWorkspaceName(index: number) {
+  return index > 1 ? `AI-CAD 工作台 ${index}` : "AI-CAD 工作台";
+}
+
+export function createWorkspaceSummary(workspace: AiCadWorkspace) {
+  const versions = getWorkspaceVersions(workspace.versions);
+  const versionCount = versions.length;
+  const completedCount = versions.filter(
+    (version) => version.status === "success"
+  ).length;
+  const hasPendingTasks = versions.some(
+    (version) =>
+      typeof version.status !== "string" ||
+      !FINAL_TASK_STATUS.has(version.status)
+  );
+  const latestPrompt =
+    typeof workspace.prompt === "string" && workspace.prompt.trim()
+      ? workspace.prompt.trim()
+      : versions.find(
+          (version) =>
+            typeof version.prompt === "string" && version.prompt.trim()
+        )?.prompt || null;
+
+  return {
+    id: workspace.id,
+    name: workspace.name,
+    generationProvider: workspace.generationProvider,
+    versionCount,
+    completedCount,
+    hasPendingTasks,
+    latestPrompt:
+      typeof latestPrompt === "string" && latestPrompt.trim()
+        ? latestPrompt.trim()
+        : null,
+    createdAt: workspace.createdAt?.toISOString() || null,
+    updatedAt: workspace.updatedAt?.toISOString() || null,
+  };
+}
+
+export function createWorkspaceDocument(workspace: AiCadWorkspace) {
+  return {
+    id: workspace.id,
+    name: workspace.name,
+    prompt: workspace.prompt,
+    generationProvider: workspace.generationProvider,
+    modelVersion: workspace.modelVersion,
+    viewerSettings: workspace.viewerSettings,
+    messages: workspace.messages,
+    versions: workspace.versions,
+    activeVersionId: workspace.activeVersionId,
+    createdAt: workspace.createdAt?.toISOString() || null,
+    updatedAt: workspace.updatedAt?.toISOString() || null,
+  };
+}

app/api/ai-cad/workspace/route.ts

@@ -0,0 +1,89 @@
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import {
+  createWorkspaceDocument,
+  normalizeWorkspacePayload,
+  type UpdateAiCadWorkspaceRequest,
+} from "@/app/api/ai-cad/workspace-utils";
+import {
+  createAiCadWorkspace,
+  listAiCadWorkspacesByUserId,
+  updateAiCadWorkspace,
+} from "@/lib/db/queries";
+
+export const runtime = "nodejs";
+
+export async function GET() {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json(
+      { success: false, error: "未登录" },
+      { status: 401 }
+    );
+  }
+
+  const workspaces = await listAiCadWorkspacesByUserId({
+    userId: session.user.id,
+  });
+  const workspace = workspaces[0] ?? null;
+
+  if (!workspace) {
+    return NextResponse.json({
+      success: true,
+      data: null,
+    });
+  }
+
+  return NextResponse.json({
+    success: true,
+    data: createWorkspaceDocument(workspace),
+  });
+}
+
+export async function PUT(request: Request) {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json(
+      { success: false, error: "未登录" },
+      { status: 401 }
+    );
+  }
+
+  const body = (await request.json()) as UpdateAiCadWorkspaceRequest;
+  const existingWorkspaces = await listAiCadWorkspacesByUserId({
+    userId: session.user.id,
+  });
+  const targetWorkspace =
+    existingWorkspaces[0] ??
+    (await createAiCadWorkspace({
+      userId: session.user.id,
+      name: "AI-CAD 工作台",
+    }));
+
+  if (!targetWorkspace) {
+    return NextResponse.json(
+      { success: false, error: "初始化 AI-CAD 工作台失败" },
+      { status: 500 }
+    );
+  }
+
+  const savedWorkspace = await updateAiCadWorkspace({
+    workspaceId: targetWorkspace.id,
+    userId: session.user.id,
+    ...normalizeWorkspacePayload(body),
+  });
+
+  if (!savedWorkspace) {
+    return NextResponse.json(
+      { success: false, error: "保存 AI-CAD 工作台失败" },
+      { status: 500 }
+    );
+  }
+
+  return NextResponse.json({
+    success: true,
+    data: {
+      updatedAt: savedWorkspace.updatedAt?.toISOString() || null,
+    },
+  });
+}

app/api/ai-cad/workspaces/[workspaceId]/route.ts

@@ -0,0 +1,114 @@
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import {
+  createWorkspaceDocument,
+  createWorkspaceSummary,
+  normalizeWorkspacePayload,
+  type UpdateAiCadWorkspaceRequest,
+} from "@/app/api/ai-cad/workspace-utils";
+import {
+  deleteAiCadWorkspaceById,
+  getAiCadWorkspaceById,
+  updateAiCadWorkspace,
+} from "@/lib/db/queries";
+
+export const runtime = "nodejs";
+
+type RouteContext = {
+  params: Promise<{
+    workspaceId: string;
+  }>;
+};
+
+export async function GET(_request: Request, context: RouteContext) {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json(
+      { success: false, error: "未登录" },
+      { status: 401 }
+    );
+  }
+
+  const { workspaceId } = await context.params;
+  const workspace = await getAiCadWorkspaceById({
+    userId: session.user.id,
+    workspaceId,
+  });
+
+  if (!workspace) {
+    return NextResponse.json(
+      { success: false, error: "AI-CAD 工作台不存在" },
+      { status: 404 }
+    );
+  }
+
+  return NextResponse.json({
+    success: true,
+    data: createWorkspaceDocument(workspace),
+  });
+}
+
+export async function PUT(request: Request, context: RouteContext) {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json(
+      { success: false, error: "未登录" },
+      { status: 401 }
+    );
+  }
+
+  const { workspaceId } = await context.params;
+  const body = (await request.json()) as UpdateAiCadWorkspaceRequest;
+  const savedWorkspace = await updateAiCadWorkspace({
+    workspaceId,
+    userId: session.user.id,
+    ...normalizeWorkspacePayload(body),
+  });
+
+  if (!savedWorkspace) {
+    return NextResponse.json(
+      { success: false, error: "AI-CAD 工作台不存在或保存失败" },
+      { status: 404 }
+    );
+  }
+
+  return NextResponse.json({
+    success: true,
+    data: {
+      id: savedWorkspace.id,
+      name: savedWorkspace.name,
+      updatedAt: savedWorkspace.updatedAt?.toISOString() || null,
+      summary: createWorkspaceSummary(savedWorkspace),
+    },
+  });
+}
+
+export async function DELETE(_request: Request, context: RouteContext) {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json(
+      { success: false, error: "未登录" },
+      { status: 401 }
+    );
+  }
+
+  const { workspaceId } = await context.params;
+  const deletedWorkspace = await deleteAiCadWorkspaceById({
+    workspaceId,
+    userId: session.user.id,
+  });
+
+  if (!deletedWorkspace) {
+    return NextResponse.json(
+      { success: false, error: "AI-CAD 工作台不存在" },
+      { status: 404 }
+    );
+  }
+
+  return NextResponse.json({
+    success: true,
+    data: {
+      id: deletedWorkspace.id,
+    },
+  });
+}

app/api/ai-cad/workspaces/route.ts

@@ -0,0 +1,69 @@
+import { NextResponse } from "next/server";
+import { auth } from "@/app/(auth)/auth";
+import {
+  buildDefaultWorkspaceName,
+  createWorkspaceSummary,
+  normalizeWorkspaceName,
+} from "@/app/api/ai-cad/workspace-utils";
+import {
+  createAiCadWorkspace,
+  listAiCadWorkspacesByUserId,
+} from "@/lib/db/queries";
+
+export const runtime = "nodejs";
+
+export async function GET() {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json(
+      { success: false, error: "未登录" },
+      { status: 401 }
+    );
+  }
+
+  const workspaces = await listAiCadWorkspacesByUserId({
+    userId: session.user.id,
+  });
+
+  return NextResponse.json({
+    success: true,
+    data: workspaces.map(createWorkspaceSummary),
+  });
+}
+
+export async function POST(request: Request) {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json(
+      { success: false, error: "未登录" },
+      { status: 401 }
+    );
+  }
+
+  const body = (await request.json().catch(() => ({}))) as { name?: unknown };
+  const existingWorkspaces = await listAiCadWorkspacesByUserId({
+    userId: session.user.id,
+  });
+  const workspace = await createAiCadWorkspace({
+    userId: session.user.id,
+    name: normalizeWorkspaceName(
+      body.name,
+      buildDefaultWorkspaceName(existingWorkspaces.length + 1)
+    ),
+  });
+
+  if (!workspace) {
+    return NextResponse.json(
+      { success: false, error: "创建 AI-CAD 工作台失败" },
+      { status: 500 }
+    );
+  }
+
+  return NextResponse.json(
+    {
+      success: true,
+      data: createWorkspaceSummary(workspace),
+    },
+    { status: 201 }
+  );
+}

app/api/ai-wash/generate/route.ts

@@ -13,7 +13,6 @@ import {
   findStyleProImageModelByRef,
   getStyleProImageModelEntries,
 } from "@/lib/style-pro/model-options";
-import { getAiModelFrontendAvailability } from "@/lib/ai/model-frontend-availability";
 
 const requestSchema = z.object({
   prompt: z.string().min(1).max(5000),
@@ -53,16 +52,6 @@ export async function POST(request: Request) {
         { status: 400 }
       );
     }
-    const availability = getAiModelFrontendAvailability(selectedModel.model);
-    if (availability.selectable === false) {
-      return NextResponse.json(
-        {
-          success: false,
-          error: availability.disabledReason || "所选 AI洗图 生图模型当前不可用",
-        },
-        { status: 400 }
-      );
-    }
 
     const imageSize = body.imageSize?.trim() || "2K";
     const unitCost = getModelGenerationCreditCost(selectedModel.model as any, "image", {

app/api/canvas-skill-tags/route.ts

@@ -7,9 +7,9 @@ import {
   CANVAS_SKILL_TAG_ORDER_SETTING_KEY_PREFIX,
   CANVAS_SKILL_TAGS_CONFIG_VERSION,
   CANVAS_SKILL_TAGS_SETTING_KEY,
+  type CanvasSkillTag,
   normalizeCanvasSkillTagSettings,
 } from "@/lib/canvas-skill-tags";
-import { applyCanvasSkillTagOrder } from "@/lib/canvas-skill-tag-order";
 
 function getUserSkillTagOrderKey(userId: string) {
   return `${CANVAS_SKILL_TAG_ORDER_SETTING_KEY_PREFIX}${userId}`;
@@ -32,6 +32,18 @@ function normalizeSkillTagOrder(value: unknown) {
     });
 }
 
+function applySkillTagOrder(tags: CanvasSkillTag[], order: string[]) {
+  if (tags.length < 2 || order.length === 0) return tags;
+
+  const tagById = new Map(tags.map((tag) => [tag.id, tag]));
+  const ordered = order
+    .map((id) => tagById.get(id))
+    .filter((tag): tag is CanvasSkillTag => Boolean(tag));
+  const orderedIds = new Set(ordered.map((tag) => tag.id));
+  const remaining = tags.filter((tag) => !orderedIds.has(tag.id));
+  return [...ordered, ...remaining];
+}
+
 export async function GET() {
   try {
     const session = await auth().catch(() => null);
@@ -59,7 +71,7 @@ export async function GET() {
     const userOrder = normalizeSkillTagOrder(userOrderSetting?.value);
     return NextResponse.json({
       ...settings,
-      tags: applyCanvasSkillTagOrder(settings.tags, userOrder),
+      tags: applySkillTagOrder(settings.tags, userOrder),
       userOrder,
     });
   } catch (error) {
@@ -121,7 +133,7 @@ export async function PATCH(request: NextRequest) {
     return NextResponse.json({
       success: true,
       userOrder: tagIds,
-      tags: applyCanvasSkillTagOrder(settings.tags, tagIds),
+      tags: applySkillTagOrder(settings.tags, tagIds),
     });
   } catch (error) {
     console.error("[CanvasSkillTags API] Save order error:", error);
@@ -140,12 +152,10 @@ export async function PUT(request: NextRequest) {
     const normalized = normalizeCanvasSkillTagSettings(body);
     const enabled = normalized.enabled;
     const title = normalized.title;
-    const categories = normalized.categories;
     const tags = normalized.tags;
     const nextValue = {
       enabled,
       title,
-      categories,
       tags,
       version: CANVAS_SKILL_TAGS_CONFIG_VERSION,
     };
@@ -173,7 +183,7 @@ export async function PUT(request: NextRequest) {
       });
     }
 
-    return NextResponse.json({ success: true, enabled, title, categories, tags });
+    return NextResponse.json({ success: true, enabled, title, tags });
   } catch (error) {
     console.error("[CanvasSkillTags API] Update error:", error);
     return NextResponse.json({ error: "Failed to update" }, { status: 500 });

app/api/canvas/[id]/capabilities/route.ts

@@ -1,91 +0,0 @@
-import { NextResponse } from "next/server";
-import { ZodError } from "zod";
-
-import { auth } from "@/app/(auth)/auth";
-import { canvasCapabilityClientCommandSchema } from "@/lib/canvas/capabilities/client-command";
-import { CanvasCapabilityRuntimeError } from "@/lib/canvas/capabilities/context";
-import { getCanvasCapabilityManifest } from "@/lib/canvas/capabilities/registry";
-import { executeCanvasCapabilityRuntime } from "@/lib/canvas/capabilities/runtime";
-import { getCanvasCapabilityTask } from "@/lib/canvas/capabilities/task-store";
-import { CanvasAgentMutationError } from "@/lib/canvas/agent-mutations";
-
-export const dynamic = "force-dynamic";
-export const maxDuration = 600;
-
-export async function GET(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const session = await auth();
-  if (!session?.user?.id) {
-    return NextResponse.json({ success: false, error: "未登录" }, { status: 401 });
-  }
-  const { id } = await params;
-  const requestId = new URL(request.url).searchParams.get("requestId");
-  if (!requestId) {
-    return NextResponse.json({
-      success: true,
-      capabilities: getCanvasCapabilityManifest(),
-    });
-  }
-  const task = await getCanvasCapabilityTask({
-    requestId,
-    userId: session.user.id,
-    projectId: id,
-  });
-  if (!task) {
-    return NextResponse.json(
-      { success: false, error: "能力任务不存在" },
-      { status: 404 }
-    );
-  }
-  return NextResponse.json({ success: true, task });
-}
-
-export async function POST(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const session = await auth();
-  if (!session?.user?.id) {
-    return NextResponse.json({ success: false, error: "未登录" }, { status: 401 });
-  }
-
-  try {
-    const { id } = await params;
-    const command = canvasCapabilityClientCommandSchema.parse(await request.json());
-    const result = await executeCanvasCapabilityRuntime({
-      command,
-      projectId: id,
-      requestHeaders: request.headers,
-      requestUrl: request.url,
-      userId: session.user.id,
-    });
-    return NextResponse.json({ success: true, ...result });
-  } catch (error) {
-    if (
-      error instanceof CanvasCapabilityRuntimeError ||
-      error instanceof CanvasAgentMutationError
-    ) {
-      return NextResponse.json(
-        { success: false, error: error.message, code: error.code },
-        { status: error.status }
-      );
-    }
-    if (error instanceof ZodError) {
-      return NextResponse.json(
-        {
-          success: false,
-          error: "画布能力参数无效",
-          issues: error.issues,
-        },
-        { status: 400 }
-      );
-    }
-    const message = error instanceof Error ? error.message : "执行画布能力失败";
-    return NextResponse.json(
-      { success: false, error: message },
-      { status: 500 }
-    );
-  }
-}

app/api/canvas/[id]/revision/route.ts

@@ -1,53 +0,0 @@
-import { and, eq } from "drizzle-orm";
-import { z } from "zod";
-import { auth } from "@/app/(auth)/auth";
-import { db } from "@/lib/db";
-import { canvasProject } from "@/lib/db/schema";
-
-const canvasIdSchema = z.string().uuid();
-
-export async function GET(
-  _request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const session = await auth();
-  if (!session?.user?.id) {
-    return Response.json(
-      { success: false, error: "未登录" },
-      { status: 401 }
-    );
-  }
-
-  const { id: rawId } = await params;
-  const parsedId = canvasIdSchema.safeParse(rawId);
-  if (!parsedId.success) {
-    return Response.json(
-      { success: false, error: "画布 ID 无效" },
-      { status: 400 }
-    );
-  }
-
-  const id = parsedId.data;
-  const [project] = await db
-    .select({ updatedAt: canvasProject.updatedAt })
-    .from(canvasProject)
-    .where(
-      and(
-        eq(canvasProject.id, id),
-        eq(canvasProject.userId, session.user.id)
-      )
-    )
-    .limit(1);
-
-  if (!project) {
-    return Response.json(
-      { success: false, error: "画布不存在" },
-      { status: 404 }
-    );
-  }
-
-  return Response.json(
-    { success: true, data: { updatedAt: project.updatedAt.toISOString() } },
-    { headers: { "Cache-Control": "no-store" } }
-  );
-}

app/api/canvas/[id]/route.ts

@@ -192,53 +192,23 @@ export async function PUT(
             })
           : undefined;
 
-      const nextWorkspaceType = workspaceType || "canvas";
-      const nextCanvasData = syncedCanvasData || {
-        nodes: [],
-        edges: [],
-        viewport: { x: 0, y: 0, zoom: 1 },
-      };
-      const nextTitle = title || getDefaultWorkspaceTitle(nextWorkspaceType);
-      const insertData: any = {
-        id, // 使用指定的 ID
-        userId: session.user.id,
-        title: nextTitle,
-        workspaceType: nextWorkspaceType,
-        canvasData: nextCanvasData,
-      };
-      const conflictUpdateData: any = {
-        title: nextTitle,
-        workspaceType: nextWorkspaceType,
-        canvasData: nextCanvasData,
-        updatedAt: new Date(),
-      };
-      if (description !== undefined) {
-        insertData.description = description;
-        conflictUpdateData.description = description;
-      }
-      if (thumbnail !== undefined) {
-        insertData.thumbnail = thumbnail;
-        conflictUpdateData.thumbnail = thumbnail;
-      }
-
-      // 创建新画布（使用指定 ID），并兼容同一用户并发创建同一画布的场景。
+      // 创建新画布（使用指定 ID）
       const [newProject] = await db
         .insert(canvasProject)
-        .values(insertData)
-        .onConflictDoUpdate({
-          target: canvasProject.id,
-          set: conflictUpdateData,
-          where: eq(canvasProject.userId, session.user.id),
+        .values({
+          id, // 使用指定的 ID
+          userId: session.user.id,
+          title: title || getDefaultWorkspaceTitle(workspaceType || "canvas"),
+          description,
+          workspaceType: workspaceType || "canvas",
+          canvasData: syncedCanvasData || {
+            nodes: [],
+            edges: [],
+            viewport: { x: 0, y: 0, zoom: 1 },
+          },
         })
         .returning();
 
-      if (!newProject) {
-        return NextResponse.json(
-          { success: false, error: '画布ID已被占用' },
-          { status: 409 }
-        );
-      }
-
       return NextResponse.json({ success: true, data: newProject });
     }
   } catch (error) {

app/api/canvas/clawd-chat/cancel/route.ts

@@ -1,27 +1,11 @@
 import { NextResponse } from "next/server";
 import { z } from "zod";
 import { auth } from "@/app/(auth)/auth";
-import { getChatById, getSystemSetting } from "@/lib/db/queries";
+import { getChatById } from "@/lib/db/queries";
 import {
   buildClawdCancelKey,
   cancelClawdRequest,
 } from "@/lib/openclaw-chat/cancel-registry";
-import {
-  OPENCLAW_AUTH_REQUIRED_CODE,
-  OPENCLAW_AUTH_REQUIRED_MESSAGE,
-} from "@/lib/openclaw-chat/errors";
-import {
-  normalizeOpenClawChatConfig,
-  OPENCLAW_CHAT_CONFIG_KEY,
-} from "@/lib/openclaw-chat/config";
-import {
-  deletePersistedClawdTask,
-  getPersistedClawdTask,
-} from "@/lib/openclaw-chat/task-store";
-import {
-  getPersistedUpstreamTaskState,
-  stopOpenClawDurableTask,
-} from "@/lib/openclaw-chat/upstream-task-client";
 
 const cancelSchema = z.object({
   id: z.string().uuid(),
@@ -31,13 +15,7 @@ const cancelSchema = z.object({
 export async function POST(request: Request) {
   const session = await auth().catch(() => null);
   if (!session?.user?.id) {
-    return NextResponse.json(
-      {
-        error: OPENCLAW_AUTH_REQUIRED_MESSAGE,
-        code: OPENCLAW_AUTH_REQUIRED_CODE,
-      },
-      { status: 401 }
-    );
+    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
   }
 
   const parsed = cancelSchema.safeParse(await request.json().catch(() => null));
@@ -50,43 +28,13 @@ export async function POST(request: Request) {
     return NextResponse.json({ error: "Forbidden" }, { status: 403 });
   }
 
-  const cancelKey = buildClawdCancelKey({
-    userId: session.user.id,
-    chatId: parsed.data.id,
-    userMessageId: parsed.data.userMessageId,
-  });
-  const task = await getPersistedClawdTask({
-    chatId: parsed.data.id,
-    userMessageId: parsed.data.userMessageId,
-  }).catch(() => null);
-  const active = cancelClawdRequest(cancelKey);
-  const upstreamTask = task
-    ? getPersistedUpstreamTaskState(task.metadata)
-    : null;
-  if (upstreamTask) {
-    const setting = await getSystemSetting({
-      key: OPENCLAW_CHAT_CONFIG_KEY,
-    }).catch(() => null);
-    const config = normalizeOpenClawChatConfig(setting?.value);
-    if (config.enabled && config.baseUrl && config.token) {
-      await stopOpenClawDurableTask({ config, upstreamTask }).catch((error) => {
-        console.warn("[ClawdChat Cancel] Upstream stop deferred:", {
-          chatId: parsed.data.id,
-          taskId: upstreamTask.taskId,
-          error,
-        });
-      });
-    }
-  }
+  const active = cancelClawdRequest(
+    buildClawdCancelKey({
+      userId: session.user.id,
+      chatId: parsed.data.id,
+      userMessageId: parsed.data.userMessageId,
+    })
+  );
 
-  const deleted = await deletePersistedClawdTask({
-    chatId: parsed.data.id,
-    userMessageId: parsed.data.userMessageId,
-  }).catch(() => []);
-
-  return NextResponse.json({
-    canceled: true,
-    active,
-    deleted: deleted.length > 0,
-  });
+  return NextResponse.json({ canceled: true, active });
 }

app/api/canvas/clawd-chat/folder-upload/route.ts

@@ -1,141 +0,0 @@
-import JSZip from "jszip";
-import { NextResponse } from "next/server";
-import { auth } from "@/app/(auth)/auth";
-import { getAllStorageConfigs } from "@/lib/db/queries";
-import {
-  countOpenClawArchiveRootFolders,
-  sanitizeOpenClawArchiveEntryPath,
-  sanitizeOpenClawArchiveName,
-} from "@/lib/openclaw-chat/folder-archive";
-import {
-  OPENCLAW_CHAT_FOLDER_MAX_FILES,
-} from "@/lib/openclaw-chat/media-attachments";
-import { createLogger } from "@/lib/observability/logger";
-import {
-  toDbS3UploadConfig,
-  uploadFileWithS3Config,
-} from "@/lib/storage/service";
-
-export const runtime = "nodejs";
-export const maxDuration = 600;
-
-const logger = createLogger("openclaw-folder-upload");
-const LEGACY_FOLDER_UPLOAD_MAX_BYTES = 300 * 1024 * 1024;
-
-function isUploadedFile(value: FormDataEntryValue): value is File {
-  return (
-    typeof value === "object" &&
-    value !== null &&
-    "arrayBuffer" in value &&
-    "name" in value &&
-    "size" in value
-  );
-}
-
-function toArrayBuffer(buffer: Buffer) {
-  return buffer.buffer.slice(
-    buffer.byteOffset,
-    buffer.byteOffset + buffer.byteLength
-  ) as ArrayBuffer;
-}
-
-export async function POST(request: Request) {
-  const session = await auth();
-  if (!session?.user?.id) {
-    return NextResponse.json({ error: "请先登录" }, { status: 401 });
-  }
-
-  try {
-    const formData = await request.formData();
-    const files = formData
-      .getAll("files")
-      .filter((entry): entry is File => isUploadedFile(entry));
-    const relativePaths = formData
-      .getAll("relativePaths")
-      .map((entry) => (typeof entry === "string" ? entry : ""));
-
-    if (files.length === 0) {
-      return NextResponse.json(
-        { error: "所选文件夹中没有可上传文件" },
-        { status: 400 }
-      );
-    }
-    if (files.length > OPENCLAW_CHAT_FOLDER_MAX_FILES) {
-      return NextResponse.json(
-        { error: `单次最多打包 ${OPENCLAW_CHAT_FOLDER_MAX_FILES} 个文件` },
-        { status: 413 }
-      );
-    }
-
-    const originalSize = files.reduce((sum, file) => sum + file.size, 0);
-    if (originalSize > LEGACY_FOLDER_UPLOAD_MAX_BYTES) {
-      return NextResponse.json(
-        { error: "请刷新页面后使用支持 2GB 和断点续传的新文件夹上传方式" },
-        { status: 413 }
-      );
-    }
-
-    const archivePaths = files.map((file, index) =>
-      sanitizeOpenClawArchiveEntryPath(
-        relativePaths[index] || file.name,
-        file.name,
-        index
-      )
-    );
-    const zip = new JSZip();
-    for (const [index, file] of files.entries()) {
-      zip.file(archivePaths[index], await file.arrayBuffer(), {
-        date: new Date(file.lastModified || Date.now()),
-      });
-    }
-
-    const archiveBaseName = sanitizeOpenClawArchiveName(
-      String(formData.get("archiveName") || archivePaths[0]?.split("/")[0] || "")
-    );
-    const archiveName = `${archiveBaseName.replace(/\.zip$/i, "")}.zip`;
-    const archiveBuffer = await zip.generateAsync({
-      type: "nodebuffer",
-      compression: "DEFLATE",
-      compressionOptions: { level: 6 },
-      platform: "UNIX",
-    });
-
-    const storageConfigs = await getAllStorageConfigs();
-    const qiniuStorage = storageConfigs
-      .filter((config) => config.type === "qiniu-kodo" && config.isEnabled)
-      .sort((left, right) => Number(right.isDefault) - Number(left.isDefault))
-      .find((config) => toDbS3UploadConfig(config));
-    const qiniuConfig = toDbS3UploadConfig(qiniuStorage);
-    if (!qiniuConfig) {
-      return NextResponse.json(
-        { error: "系统尚未配置可用的七牛云储存桶" },
-        { status: 503 }
-      );
-    }
-
-    const uploaded = await uploadFileWithS3Config(
-      archiveName,
-      toArrayBuffer(archiveBuffer),
-      qiniuConfig
-    );
-    if (!/^https?:\/\//i.test(uploaded.url)) {
-      throw new Error("七牛云未返回可访问的公网地址");
-    }
-
-    return NextResponse.json({
-      url: uploaded.url,
-      name: archiveName,
-      contentType: "application/zip",
-      size: archiveBuffer.byteLength,
-      originalSize,
-      fileCount: files.length,
-      folderCount: countOpenClawArchiveRootFolders(archivePaths),
-    });
-  } catch (error) {
-    logger.error("Failed to package and upload Claw folders", error);
-    return NextResponse.json(
-      { error: error instanceof Error ? error.message : "文件夹上传失败" },
-      { status: 500 }
-    );
-  }
-}

app/api/canvas/clawd-chat/history/route.ts

@@ -1,10 +1,6 @@
 import { NextResponse } from "next/server";
 import { auth } from "@/app/(auth)/auth";
 import { getClawdChatsByUserId } from "@/lib/db/queries";
-import {
-  OPENCLAW_AUTH_REQUIRED_CODE,
-  OPENCLAW_AUTH_REQUIRED_MESSAGE,
-} from "@/lib/openclaw-chat/errors";
 
 export const dynamic = "force-dynamic";
 export const revalidate = 0;
@@ -13,13 +9,7 @@ export async function GET(request: Request) {
   const session = await auth().catch(() => null);
 
   if (!session?.user?.id) {
-    return NextResponse.json(
-      {
-        error: OPENCLAW_AUTH_REQUIRED_MESSAGE,
-        code: OPENCLAW_AUTH_REQUIRED_CODE,
-      },
-      { status: 401 }
-    );
+    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
   }
 
   const url = new URL(request.url);

app/api/canvas/clawd-chat/route.ts

@@ -1,59 +1,34 @@
-import { after, NextResponse } from "next/server";
+import { NextResponse } from "next/server";
 import { z } from "zod";
 import { auth } from "@/app/(auth)/auth";
 import {
   getChatById,
+  getMessagesByChatId,
   getSystemSetting,
   getUserById,
   saveChat,
+  saveMessages,
 } from "@/lib/db/queries";
+import {
+  normalizeOpenClawChatConfig,
+  OPENCLAW_CHAT_CONFIG_KEY,
+} from "@/lib/openclaw-chat/config";
 import {
   buildClawdCancelKey,
+  cancelClawdRequest,
   clearClawdRequestCancellation,
   isClawdRequestCanceled,
   registerActiveClawdRequest,
   unregisterActiveClawdRequest,
 } from "@/lib/openclaw-chat/cancel-registry";
-import {
-  normalizeOpenClawChatConfig,
-  OPENCLAW_CHAT_CONFIG_KEY,
-} from "@/lib/openclaw-chat/config";
-import {
-  getOpenClawTaskFailureMessage,
-  OPENCLAW_AUTH_REQUIRED_CODE,
-  OPENCLAW_AUTH_REQUIRED_MESSAGE,
-  OPENCLAW_UPGRADE_RETRY_MESSAGE,
-} from "@/lib/openclaw-chat/errors";
-import {
-  normalizeOpenClawChatMediaAttachments,
-  OPENCLAW_CHAT_MEDIA_MAX_ATTACHMENTS,
-  type OpenClawChatMediaAttachment,
-} from "@/lib/openclaw-chat/media-attachments";
 import {
   buildOpenClawDisplayMessage,
   buildOpenClawMessageWithSpreadsheetMarkdown,
   buildOpenClawSpreadsheetMarkdown,
 } from "@/lib/openclaw-chat/spreadsheet-markdown";
-import {
-  appendPersistedClawdTaskProgress,
-  getPersistedClawdTask,
-  markClawdTaskCanceled,
-  markClawdTaskCompleted,
-  markClawdTaskFailed,
-  markClawdTaskRunning,
-  persistPendingClawdTask,
-} from "@/lib/openclaw-chat/task-store";
-import {
-  OpenClawTaskDetachedError,
-  submitOpenClawDurableTask,
-  waitForOpenClawDurableTask,
-} from "@/lib/openclaw-chat/upstream-task-client";
 import { generateUUID } from "@/lib/utils";
 
-const DEFAULT_PROCESSING_HINT =
-  "已收到，这个任务稍微繁重一些，处理时间可能会长一点，请耐心等候。";
-
-export const maxDuration = 1800;
+const CLAW_UPGRADE_RETRY_MESSAGE = "claw正在升级更新稍等5分钟再试";
 
 const requestSchema = z.object({
   id: z.string().uuid(),
@@ -61,63 +36,12 @@ const requestSchema = z.object({
   displayMessage: z.string().trim().max(8000).optional(),
   userMessageId: z.string().uuid().optional(),
   metadata: z.record(z.unknown()).optional(),
-  sensitiveInput: z
-    .discriminatedUnion("type", [
-      z.object({
-        type: z.literal("taobao_credentials"),
-        username: z.string().min(1).max(160),
-        password: z.string().min(1).max(256),
-      }),
-      z.object({
-        type: z.literal("taobao_verification"),
-        verification_code: z.string().min(4).max(12),
-      }),
-    ])
-    .optional(),
-  attachments: z
-    .array(z.unknown())
-    .max(OPENCLAW_CHAT_MEDIA_MAX_ATTACHMENTS)
-    .optional()
-    .default([]),
 });
 
-type ParsedClawdChatRequest = Omit<
-  z.infer<typeof requestSchema>,
-  "attachments"
-> & {
-  attachments: OpenClawChatMediaAttachment[];
+type ParsedClawdChatRequest = z.infer<typeof requestSchema> & {
   tableFiles: File[];
 };
 
-type ClawdSpreadsheetAttachment = {
-  name: string;
-  size: number;
-  contentType: string;
-  sheetCount: number;
-  rowCount: number;
-  truncated: boolean;
-};
-
-type ExecuteClawdTaskParams = {
-  assistantMessageId: string;
-  cancelKey: string;
-  chatId: string;
-  config: { baseUrl: string; token: string; timeoutMs: number };
-  conversationId: string;
-  departmentName: string;
-  metadata: Record<string, unknown> | undefined;
-  sensitiveInput?: z.infer<typeof requestSchema>["sensitiveInput"];
-  mediaAttachments: OpenClawChatMediaAttachment[];
-  skillTagId: string;
-  skillTagName: string;
-  spreadsheetFiles: unknown[];
-  spreadsheetMarkdownTruncated: boolean;
-  upstreamMessage: string;
-  userId: string;
-  userMessageId: string;
-  userName: string;
-};
-
 function buildChatTitle(message: string) {
   const normalized = message.replace(/\s+/g, " ").trim();
   if (!normalized) return "Claw 对话";
@@ -133,15 +57,17 @@ function getOpenClawUserName(user: {
   name?: string | null;
   email?: string | null;
 }) {
-  return String(user.name || user.email || user.id).trim();
+  const name = String(user.name || "").trim();
+  if (name) return name;
+
+  const email = String(user.email || "").trim();
+  if (email) return email;
+
+  return user.id;
 }
 
-function getMetadataString(
-  metadata: Record<string, unknown> | undefined,
-  key: string
-) {
-  const value = metadata?.[key];
-  return typeof value === "string" ? value.trim() : "";
+function getOpenClawDepartmentName(department?: string | null) {
+  return String(department || "").trim();
 }
 
 function isRequestFile(value: FormDataEntryValue): value is File {
@@ -160,39 +86,25 @@ async function parseClawdChatRequest(
   const contentType = request.headers.get("content-type") || "";
   if (!contentType.includes("multipart/form-data")) {
     const parsed = requestSchema.safeParse(await request.json().catch(() => null));
-    if (!parsed.success) return null;
-    const attachments = normalizeOpenClawChatMediaAttachments(
-      parsed.data.attachments
-    );
-    if (attachments.length !== parsed.data.attachments.length) return null;
-    return { ...parsed.data, attachments, tableFiles: [] };
+    return parsed.success ? { ...parsed.data, tableFiles: [] } : null;
   }
 
   const formData = await request.formData().catch(() => null);
   if (!formData) return null;
 
-  let metadata: Record<string, unknown> | undefined;
-  let attachments: unknown[] = [];
-  let sensitiveInput: unknown;
   const metadataValue = formData.get("metadata");
-  const attachmentsValue = formData.get("attachments");
-  const sensitiveInputValue = formData.get("sensitiveInput");
-  try {
-    if (typeof metadataValue === "string" && metadataValue.trim()) {
+  let metadata: Record<string, unknown> | undefined;
+  if (typeof metadataValue === "string" && metadataValue.trim()) {
+    try {
       const parsedMetadata = JSON.parse(metadataValue);
-      if (!parsedMetadata || typeof parsedMetadata !== "object") return null;
-      metadata = parsedMetadata as Record<string, unknown>;
+      if (parsedMetadata && typeof parsedMetadata === "object") {
+        metadata = parsedMetadata as Record<string, unknown>;
+      } else {
+        return null;
+      }
+    } catch {
+      return null;
     }
-    if (typeof attachmentsValue === "string" && attachmentsValue.trim()) {
-      const parsedAttachments = JSON.parse(attachmentsValue);
-      if (!Array.isArray(parsedAttachments)) return null;
-      attachments = parsedAttachments;
-    }
-    if (typeof sensitiveInputValue === "string" && sensitiveInputValue.trim()) {
-      sensitiveInput = JSON.parse(sensitiveInputValue);
-    }
-  } catch {
-    return null;
   }
 
   const parsed = requestSchema.safeParse({
@@ -201,275 +113,68 @@ async function parseClawdChatRequest(
     displayMessage: formData.get("displayMessage") || undefined,
     userMessageId: formData.get("userMessageId") || undefined,
     metadata,
-    attachments,
-    sensitiveInput,
   });
   if (!parsed.success) return null;
-  const normalizedAttachments = normalizeOpenClawChatMediaAttachments(
-    parsed.data.attachments
-  );
-  if (normalizedAttachments.length !== parsed.data.attachments.length) {
-    return null;
-  }
 
-  return {
-    ...parsed.data,
-    attachments: normalizedAttachments,
-    tableFiles: formData
-      .getAll("tableFiles")
-      .filter((entry): entry is File => isRequestFile(entry) && entry.size > 0),
-  };
+  const tableFiles = formData
+    .getAll("tableFiles")
+    .filter((entry): entry is File => isRequestFile(entry) && entry.size > 0);
+
+  return { ...parsed.data, tableFiles };
 }
 
 async function readOpenClawConfig() {
-  const setting = await getSystemSetting({
-    key: OPENCLAW_CHAT_CONFIG_KEY,
-  }).catch(() => null);
+  const setting = await getSystemSetting({ key: OPENCLAW_CHAT_CONFIG_KEY }).catch(
+    () => null
+  );
   return normalizeOpenClawChatConfig(setting?.value);
 }
 
-function getAnswer(payload: unknown) {
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
-    return "";
-  }
-  return String((payload as Record<string, unknown>).answer || "").trim();
+function getOpenClawErrorCode(payload: unknown) {
+  if (!payload || typeof payload !== "object") return "";
+  const raw = payload as Record<string, unknown>;
+  const nestedError =
+    raw.error && typeof raw.error === "object"
+      ? (raw.error as Record<string, unknown>)
+      : null;
+  const code = nestedError?.code || raw.code;
+  return typeof code === "string" ? code.trim() : "";
 }
 
-function getRequestId(payload: unknown) {
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
-    return null;
-  }
-  const value = (payload as Record<string, unknown>).request_id;
-  return value ? String(value) : null;
+function getMetadataString(
+  metadata: Record<string, unknown> | undefined,
+  key: string
+) {
+  const value = metadata?.[key];
+  return typeof value === "string" ? value.trim() : "";
 }
 
-async function executeClawdTask(params: ExecuteClawdTaskParams) {
-  const controller = new AbortController();
-  registerActiveClawdRequest(
-    params.cancelKey,
-    controller,
-    Math.max(params.config.timeoutMs, 10 * 60 * 1000)
-  );
-
-  try {
-    if (isClawdRequestCanceled(params.cancelKey)) return;
-    await markClawdTaskRunning({
-      chatId: params.chatId,
-      assistantMessageId: params.assistantMessageId,
-    });
-
-    const upstreamBody: Record<string, unknown> = {
-      conversation_id: params.conversationId,
-      user_id: params.userId,
-      user_name: params.userName,
-      username: params.userName,
-      department: params.departmentName,
-      department_name: params.departmentName,
-      user_department: params.departmentName,
-      skill_tag_id: params.skillTagId || undefined,
-      skill_tag_name: params.skillTagName || undefined,
-      message: params.upstreamMessage,
-      attachments:
-        params.mediaAttachments.length > 0
-          ? params.mediaAttachments
-          : undefined,
-      metadata: {
-        source: "ai_chatbot_canvas",
-        page: "/canvas",
-        tenant: "default",
-        chat_id: params.chatId,
-        user_id: params.userId,
-        user_name: params.userName,
-        username: params.userName,
-        department: params.departmentName,
-        department_name: params.departmentName,
-        user_department: params.departmentName,
-        skill_tag_id: params.skillTagId || undefined,
-        skill_tag_name: params.skillTagName || undefined,
-        media_attachments:
-          params.mediaAttachments.length > 0
-            ? params.mediaAttachments
-            : undefined,
-        spreadsheet_files:
-          params.spreadsheetFiles.length > 0
-            ? params.spreadsheetFiles
-            : undefined,
-        spreadsheet_markdown_truncated:
-          params.spreadsheetMarkdownTruncated || undefined,
-        ...params.metadata,
-      },
-      stream_progress: false,
-      sensitive_input: params.sensitiveInput,
-    };
-
-    if (params.sensitiveInput) {
-      const timeout = setTimeout(
-        () =>
-          controller.abort(
-            new DOMException("OpenClaw request timed out", "TimeoutError")
-          ),
-        params.config.timeoutMs
-      );
-      try {
-        const response = await fetch(`${params.config.baseUrl}/api/chat`, {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${params.config.token}`,
-            "Content-Type": "application/json",
-            Accept: "application/json",
-          },
-          body: JSON.stringify(upstreamBody),
-          signal: controller.signal,
-          cache: "no-store",
-        });
-        const payload = (await response.json().catch(() => null)) as Record<
-          string,
-          unknown
-        > | null;
-        if (!response.ok) {
-          throw new Error(`OpenClaw request failed: ${response.status}`);
-        }
-        if (!payload) throw new Error("OpenClaw returned an invalid response");
-        const answer = getAnswer(payload);
-        if (!answer) throw new Error("OpenClaw returned an empty answer");
-        await markClawdTaskCompleted({
-          chatId: params.chatId,
-          assistantMessageId: params.assistantMessageId,
-          answer,
-          requestId: getRequestId(payload),
-        });
-        clearClawdRequestCancellation(params.cancelKey);
-        return;
-      } finally {
-        clearTimeout(timeout);
-      }
-    }
-
-    const target = {
-      chatId: params.chatId,
-      assistantMessageId: params.assistantMessageId,
-    };
-    const upstreamTask = await submitOpenClawDurableTask({
-      config: params.config,
-      body: upstreamBody,
-      idempotencyKey: `${params.userId}:${params.chatId}:${params.userMessageId}`,
-      target,
-      signal: controller.signal,
-    });
-    const outcome = await waitForOpenClawDurableTask({
-      config: params.config,
-      upstreamTask,
-      target,
-      deadlineAt: Date.now() + params.config.timeoutMs,
-      signal: controller.signal,
-    });
-
-    if (isClawdRequestCanceled(params.cancelKey)) return;
-    if (outcome.status === "completed") {
-      await markClawdTaskCompleted({
-        ...target,
-        answer: outcome.answer,
-        requestId: outcome.requestId,
-      });
-    } else if (outcome.status === "canceled") {
-      await markClawdTaskCanceled({
-        ...target,
-        message: outcome.error,
-      });
-    } else if (outcome.status === "failed") {
-      await markClawdTaskFailed({
-        ...target,
-        error: outcome.error,
-      });
-    }
-    clearClawdRequestCancellation(params.cancelKey);
-  } catch (error) {
-    if (isClawdRequestCanceled(params.cancelKey)) return;
-    if (error instanceof OpenClawTaskDetachedError) {
-      await appendPersistedClawdTaskProgress({
-        chatId: params.chatId,
-        assistantMessageId: params.assistantMessageId,
-        progress: {
-          step_code: "task.detached",
-          step_state: "waiting",
-          message: "任务仍在 OpenClaw 后台执行，打开原对话后会自动续接结果",
-          display: "任务仍在 OpenClaw 后台执行，打开原对话后会自动续接结果",
-        },
-      }).catch(() => null);
-      return;
-    }
-    console.error("[ClawdChat API] Durable task failed:", error);
-    await markClawdTaskFailed({
-      chatId: params.chatId,
-      assistantMessageId: params.assistantMessageId,
-      error: getOpenClawTaskFailureMessage(error),
-    }).catch(() => null);
-  } finally {
-    if (params.sensitiveInput?.type === "taobao_credentials") {
-      params.sensitiveInput.username = "";
-      params.sensitiveInput.password = "";
-    } else if (params.sensitiveInput?.type === "taobao_verification") {
-      params.sensitiveInput.verification_code = "";
-    }
-    params.sensitiveInput = undefined;
-    unregisterActiveClawdRequest(params.cancelKey);
-  }
-}
-
-function buildTaskResponse(params: {
-  chatId: string;
-  userMessageId: string;
-  assistantMessageId: string;
-  status: string;
-  processingHint: string;
-}) {
-  const statusUrl = `/api/canvas/clawd-chat/status?id=${encodeURIComponent(
-    params.chatId
-  )}&userMessageId=${encodeURIComponent(params.userMessageId)}`;
-  return {
-    accepted: true,
-    task: {
-      chatId: params.chatId,
-      userMessageId: params.userMessageId,
-      assistantMessageId: params.assistantMessageId,
-      status: params.status,
-      processingHint: params.processingHint,
-      statusUrl,
-    },
-  };
+function createCanceledResponse() {
+  return NextResponse.json({ canceled: true }, { status: 499 });
 }
 
 export async function POST(request: Request) {
   const session = await auth().catch(() => null);
+
   if (!session?.user?.id) {
-    return NextResponse.json(
-      {
-        error: OPENCLAW_AUTH_REQUIRED_MESSAGE,
-        code: OPENCLAW_AUTH_REQUIRED_CODE,
-      },
-      { status: 401 }
-    );
+    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
   }
 
   const parsed = await parseClawdChatRequest(request);
   if (!parsed) {
     return NextResponse.json({ error: "请求参数不正确" }, { status: 400 });
   }
-  if (
-    !parsed.message &&
-    parsed.tableFiles.length === 0 &&
-    parsed.attachments.length === 0
-  ) {
-    return NextResponse.json(
-      { error: "请输入问题或上传附件" },
-      { status: 400 }
-    );
+  if (!parsed.message && parsed.tableFiles.length === 0) {
+    return NextResponse.json({ error: "请输入问题或上传表格" }, { status: 400 });
   }
 
   const config = await readOpenClawConfig();
-  if (!config.enabled || !config.baseUrl || !config.token) {
+  if (!config.enabled) {
+    return NextResponse.json({ error: CLAW_UPGRADE_RETRY_MESSAGE }, { status: 503 });
+  }
+  if (!config.baseUrl || !config.token) {
     return NextResponse.json(
-      { error: OPENCLAW_UPGRADE_RETRY_MESSAGE },
+      { error: CLAW_UPGRADE_RETRY_MESSAGE },
       { status: 503 }
     );
   }
@@ -480,22 +185,13 @@ export async function POST(request: Request) {
   }
 
   const userMessageId = parsed.userMessageId || generateUUID();
-  const existingTask = await getPersistedClawdTask({
+  const cancelKey = buildClawdCancelKey({
+    userId: session.user.id,
     chatId: parsed.id,
     userMessageId,
-  }).catch(() => null);
-  if (existingTask) {
-    return NextResponse.json(
-      buildTaskResponse({
-        chatId: parsed.id,
-        userMessageId,
-        assistantMessageId: existingTask.metadata.assistantMessageId,
-        status: existingTask.metadata.status,
-        processingHint:
-          existingTask.metadata.processingHint || DEFAULT_PROCESSING_HINT,
-      }),
-      { status: 202, headers: { "Retry-After": "2" } }
-    );
+  });
+  if (isClawdRequestCanceled(cancelKey)) {
+    return createCanceledResponse();
   }
 
   let spreadsheetMarkdownResult: Awaited<
@@ -525,23 +221,10 @@ export async function POST(request: Request) {
     message: parsed.message,
     spreadsheetMarkdown: spreadsheetMarkdownResult?.markdown || "",
   });
-  const spreadsheetAttachments: ClawdSpreadsheetAttachment[] = (
-    spreadsheetMarkdownResult?.files || []
-  ).map((summary, index) => {
-    const sourceFile = parsed.tableFiles[index];
-    return {
-      name: summary.fileName,
-      size: sourceFile?.size || 0,
-      contentType:
-        sourceFile?.type ||
-        (summary.fileName.toLowerCase().endsWith(".xlsx")
-          ? "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-          : "text/csv"),
-      sheetCount: summary.sheetCount,
-      rowCount: summary.rowCount,
-      truncated: summary.truncated,
-    };
-  });
+
+  if (isClawdRequestCanceled(cancelKey)) {
+    return createCanceledResponse();
+  }
 
   if (!existingChat) {
     await saveChat({
@@ -553,91 +236,220 @@ export async function POST(request: Request) {
   }
 
   const assistantMessageId = generateUUID();
-  const skillTagId = getMetadataString(parsed.metadata, "skillTagId");
-  const skillTagName = getMetadataString(parsed.metadata, "skillTagName");
-  const processingHint =
-    getMetadataString(parsed.metadata, "processingHint") ||
-    DEFAULT_PROCESSING_HINT;
-  const messageAttachments = parsed.attachments.map((attachment) => ({
-    name:
-      attachment.name ||
-      (attachment.type === "video"
-        ? "视频附件"
-        : attachment.type === "file"
-          ? "文件附件"
-          : "图片附件"),
-    url: attachment.url,
-    contentType:
-      attachment.content_type ||
-      (attachment.type === "video"
-        ? "video/mp4"
-        : attachment.type === "file"
-          ? "application/octet-stream"
-          : "image/jpeg"),
-  }));
-
-  await persistPendingClawdTask({
-    chatId: parsed.id,
-    userMessageId,
-    assistantMessageId,
-    displayMessage,
-    attachments: messageAttachments,
-    spreadsheetAttachments,
-    skillTagId,
-    skillTagName,
-    processingHint,
-  });
-
-  const userProfile = await getUserById({ id: session.user.id }).catch(
-    () => null
-  );
-  const userName = getOpenClawUserName({
+  const conversationId = createConversationId(session.user.id, parsed.id);
+  const userProfile = await getUserById({ id: session.user.id }).catch(() => null);
+  const openClawUserName = getOpenClawUserName({
     id: session.user.id,
     name: userProfile?.name ?? session.user.name,
     email: userProfile?.email ?? session.user.email,
   });
-  const cancelKey = buildClawdCancelKey({
-    userId: session.user.id,
-    chatId: parsed.id,
-    userMessageId,
-  });
+  const openClawDepartmentName = getOpenClawDepartmentName(userProfile?.department);
+  const skillTagId = getMetadataString(parsed.metadata, "skillTagId");
+  const skillTagName = getMetadataString(parsed.metadata, "skillTagName");
+  const endpoint = `${config.baseUrl}/api/chat`;
 
-  after(async () => {
-    await executeClawdTask({
-      assistantMessageId,
-      cancelKey,
-      chatId: parsed.id,
-      config,
-      conversationId: createConversationId(session.user.id, parsed.id),
-      departmentName: String(userProfile?.department || "").trim(),
-      metadata: parsed.metadata,
-      sensitiveInput: parsed.sensitiveInput,
-      mediaAttachments: parsed.attachments,
-      skillTagId,
-      skillTagName,
-      spreadsheetFiles: spreadsheetMarkdownResult?.files || [],
-      spreadsheetMarkdownTruncated:
-        spreadsheetMarkdownResult?.truncated || false,
-      upstreamMessage,
-      userId: session.user.id,
-      userMessageId,
-      userName,
+  let upstreamPayload: unknown = null;
+  let upstreamStatus = 502;
+
+  if (isClawdRequestCanceled(cancelKey)) {
+    return createCanceledResponse();
+  }
+
+  try {
+    const controller = new AbortController();
+    registerActiveClawdRequest(cancelKey, controller, config.timeoutMs);
+    const timeout = setTimeout(() => controller.abort(), config.timeoutMs);
+    const handleRequestAbort = () => {
+      cancelClawdRequest(cancelKey);
+    };
+    request.signal.addEventListener("abort", handleRequestAbort, { once: true });
+    const response = await fetch(endpoint, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${config.token}`,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        conversation_id: conversationId,
+        user_id: session.user.id,
+        user_name: openClawUserName,
+        username: openClawUserName,
+        department: openClawDepartmentName,
+        department_name: openClawDepartmentName,
+        user_department: openClawDepartmentName,
+        skill_tag_id: skillTagId || undefined,
+        skill_tag_name: skillTagName || undefined,
+        message: upstreamMessage,
+        metadata: {
+          source: "ai_chatbot_canvas",
+          page: "/canvas",
+          tenant: "default",
+          chat_id: parsed.id,
+          user_id: session.user.id,
+          user_name: openClawUserName,
+          username: openClawUserName,
+          department: openClawDepartmentName,
+          department_name: openClawDepartmentName,
+          user_department: openClawDepartmentName,
+          skill_tag_id: skillTagId || undefined,
+          skill_tag_name: skillTagName || undefined,
+          spreadsheet_files: spreadsheetMarkdownResult?.files || undefined,
+          spreadsheet_markdown_truncated:
+            spreadsheetMarkdownResult?.truncated || undefined,
+          ...parsed.metadata,
+        },
+      }),
+      signal: controller.signal,
+    }).finally(() => {
+      clearTimeout(timeout);
+      request.signal.removeEventListener("abort", handleRequestAbort);
+      unregisterActiveClawdRequest(cancelKey);
     });
-  });
 
-  const responseBody = buildTaskResponse({
+    upstreamStatus = response.status;
+    upstreamPayload = await response.json().catch(() => null);
+
+    if (!response.ok) {
+      const errorCode = getOpenClawErrorCode(upstreamPayload);
+      console.error("[ClawdChat API] OpenClaw upstream error:", {
+        status: response.status,
+        code: errorCode || undefined,
+        payload: upstreamPayload,
+      });
+      return NextResponse.json(
+        {
+          error: CLAW_UPGRADE_RETRY_MESSAGE,
+          code: errorCode || undefined,
+        },
+        { status: response.status }
+      );
+    }
+  } catch (error) {
+    unregisterActiveClawdRequest(cancelKey);
+    const errorName =
+      error && typeof error === "object" && "name" in error
+        ? String((error as { name?: unknown }).name || "")
+        : "";
+    const isAbortError = errorName === "AbortError";
+    if (isClawdRequestCanceled(cancelKey)) {
+      console.info("[ClawdChat API] OpenClaw request canceled:", {
+        chatId: parsed.id,
+        userMessageId,
+      });
+      return createCanceledResponse();
+    }
+    console.error("[ClawdChat API] OpenClaw request failed:", error);
+    return NextResponse.json(
+      {
+        error: CLAW_UPGRADE_RETRY_MESSAGE,
+      },
+      { status: isAbortError ? 504 : upstreamStatus }
+    );
+  }
+
+  const answer =
+    upstreamPayload && typeof upstreamPayload === "object"
+      ? String((upstreamPayload as Record<string, unknown>).answer || "").trim()
+      : "";
+
+  if (!answer) {
+    console.error("[ClawdChat API] OpenClaw empty answer:", upstreamPayload);
+    return NextResponse.json(
+      { error: CLAW_UPGRADE_RETRY_MESSAGE },
+      { status: 502 }
+    );
+  }
+
+  if (isClawdRequestCanceled(cancelKey)) {
+    return createCanceledResponse();
+  }
+
+  const existingMessages = await getMessagesByChatId({ id: parsed.id }).catch(
+    () => []
+  );
+  const latestMessageTimestamp = existingMessages.reduce((latest, item) => {
+    const timestamp =
+      item.createdAt instanceof Date
+        ? item.createdAt.getTime()
+        : Date.parse(String(item.createdAt || ""));
+    return Number.isFinite(timestamp) ? Math.max(latest, timestamp) : latest;
+  }, 0);
+  const userCreatedAt = new Date(
+    Math.max(Date.now(), latestMessageTimestamp + 1)
+  );
+  const assistantCreatedAt = new Date(userCreatedAt.getTime() + 1);
+
+  const userMessage = {
+    id: userMessageId,
     chatId: parsed.id,
-    userMessageId,
-    assistantMessageId,
-    status: "queued",
-    processingHint,
-  });
-  return NextResponse.json(responseBody, {
-    status: 202,
-    headers: {
-      "Cache-Control": "no-store, max-age=0",
-      Location: responseBody.task.statusUrl,
-      "Retry-After": "2",
+    role: "user",
+    parts: [{ type: "text", text: displayMessage }],
+    attachments: [],
+    createdAt: userCreatedAt,
+    videoStorageStatus: null,
+    temporaryVideoUrl: null,
+    permanentVideoUrl: null,
+    archivedAt: null,
+    videoMetadata: {
+      composerMode: "clawd",
+      source: "openclaw",
+      skillTagId: skillTagId || null,
+      skillTagName: skillTagName || null,
     },
+  };
+  const assistantMessage = {
+    id: assistantMessageId,
+    chatId: parsed.id,
+    role: "assistant",
+    parts: [{ type: "text", text: answer }],
+    attachments: [],
+    createdAt: assistantCreatedAt,
+    videoStorageStatus: null,
+    temporaryVideoUrl: null,
+    permanentVideoUrl: null,
+    archivedAt: null,
+    videoMetadata: {
+      composerMode: "clawd",
+      source: "openclaw",
+      requestId:
+        upstreamPayload && typeof upstreamPayload === "object"
+          ? (upstreamPayload as Record<string, unknown>).request_id || null
+          : null,
+    },
+  };
+
+  await saveMessages({ messages: [userMessage, assistantMessage] });
+  clearClawdRequestCancellation(cancelKey);
+
+  return NextResponse.json({
+    conversationId,
+    requestId:
+      upstreamPayload && typeof upstreamPayload === "object"
+        ? (upstreamPayload as Record<string, unknown>).request_id || null
+        : null,
+    messages: [
+      {
+        id: userMessage.id,
+        role: "user",
+        parts: userMessage.parts,
+        createdAt: userMessage.createdAt.toISOString(),
+        metadata: {
+          createdAt: userMessage.createdAt.toISOString(),
+          composerMode: "clawd",
+        },
+        videoMetadata: userMessage.videoMetadata,
+      },
+      {
+        id: assistantMessage.id,
+        role: "assistant",
+        parts: assistantMessage.parts,
+        createdAt: assistantMessage.createdAt.toISOString(),
+        metadata: {
+          createdAt: assistantMessage.createdAt.toISOString(),
+          composerMode: "clawd",
+        },
+        videoMetadata: assistantMessage.videoMetadata,
+      },
+    ],
   });
 }

app/api/canvas/clawd-chat/status/route.ts

@@ -1,190 +0,0 @@
-import { NextResponse } from "next/server";
-import { z } from "zod";
-import { auth } from "@/app/(auth)/auth";
-import { getChatById, getSystemSetting } from "@/lib/db/queries";
-import {
-  buildClawdCancelKey,
-  hasActiveClawdRequest,
-  registerActiveClawdRequest,
-  unregisterActiveClawdRequest,
-} from "@/lib/openclaw-chat/cancel-registry";
-import {
-  normalizeOpenClawChatConfig,
-  OPENCLAW_CHAT_CONFIG_KEY,
-} from "@/lib/openclaw-chat/config";
-import {
-  OPENCLAW_AUTH_REQUIRED_CODE,
-  OPENCLAW_AUTH_REQUIRED_MESSAGE,
-} from "@/lib/openclaw-chat/errors";
-import {
-  getPersistedClawdTask,
-  markClawdTaskCanceled,
-  markClawdTaskCompleted,
-  markClawdTaskFailed,
-} from "@/lib/openclaw-chat/task-store";
-import { isPendingClawdTaskStatus } from "@/lib/openclaw-chat/task-state";
-import {
-  getPersistedUpstreamTaskState,
-  refreshOpenClawDurableTask,
-} from "@/lib/openclaw-chat/upstream-task-client";
-
-const statusSchema = z.object({
-  id: z.string().uuid(),
-  userMessageId: z.string().uuid().optional(),
-});
-
-export const dynamic = "force-dynamic";
-export const revalidate = 0;
-export const maxDuration = 60;
-
-async function reconcileDetachedOpenClawTask(params: {
-  chatId: string;
-  userId: string;
-  task: NonNullable<Awaited<ReturnType<typeof getPersistedClawdTask>>>;
-}) {
-  if (!isPendingClawdTaskStatus(params.task.metadata.status)) return;
-  const upstreamTask = getPersistedUpstreamTaskState(params.task.metadata);
-  if (!upstreamTask) return;
-  const cancelKey = buildClawdCancelKey({
-    userId: params.userId,
-    chatId: params.chatId,
-    userMessageId: params.task.metadata.userMessageId,
-  });
-  if (hasActiveClawdRequest(cancelKey)) return;
-
-  const controller = new AbortController();
-  registerActiveClawdRequest(cancelKey, controller, 30_000);
-  const target = {
-    chatId: params.chatId,
-    assistantMessageId: params.task.metadata.assistantMessageId,
-  };
-  try {
-    const setting = await getSystemSetting({
-      key: OPENCLAW_CHAT_CONFIG_KEY,
-    }).catch(() => null);
-    const config = normalizeOpenClawChatConfig(setting?.value);
-    if (!config.enabled || !config.baseUrl || !config.token) return;
-    const outcome = await refreshOpenClawDurableTask({
-      config,
-      upstreamTask,
-      target,
-      signal: controller.signal,
-    });
-    if (outcome.status === "completed") {
-      await markClawdTaskCompleted({
-        ...target,
-        answer: outcome.answer,
-        requestId: outcome.requestId,
-      });
-    } else if (outcome.status === "failed") {
-      await markClawdTaskFailed({ ...target, error: outcome.error });
-    } else if (outcome.status === "canceled") {
-      await markClawdTaskCanceled({ ...target, message: outcome.error });
-    }
-  } catch (error) {
-    if (!controller.signal.aborted) {
-      console.warn("[ClawdChat Status] Upstream reconciliation deferred:", {
-        chatId: params.chatId,
-        taskId: upstreamTask.taskId,
-        error,
-      });
-    }
-  } finally {
-    unregisterActiveClawdRequest(cancelKey);
-  }
-}
-
-export async function GET(request: Request) {
-  const session = await auth().catch(() => null);
-  if (!session?.user?.id) {
-    return NextResponse.json(
-      {
-        error: OPENCLAW_AUTH_REQUIRED_MESSAGE,
-        code: OPENCLAW_AUTH_REQUIRED_CODE,
-      },
-      { status: 401 }
-    );
-  }
-
-  const url = new URL(request.url);
-  const parsed = statusSchema.safeParse({
-    id: url.searchParams.get("id"),
-    userMessageId: url.searchParams.get("userMessageId") || undefined,
-  });
-  if (!parsed.success) {
-    return NextResponse.json({ error: "请求参数不正确" }, { status: 400 });
-  }
-
-  const chat = await getChatById({ id: parsed.data.id }).catch(() => null);
-  if (!chat) {
-    return NextResponse.json({ task: null }, { status: 404 });
-  }
-  if (chat.userId !== session.user.id) {
-    return NextResponse.json({ error: "Forbidden" }, { status: 403 });
-  }
-
-  let task = await getPersistedClawdTask({
-    chatId: parsed.data.id,
-    userMessageId: parsed.data.userMessageId,
-  });
-  if (!task) {
-    return NextResponse.json(
-      { task: null },
-      { headers: { "Cache-Control": "no-store, max-age=0" } }
-    );
-  }
-
-  await reconcileDetachedOpenClawTask({
-    chatId: parsed.data.id,
-    userId: session.user.id,
-    task,
-  });
-  task =
-    (await getPersistedClawdTask({
-      chatId: parsed.data.id,
-      userMessageId: parsed.data.userMessageId,
-    })) || task;
-
-  const userTextPart = Array.isArray(task.userMessage?.parts)
-    ? task.userMessage.parts.find(
-        (part) =>
-          part &&
-          typeof part === "object" &&
-          !Array.isArray(part) &&
-          (part as { type?: unknown }).type === "text"
-      )
-    : null;
-  const userText =
-    userTextPart && typeof userTextPart === "object"
-      ? String((userTextPart as { text?: unknown }).text || "")
-      : "";
-
-  return NextResponse.json(
-    {
-      task: {
-        chatId: parsed.data.id,
-        userMessageId: task.metadata.userMessageId,
-        assistantMessageId: task.metadata.assistantMessageId,
-        status: task.metadata.status,
-        processingHint: task.metadata.processingHint,
-        progressEvents: task.metadata.progressEvents,
-        skillTagId: task.metadata.skillTagId || null,
-        skillTagName: task.metadata.skillTagName || null,
-        requestId: task.metadata.requestId || null,
-        error: task.metadata.error || null,
-        createdAt: task.metadata.createdAt,
-        updatedAt: task.metadata.updatedAt,
-        userMessage: {
-          text: userText,
-          attachments: task.userMessage?.attachments || [],
-        },
-      },
-    },
-    {
-      headers: {
-        "Cache-Control": "no-store, max-age=0",
-        "Retry-After": "2",
-      },
-    }
-  );
-}

app/api/canvas/detail-plan/route.ts

@@ -1956,7 +1956,7 @@ export async function POST(request: Request) {
       (item) =>
         !item.model.isSubModel &&
         item.model.isEnabled &&
-        ["zhipu", "alibaba", "openai", "custom", "local", "vip98k"].includes(item.provider.type),
+        ["zhipu", "alibaba", "openai", "custom", "local"].includes(item.provider.type),
     );
     const configuredDetailAgentConfig =
       currentSiteSettings?.canvasDetailAgentModelId &&

app/api/canvas/detail-review/route.ts

@@ -204,7 +204,7 @@ export async function POST(request: Request) {
       (item) =>
         !item.model.isSubModel &&
         item.model.isEnabled &&
-        ["zhipu", "alibaba", "openai", "custom", "local", "vip98k"].includes(item.provider.type),
+        ["zhipu", "alibaba", "openai", "custom", "local"].includes(item.provider.type),
     );
     const configuredDetailAgentConfig =
       currentSiteSettings?.canvasDetailAgentModelId &&

app/api/canvas/local-edit/route.ts

@@ -9,25 +9,10 @@ import {
   getCanvasImageTaskForUser,
 } from "@/lib/canvas/image-task-queue";
 import type { CanvasGenerateImageRequest } from "@/lib/canvas/generate-image";
-import { hasScaleAdjustPositionMoved } from "@/lib/canvas/scale-adjust-geometry";
-import {
-  buildScaleAdjustProductLockAssets,
-  type CanvasScaleAdjustIntentRegion,
-} from "@/lib/canvas/scale-adjust-product-lock";
-import {
-  buildSemanticScaleAdjustCleanupPrompt,
-  buildSemanticScaleAdjustCompositeRegions,
-  buildSemanticScaleAdjustExtractionPrompt,
-} from "@/lib/canvas/scale-adjust-semantic";
 import {
   getPointsSystemConfig,
   getSiteSettings,
-  getSystemSetting,
 } from "@/lib/db/queries";
-import {
-  CANVAS_LOCAL_EDIT_CONFIG_KEY,
-  normalizeCanvasLocalEditConfig,
-} from "@/lib/canvas/local-edit-config";
 import { getImageToolCreditCost } from "@/lib/points/config";
 import { prepareFeaturePointsCharge } from "@/lib/points/feature-charge";
 import { uploadFile } from "@/lib/storage/service";
@@ -110,9 +95,6 @@ const MAX_LOCAL_EDIT_REGIONS = 8;
 const MAX_REFERENCE_IMAGES_PER_REGION = 3;
 const MIN_REGION_EDGE_PX = 24;
 const SCALE_ADJUST_OPERATION = "scale-adjust";
-const SCALE_ADJUST_REPAIR_MODEL_REF = "e03d3341-cecd-425e-b88b-9350cbbce18f";
-const SCALE_ADJUST_SEMANTIC_CLEANUP_MODEL_REF =
-  "5198c20f-b4cc-402c-bc73-eeabacd086b4";
 type LocalEditOperation = "local-edit" | typeof SCALE_ADJUST_OPERATION;
 const MIN_SCALE_ADJUST_PERCENT = -80;
 const MAX_SCALE_ADJUST_PERCENT = 200;
@@ -536,6 +518,60 @@ function buildLocalEditPrompt(regions: NormalizedLocalEditRegion[]) {
   ].join("\n");
 }
 
+function buildSimpleScaleAdjustPrompt(
+  regions: NormalizedLocalEditRegion[],
+  scalePercent: ScaleAdjustPercent | null | undefined,
+  sourceSize: { width: number; height: number }
+) {
+  const regionLines = regions
+    .map((region) => {
+      const targetRect = getScaleAdjustTargetRect(region, scalePercent);
+      const targetPixelRect =
+        region.targetPixelRect ||
+        rectToPixels(targetRect, sourceSize.width, sourceSize.height);
+      const sourceRight = region.pixelRect.left + region.pixelRect.width;
+      const sourceBottom = region.pixelRect.top + region.pixelRect.height;
+      const targetRight = targetPixelRect.left + targetPixelRect.width;
+      const targetBottom = targetPixelRect.top + targetPixelRect.height;
+      const widthFactor =
+        region.rect.width > 0 ? targetRect.width / region.rect.width : 1;
+      const heightFactor =
+        region.rect.height > 0 ? targetRect.height / region.rect.height : 1;
+      const moved =
+        Math.hypot(
+          targetRect.x + targetRect.width / 2 - (region.rect.x + region.rect.width / 2),
+          targetRect.y + targetRect.height / 2 - (region.rect.y + region.rect.height / 2)
+        ) > 0.01;
+      const action =
+        widthFactor < 0.92 || heightFactor < 0.92
+          ? "把同一个主体等比缩小"
+          : widthFactor > 1.08 || heightFactor > 1.08
+            ? "把同一个主体等比放大"
+            : "把同一个主体调整到目标位置和大小";
+      return [
+        `区域 ${region.index}:`,
+        `源框 A: left=${region.pixelRect.left}, top=${region.pixelRect.top}, right=${sourceRight}, bottom=${sourceBottom}, width=${region.pixelRect.width}, height=${region.pixelRect.height}.`,
+        `目标框 B: left=${targetPixelRect.left}, top=${targetPixelRect.top}, right=${targetRight}, bottom=${targetBottom}, width=${targetPixelRect.width}, height=${targetPixelRect.height}.`,
+        `目标比例约为宽 ${widthFactor.toFixed(2)}x、高 ${heightFactor.toFixed(2)}x。`,
+        `请识别 A 框内的主要商品/物体/人物主体，只${action}，${moved ? "并移动到 B 框中心附近" : "保持在当前位置附近"}。`,
+      ].join(" ");
+    })
+    .join("\n");
+
+  return [
+    "对输入图片做一次简单的图生图局部比例编辑。",
+    `最终输出保持原图完整画幅和像素尺寸：${sourceSize.width} x ${sourceSize.height} px。`,
+    "只编辑用户框选的主体本身，保持主体外观、材质、文字、图案、透视和宽高比，不要拉伸或压扁。",
+    "不要缩放整张图，不要裁剪整张图，不要重绘未选区域。",
+    "如果主体变小，原位置露出的区域按原图背景自然补齐；白底或纯色背景必须保持干净一致。",
+    "如果主体变大，让同一个主体自然占据更大的目标范围，并保持边缘、阴影和背景衔接自然。",
+    "A/B 坐标只是隐藏编辑指令，最终图片里绝不能出现框线、箭头、文字、标注、UI 或半透明色块。",
+    "",
+    "编辑要求:",
+    regionLines,
+  ].join("\n");
+}
+
 export async function POST(request: NextRequest) {
   try {
     const session = await auth();
@@ -624,23 +660,10 @@ export async function POST(request: NextRequest) {
       );
     }
 
-    const [pointsConfig, siteSettingsForModel, localEditConfigSetting] = await Promise.all([
+    const [pointsConfig, siteSettingsForModel] = await Promise.all([
       getPointsSystemConfig(),
       getSiteSettings().catch(() => null),
-      getSystemSetting({ key: CANVAS_LOCAL_EDIT_CONFIG_KEY }).catch(() => null),
     ]);
-    const localEditConfig = normalizeCanvasLocalEditConfig(
-      localEditConfigSetting?.value
-    );
-    const siteDetailDefaultModelId =
-      typeof siteSettingsForModel?.canvasDetailDefaultModelId === "string"
-        ? siteSettingsForModel.canvasDetailDefaultModelId.trim()
-        : "";
-    const configuredLocalEditModelId = localEditConfig.modelId;
-    const configuredScaleAdjustModelId =
-      localEditConfig.scaleAdjustModelId ||
-      siteDetailDefaultModelId ||
-      SCALE_ADJUST_REPAIR_MODEL_REF;
     const pointsCharge = await prepareFeaturePointsCharge({
       userId: session.user.id,
       unitCost: getImageToolCreditCost(pointsConfig, "repaint"),
@@ -668,164 +691,45 @@ export async function POST(request: NextRequest) {
         typeof body.model === "string" && body.model.trim()
           ? body.model.trim()
           : undefined;
+      const configuredDetailModel =
+        typeof siteSettingsForModel?.canvasDetailDefaultModelId === "string"
+          ? siteSettingsForModel.canvasDetailDefaultModelId.trim()
+          : "";
+      const configuredCanvasModel =
+        typeof siteSettingsForModel?.canvasDefaultModelId === "string"
+          ? siteSettingsForModel.canvasDefaultModelId.trim()
+          : "";
+      const configuredAutoCanvasModel =
+        typeof siteSettingsForModel?.canvasAutoModeDefaultModelId === "string"
+          ? siteSettingsForModel.canvasAutoModeDefaultModelId.trim()
+          : "";
+      const resolvedModel =
+        requestedModel ||
+        configuredDetailModel ||
+        configuredCanvasModel ||
+        configuredAutoCanvasModel;
       const requestedImageSize =
         typeof body.imageSize === "string" && body.imageSize.trim()
           ? body.imageSize.trim()
           : "2K";
-      const scaleAdjustIntentRegions: CanvasScaleAdjustIntentRegion[] = regions.map(
-        (region) => ({
-          index: region.index,
-          rect: region.rect,
-          targetRect: getScaleAdjustTargetRect(region, scalePercent),
-        })
+      const manualRegionReferenceImageUrls = regions.flatMap((region) =>
+        region.referenceImages.map((reference) => reference.url)
       );
-      const hasPositionMove = scaleAdjustIntentRegions.some((region) =>
-        hasScaleAdjustPositionMoved(region.rect, region.targetRect)
-      );
-      const productLockAssets = await buildScaleAdjustProductLockAssets({
-        protectPeople: hasPositionMove,
-        regions: scaleAdjustIntentRegions,
-        sourceBuffer,
-        sourceHeight,
-        sourceImageUrl,
-        sourceWidth,
-        userId: session.user.id,
+      const prompt = buildSimpleScaleAdjustPrompt(regions, scalePercent, {
+        width: sourceWidth,
+        height: sourceHeight,
       });
-      const useSemanticScaleAdjust =
-        !hasPositionMove && productLockAssets.semanticFallbackSuggested;
-      const semanticCompositeRegions = useSemanticScaleAdjust
-        ? buildSemanticScaleAdjustCompositeRegions(scaleAdjustIntentRegions)
-        : [];
-      const assetSuffix = `${Date.now()}-${Math.random()
-        .toString(36)
-        .slice(2, 8)}`;
-      const [
-        modelMaskUpload,
-        overlayUpload,
-        repairMaskUpload,
-        semanticSourceCropUploads,
-        sourceSubjectMaskUpload,
-      ] = await Promise.all([
-          uploadFile(
-            `canvas-scale-adjust-mask-${assetSuffix}.png`,
-            toArrayBuffer(productLockAssets.modelMaskBuffer)
-          ),
-          uploadFile(
-            `canvas-scale-adjust-overlay-${assetSuffix}.png`,
-            toArrayBuffer(productLockAssets.overlayBuffer)
-          ),
-          uploadFile(
-            `canvas-scale-adjust-repair-mask-${assetSuffix}.png`,
-            toArrayBuffer(productLockAssets.repairMaskBuffer)
-          ),
-          useSemanticScaleAdjust
-            ? Promise.all(
-                productLockAssets.semanticSourceCropBuffers.map(
-                  (buffer, index) =>
-                    uploadFile(
-                      `canvas-scale-adjust-semantic-source-${assetSuffix}-${index + 1}.png`,
-                      toArrayBuffer(buffer)
-                    )
-                )
-              )
-            : Promise.resolve([]),
-          hasPositionMove || useSemanticScaleAdjust
-            ? uploadFile(
-                `canvas-scale-adjust-subject-mask-${assetSuffix}.png`,
-                toArrayBuffer(productLockAssets.sourceSubjectMaskBuffer)
-              )
-            : Promise.resolve(null),
-        ]);
-      const backgroundPlateUpload = productLockAssets.backgroundPlateBuffer
-        ? await uploadFile(
-            `canvas-scale-adjust-background-${assetSuffix}.png`,
-            toArrayBuffer(productLockAssets.backgroundPlateBuffer)
-          )
-        : null;
-      const prompt = useSemanticScaleAdjust
-        ? buildSemanticScaleAdjustExtractionPrompt()
-        : hasPositionMove
-          ? "只编辑白色掩膜区域，完整移除旧位置的产品及其原有阴影，并根据周围墙面、地面、家具和光照连续自然地重建被遮挡背景。黑色区域保持不变，不要保留产品的任何部件或残影。"
-          : "移除掩膜中的完整产品并自然还原背景。";
-      const providerImageParams = useSemanticScaleAdjust
-        ? {
-            quality: "high",
-          }
-        : hasPositionMove
-        ? {
-            maskImageUrl: modelMaskUpload.url,
-            quality: "medium",
-          }
-        : {
-            objectRemovalMaskImageUrl: modelMaskUpload.url,
-            objectRemovalMode: "premium",
-          };
-      const productLockComposite = {
-        ...(backgroundPlateUpload
-          ? { backgroundPlateImageUrl: backgroundPlateUpload.url }
-          : {}),
-        overlayImageUrl: overlayUpload.url,
-        ...(hasPositionMove
-          ? {
-              repairMaskImageUrl: repairMaskUpload.url,
-              sourceImageUrl,
-            }
-          : {}),
-        ...(hasPositionMove && sourceSubjectMaskUpload
-          ? {
-              regions: scaleAdjustIntentRegions.map((region) => ({
-                source: region.rect,
-                target: region.targetRect,
-              })),
-              shadowSourceImageUrl: sourceImageUrl,
-              sourceSubjectMaskImageUrl: sourceSubjectMaskUpload.url,
-            }
-          : {}),
-        sourceHeight,
-        sourceWidth,
-      };
-      const scaleAdjustVerification = {
-        allowOutsideChangedWhenChangedInside: false,
-        deterministicProductOverlayApplied: true,
-        oldFootprintMaskImageUrl: useSemanticScaleAdjust
-          ? sourceSubjectMaskUpload?.url
-          : hasPositionMove
-            ? sourceSubjectMaskUpload?.url
-            : repairMaskUpload.url,
-        regions: scaleAdjustIntentRegions.map((region) => region.rect),
-        rejectFailedCandidates: true,
-        rejectNoEffectiveChangeOnly: false,
-        rejectOldFootprintOnly: true,
-        sourceImageUrl,
-        targetRegions: scaleAdjustIntentRegions.map((region) => region.targetRect),
-      };
       const imageRequest: CanvasGenerateImageRequest = {
-        allowFailover: false,
-        aspectRatio: hasPositionMove ? "auto" : resolvedAspectRatio,
+        aspectRatio: resolvedAspectRatio,
         billingFeature: "repaint",
-        debugLabel: "canvas-scale-adjust-product-lock",
+        debugLabel: "canvas-scale-adjust-simple",
         debugMeta: {
           displayPrompt,
           operation,
           requestedModel: requestedModel || null,
-          resolvedAspectRatio: hasPositionMove ? "auto" : resolvedAspectRatio,
-          resolvedModel: configuredScaleAdjustModelId,
-          scaleAdjustProductLockMaskEditApplied: true,
-          scaleAdjustPersonExclusionApplied:
-            productLockAssets.personExclusionApplied,
-          scaleAdjustPromptStrategy: useSemanticScaleAdjust
-            ? "gpt-extract-product-lock-v2"
-            : hasPositionMove
-              ? "gpt-mask-background-rebuild-product-lock-v1"
-              : "finegrain-erase-product-lock-v1",
-          scaleAdjustProviderMaskImageUrl: useSemanticScaleAdjust
-            ? null
-            : modelMaskUpload.url,
-          scaleAdjustSemanticFallbackRegionIndexes:
-            productLockAssets.semanticFallbackRegionIndexes,
-          scaleAdjustSemanticFallbackSuggested:
-            productLockAssets.semanticFallbackSuggested,
-          scaleAdjustSequentialCleanupRetry: !useSemanticScaleAdjust,
+          resolvedAspectRatio,
+          resolvedModel: resolvedModel || null,
+          scaleAdjustPromptStrategy: "simple-image-edit-v1",
           scaleAdjustTargetRegionCount: regions.filter((region) => region.targetRect)
             .length,
           scalePercent,
@@ -836,80 +740,12 @@ export async function POST(request: NextRequest) {
         displayPrompt,
         imageCount: 1,
         imageSize: requestedImageSize,
-        model: configuredScaleAdjustModelId,
+        model: resolvedModel || undefined,
         negativePrompt:
-          "框线、箭头、坐标、标注、文字、UI、缩放整张图、裁剪整张图、拉伸主体、复制主体、替换主体、旧主体残影",
+          "不要画框线、箭头、坐标、标注、文字或 UI。不要缩放整张图、裁剪整张图、重绘未选区域。不要拉伸、压扁、复制或替换主体。",
         prompt,
         promptExtend: false,
-        providerImageParams,
-        referenceImages: [sourceImageUrl],
-        ...(useSemanticScaleAdjust
-          ? {
-              localEditComposite: {
-                expandRegions: false,
-                featherMaxPx: 28,
-                featherMinPx: 12,
-                featherRatio: 0.012,
-                maskMode: "region" as const,
-                regions: semanticCompositeRegions,
-                sourceImageUrl,
-              },
-            }
-          : {}),
-        ...(useSemanticScaleAdjust &&
-        semanticSourceCropUploads.length === scaleAdjustIntentRegions.length
-          ? {
-              semanticScaleAdjustPreparation: {
-                cleanupImageSize: "2K",
-                cleanupModel: SCALE_ADJUST_SEMANTIC_CLEANUP_MODEL_REF,
-                cleanupPrompt: buildSemanticScaleAdjustCleanupPrompt(),
-                extractionPrompt: buildSemanticScaleAdjustExtractionPrompt(),
-                regions: scaleAdjustIntentRegions.map((region, index) => ({
-                  source: region.rect,
-                  sourceCropImageUrl: semanticSourceCropUploads[index]?.url || "",
-                  target: region.targetRect,
-                })),
-                relightModel: configuredScaleAdjustModelId,
-                sourceImageUrl,
-              },
-            }
-          : {}),
-        retryVariants: useSemanticScaleAdjust ? [] : [
-          {
-            debugMeta: {
-              scaleAdjustRetryReason: "old-footprint-remnant-detected",
-              scaleAdjustRetryStrategy: "sequential-finegrain-cleanup",
-            },
-            label: "finegrain-cleanup-pass",
-            prompt,
-            providerImageParams,
-            referenceImages: [sourceImageUrl],
-            scaleAdjustProductLockComposite: productLockComposite,
-            scaleAdjustVerification: {
-              ...scaleAdjustVerification,
-              rejectNoEffectiveChangeOnly: true,
-              rejectOldFootprintOnly: false,
-            },
-          },
-        ],
-        ...(useSemanticScaleAdjust
-          ? {}
-          : { scaleAdjustProductLockComposite: productLockComposite }),
-        ...(hasPositionMove
-          ? {
-              scaleAdjustModelRelight: {
-                model: configuredScaleAdjustModelId,
-                overlayImageUrl: overlayUpload.url,
-                quality: "medium" as const,
-                regions: scaleAdjustIntentRegions.map((region) => ({
-                  target: region.targetRect,
-                })),
-                sourceHeight,
-                sourceWidth,
-              },
-            }
-          : {}),
-        scaleAdjustVerification,
+        referenceImages: [sourceImageUrl, ...manualRegionReferenceImageUrls],
         ownerKey: session.user.id,
       };
 
@@ -935,7 +771,7 @@ export async function POST(request: NextRequest) {
 
       return NextResponse.json({
         success: true,
-        annotatedReferenceUrl: overlayUpload.url,
+        annotatedReferenceUrl: sourceImageUrl,
         aspectRatio: resolvedAspectRatio,
         displayPrompt,
         prompt: displayPrompt,
@@ -997,7 +833,6 @@ export async function POST(request: NextRequest) {
         displayPrompt,
         operation,
         requestedModel: requestedModel || null,
-        resolvedModel: requestedModel || configuredLocalEditModelId || null,
         resolvedAspectRatio,
         manualRegionReferenceImageCount: manualRegionReferenceImageUrls.length,
         regionReferenceImageCount: referenceImages.length,
@@ -1009,7 +844,7 @@ export async function POST(request: NextRequest) {
       displayPrompt,
       imageCount: 1,
       imageSize: requestedImageSize,
-      model: requestedModel || configuredLocalEditModelId || undefined,
+      model: requestedModel || undefined,
       negativePrompt:
         "彩色框、蓝色边框、绿色边框、红色边框、橙色边框、矩形框、编号圆点、提示词气泡、标注文字、UI 控件、半透明色块、选区边框、白边、画幅压扁、画面拉伸、主体截断、贴边裁切、矩形贴片、硬边、拼接线、补丁感、色差边缘、背景错位、地面纹理断裂、椅脚错位",
       prompt,

app/api/canvas/text-edit/route.ts

@@ -11,10 +11,6 @@ import { resolveModelRuntimeId } from "@/lib/ai/model-runtime";
 import { createFalImage } from "@/lib/ai/providers/fal-image";
 import { createSnapgenImage } from "@/lib/ai/providers/snapgen-image";
 import { createOpenAIImage } from "@/lib/ai/providers/openai-image";
-import { createBananaImage } from "@/lib/ai/providers/bananaimage";
-import { createVisionary } from "@/lib/ai/providers/visionary";
-import { createAtlasCloud } from "@/lib/ai/providers/atlascloud";
-import { createVip98k } from "@/lib/ai/providers/vip98k";
 import { createStepfunImage } from "@/lib/ai/providers/stepfun-image";
 import { createMidjourney } from "@/lib/ai/providers/midjourney";
 import { createRunway } from "@/lib/ai/providers/runway";
@@ -55,10 +51,6 @@ const SUPPORTED_TEXT_EDIT_PROVIDER_TYPES = new Set([
   "fal-image",
   "snapgen-image",
   "openai-image",
-  "bananaimage",
-  "visionary",
-  "atlascloud",
-  "vip98k",
   "stepfun-image",
   "midjourney",
   "runway",
@@ -123,14 +115,6 @@ function createTextEditProvider(
       return createSnapgenImage({ baseURL, apiKey });
     case "openai-image":
       return createOpenAIImage({ baseURL, apiKey });
-    case "bananaimage":
-      return createBananaImage({ baseURL, apiKey });
-    case "visionary":
-      return createVisionary({ baseURL, apiKey });
-    case "atlascloud":
-      return createAtlasCloud({ baseURL, apiKey });
-    case "vip98k":
-      return createVip98k({ baseURL, apiKey });
     case "stepfun-image":
       return createStepfunImage({ baseURL, apiKey });
     case "midjourney":
@@ -483,7 +467,7 @@ async function generateTextEditImageWithFailover(params: {
       const runtimeModelId = resolveModelRuntimeId(selected.model, {
         providerType: selected.provider.type,
       });
-      const generationOptions: any = {
+      const result = await provider.chat(runtimeModelId).doGenerate({
         messages: [
           {
             role: "user",
@@ -496,18 +480,7 @@ async function generateTextEditImageWithFailover(params: {
         imageParams: {
           imageCount: 1,
         },
-      };
-      if (selected.provider.type === "atlascloud" || selected.provider.type === "vip98k") {
-        generationOptions.imageGenConfig = selected.model.imageGenConfig || null;
-      }
-      const modelInstance =
-        selected.provider.type === "vip98k"
-          ? (provider as any).chat(runtimeModelId, {
-              capabilities: selected.model.capabilities || null,
-              imageGenConfig: selected.model.imageGenConfig || null,
-            })
-          : provider.chat(runtimeModelId);
-      const result = await modelInstance.doGenerate(generationOptions);
+      });
 
       const resultText = String(result?.text || "").trim();
       const finishReason = String(result?.finishReason || "").toLowerCase();

app/api/canvas/world/tasks/[taskId]/route.ts

@@ -7,16 +7,9 @@ import { resolveThreeDModelAliasId } from "@/lib/model3d/model-alias-config";
 import { getThreeDModelAliasConfigForRuntime } from "@/lib/model3d/model-alias-config-server";
 import { createLogger } from "@/lib/observability/logger";
 import { uploadFile } from "@/lib/storage/service";
-import {
-  isWorldLabsExternalTaskApi,
-  WORLDLABS_EXTERNAL_TASK_MODEL,
-  WorldLabsApiError,
-  worldLabsRequest,
-} from "@/lib/worldlabs/client";
+import { WorldLabsApiError, worldLabsRequest } from "@/lib/worldlabs/client";
 import { getWorldLabsProviderConfig } from "@/lib/worldlabs/server";
 import type {
-  WorldLabsExternalTaskResponse,
-  WorldLabsExternalTaskResultData,
   WorldLabsOperation,
   WorldLabsWorld,
   WorldLabsWorldAssets,
@@ -426,214 +419,6 @@ function buildAssetPayload(
   };
 }
 
-function unwrapExternalTaskData<T extends Record<string, unknown>>(payload: unknown) {
-  const root = getObjectValue(payload);
-  const data = getObjectValue(root?.data);
-  return (data || root || {}) as T;
-}
-
-function normalizeExternalTaskStatus(status?: string | null, done?: boolean) {
-  const normalized = String(status || "").trim().toLowerCase();
-  if (done === true || ["succeeded", "success", "completed", "done"].includes(normalized)) {
-    return "success" as const;
-  }
-  if (["failed", "failure", "error", "cancelled", "canceled"].includes(normalized)) {
-    return "failed" as const;
-  }
-  return "running" as const;
-}
-
-function readStringRecord(value: unknown) {
-  const record = getObjectValue(value);
-  if (!record) return null;
-  const entries = Object.entries(record).filter(
-    (entry): entry is [string, string] =>
-      Boolean(entry[0]) && typeof entry[1] === "string" && entry[1].trim().length > 0
-  );
-  return entries.length > 0 ? Object.fromEntries(entries) : null;
-}
-
-function findNestedString(
-  value: unknown,
-  keys: string[],
-  depth = 0
-): string | null {
-  if (depth > 8) return null;
-  const record = getObjectValue(value);
-  if (!record) return null;
-
-  for (const key of keys) {
-    const directValue = getStringValue(record[key]);
-    if (directValue) return directValue;
-  }
-
-  for (const child of Object.values(record)) {
-    const found = findNestedString(child, keys, depth + 1);
-    if (found) return found;
-  }
-  return null;
-}
-
-function findNestedObject(
-  value: unknown,
-  keys: string[],
-  depth = 0
-): Record<string, unknown> | null {
-  if (depth > 8) return null;
-  const record = getObjectValue(value);
-  if (!record) return null;
-
-  for (const key of keys) {
-    const directValue = getObjectValue(record[key]);
-    if (directValue) return directValue;
-  }
-
-  for (const child of Object.values(record)) {
-    const found = findNestedObject(child, keys, depth + 1);
-    if (found) return found;
-  }
-  return null;
-}
-
-function findNestedStringRecord(
-  value: unknown,
-  keys: string[],
-  depth = 0
-): Record<string, string> | null {
-  if (depth > 8) return null;
-  const record = getObjectValue(value);
-  if (!record) return null;
-
-  for (const key of keys) {
-    const directValue = readStringRecord(record[key]);
-    if (directValue) return directValue;
-  }
-
-  for (const child of Object.values(record)) {
-    const found = findNestedStringRecord(child, keys, depth + 1);
-    if (found) return found;
-  }
-  return null;
-}
-
-function extractExternalTaskErrorMessage(
-  data: WorldLabsExternalTaskResultData,
-  payload: WorldLabsExternalTaskResponse<WorldLabsExternalTaskResultData>
-) {
-  const dataError = getObjectValue(data.error);
-  const payloadError = getObjectValue(payload.error);
-  return (
-    getStringValue(
-      data.errorMessage,
-      data.message,
-      dataError?.message,
-      payload.message,
-      payloadError?.message,
-      payload.error
-    ) || "World Labs 外部任务失败"
-  );
-}
-
-function extractExternalWorldAssetPayload(data: WorldLabsExternalTaskResultData) {
-  const root = getObjectValue(data) || {};
-  const resultRoot =
-    getObjectValue(root.result) ||
-    getObjectValue(root.output) ||
-    getObjectValue(root.world) ||
-    root;
-  const assets = findNestedObject(resultRoot, ["assets"]);
-  const worldAssets = assets as Partial<WorldLabsWorldAssets> | null;
-  const splats = getObjectValue(worldAssets?.splats);
-
-  return {
-    worldId: getStringValue(
-      findNestedString(resultRoot, ["worldId", "world_id"]),
-      findNestedString(root, ["worldId", "world_id"])
-    ),
-    worldUrl: getStringValue(
-      findNestedString(resultRoot, [
-        "worldUrl",
-        "world_marble_url",
-        "sourceWorldUrl",
-        "viewerUrl",
-        "marbleUrl",
-      ]),
-      findNestedString(root, [
-        "worldUrl",
-        "world_marble_url",
-        "sourceWorldUrl",
-        "viewerUrl",
-        "marbleUrl",
-      ])
-    ),
-    displayName: getStringValue(
-      findNestedString(resultRoot, ["displayName", "display_name"]),
-      findNestedString(root, ["displayName", "display_name"])
-    ),
-    model:
-      getStringValue(
-        findNestedString(resultRoot, ["model", "modelId", "model_id"]),
-        findNestedString(root, ["model", "modelId", "model_id"])
-      ) || WORLDLABS_EXTERNAL_TASK_MODEL,
-    caption: getStringValue(
-      worldAssets?.caption,
-      findNestedString(resultRoot, ["caption"]),
-      findNestedString(root, ["caption"])
-    ),
-    thumbnailUrl: getStringValue(
-      worldAssets?.thumbnail_url,
-      findNestedString(resultRoot, [
-        "thumbnailUrl",
-        "thumbnail_url",
-        "previewImageUrl",
-        "preview_image_url",
-      ]),
-      findNestedString(root, [
-        "thumbnailUrl",
-        "thumbnail_url",
-        "previewImageUrl",
-        "preview_image_url",
-      ])
-    ),
-    panoUrl: getStringValue(
-      worldAssets?.imagery?.pano_url,
-      findNestedString(resultRoot, ["panoUrl", "pano_url", "panoramaUrl", "panorama_url"]),
-      findNestedString(root, ["panoUrl", "pano_url", "panoramaUrl", "panorama_url"])
-    ),
-    meshUrl: getStringValue(
-      worldAssets?.mesh?.collider_mesh_url,
-      findNestedString(resultRoot, [
-        "meshUrl",
-        "mesh_url",
-        "modelUrl",
-        "model_url",
-        "glbUrl",
-        "glb_url",
-        "colliderMeshUrl",
-        "collider_mesh_url",
-      ]),
-      findNestedString(root, [
-        "meshUrl",
-        "mesh_url",
-        "modelUrl",
-        "model_url",
-        "glbUrl",
-        "glb_url",
-        "colliderMeshUrl",
-        "collider_mesh_url",
-      ])
-    ),
-    spzUrls:
-      readStringRecord(splats?.spz_urls) ||
-      findNestedStringRecord(resultRoot, ["spzUrls", "spz_urls"]) ||
-      findNestedStringRecord(root, ["spzUrls", "spz_urls"]),
-    semanticsMetadata:
-      getObjectValue(splats?.semantics_metadata) ||
-      findNestedObject(resultRoot, ["semanticsMetadata", "semantics_metadata"]) ||
-      findNestedObject(root, ["semanticsMetadata", "semantics_metadata"]),
-  };
-}
-
 interface RouteParams {
   params: Promise<{ taskId: string }>;
 }
@@ -667,187 +452,6 @@ export async function GET(request: Request, { params }: RouteParams) {
     });
     providerForLog = config.providerId || null;
     const modelAliasConfig = await getThreeDModelAliasConfigForRuntime();
-    const persistedAssetPayload =
-      getObjectValue(persistedWorldAsset?.assetPayload) || {};
-    const shouldUseExternalTaskResultApi =
-      isWorldLabsExternalTaskApi(config.baseUrl) &&
-      persistedAssetPayload.externalTaskApi !== false &&
-      persistedAssetPayload.marbleApi !== true;
-    if (shouldUseExternalTaskResultApi) {
-      const externalPayload = await worldLabsRequest<
-        WorldLabsExternalTaskResponse<WorldLabsExternalTaskResultData>
-      >(config, {
-        method: "GET",
-        path: `/api/external/task/result?taskId=${encodeURIComponent(normalizedTaskId)}`,
-        timeoutMs: resolveWorldLabsStatusTimeoutMs(),
-      });
-      const externalData =
-        unwrapExternalTaskData<WorldLabsExternalTaskResultData>(externalPayload);
-      const externalStatusText = getStringValue(externalData.status) || "running";
-      const externalStatus = normalizeExternalTaskStatus(
-        externalStatusText,
-        externalData.done === true
-      );
-      const externalAssetPayloadBase = {
-        ...persistedAssetPayload,
-        providerId: config.providerId || null,
-        providerName: config.providerName || null,
-        externalTaskApi: true,
-        externalTaskStatus: externalStatusText,
-        requestId: getStringValue(externalPayload.requestId, externalPayload.request_id),
-      };
-
-      if (externalStatus === "running") {
-        return NextResponse.json({
-          success: true,
-          data: {
-            taskId: normalizedTaskId,
-            type: "world",
-            status: "running",
-            progress: null,
-            output: externalData,
-            assetPayload: externalAssetPayloadBase,
-          },
-        });
-      }
-
-      if (externalStatus === "failed") {
-        const errorMessage = extractExternalTaskErrorMessage(
-          externalData,
-          externalPayload
-        );
-        await updatePersistedWorldAsset({
-          id: persistedWorldAsset?.id,
-          status: "failed",
-          progress: null,
-          error: errorMessage,
-          assetPayload: externalAssetPayloadBase,
-        });
-        logger.warn("external task failed status", {
-          elapsedMs: Date.now() - startedAt,
-          taskIdLength: normalizedTaskId.length,
-          providerId: config.providerId || null,
-          error: errorMessage,
-        });
-        return NextResponse.json({
-          success: true,
-          data: {
-            taskId: normalizedTaskId,
-            type: "world",
-            status: "failed",
-            progress: null,
-            errorMessage,
-            output: externalData,
-            assetPayload: externalAssetPayloadBase,
-          },
-        });
-      }
-
-      const extractedAssetPayload = extractExternalWorldAssetPayload(externalData);
-      const rawMeshUrl = extractedAssetPayload.meshUrl;
-      const rawThumbnailUrl = extractedAssetPayload.thumbnailUrl;
-      const rawPanoUrl = extractedAssetPayload.panoUrl;
-      const stableWorldUrl: string | null = null;
-      const stableModelUrl = await archiveRemoteAssetIfNeeded({
-        cacheKey: `worldlabs:${normalizedTaskId}:mesh`,
-        sourceUrl: rawMeshUrl,
-        filenamePrefix: `worldlabs-mesh-${normalizedTaskId}`,
-        fallbackExtension: "glb",
-        validateAs: "glb",
-      });
-      const stableThumbnailUrl = await archiveRemoteAssetIfNeeded({
-        cacheKey: `worldlabs:${normalizedTaskId}:thumb`,
-        sourceUrl: rawThumbnailUrl,
-        filenamePrefix: `worldlabs-thumb-${normalizedTaskId}`,
-        fallbackExtension: "jpg",
-      });
-      const stablePanoUrl = await archiveRemoteAssetIfNeeded({
-        cacheKey: `worldlabs:${normalizedTaskId}:pano`,
-        sourceUrl: rawPanoUrl,
-        filenamePrefix: `worldlabs-pano-${normalizedTaskId}`,
-        fallbackExtension: "jpg",
-      });
-      const stableSpzUrls = await archiveRemoteAssetMapIfNeeded({
-        cacheKeyPrefix: `worldlabs:${normalizedTaskId}:spz`,
-        sourceMap: extractedAssetPayload.spzUrls,
-        filenamePrefix: `worldlabs-splat-${normalizedTaskId}`,
-        fallbackExtension: "spz",
-        validateAs: "spz",
-      });
-      const assetPayload = {
-        ...externalAssetPayloadBase,
-        worldId: extractedAssetPayload.worldId,
-        worldUrl: stableWorldUrl,
-        displayName: extractedAssetPayload.displayName,
-        model: resolveThreeDModelAliasId(
-          extractedAssetPayload.model,
-          modelAliasConfig.worldModels
-        ),
-        caption: extractedAssetPayload.caption,
-        thumbnailUrl: stableThumbnailUrl || extractedAssetPayload.thumbnailUrl,
-        panoUrl: stablePanoUrl || extractedAssetPayload.panoUrl,
-        meshUrl: stableModelUrl,
-        spzUrls: stableSpzUrls,
-        semanticsMetadata: extractedAssetPayload.semanticsMetadata,
-        storageArchivedAt: new Date().toISOString(),
-        sourceWorldUrl: extractedAssetPayload.worldUrl || null,
-        sourceMeshUrl:
-          rawMeshUrl && stableModelUrl && rawMeshUrl !== stableModelUrl
-            ? rawMeshUrl
-            : null,
-        sourceThumbnailUrl:
-          rawThumbnailUrl && stableThumbnailUrl && rawThumbnailUrl !== stableThumbnailUrl
-            ? rawThumbnailUrl
-            : null,
-        sourcePanoUrl:
-          rawPanoUrl && stablePanoUrl && rawPanoUrl !== stablePanoUrl
-            ? rawPanoUrl
-            : null,
-        sourceSpzUrls:
-          extractedAssetPayload.spzUrls && stableSpzUrls !== extractedAssetPayload.spzUrls
-            ? extractedAssetPayload.spzUrls
-            : null,
-      };
-
-      await updatePersistedWorldAsset({
-        id: persistedWorldAsset?.id,
-        status: "success",
-        progress: 100,
-        modelUrl: stableModelUrl,
-        previewImageUrl: stableThumbnailUrl || stablePanoUrl || null,
-        error: null,
-        assetPayload,
-      });
-
-      logger.info("external task success status", {
-        elapsedMs: Date.now() - startedAt,
-        taskIdLength: normalizedTaskId.length,
-        providerId: config.providerId || null,
-        hasMesh: Boolean(stableModelUrl),
-        hasPano: Boolean(stablePanoUrl),
-        hasThumbnail: Boolean(stableThumbnailUrl),
-        hasSplat: Boolean(stableSpzUrls && Object.keys(stableSpzUrls).length > 0),
-      });
-
-      return NextResponse.json({
-        success: true,
-        data: {
-          taskId: normalizedTaskId,
-          type: "world",
-          status: "success",
-          progress: 100,
-          output: externalData,
-          modelUrl: stableModelUrl,
-          previewImageUrl: stableThumbnailUrl || stablePanoUrl || null,
-          worldId: assetPayload.worldId,
-          worldUrl: stableWorldUrl,
-          panoUrl: stablePanoUrl,
-          caption: assetPayload.caption,
-          assetPayload,
-        },
-      });
-    }
-
     const operation = await worldLabsRequest<WorldLabsOperation>(config, {
       method: "GET",
       path: `/marble/v1/operations/${encodeURIComponent(normalizedTaskId)}`,

app/api/canvas/world/tasks/route.ts

@@ -12,23 +12,13 @@ import {
 import { getThreeDModelAliasConfigForRuntime } from "@/lib/model3d/model-alias-config-server";
 import { createLogger } from "@/lib/observability/logger";
 import { get3DWorldCreditCost } from "@/lib/points/config";
-import {
-  isWorldLabsExternalTaskApi,
-  WORLDLABS_EXTERNAL_TASK_MODEL,
-  WorldLabsApiError,
-  worldLabsRequest,
-} from "@/lib/worldlabs/client";
+import { WorldLabsApiError, worldLabsRequest } from "@/lib/worldlabs/client";
 import {
   getWorldLabsProviderConfig,
   getWorldLabsProviderConfigs,
   reportWorldLabsProviderRuntimeFailure,
 } from "@/lib/worldlabs/server";
-import type {
-  WorldLabsExternalTaskCreateData,
-  WorldLabsExternalTaskResponse,
-  WorldLabsModel,
-  WorldLabsOperation,
-} from "@/lib/worldlabs/types";
+import type { WorldLabsModel, WorldLabsOperation } from "@/lib/worldlabs/types";
 
 export const runtime = "nodejs";
 export const maxDuration = 180;
@@ -57,10 +47,8 @@ type CreateWorldTaskRequest = {
   makePublic?: boolean;
   reconstructImages?: boolean;
   mediaAssetId?: string;
-  sourceUrl?: string;
   mediaAssets?: Array<{
     mediaAssetId?: string;
-    sourceUrl?: string;
     azimuth?: number | null;
   }>;
 };
@@ -70,89 +58,10 @@ function readOptionalTrimmedText(input: unknown) {
   return value || null;
 }
 
-function readOptionalHttpUrl(input: unknown) {
-  const value = readOptionalTrimmedText(input);
-  if (!value) return null;
-  try {
-    const parsed = new URL(value);
-    return parsed.protocol === "http:" || parsed.protocol === "https:"
-      ? parsed.toString()
-      : null;
-  } catch {
-    return null;
-  }
-}
-
-function getObjectValue(value: unknown) {
-  return value && typeof value === "object" ? (value as Record<string, unknown>) : null;
-}
-
-function unwrapExternalTaskData<T extends Record<string, unknown>>(payload: unknown) {
-  const root = getObjectValue(payload);
-  const data = getObjectValue(root?.data);
-  return (data || root || {}) as T;
-}
-
-function normalizeExternalTaskStatus(status?: string | null, done?: boolean) {
-  const normalized = String(status || "").trim().toLowerCase();
-  if (done === true || ["succeeded", "success", "completed", "done"].includes(normalized)) {
-    return "success" as const;
-  }
-  if (["failed", "failure", "error", "cancelled", "canceled"].includes(normalized)) {
-    return "failed" as const;
-  }
-  return "running" as const;
-}
-
-function normalizeExternalTaskCreateOperation(
-  payload: WorldLabsExternalTaskResponse<WorldLabsExternalTaskCreateData>
-): WorldLabsOperation {
-  const data = unwrapExternalTaskData<WorldLabsExternalTaskCreateData>(payload);
-  const taskId = readOptionalTrimmedText(data.taskId || data.task_id || data.id);
-  const status = readOptionalTrimmedText(data.status) || "accepted";
-  const normalizedStatus = normalizeExternalTaskStatus(status, data.done === true);
-  return {
-    operation_id: taskId || undefined,
-    done: normalizedStatus === "success",
-    error:
-      normalizedStatus === "failed"
-        ? {
-            message:
-              readOptionalTrimmedText(
-                (payload as Record<string, unknown>)?.message ||
-                  (payload as Record<string, unknown>)?.error
-              ) || "World Labs 外部任务创建失败",
-          }
-        : null,
-    metadata: {
-      externalTaskApi: true,
-      status,
-      resultPath: readOptionalTrimmedText(data.resultPath || data.result_path),
-      requestId: readOptionalTrimmedText(payload.requestId || payload.request_id),
-    },
-    response: data,
-  };
-}
-
 function shouldCharge3DPoints(mode: WorldTaskMode) {
   return mode === "text" || mode === "image" || mode === "multi-image" || mode === "video";
 }
 
-function shouldUseExternalTaskCreateApi(
-  config: Awaited<ReturnType<typeof getWorldLabsProviderConfig>>,
-  mode: WorldTaskMode
-) {
-  return isWorldLabsExternalTaskApi(config.baseUrl) && mode === "text";
-}
-
-function resolveOfficialMarbleModel(model?: string | null) {
-  const normalized = readOptionalTrimmedText(model);
-  if (!normalized || normalized === WORLDLABS_EXTERNAL_TASK_MODEL) {
-    return "marble-1.1";
-  }
-  return normalized;
-}
-
 function buildWorldPrompt(body: CreateWorldTaskRequest, mode: WorldTaskMode) {
   const textPrompt = readOptionalTrimmedText(body.prompt);
 
@@ -171,21 +80,15 @@ function buildWorldPrompt(body: CreateWorldTaskRequest, mode: WorldTaskMode) {
 
   if (mode === "image") {
     const mediaAssetId = readOptionalTrimmedText(body.mediaAssetId);
-    const sourceUrl = readOptionalHttpUrl(body.sourceUrl);
-    if (!mediaAssetId && !sourceUrl) {
-      throw new Error("图生世界缺少 mediaAssetId 或 sourceUrl");
+    if (!mediaAssetId) {
+      throw new Error("图生世界缺少 mediaAssetId");
     }
     return {
       type: "image",
-      image_prompt: mediaAssetId
-        ? {
-            source: "media_asset",
-            media_asset_id: mediaAssetId,
-          }
-        : {
-            source: "uri",
-            uri: sourceUrl,
-          },
+      image_prompt: {
+        source: "media_asset",
+        media_asset_id: mediaAssetId,
+      },
       ...(textPrompt ? { text_prompt: textPrompt } : {}),
       ...(body.disableRecaption !== undefined
         ? { disable_recaption: body.disableRecaption }
@@ -199,8 +102,7 @@ function buildWorldPrompt(body: CreateWorldTaskRequest, mode: WorldTaskMode) {
     const multiImagePrompt = mediaAssets
       .map((item) => {
         const mediaAssetId = readOptionalTrimmedText(item?.mediaAssetId);
-        const sourceUrl = readOptionalHttpUrl(item?.sourceUrl);
-        if (!mediaAssetId && !sourceUrl) return null;
+        if (!mediaAssetId) return null;
         const azimuth =
           item?.azimuth === null || item?.azimuth === undefined
             ? null
@@ -209,15 +111,10 @@ function buildWorldPrompt(body: CreateWorldTaskRequest, mode: WorldTaskMode) {
               : null;
         return {
           ...(azimuth === null ? {} : { azimuth }),
-          content: mediaAssetId
-            ? {
-                source: "media_asset",
-                media_asset_id: mediaAssetId,
-              }
-            : {
-                source: "uri",
-                uri: sourceUrl,
-              },
+          content: {
+            source: "media_asset",
+            media_asset_id: mediaAssetId,
+          },
         };
       })
       .filter(Boolean);
@@ -240,22 +137,16 @@ function buildWorldPrompt(body: CreateWorldTaskRequest, mode: WorldTaskMode) {
   }
 
   const mediaAssetId = readOptionalTrimmedText(body.mediaAssetId);
-  const sourceUrl = readOptionalHttpUrl(body.sourceUrl);
-  if (!mediaAssetId && !sourceUrl) {
-    throw new Error("视频生成世界缺少 mediaAssetId 或 sourceUrl");
+  if (!mediaAssetId) {
+    throw new Error("视频生成世界缺少 mediaAssetId");
   }
 
   return {
     type: "video",
-    video_prompt: mediaAssetId
-      ? {
-          source: "media_asset",
-          media_asset_id: mediaAssetId,
-        }
-      : {
-          source: "uri",
-          uri: sourceUrl,
-        },
+    video_prompt: {
+      source: "media_asset",
+      media_asset_id: mediaAssetId,
+    },
     ...(textPrompt ? { text_prompt: textPrompt } : {}),
   };
 }
@@ -296,29 +187,12 @@ export async function POST(request: Request) {
     );
     modelForLog = resolvedWorldModel || "marble-1.1";
 
-    const preferredProviderId = readOptionalTrimmedText(body.providerId);
-    const displayName =
-      readOptionalTrimmedText(body.displayName) ||
-      readOptionalTrimmedText(body.prompt) ||
-      `World ${new Date().toLocaleString("zh-CN")}`;
-    const worldPrompt = buildWorldPrompt(body, mode);
-
-    const candidates = preferredProviderId
-      ? [await getWorldLabsProviderConfig(preferredProviderId)]
-      : await getWorldLabsProviderConfigs();
-    if (candidates.length === 0) {
-      throw new Error("未找到可用的 World Labs Key");
-    }
-
-    const officialMarbleModel = resolveOfficialMarbleModel(resolvedWorldModel);
-    const predictedBillingModel = candidates.some((candidate) =>
-      shouldUseExternalTaskCreateApi(candidate, mode)
-    )
-      ? WORLDLABS_EXTERNAL_TASK_MODEL
-      : officialMarbleModel;
     const pointsConfig = await getPointsSystemConfig();
     const shouldChargePoints = shouldCharge3DPoints(mode);
-    const unitCost = get3DWorldCreditCost(pointsConfig, predictedBillingModel);
+    const unitCost = get3DWorldCreditCost(
+      pointsConfig,
+      resolvedWorldModel || "marble-1.1",
+    );
 
     if (
       shouldChargePoints &&
@@ -346,51 +220,42 @@ export async function POST(request: Request) {
       }
     }
 
+    const preferredProviderId = readOptionalTrimmedText(body.providerId);
+    const displayName =
+      readOptionalTrimmedText(body.displayName) ||
+      readOptionalTrimmedText(body.prompt) ||
+      `World ${new Date().toLocaleString("zh-CN")}`;
+    const worldPrompt = buildWorldPrompt(body, mode);
+
+    const candidates = preferredProviderId
+      ? [await getWorldLabsProviderConfig(preferredProviderId)]
+      : await getWorldLabsProviderConfigs();
+    if (candidates.length === 0) {
+      throw new Error("未找到可用的 World Labs Key");
+    }
+
     let result: WorldLabsOperation | null = null;
     let usedProvider = null as Awaited<
       ReturnType<typeof getWorldLabsProviderConfig>
     > | null;
-    let usedExternalTaskApi = false;
     let lastError: unknown = null;
 
     for (const candidate of candidates) {
       try {
-        const useExternalTaskApi = shouldUseExternalTaskCreateApi(candidate, mode);
-        if (useExternalTaskApi) {
-          const prompt = readOptionalTrimmedText(body.prompt);
-          if (!prompt) {
-            throw new Error("请输入世界描述");
-          }
-          const externalResult = await worldLabsRequest<
-            WorldLabsExternalTaskResponse<WorldLabsExternalTaskCreateData>
-          >(candidate, {
-            method: "POST",
-            path: "/api/external/task/generate",
-            timeoutMs: resolveWorldLabsCreateTimeoutMs(),
-            json: {
-              model: WORLDLABS_EXTERNAL_TASK_MODEL,
-              displayName,
-              prompt,
+        result = await worldLabsRequest<WorldLabsOperation>(candidate, {
+          method: "POST",
+          path: "/marble/v1/worlds:generate",
+          timeoutMs: resolveWorldLabsCreateTimeoutMs(),
+          json: {
+            display_name: displayName,
+            model: resolvedWorldModel || "marble-1.1",
+            permission: {
+              public: body.makePublic === true,
             },
-          });
-          result = normalizeExternalTaskCreateOperation(externalResult);
-        } else {
-          result = await worldLabsRequest<WorldLabsOperation>(candidate, {
-            method: "POST",
-            path: "/marble/v1/worlds:generate",
-            timeoutMs: resolveWorldLabsCreateTimeoutMs(),
-            json: {
-              display_name: displayName,
-              model: officialMarbleModel,
-              permission: {
-                public: body.makePublic === true,
-              },
-              world_prompt: worldPrompt,
-            },
-          });
-        }
+            world_prompt: worldPrompt,
+          },
+        });
         usedProvider = candidate;
-        usedExternalTaskApi = useExternalTaskApi;
         providerForLog = candidate.providerId || null;
         break;
       } catch (error) {
@@ -427,18 +292,12 @@ export async function POST(request: Request) {
 
     if (shouldChargePoints && pointsConfig.enabled && unitCost > 0) {
       try {
-        const usedBillingModel = usedExternalTaskApi
-          ? WORLDLABS_EXTERNAL_TASK_MODEL
-          : officialMarbleModel;
-        const usedBillingDisplayName = usedBillingModel === WORLDLABS_EXTERNAL_TASK_MODEL
-          ? WORLDLABS_EXTERNAL_TASK_MODEL
-          : worldModelDisplayName;
         await consumeUserPoints({
           userId: session.user.id,
           amount: unitCost,
           reason: "world3d_generation",
-          modelId: `worldlabs-3d:${usedBillingModel}`,
-          note: `3D世界生成消耗积分（${usedBillingDisplayName}）`,
+          modelId: `worldlabs-3d:${resolvedWorldModel || "marble-1.1"}`,
+          note: `3D世界生成消耗积分（${worldModelDisplayName}）`,
         });
       } catch (error) {
         logger.error("points consume failed", error, {
@@ -454,13 +313,10 @@ export async function POST(request: Request) {
       elapsedMs: Date.now() - startedAt,
       taskIdLength: taskId.length,
       mode,
-      model: usedExternalTaskApi
-        ? WORLDLABS_EXTERNAL_TASK_MODEL
-        : officialMarbleModel,
+      model: resolvedWorldModel || "marble-1.1",
       providerId: usedProvider.providerId || null,
       status: result.done ? "success" : "running",
       unitCost,
-      externalTaskApi: usedExternalTaskApi,
     });
 
     return NextResponse.json({
@@ -471,8 +327,6 @@ export async function POST(request: Request) {
         assetPayload: {
           providerId: usedProvider.providerId || null,
           providerName: usedProvider.providerName || null,
-          externalTaskApi: usedExternalTaskApi,
-          marbleApi: !usedExternalTaskApi,
         },
         raw: result,
       },

app/api/canvas/world/upload/route.ts

@@ -1,11 +1,7 @@
 import { NextResponse } from "next/server";
 import { auth } from "@/app/(auth)/auth";
 import { createLogger } from "@/lib/observability/logger";
-import { uploadFile } from "@/lib/storage/service";
-import {
-  WorldLabsApiError,
-  worldLabsRequest,
-} from "@/lib/worldlabs/client";
+import { WorldLabsApiError, worldLabsRequest } from "@/lib/worldlabs/client";
 import {
   getWorldLabsProviderConfig,
   getWorldLabsProviderConfigs,
@@ -116,81 +112,6 @@ function normalizeMediaAssetId(data: WorldLabsPrepareUploadResponse) {
   return String(data.media_asset?.media_asset_id || data.media_asset?.id || "").trim();
 }
 
-function readOptionalString(value: unknown) {
-  const text = String(value || "").trim();
-  return text || null;
-}
-
-function extractUploadInfoFromCurlExample(curlExample: unknown) {
-  const curl = String(curlExample || "");
-  const uploadUrl =
-    [...curl.matchAll(/https?:\/\/[^\s'"\\]+/g)]
-      .map((match) => match[0])
-      .find(Boolean) || null;
-  const requiredHeaders: Record<string, string> = {};
-  const headerPattern = /(?:-H|--header)\s+(?:"([^"]+)"|'([^']+)'|([^\s]+))/g;
-  let headerMatch: RegExpExecArray | null;
-
-  while ((headerMatch = headerPattern.exec(curl))) {
-    const header = String(
-      headerMatch[1] || headerMatch[2] || headerMatch[3] || ""
-    ).trim();
-    const colonIndex = header.indexOf(":");
-    if (colonIndex <= 0) continue;
-    const name = header.slice(0, colonIndex).trim();
-    const value = header.slice(colonIndex + 1).trim();
-    if (name && value) {
-      requiredHeaders[name] = value;
-    }
-  }
-
-  return { uploadUrl, requiredHeaders };
-}
-
-function resolvePrepareUploadDetails(data: WorldLabsPrepareUploadResponse) {
-  const uploadInfo = data.upload_info || {};
-  const uploadInfoRecord = uploadInfo as Record<string, unknown>;
-  const curlDetails = extractUploadInfoFromCurlExample(uploadInfo.curl_example);
-  const explicitHeaders =
-    uploadInfo.required_headers && typeof uploadInfo.required_headers === "object"
-      ? uploadInfo.required_headers
-      : {};
-
-  return {
-    uploadUrl:
-      readOptionalString(uploadInfo.upload_url) ||
-      readOptionalString(uploadInfoRecord.uploadUrl) ||
-      readOptionalString(uploadInfoRecord.url) ||
-      curlDetails.uploadUrl,
-    uploadMethod:
-      readOptionalString(uploadInfo.upload_method) ||
-      readOptionalString(uploadInfoRecord.method) ||
-      "PUT",
-    requiredHeaders: {
-      ...curlDetails.requiredHeaders,
-      ...explicitHeaders,
-    },
-  };
-}
-
-function isSignedUploadFailure(error: unknown) {
-  const message = error instanceof Error ? error.message : String(error || "");
-  return (
-    message.includes("SignatureDoesNotMatch") ||
-    message.includes("Access denied") ||
-    message.includes("Google secret key") ||
-    message.includes("签名")
-  );
-}
-
-async function uploadWorldLabsInputToStorage(file: File, extension: string) {
-  const buffer = await file.arrayBuffer();
-  const safeExtension = extension && extension !== "bin" ? extension : "bin";
-  const filename = `worldlabs-input-${Date.now()}-${crypto.randomUUID()}.${safeExtension}`;
-  const uploaded = await uploadFile(filename, buffer);
-  return uploaded.url;
-}
-
 function isCredentialOrBillingProviderError(error: unknown) {
   return (
     error instanceof WorldLabsApiError &&
@@ -281,24 +202,24 @@ export async function POST(request: Request) {
         );
 
         const mediaAssetId = normalizeMediaAssetId(prepareUpload);
-        const { uploadUrl, uploadMethod, requiredHeaders } =
-          resolvePrepareUploadDetails(prepareUpload);
+        const uploadUrl = String(prepareUpload.upload_info?.upload_url || "").trim();
         if (!mediaAssetId || !uploadUrl) {
           throw new Error("World Labs 返回的上传信息不完整");
         }
 
         const uploadHeaders = new Headers();
+        uploadHeaders.set("Content-Type", file.type || "application/octet-stream");
+        const requiredHeaders = prepareUpload.upload_info?.required_headers || {};
         for (const [headerName, headerValue] of Object.entries(requiredHeaders)) {
           if (!headerName || headerValue === undefined || headerValue === null) continue;
           uploadHeaders.set(headerName, String(headerValue));
         }
-        if (!uploadHeaders.has("Content-Type") && !prepareUpload.upload_info?.curl_example) {
-          uploadHeaders.set("Content-Type", file.type || "application/octet-stream");
-        }
 
-        const normalizedUploadMethod = uploadMethod.toUpperCase();
+        const uploadMethod = String(
+          prepareUpload.upload_info?.upload_method || "PUT"
+        ).toUpperCase();
         const uploadResponse = await fetch(uploadUrl, {
-          method: normalizedUploadMethod === "PUT" ? "PUT" : normalizedUploadMethod,
+          method: uploadMethod === "PUT" ? "PUT" : uploadMethod,
           headers: uploadHeaders,
           body: file,
           cache: "no-store",
@@ -331,28 +252,6 @@ export async function POST(request: Request) {
         });
       } catch (error) {
         lastError = error;
-        if (isSignedUploadFailure(error)) {
-          try {
-            const sourceUrl = await uploadWorldLabsInputToStorage(file, extension);
-            logger.warn("worldlabs signed upload failed; using storage source url", {
-              elapsedMs: Date.now() - startedAt,
-              providerId: config.providerId || null,
-              kind: isImage ? "image" : "video",
-              size: file.size,
-            });
-            return NextResponse.json({
-              success: true,
-              data: {
-                sourceUrl,
-                providerId: config.providerId || null,
-                providerName: config.providerName || null,
-                uploadFallback: "storage-source-url",
-              },
-            });
-          } catch (fallbackError) {
-            lastError = fallbackError;
-          }
-        }
         if (isCredentialOrBillingProviderError(error)) {
           await reportWorldLabsProviderRuntimeFailure(
             config.providerId,

app/api/client-performance/agent-style/route.ts

@@ -2,7 +2,6 @@ import { sql } from "drizzle-orm";
 import { NextResponse } from "next/server";
 import { z } from "zod";
 import { auth } from "@/app/(auth)/auth";
-import { isAgentModeScopedChatId } from "@/lib/chat/messages-route-access";
 import { db } from "@/lib/db";
 import { clientPerformanceEvent } from "@/lib/db/schema";
 
@@ -168,12 +167,9 @@ export async function POST(request: Request) {
       console.warn("[ClientPerformance] prune failed", error);
     });
 
-    const persistedChatId =
-      event.chatId && !isAgentModeScopedChatId(event.chatId) ? event.chatId : null;
-
     await db.insert(clientPerformanceEvent).values({
       userId: session?.user?.id || null,
-      chatId: persistedChatId,
+      chatId: event.chatId || null,
       projectId: clampText(event.projectId, 64),
       eventType: clampText(event.eventType, 64) || "unknown",
       section: event.section || "unknown",

app/api/enhance/route.ts

@@ -1,7 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import {
   createMediaAssetRelation,
-  getAiProvidersByType,
   getMediaAssetsByUserAndUrls,
   getSystemSetting,
   upsertMediaAsset,
@@ -10,12 +9,9 @@ import { auth } from "@/app/(auth)/auth";
 import { uploadFile } from "@/lib/storage/service";
 import { db } from "@/lib/db";
 import { generatedImage } from "@/lib/db/schema";
-import { executeConfiguredVip98kTask } from "@/lib/ai/vip98k-runtime";
-import { createFalClient } from "@fal-ai/client";
 
 // 变清晰API配置类型
 type EnhanceApiConfig = {
-  provider?: "vip98k" | "aoscdn";
   apiUrl?: string;
   apiKey?: string;
   type?: string; // "clean" | "face"
@@ -321,155 +317,6 @@ async function processWithRealESRGANBase64(
   };
 }
 
-async function processWithFalEsrgan(
-  imageBase64: string,
-  requestedScaleFactor: number,
-): Promise<{ imageBase64: string; processingTime: number }> {
-  const providers = await getAiProvidersByType({
-    type: "fal-image",
-    enabledOnly: true,
-  });
-  const provider = providers.find((item) => item.apiKey?.trim());
-  if (!provider?.apiKey) {
-    throw new Error("未配置可用的 FAL 专用高清服务");
-  }
-
-  const scale = Math.max(2, Math.min(8, requestedScaleFactor || 4));
-  const model = scale <= 2 ? "RealESRGAN_x2plus" : "RealESRGAN_x4plus";
-  const credentials = provider.apiKey
-    .trim()
-    .replace(/^(?:Key|Bearer)\s+/i, "");
-  const fal = createFalClient({ credentials });
-  const startedAt = Date.now();
-  const result: any = await fal.subscribe("fal-ai/esrgan", {
-    input: {
-      image_url: `data:image/jpeg;base64,${imageBase64}`,
-      scale,
-      model,
-      output_format: "png",
-    },
-    logs: true,
-    timeout: 180_000,
-  });
-  const outputUrl = result?.data?.image?.url || result?.image?.url;
-  if (!outputUrl) {
-    throw new Error("FAL ESRGAN 专用高清服务未返回图片");
-  }
-
-  const outputResponse = await fetch(outputUrl, {
-    cache: "no-store",
-    signal: AbortSignal.timeout(120_000),
-  });
-  if (!outputResponse.ok) {
-    throw new Error(
-      `FAL ESRGAN 高清结果下载失败（HTTP ${outputResponse.status}）`,
-    );
-  }
-
-  return {
-    imageBase64: Buffer.from(await outputResponse.arrayBuffer()).toString(
-      "base64",
-    ),
-    processingTime: (Date.now() - startedAt) / 1000,
-  };
-}
-
-async function processWithVip98kEnhance(params: {
-  userId: string;
-  imageBase64: string;
-  prompt: string;
-  chatId: string | null;
-  messageId: string | null;
-  sourceImageUrl: string | null;
-  scaleFactor: number;
-}) {
-  const startedAt = Date.now();
-  const result = await executeConfiguredVip98kTask({
-    modelId: "enhance",
-    kind: "image-tool",
-    prompt: `${params.prompt || "Enhance image clarity"}. Upscale ${params.scaleFactor}x while preserving composition, color and texture.`,
-    imageUrls: [`data:image/jpeg;base64,${params.imageBase64}`],
-    imageParams: { scaleFactor: params.scaleFactor },
-  });
-  const outputUrl = result.outputUrls[0];
-  if (!outputUrl) throw new Error("VIP98K 变清晰未返回图片");
-
-  const response = await fetch(outputUrl, {
-    cache: "no-store",
-    signal: AbortSignal.timeout(120_000),
-  });
-  if (!response.ok) {
-    throw new Error(`VIP98K 变清晰结果下载失败（HTTP ${response.status}）`);
-  }
-  const outputBuffer = Buffer.from(await response.arrayBuffer());
-  const outputBase64 = outputBuffer.toString("base64");
-  const uploaded = await uploadBase64ToS3(outputBase64, "image/png");
-  const [savedImage] = await db
-    .insert(generatedImage)
-    .values({
-      userId: params.userId,
-      chatId: params.chatId,
-      messageId: params.messageId,
-      thumbnailUrl: uploaded.thumbnail,
-      originalUrl: uploaded.original,
-      imageSize: `${params.scaleFactor}x放大`,
-      prompt: params.prompt,
-      modelId: "enhance",
-    })
-    .returning();
-
-  try {
-    const sourceAssets = params.sourceImageUrl
-      ? await getMediaAssetsByUserAndUrls({
-          userId: params.userId,
-          urls: [params.sourceImageUrl],
-        })
-      : [];
-    const media = await upsertMediaAsset({
-      userId: params.userId,
-      chatId: params.chatId,
-      mediaType: "image",
-      sourceType: "edited",
-      status: "ready",
-      originalUrl: uploaded.original,
-      previewUrl: uploaded.original,
-      thumbnailUrl: uploaded.thumbnail,
-      displayName: params.prompt.slice(0, 80),
-      prompt: params.prompt,
-      modelId: "enhance",
-      sourceMessageId: params.messageId,
-      sourceTable: "GeneratedImage",
-      sourceRowId: savedImage?.id || null,
-      primaryParentAssetId: sourceAssets[0]?.id ?? null,
-      metadata: { provider: "vip98k", scaleFactor: params.scaleFactor },
-    });
-    if (media) {
-      for (const sourceAsset of sourceAssets) {
-        await createMediaAssetRelation({
-          userId: params.userId,
-          chatId: params.chatId,
-          fromAssetId: sourceAsset.id,
-          toAssetId: media.id,
-          relationType: "edited_from",
-          sourceMessageId: params.messageId,
-          metadata: { prompt: params.prompt, provider: "vip98k" },
-        });
-      }
-    }
-  } catch (error) {
-    console.warn("[Enhance-VIP98K] MediaAsset registration failed", error);
-  }
-
-  return {
-    success: true,
-    image_base64: outputBase64,
-    thumbnail_url: uploaded.thumbnail,
-    original_url: uploaded.original,
-    processing_time: (Date.now() - startedAt) / 1000,
-    api_type: "vip98k",
-  };
-}
-
 /**
  * 轮询获取任务结果（根据官方示例）
  */
@@ -689,42 +536,6 @@ async function finalizeEnhanceTaskResult(params: {
   };
 }
 
-async function executeFalEsrganFallback(params: {
-  userId: string;
-  imageBase64: string;
-  prompt: string;
-  chatId: string | null;
-  messageId: string | null;
-  sourceImageUrl: string | null;
-  requestedScaleFactor?: number;
-  reason: string;
-}) {
-  const scaleFactor = params.requestedScaleFactor || 4;
-  console.warn("[Enhance-FAL-ESRGAN] 启用专用高清备用链路", {
-    reason: params.reason.slice(0, 500),
-    scaleFactor,
-  });
-  const result = await processWithFalEsrgan(params.imageBase64, scaleFactor);
-  const payload = await finalizeEnhanceTaskResult({
-    userId: params.userId,
-    taskResult: {
-      status: 200,
-      data: { image_base64: result.imageBase64 },
-    },
-    prompt: params.prompt || "图片变清晰处理",
-    chatId: params.chatId,
-    messageId: params.messageId,
-    sourceImageUrls: params.sourceImageUrl
-      ? [params.sourceImageUrl]
-      : undefined,
-  });
-  return {
-    ...payload,
-    processing_time: result.processingTime,
-    api_type: "fal-esrgan",
-  };
-}
-
 export async function GET(request: NextRequest) {
   try {
     const session = await auth();
@@ -752,12 +563,6 @@ export async function GET(request: NextRequest) {
     }
 
     const config = enhanceConfig.value as EnhanceApiConfig;
-    if (config.provider === "vip98k") {
-      return NextResponse.json(
-        { error: "VIP98K 变清晰任务在 POST 请求内完成，无需 taskId 轮询" },
-        { status: 400 }
-      );
-    }
     if (config.useBackupApi) {
       return NextResponse.json(
         { error: "当前启用了Real-ESRGAN备用模式，不支持 taskId 轮询" },
@@ -846,15 +651,12 @@ export async function POST(request: NextRequest) {
     }
 
     const config = enhanceConfig.value as EnhanceApiConfig;
-    const useVip98k = config.provider === "vip98k";
 
     // 检查是否使用备用API
-    const useBackupApi = !useVip98k && config.useBackupApi === true;
+    const useBackupApi = config.useBackupApi === true;
     console.log(`[Enhance API] 使用${useBackupApi ? "备用API (Real-ESRGAN)" : "主API"}`);
 
-    if (useVip98k) {
-      // VIP98K 密钥只从 AiProvider 读取。
-    } else if (useBackupApi) {
+    if (useBackupApi) {
       // 验证备用API配置
       if (!config.backupApiUrl || !config.backupApiKey) {
         return NextResponse.json(
@@ -955,31 +757,6 @@ export async function POST(request: NextRequest) {
       );
     }
 
-    if (useVip98k) {
-      try {
-        const scaleFactor = requestedScaleFactor || 4;
-        const payload = await processWithVip98kEnhance({
-          userId,
-          imageBase64,
-          prompt: prompt || "图片变清晰处理",
-          chatId,
-          messageId,
-          sourceImageUrl,
-          scaleFactor,
-        });
-        return NextResponse.json(payload);
-      } catch (error) {
-        console.error("[Enhance-VIP98K] Processing failed", error);
-        return NextResponse.json(
-          {
-            error: "VIP98K 变清晰处理失败",
-            detail: error instanceof Error ? error.message : "未知错误",
-          },
-          { status: 500 }
-        );
-      }
-    }
-
     // ========== 备用API处理路径 (Real-ESRGAN) ==========
     if (useBackupApi) {
       console.log("[Enhance API] 使用Real-ESRGAN备用API处理（URL方式）...");
@@ -1117,21 +894,6 @@ export async function POST(request: NextRequest) {
         
       } catch (error) {
         console.error("[Enhance-RealESRGAN] ❌ 处理失败:", error);
-        try {
-          const fallbackPayload = await executeFalEsrganFallback({
-            userId,
-            imageBase64,
-            prompt,
-            chatId,
-            messageId,
-            sourceImageUrl,
-            requestedScaleFactor,
-            reason: error instanceof Error ? error.message : "RealESRGAN 备用服务失败",
-          });
-          return NextResponse.json(fallbackPayload);
-        } catch (falError) {
-          console.error("[Enhance-FAL-ESRGAN] 专用高清备用链路失败:", falError);
-        }
         return NextResponse.json(
           { 
             error: "Real-ESRGAN变清晰处理失败",
@@ -1286,22 +1048,6 @@ export async function POST(request: NextRequest) {
         enhanceUrl,
         processingTime,
       });
-
-      try {
-        const fallbackPayload = await executeFalEsrganFallback({
-          userId,
-          imageBase64,
-          prompt,
-          chatId,
-          messageId,
-          sourceImageUrl,
-          requestedScaleFactor,
-          reason: fetchError instanceof Error ? fetchError.message : "AOS 高清任务创建失败",
-        });
-        return NextResponse.json(fallbackPayload);
-      } catch (falError) {
-        console.error("[Enhance-FAL-ESRGAN] 专用高清备用链路失败:", falError);
-      }
       
       // 检查是否是网络连接错误
       if (fetchError instanceof Error) {
@@ -1368,21 +1114,6 @@ export async function POST(request: NextRequest) {
           return buildEnhanceTaskPendingResponse(taskId);
         }
         const detail = pollError instanceof Error ? pollError.message : "轮询失败";
-        try {
-          const fallbackPayload = await executeFalEsrganFallback({
-            userId,
-            imageBase64,
-            prompt,
-            chatId,
-            messageId,
-            sourceImageUrl,
-            requestedScaleFactor,
-            reason: detail,
-          });
-          return NextResponse.json(fallbackPayload);
-        } catch (falError) {
-          console.error("[Enhance-FAL-ESRGAN] 专用高清备用链路失败:", falError);
-        }
         const friendlyMessage = getAosFriendlyErrorMessage(detail);
         return NextResponse.json(
           { error: "变清晰处理失败", detail: friendlyMessage || detail },

app/api/external/image/generate/route.ts

@@ -21,6 +21,103 @@ import {
 export const runtime = "nodejs";
 export const maxDuration = 1200;
 
+const EXTERNAL_IMAGE_API_LIMITER_KEY = "__external_image_api_limiter__";
+const DEFAULT_EXTERNAL_IMAGE_API_MAX_CONCURRENT = 2;
+const DEFAULT_EXTERNAL_IMAGE_API_MAX_QUEUE = 8;
+const DEFAULT_EXTERNAL_IMAGE_API_QUEUE_TIMEOUT_MS = 15_000;
+
+class ExternalImageApiBusyError extends Error {
+  readonly retryAfterSeconds: number;
+
+  constructor(message: string, retryAfterSeconds = 15) {
+    super(message);
+    this.name = "ExternalImageApiBusyError";
+    this.retryAfterSeconds = retryAfterSeconds;
+  }
+}
+
+type ExternalImageApiWaiter = {
+  resolve: (release: () => void) => void;
+  reject: (error: Error) => void;
+  timer: ReturnType<typeof setTimeout>;
+};
+
+type ExternalImageApiLimiterState = {
+  running: number;
+  queue: ExternalImageApiWaiter[];
+};
+
+function parsePositiveInteger(value: unknown, fallback: number) {
+  const parsed = Number.parseInt(String(value || ""), 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+
+function getExternalImageApiLimiterState(): ExternalImageApiLimiterState {
+  const globalState = globalThis as typeof globalThis & {
+    [EXTERNAL_IMAGE_API_LIMITER_KEY]?: ExternalImageApiLimiterState;
+  };
+
+  if (!globalState[EXTERNAL_IMAGE_API_LIMITER_KEY]) {
+    globalState[EXTERNAL_IMAGE_API_LIMITER_KEY] = {
+      running: 0,
+      queue: [],
+    };
+  }
+
+  return globalState[EXTERNAL_IMAGE_API_LIMITER_KEY]!;
+}
+
+function acquireExternalImageApiSlot(): Promise<() => void> {
+  const state = getExternalImageApiLimiterState();
+  const maxConcurrent = parsePositiveInteger(
+    process.env.EXTERNAL_IMAGE_API_MAX_CONCURRENT,
+    DEFAULT_EXTERNAL_IMAGE_API_MAX_CONCURRENT,
+  );
+  const maxQueue = parsePositiveInteger(
+    process.env.EXTERNAL_IMAGE_API_MAX_QUEUE,
+    DEFAULT_EXTERNAL_IMAGE_API_MAX_QUEUE,
+  );
+  const queueTimeoutMs = parsePositiveInteger(
+    process.env.EXTERNAL_IMAGE_API_QUEUE_TIMEOUT_MS,
+    DEFAULT_EXTERNAL_IMAGE_API_QUEUE_TIMEOUT_MS,
+  );
+
+  const release = () => {
+    state.running = Math.max(0, state.running - 1);
+    const next = state.queue.shift();
+    if (!next) return;
+    clearTimeout(next.timer);
+    state.running += 1;
+    next.resolve(release);
+  };
+
+  if (state.running < maxConcurrent) {
+    state.running += 1;
+    return Promise.resolve(release);
+  }
+
+  if (state.queue.length >= maxQueue) {
+    return Promise.reject(
+      new ExternalImageApiBusyError("图片生成服务繁忙，请稍后重试"),
+    );
+  }
+
+  return new Promise((resolve, reject) => {
+    const waiter: ExternalImageApiWaiter = {
+      resolve,
+      reject,
+      timer: setTimeout(() => {
+        const index = state.queue.indexOf(waiter);
+        if (index >= 0) {
+          state.queue.splice(index, 1);
+        }
+        reject(new ExternalImageApiBusyError("图片生成排队超时，请稍后重试"));
+      }, queueTimeoutMs),
+    };
+    state.queue.push(waiter);
+  });
+}
+
 const requestSchema = z.object({
   prompt: z.string().trim().min(1, "prompt 不能为空"),
   negativePrompt: z.string().trim().optional(),
@@ -197,8 +294,10 @@ export async function POST(request: Request) {
 
   const startedAt = Date.now();
   let logId: string | null = null;
+  let releaseExternalImageApiSlot: (() => void) | null = null;
 
   try {
+    releaseExternalImageApiSlot = await acquireExternalImageApiSlot();
     const payload = await parseRequestPayload(request);
     const imageSize = normalizeExternalImageApiImageSize(payload.imageSize);
     const candidateModels = await buildExternalImageApiModelCandidates({
@@ -245,7 +344,6 @@ export async function POST(request: Request) {
 
     const generationResult = await generateImagesWithFailover({
       candidates: candidateModels,
-      ownerKey: `external-image-api:${authResult.accessKey.id}`,
       prompt: payload.prompt,
       negativePrompt: payload.negativePrompt || null,
       imageCount: payload.imageCount || 1,
@@ -369,6 +467,21 @@ export async function POST(request: Request) {
         .where(eq(externalImageApiRequestLog.id, logId));
     }
 
+    if (error instanceof ExternalImageApiBusyError) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: error.message,
+        },
+        {
+          status: 429,
+          headers: {
+            "Retry-After": String(error.retryAfterSeconds),
+          },
+        },
+      );
+    }
+
     return NextResponse.json(
       {
         success: false,
@@ -376,5 +489,9 @@ export async function POST(request: Request) {
       },
       { status: 500 },
     );
+  } finally {
+    if (releaseExternalImageApiSlot) {
+      releaseExternalImageApiSlot();
+    }
   }
 }

app/api/mcp/canvas/[id]/route.ts

@@ -1,38 +0,0 @@
-import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
-import { NextResponse } from "next/server";
-
-import { auth } from "@/app/(auth)/auth";
-import { createCanvasCapabilityMcpServer } from "@/lib/canvas/capabilities/mcp-server";
-
-export const dynamic = "force-dynamic";
-export const maxDuration = 600;
-
-async function handleMcpRequest(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const session = await auth();
-  if (!session?.user?.id) {
-    return NextResponse.json(
-      { error: "未登录，无法访问画布 MCP 服务" },
-      { status: 401 }
-    );
-  }
-
-  const { id: projectId } = await params;
-  const transport = new WebStandardStreamableHTTPServerTransport({
-    enableJsonResponse: true,
-  });
-  const server = await createCanvasCapabilityMcpServer({
-    projectId,
-    requestHeaders: request.headers,
-    requestUrl: request.url,
-    userId: session.user.id,
-  });
-  await server.connect(transport);
-  return transport.handleRequest(request);
-}
-
-export const POST = handleMcpRequest;
-export const GET = handleMcpRequest;
-export const DELETE = handleMcpRequest;

app/api/messages/route.ts

@@ -32,15 +32,6 @@ const FAL_IMAGE_TASK_POLL_INTERVAL_MS = 2_000;
 const falTaskLastPolledAt = new Map<string, number>();
 const falTaskSyncInFlight = new Set<string>();
 
-function toPublicVideoMetadata(value: DBMessage["videoMetadata"]) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return value;
-  const metadata = value as Record<string, unknown>;
-  if (metadata.taskKind !== "clawd_chat") return value;
-  const publicMetadata = { ...metadata };
-  delete publicMetadata.upstreamTaskKey;
-  return publicMetadata;
-}
-
 function createEmptyMessagesResponse() {
   return NextResponse.json(
     { messages: [] },
@@ -286,7 +277,7 @@ export async function GET(request: NextRequest) {
         createdAt: msg.createdAt,
         parts: parts,
         attachments: msg.attachments || [],
-        videoMetadata: toPublicVideoMetadata(msg.videoMetadata) || null,
+        videoMetadata: msg.videoMetadata || null,
       };
     });
 

app/api/openapi/v1/access-keys/provision/route.ts

@@ -1,148 +0,0 @@
-import { and, eq, isNotNull } from "drizzle-orm";
-import { z } from "zod";
-import {
-  createUserAccessKey,
-  listUserAccessKeys,
-} from "@/lib/access-keys/service";
-import {
-  MIN_PROVISIONING_SECRET_LENGTH,
-  parseProvisioningBearerSecret,
-  verifyProvisioningSecret,
-} from "@/lib/access-keys/provisioning-secret";
-import { db } from "@/lib/db";
-import { user } from "@/lib/db/schema";
-
-const provisionAccessKeySchema = z.object({
-  dingTalkUsername: z.string().trim().min(1).max(100),
-  dingTalkUserId: z.string().trim().min(1).max(128).optional(),
-  keyName: z.string().trim().min(1).max(100).optional(),
-  scopes: z
-    .array(z.enum(["canvas:read", "canvas:write"]))
-    .min(1)
-    .optional(),
-  expiresInDays: z.number().int().min(1).max(365).optional(),
-});
-
-function jsonError(error: string, code: string, status: number) {
-  return Response.json(
-    { success: false, error, code },
-    { status, headers: { "Cache-Control": "no-store" } }
-  );
-}
-
-export async function POST(request: Request) {
-  const expectedSecret = String(
-    process.env.MCP_KEY_PROVISIONING_SECRET || ""
-  ).trim();
-  if (expectedSecret.length < MIN_PROVISIONING_SECRET_LENGTH) {
-    return jsonError(
-      "Access Key provisioning is not configured",
-      "PROVISIONING_NOT_CONFIGURED",
-      503
-    );
-  }
-
-  const providedSecret = parseProvisioningBearerSecret(
-    request.headers.get("authorization")
-  );
-  if (!verifyProvisioningSecret(providedSecret, expectedSecret)) {
-    return jsonError(
-      "Missing or invalid provisioning credential",
-      "PROVISIONING_UNAUTHORIZED",
-      401
-    );
-  }
-
-  const parsedBody = provisionAccessKeySchema.safeParse(
-    await request.json().catch(() => null)
-  );
-  if (!parsedBody.success) {
-    return jsonError(
-      "Invalid provisioning request",
-      "PROVISIONING_REQUEST_INVALID",
-      400
-    );
-  }
-
-  const body = parsedBody.data;
-  const conditions = [
-    eq(user.name, body.dingTalkUsername),
-    eq(user.isActive, true),
-    isNotNull(user.dingtalkUserId),
-  ];
-  if (body.dingTalkUserId) {
-    conditions.push(eq(user.dingtalkUserId, body.dingTalkUserId));
-  }
-
-  const matches = await db
-    .select({
-      id: user.id,
-      name: user.name,
-      dingtalkUserId: user.dingtalkUserId,
-    })
-    .from(user)
-    .where(and(...conditions))
-    .limit(2);
-
-  if (matches.length === 0) {
-    return jsonError(
-      "No active DingTalk user matched the supplied identity",
-      "DINGTALK_USER_NOT_FOUND",
-      404
-    );
-  }
-  if (matches.length > 1) {
-    return jsonError(
-      "DingTalk username is not unique; provide dingTalkUserId",
-      "DINGTALK_USERNAME_AMBIGUOUS",
-      409
-    );
-  }
-
-  const matchedUser = matches[0];
-  const existingKeys = await listUserAccessKeys(matchedUser.id);
-  const activeKeyCount = existingKeys.filter(
-    (item) =>
-      !item.revokedAt &&
-      (!item.expiresAt || new Date(item.expiresAt).getTime() > Date.now())
-  ).length;
-  if (activeKeyCount >= 10) {
-    return jsonError(
-      "The user already has 10 active Access Keys",
-      "ACCESS_KEY_LIMIT_REACHED",
-      409
-    );
-  }
-
-  try {
-    const accessKey = await createUserAccessKey({
-      userId: matchedUser.id,
-      name: body.keyName || "第三方 OpenClaw",
-      scopes: body.scopes,
-      expiresInDays: body.expiresInDays,
-    });
-
-    return Response.json(
-      {
-        success: true,
-        data: {
-          user: matchedUser,
-          accessKey,
-        },
-      },
-      {
-        status: 201,
-        headers: {
-          "Cache-Control": "no-store",
-          Pragma: "no-cache",
-        },
-      }
-    );
-  } catch {
-    return jsonError(
-      "Failed to provision Access Key",
-      "ACCESS_KEY_PROVISION_FAILED",
-      500
-    );
-  }
-}

app/api/openapi/v1/canvases/[id]/operations/route.ts

@@ -1,48 +0,0 @@
-import { getCanvasAgentFeatureFlagsFromSystemSettings } from "@/lib/canvas/agent-feature-settings";
-import { applyCanvasOperationPlan } from "@/lib/canvas/agent-mutations";
-import { handleCanvasAgentOperationRouteRequest } from "@/lib/canvas/agent-operation-route";
-import { z } from "zod";
-import {
-  openApiErrorResponse,
-  requireOpenApiPrincipal,
-} from "@/lib/access-keys/openapi-auth";
-
-const canvasIdSchema = z.string().uuid();
-
-export async function POST(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  try {
-    const principal = await requireOpenApiPrincipal(request, "canvas:write");
-    const { id: rawId } = await params;
-    const parsedId = canvasIdSchema.safeParse(rawId);
-    if (!parsedId.success) {
-      return Response.json(
-        {
-          success: false,
-          error: "Invalid canvas ID",
-          code: "INVALID_CANVAS_ID",
-        },
-        { status: 400 }
-      );
-    }
-
-    const id = parsedId.data;
-    const response = await handleCanvasAgentOperationRouteRequest({
-      userId: principal.userId,
-      projectId: id,
-      readBody: () => request.json(),
-      features: await getCanvasAgentFeatureFlagsFromSystemSettings(),
-      applyOperation: applyCanvasOperationPlan,
-      logger: console,
-    });
-
-    return Response.json(response.body, {
-      status: response.status,
-      headers: { "Cache-Control": "no-store" },
-    });
-  } catch (error) {
-    return openApiErrorResponse(error);
-  }
-}

app/api/openapi/v1/canvases/[id]/route.ts

@@ -1,57 +0,0 @@
-import { and, eq } from "drizzle-orm";
-import { z } from "zod";
-import { db } from "@/lib/db";
-import { canvasProject } from "@/lib/db/schema";
-import {
-  openApiErrorResponse,
-  requireOpenApiPrincipal,
-} from "@/lib/access-keys/openapi-auth";
-
-const canvasIdSchema = z.string().uuid();
-
-export async function GET(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  try {
-    const principal = await requireOpenApiPrincipal(request, "canvas:read");
-    const { id: rawId } = await params;
-    const parsedId = canvasIdSchema.safeParse(rawId);
-    if (!parsedId.success) {
-      return Response.json(
-        {
-          success: false,
-          error: "Invalid canvas ID",
-          code: "INVALID_CANVAS_ID",
-        },
-        { status: 400 }
-      );
-    }
-
-    const id = parsedId.data;
-    const [project] = await db
-      .select()
-      .from(canvasProject)
-      .where(
-        and(
-          eq(canvasProject.id, id),
-          eq(canvasProject.userId, principal.userId)
-        )
-      )
-      .limit(1);
-
-    if (!project) {
-      return Response.json(
-        { success: false, error: "Canvas not found", code: "CANVAS_NOT_FOUND" },
-        { status: 404 }
-      );
-    }
-
-    return Response.json(
-      { success: true, data: project },
-      { headers: { "Cache-Control": "no-store" } }
-    );
-  } catch (error) {
-    return openApiErrorResponse(error);
-  }
-}

app/api/openapi/v1/canvases/route.ts

@@ -1,52 +0,0 @@
-import { and, desc, eq } from "drizzle-orm";
-import { db } from "@/lib/db";
-import { canvasProject } from "@/lib/db/schema";
-import {
-  openApiErrorResponse,
-  requireOpenApiPrincipal,
-} from "@/lib/access-keys/openapi-auth";
-
-function normalizeWorkspaceType(value: string | null) {
-  return value === "agent" || value === "video" ? value : "canvas";
-}
-
-export async function GET(request: Request) {
-  try {
-    const principal = await requireOpenApiPrincipal(request, "canvas:read");
-    const url = new URL(request.url);
-    const workspaceType = normalizeWorkspaceType(
-      url.searchParams.get("workspaceType")
-    );
-    const requestedLimit = Number(url.searchParams.get("limit") || 24);
-    const limit = Number.isFinite(requestedLimit)
-      ? Math.min(50, Math.max(1, Math.round(requestedLimit)))
-      : 24;
-
-    const projects = await db
-      .select({
-        id: canvasProject.id,
-        title: canvasProject.title,
-        description: canvasProject.description,
-        thumbnail: canvasProject.thumbnail,
-        workspaceType: canvasProject.workspaceType,
-        createdAt: canvasProject.createdAt,
-        updatedAt: canvasProject.updatedAt,
-      })
-      .from(canvasProject)
-      .where(
-        and(
-          eq(canvasProject.userId, principal.userId),
-          eq(canvasProject.workspaceType, workspaceType)
-        )
-      )
-      .orderBy(desc(canvasProject.updatedAt))
-      .limit(limit);
-
-    return Response.json(
-      { success: true, data: projects },
-      { headers: { "Cache-Control": "no-store" } }
-    );
-  } catch (error) {
-    return openApiErrorResponse(error);
-  }
-}

app/api/openapi/v1/me/route.ts

@@ -1,41 +0,0 @@
-import { eq } from "drizzle-orm";
-import { db } from "@/lib/db";
-import { user } from "@/lib/db/schema";
-import {
-  openApiErrorResponse,
-  requireOpenApiPrincipal,
-} from "@/lib/access-keys/openapi-auth";
-
-export async function GET(request: Request) {
-  try {
-    const principal = await requireOpenApiPrincipal(request, "canvas:read");
-    const [currentUser] = await db
-      .select({
-        id: user.id,
-        email: user.email,
-        name: user.name,
-        department: user.department,
-        role: user.role,
-      })
-      .from(user)
-      .where(eq(user.id, principal.userId))
-      .limit(1);
-
-    return Response.json(
-      {
-        success: true,
-        data: {
-          user: currentUser,
-          accessKey: {
-            id: principal.accessKeyId,
-            name: principal.accessKeyName,
-            scopes: principal.scopes,
-          },
-        },
-      },
-      { headers: { "Cache-Control": "no-store" } }
-    );
-  } catch (error) {
-    return openApiErrorResponse(error);
-  }
-}

app/api/scene-fusion/route.ts

@@ -25,10 +25,6 @@ import { createRuxaImage } from "@/lib/ai/providers/ruxa-image";
 import { createFalImage } from "@/lib/ai/providers/fal-image";
 import { createSnapgenImage } from "@/lib/ai/providers/snapgen-image";
 import { createOpenAIImage } from "@/lib/ai/providers/openai-image";
-import { createBananaImage } from "@/lib/ai/providers/bananaimage";
-import { createVisionary } from "@/lib/ai/providers/visionary";
-import { createAtlasCloud } from "@/lib/ai/providers/atlascloud";
-import { createVip98k } from "@/lib/ai/providers/vip98k";
 import { callQwen3Vl } from "@/lib/ai/qwen3-vl";
 import {
   canProcessSceneFusionProviderType,
@@ -1479,8 +1475,7 @@ async function processSceneWithProvider(
   modelId: string,
   runtimeModelId: string,
   aspectRatio?: string,
-  imageSize?: string,
-  imageGenConfig?: Record<string, any> | null
+  imageSize?: string
 ): Promise<{ thumbnail: string; original: string; prompt: string }> {
   // 构建智能提示词
   const prompt = buildPrompt(
@@ -1532,52 +1527,6 @@ async function processSceneWithProvider(
     case "openai-image":
       return processWithOpenAIImage(productImageUrl, sceneImageUrl, prompt, provider, modelId, aspectRatio, imageSize);
 
-    case "bananaimage":
-      return processWithBananaImage(
-        productImageUrl,
-        sceneImageUrl,
-        prompt,
-        provider,
-        runtimeModelId || modelId,
-        aspectRatio,
-        imageSize,
-      );
-
-    case "visionary":
-      return processWithVisionary(
-        productImageUrl,
-        sceneImageUrl,
-        prompt,
-        provider,
-        runtimeModelId || modelId,
-        aspectRatio,
-        imageSize,
-      );
-
-    case "atlascloud":
-      return processWithAtlasCloud(
-        productImageUrl,
-        sceneImageUrl,
-        prompt,
-        provider,
-        runtimeModelId || modelId,
-        aspectRatio,
-        imageSize,
-        imageGenConfig,
-      );
-
-    case "vip98k":
-      return processWithVip98k(
-        productImageUrl,
-        sceneImageUrl,
-        prompt,
-        provider,
-        runtimeModelId || modelId,
-        aspectRatio,
-        imageSize,
-        imageGenConfig,
-      );
-
     case "gemini":
     case "gemini-image":
       return processWithGemini(productImageUrl, sceneImageUrl, prompt, provider, modelId, aspectRatio, imageSize);
@@ -1833,158 +1782,6 @@ async function processWithOpenAIImage(
   return { thumbnail, original, prompt };
 }
 
-async function processWithBananaImage(
-  productImageUrl: string,
-  sceneImageUrl: string,
-  prompt: string,
-  provider: { baseUrl: string; apiKey: string },
-  modelId: string,
-  aspectRatio?: string,
-  imageSize?: string
-): Promise<{ thumbnail: string; original: string; prompt: string }> {
-  logger.info("provider_processing", { providerType: "bananaimage", modelId });
-
-  const bananaImageProvider = createBananaImage({
-    baseURL: provider.baseUrl,
-    apiKey: provider.apiKey,
-  });
-  const result = await bananaImageProvider.chat(modelId).doGenerate({
-    messages: [
-      {
-        role: "user",
-        content: [
-          { type: "image_url", image_url: { url: productImageUrl } },
-          { type: "image_url", image_url: { url: sceneImageUrl } },
-          { type: "text", text: prompt },
-        ],
-      },
-    ],
-    imageParams: {
-      aspectRatio: aspectRatio || "auto",
-      imageSize: imageSize || "2K",
-      imageCount: 1,
-    },
-  });
-
-  const { thumbnail, original } = parseImageFromMarkdown(result.text);
-  return { thumbnail, original, prompt };
-}
-
-async function processWithVisionary(
-  productImageUrl: string,
-  sceneImageUrl: string,
-  prompt: string,
-  provider: { baseUrl: string; apiKey: string },
-  modelId: string,
-  aspectRatio?: string,
-  imageSize?: string
-): Promise<{ thumbnail: string; original: string; prompt: string }> {
-  logger.info("provider_processing", { providerType: "visionary", modelId });
-
-  const visionaryProvider = createVisionary({
-    baseURL: provider.baseUrl,
-    apiKey: provider.apiKey,
-  });
-  const result = await visionaryProvider.chat(modelId).doGenerate({
-    messages: [
-      {
-        role: "user",
-        content: [
-          { type: "image_url", image_url: { url: productImageUrl } },
-          { type: "image_url", image_url: { url: sceneImageUrl } },
-          { type: "text", text: prompt },
-        ],
-      },
-    ],
-    imageParams: {
-      aspectRatio: aspectRatio || "auto",
-      imageSize: imageSize || "2K",
-      imageCount: 1,
-    },
-  });
-
-  const { thumbnail, original } = parseImageFromMarkdown(result.text);
-  return { thumbnail, original, prompt };
-}
-
-async function processWithAtlasCloud(
-  productImageUrl: string,
-  sceneImageUrl: string,
-  prompt: string,
-  provider: { baseUrl: string; apiKey: string },
-  modelId: string,
-  aspectRatio?: string,
-  imageSize?: string,
-  imageGenConfig?: Record<string, any> | null
-): Promise<{ thumbnail: string; original: string; prompt: string }> {
-  logger.info("provider_processing", { providerType: "atlascloud", modelId });
-
-  const atlasCloudProvider = createAtlasCloud({
-    baseURL: provider.baseUrl,
-    apiKey: provider.apiKey,
-  });
-  const result = await atlasCloudProvider.chat(modelId).doGenerate({
-    messages: [
-      {
-        role: "user",
-        content: [
-          { type: "image_url", image_url: { url: productImageUrl } },
-          { type: "image_url", image_url: { url: sceneImageUrl } },
-          { type: "text", text: prompt },
-        ],
-      },
-    ],
-    imageParams: {
-      aspectRatio: aspectRatio || "auto",
-      imageSize: imageSize || "2K",
-      imageCount: 1,
-    },
-    imageGenConfig,
-  });
-
-  const { thumbnail, original } = parseImageFromMarkdown(result.text);
-  return { thumbnail, original, prompt };
-}
-
-async function processWithVip98k(
-  productImageUrl: string,
-  sceneImageUrl: string,
-  prompt: string,
-  provider: { baseUrl: string; apiKey: string },
-  modelId: string,
-  aspectRatio?: string,
-  imageSize?: string,
-  imageGenConfig?: Record<string, any> | null
-): Promise<{ thumbnail: string; original: string; prompt: string }> {
-  logger.info("provider_processing", { providerType: "vip98k", modelId });
-
-  const vip98kProvider = createVip98k({
-    baseURL: provider.baseUrl,
-    apiKey: provider.apiKey,
-  });
-  const result = await vip98kProvider.chat(modelId, imageGenConfig || null).doGenerate({
-    messages: [
-      {
-        role: "user",
-        content: [
-          { type: "image_url", image_url: { url: productImageUrl } },
-          { type: "image_url", image_url: { url: sceneImageUrl } },
-          { type: "text", text: prompt },
-        ],
-      },
-    ],
-    imageParams: {
-      aspectRatio: aspectRatio || "auto",
-      imageSize: imageSize || "2K",
-      imageCount: 1,
-    },
-    imageGenConfig,
-  });
-
-  const { thumbnail, original } = parseImageFromMarkdown(result.text);
-  return { thumbnail, original, prompt };
-}
-
 /**
  * 使用既梦/火山模型处理
  */
@@ -2240,8 +2037,7 @@ async function processSceneWithDiversity(
           candidate.model.modelId,
           runtimeModelId,
           normalizedOutputParams.aspectRatio,
-          normalizedOutputParams.imageSize,
-          (candidate.model.imageGenConfig as Record<string, any> | null) || null
+          normalizedOutputParams.imageSize
         );
       } finally {
         await modelSlot.release();

app/api/site-settings/route.ts

@@ -579,10 +579,6 @@ const HOME_SITE_SETTINGS_FALLBACK: Record<string, unknown> = {
   favicon: null,
   lovartPromoText: "现在升级，立享 Kling 3.0 与 Nano Banana Pro，最高 5 折优惠",
   lovartPromoActionText: "立即升级",
-  bannerEnabled: true,
-  bannerText: "限时特惠：升级会员最高立享 45% OFF!",
-  bannerLink: null,
-  bannerActionText: "立即查看",
   lovartHeroTitle: "由壹点AI 让设计更简单",
   lovartHeroSubtitle: "懂你的设计代理，帮你搞定一切",
   surpriseCategories: ["全部", "精选"],
@@ -901,7 +897,6 @@ async function getScopedPublicSiteSettings(
       bannerText:
         typedSettings?.bannerText || "限时特惠：升级会员最高立享 45% OFF!",
       bannerLink: typedSettings?.bannerLink || null,
-      bannerActionText: typedSettings?.bannerActionText || "立即查看",
       lovartComposerPrefix: normalizeLovartComposerPrefix(
         valueByKey.get(LOVART_COMPOSER_PREFIX_KEY)
       ),
@@ -944,11 +939,6 @@ async function getScopedPublicSiteSettings(
 
   return createScopedSiteSettingsResponse(scope, {
     ...createBrandingSettings(typedSettings),
-    bannerEnabled: typedSettings?.bannerEnabled ?? true,
-    bannerText:
-      typedSettings?.bannerText || "限时特惠：升级会员最高立享 45% OFF!",
-    bannerLink: typedSettings?.bannerLink || null,
-    bannerActionText: typedSettings?.bannerActionText || "立即查看",
     lovartPromoText:
       typedSettings?.lovartPromoText ||
       "现在升级，立享 Kling 3.0 与 Nano Banana Pro，最高 5 折优惠",
@@ -1480,7 +1470,6 @@ export async function GET(request: NextRequest) {
         bannerEnabled: true,
         bannerText: "限时特惠：升级会员最高立享 45% OFF!",
         bannerLink: null,
-        bannerActionText: "立即查看",
         toolbox1Name: "工具箱",
         toolbox1Enabled: true,
         toolbox2Name: "工具箱2",
@@ -1662,7 +1651,6 @@ const updateSchema = z.object({
   bannerEnabled: z.boolean().optional(),
   bannerText: z.string().optional(),
   bannerLink: z.string().nullable().optional(),
-  bannerActionText: z.string().max(32).optional(),
   toolbox1Name: z.string().max(64).optional(),
   toolbox1Enabled: z.boolean().optional(),
   toolbox2Name: z.string().max(64).optional(),
@@ -3123,7 +3111,6 @@ export async function PUT(request: NextRequest) {
           bannerEnabled: siteSettingsPayload.bannerEnabled ?? true,
           bannerText: siteSettingsPayload.bannerText ?? "限时特惠：升级会员最高立享 45% OFF!",
           bannerLink: siteSettingsPayload.bannerLink,
-          bannerActionText: siteSettingsPayload.bannerActionText ?? "立即查看",
           toolbox1Name: siteSettingsPayload.toolbox1Name ?? "工具箱",
           toolbox1Enabled: siteSettingsPayload.toolbox1Enabled ?? true,
           toolbox2Name: siteSettingsPayload.toolbox2Name ?? "工具箱2",

app/api/style-pro/model-options/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
 import { auth } from "@/app/(auth)/auth";
 import { getModelGenerationCreditCost } from "@/lib/ai/image-model-pricing";
-import { getSystemSetting, getUserById } from "@/lib/db/queries";
+import { getSystemSetting } from "@/lib/db/queries";
 import {
   findStyleProImageModelByRef,
   getStyleProImageModelDisplayEntries,
@@ -26,16 +26,10 @@ export async function GET() {
       );
     }
 
-    const currentUser = await getUserById({ id: session.user.id });
-    const allowHiddenModels =
-      session.user.type === "admin" || Boolean(currentUser?.isHighVip);
-
     const [displayEntries, entries, realisticModelEntries, setting] =
       await Promise.all([
-        getStyleProImageModelDisplayEntries({
-          includeHidden: allowHiddenModels,
-        }),
-        getStyleProImageModelEntries({ includeHidden: allowHiddenModels }),
+        getStyleProImageModelDisplayEntries({ includeHidden: false }),
+        getStyleProImageModelEntries({ includeHidden: false }),
         getStyleProImageModelEntries({ includeHidden: true }),
         getSystemSetting({ key: STYLE_PRO_CONFIG_KEY }).catch(() => null),
       ]);

app/api/user/access-keys/[id]/route.ts

@@ -1,40 +0,0 @@
-import { NextResponse } from "next/server";
-import { z } from "zod";
-import { auth } from "@/app/(auth)/auth";
-import { revokeUserAccessKey } from "@/lib/access-keys/service";
-
-const idSchema = z.string().uuid();
-
-export async function DELETE(
-  _request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const session = await auth();
-  if (!session?.user?.id || session.user.type === "guest") {
-    return NextResponse.json(
-      { success: false, error: "请先登录正式账号" },
-      { status: 401 }
-    );
-  }
-
-  const parsedId = idSchema.safeParse((await params).id);
-  if (!parsedId.success) {
-    return NextResponse.json(
-      { success: false, error: "Access Key ID 无效" },
-      { status: 400 }
-    );
-  }
-
-  const revoked = await revokeUserAccessKey({
-    userId: session.user.id,
-    accessKeyId: parsedId.data,
-  });
-  if (!revoked) {
-    return NextResponse.json(
-      { success: false, error: "Access Key 不存在" },
-      { status: 404 }
-    );
-  }
-
-  return NextResponse.json({ success: true });
-}

app/api/user/access-keys/route.ts

@@ -1,76 +0,0 @@
-import { NextResponse } from "next/server";
-import { z } from "zod";
-import { auth } from "@/app/(auth)/auth";
-import {
-  createUserAccessKey,
-  listUserAccessKeys,
-} from "@/lib/access-keys/service";
-
-const createAccessKeySchema = z.object({
-  name: z.string().trim().min(1).max(100).optional(),
-  scopes: z
-    .array(z.enum(["canvas:read", "canvas:write"]))
-    .min(1)
-    .optional(),
-  expiresInDays: z.number().int().min(1).max(365).optional(),
-});
-
-export async function GET() {
-  const session = await auth();
-  if (!session?.user?.id || session.user.type === "guest") {
-    return NextResponse.json(
-      { success: false, error: "请先登录正式账号" },
-      { status: 401 }
-    );
-  }
-
-  const keys = await listUserAccessKeys(session.user.id);
-  return NextResponse.json(
-    { success: true, data: keys },
-    { headers: { "Cache-Control": "no-store" } }
-  );
-}
-
-export async function POST(request: Request) {
-  const session = await auth();
-  if (!session?.user?.id || session.user.type === "guest") {
-    return NextResponse.json(
-      { success: false, error: "请先登录正式账号" },
-      { status: 401 }
-    );
-  }
-
-  const existingKeys = await listUserAccessKeys(session.user.id);
-  const activeKeyCount = existingKeys.filter(
-    (item) =>
-      !item.revokedAt &&
-      (!item.expiresAt || new Date(item.expiresAt).getTime() > Date.now())
-  ).length;
-  if (activeKeyCount >= 10) {
-    return NextResponse.json(
-      { success: false, error: "最多保留 10 个有效 Access Key" },
-      { status: 409 }
-    );
-  }
-
-  try {
-    const body = createAccessKeySchema.parse(
-      await request.json().catch(() => ({}))
-    );
-    const created = await createUserAccessKey({
-      userId: session.user.id,
-      name: body?.name,
-      scopes: body?.scopes,
-      expiresInDays: body?.expiresInDays,
-    });
-    return NextResponse.json({ success: true, data: created }, { status: 201 });
-  } catch (error) {
-    return NextResponse.json(
-      {
-        success: false,
-        error: error instanceof Error ? error.message : "创建 Access Key 失败",
-      },
-      { status: 400 }
-    );
-  }
-}

app/api/watermark-remove/route.ts

@@ -12,10 +12,6 @@ import {
 } from "@/lib/db/queries";
 import { prepareFeaturePointsCharge } from "@/lib/points/feature-charge";
 import { getImageToolCreditCost } from "@/lib/points/config";
-import { generateCanvasImage } from "@/lib/canvas/generate-image";
-import { FAL_NANO_BANANA_2_EDIT_MODEL_ID } from "@/lib/ai/fal-image-models";
-
-export const maxDuration = 600;
 
 // PicWish API 需要公网可访问的 HTTP/HTTPS URL
 const WATERMARK_SYNC_WAIT_TIMEOUT_MS = 20_000;
@@ -119,10 +115,11 @@ function buildWatermarkTaskPendingResponse(taskId: string) {
   );
 }
 
-async function persistWatermarkResult(params: {
-  processedImageUrl: string;
+async function finalizeWatermarkTaskResult(params: {
+  taskId: string;
   userId: string;
   startedAt?: number;
+  apiKey: string;
   sourceImageUrls?: string[];
 }): Promise<{
   success: boolean;
@@ -130,8 +127,17 @@ async function persistWatermarkResult(params: {
   thumbnail_url: string;
   processing_time?: number;
 }> {
+  const pollResult = await pollForResult(params.taskId, params.apiKey, WATERMARK_SYNC_WAIT_TIMEOUT_MS);
+  if (pollResult.pending) {
+    throw new Error("WATERMARK_TASK_PENDING");
+  }
+  if (!pollResult.success || !pollResult.imageUrl) {
+    throw new Error(pollResult.error || "去水印处理失败");
+  }
+
+  const processedImageUrl = pollResult.imageUrl;
   try {
-    const imageResponse = await fetch(params.processedImageUrl);
+    const imageResponse = await fetch(processedImageUrl);
     if (!imageResponse.ok) {
       throw new Error("下载处理后的图片失败");
     }
@@ -211,7 +217,7 @@ async function persistWatermarkResult(params: {
           }
         }
       } catch (assetError) {
-        console.error("[WatermarkRemove] MediaAsset 注册失败:", assetError);
+        console.error("[WatermarkRemove] ⚠️ MediaAsset 注册失败:", assetError);
       }
     }
 
@@ -226,85 +232,14 @@ async function persistWatermarkResult(params: {
     console.error("[WatermarkRemove] 上传结果失败，回退原始URL:", uploadError);
     return {
       success: true,
-      original_url: params.processedImageUrl,
-      thumbnail_url: params.processedImageUrl,
+      original_url: processedImageUrl,
+      thumbnail_url: processedImageUrl,
       processing_time:
         typeof params.startedAt === "number" ? (Date.now() - params.startedAt) / 1000 : undefined,
     };
   }
 }
 
-function shouldUseFalWatermarkFallback(status: number, detail: string) {
-  return (
-    status === 401 ||
-    status === 402 ||
-    status === 403 ||
-    status === 429 ||
-    status >= 500 ||
-    /quota|credit|balance|exceed|expired|invalid|unauthor/i.test(detail)
-  );
-}
-
-async function removeWatermarkWithFal(params: {
-  imageUrl: string;
-  userId: string;
-  startedAt: number;
-  sourceImageUrls?: string[];
-}) {
-  console.warn("[WatermarkRemove] AOS unavailable; using FAL Nano Banana 2 edit fallback");
-  const result = await generateCanvasImage({
-    prompt: [
-      "仅移除图片中后期叠加的水印、平台角标和覆盖式文字标记。",
-      "必须完整保留原图主体、商品、背景、构图、尺寸、颜色、光影和清晰度。",
-      "用周围真实纹理自然补全被遮挡区域，不得新增文字、标志或其他物体。",
-    ].join(""),
-    model: FAL_NANO_BANANA_2_EDIT_MODEL_ID,
-    aspectRatio: "auto",
-    imageSize: "2K",
-    imageCount: 1,
-    referenceImages: [params.imageUrl],
-    allowFailover: false,
-    debugLabel: "watermark-remove-fal-fallback",
-  });
-  const processedImageUrl = result.images[0]?.originalUrl;
-  if (!processedImageUrl) {
-    throw new Error("FAL 去水印未返回可用图片");
-  }
-  return persistWatermarkResult({
-    processedImageUrl,
-    userId: params.userId,
-    startedAt: params.startedAt,
-    sourceImageUrls: params.sourceImageUrls,
-  });
-}
-
-async function finalizeWatermarkTaskResult(params: {
-  taskId: string;
-  userId: string;
-  startedAt?: number;
-  apiKey: string;
-  sourceImageUrls?: string[];
-}): Promise<{
-  success: boolean;
-  original_url: string;
-  thumbnail_url: string;
-  processing_time?: number;
-}> {
-  const pollResult = await pollForResult(params.taskId, params.apiKey, WATERMARK_SYNC_WAIT_TIMEOUT_MS);
-  if (pollResult.pending) {
-    throw new Error("WATERMARK_TASK_PENDING");
-  }
-  if (!pollResult.success || !pollResult.imageUrl) {
-    throw new Error(pollResult.error || "去水印处理失败");
-  }
-  return persistWatermarkResult({
-    processedImageUrl: pollResult.imageUrl,
-    userId: params.userId,
-    startedAt: params.startedAt,
-    sourceImageUrls: params.sourceImageUrls,
-  });
-}
-
 export async function GET(request: NextRequest) {
   try {
     const session = await auth();
@@ -371,6 +306,13 @@ export async function POST(request: NextRequest) {
 
     // 获取API配置
     const config = await getWatermarkRemoveConfig();
+    if (!config?.apiKey) {
+      return NextResponse.json(
+        { error: "去水印服务未配置，请联系管理员在系统设置中配置API密钥" },
+        { status: 500 }
+      );
+    }
+
     console.log("[WatermarkRemove] 使用原图URL:", image_url.substring(0, 100) + "...");
 
     // 处理图片URL，确保获取公网可访问的URL
@@ -454,24 +396,6 @@ export async function POST(request: NextRequest) {
       return NextResponse.json(pointsCharge.payload, { status: pointsCharge.status });
     }
 
-    const sourceImageUrls =
-      typeof image_url === "string" && /^https?:\/\//i.test(image_url)
-        ? [image_url]
-        : undefined;
-
-    if (!config?.apiKey) {
-      const fallbackResult = await removeWatermarkWithFal({
-        imageUrl: publicImageUrl,
-        userId: session.user.id,
-        startedAt: startTime,
-        sourceImageUrls,
-      });
-      if (pointsCharge.chargeable) {
-        await pointsCharge.consume({ note: "FAL 去水印备用链路消耗积分" });
-      }
-      return NextResponse.json(fallbackResult);
-    }
-
     // 创建去水印任务
     const formData = new FormData();
     formData.append("sync", "0");
@@ -491,24 +415,8 @@ export async function POST(request: NextRequest) {
     if (!createResponse.ok) {
       const errorText = await createResponse.text();
       console.error("[WatermarkRemove] 创建任务失败:", errorText);
-      if (shouldUseFalWatermarkFallback(createResponse.status, errorText)) {
-        try {
-          const fallbackResult = await removeWatermarkWithFal({
-            imageUrl: publicImageUrl,
-            userId: session.user.id,
-            startedAt: startTime,
-            sourceImageUrls,
-          });
-          if (pointsCharge.chargeable) {
-            await pointsCharge.consume({ note: "FAL 去水印备用链路消耗积分" });
-          }
-          return NextResponse.json(fallbackResult);
-        } catch (fallbackError) {
-          console.error("[WatermarkRemove] FAL 备用链路失败:", fallbackError);
-        }
-      }
       return NextResponse.json(
-        { error: "去水印服务暂时不可用，请稍后重试" },
+        { error: "创建去水印任务失败" },
         { status: 500 }
       );
     }
@@ -540,7 +448,10 @@ export async function POST(request: NextRequest) {
         userId: session.user.id,
         startedAt: startTime,
         apiKey: config.apiKey,
-        sourceImageUrls,
+        sourceImageUrls:
+          typeof image_url === "string" && /^https?:\/\//i.test(image_url)
+            ? [image_url]
+            : undefined,
       });
       return NextResponse.json(result);
     } catch (error) {

app/canvas/[id]/CanvasEditorLegacyPageClient.tsx

@@ -141,7 +141,6 @@ import {
   createEmptyAgentGenerationProjectWorkspaceState,
   createEmptyAgentWorkflowPersistedState,
   normalizeAgentGenerationProjectPersistedState,
-  normalizeAgentGenerationProjectReplacementResultState,
 } from "@/lib/agents/generation-project-state";
 import {
   createEmptyAgentModeWorkspaceState,
@@ -192,12 +191,12 @@ import {
   getAgentWorkflowPageFeatureSettings,
   sanitizeAgentWorkflowSelections,
 } from "@/lib/agents/workflow-ui-config";
+import { cn, fetcher } from "@/lib/utils";
 import {
   loadCanvasChatPanelModule,
   preloadCanvasChatPanel,
 } from "@/components/canvas/canvas-chat-panel-loader";
 import { preloadCanvasChatData } from "@/lib/client/canvas-chat-preload";
-import { cn, fetcher } from "@/lib/utils";
 import {
   buildVideoWorkflowCanvasNode,
   getVideoWorkflowNodeDefinition,
@@ -233,7 +232,6 @@ import { canvasSelectors, useCanvasStore } from "@/store/canvas";
 import type {
   AgentGenerationProject,
   AgentGenerationProjectPersistedState,
-  AgentGenerationProjectReplacementResultState,
   AgentGenerationProjectResultCollections,
   AgentGenerationProjectWorkspaceAttachment,
   AgentGenerationProjectWorkspaceState,
@@ -1142,7 +1140,7 @@ function normalizeImportedCanvasState(payload: unknown): {
   };
 }
 
-const FLOATING_PANEL_WIDTH = 400;
+const FLOATING_PANEL_WIDTH = 380;
 const FLOATING_PANEL_MAX_VIEWPORT_RATIO = 0.75;
 const FLOATING_PANEL_WIDTH_STORAGE_KEY = "canvas.chatPanel.width.v1";
 const FLOATING_PANEL_INSET = 16;
@@ -1547,57 +1545,6 @@ function normalizeResultCollectionUrls(urls: string[] | undefined | null) {
   );
 }
 
-function areReplacementResultStatesEqual(
-  left: AgentGenerationProjectReplacementResultState | undefined | null,
-  right: AgentGenerationProjectReplacementResultState | undefined | null
-) {
-  return (
-    JSON.stringify(normalizeAgentGenerationProjectReplacementResultState(left)) ===
-    JSON.stringify(normalizeAgentGenerationProjectReplacementResultState(right))
-  );
-}
-
-function getReplacementResultUrlCount(
-  state: AgentGenerationProjectPersistedState | undefined | null
-) {
-  const normalized = normalizeAgentGenerationProjectReplacementResultState(
-    state?.replacementResultState
-  );
-  return (
-    Object.values(normalized.detail_replacement || {}).filter((record) =>
-      Boolean(record.url)
-    ).length +
-    Object.values(normalized.sku_replacement || {}).filter((record) =>
-      Boolean(record.url)
-    ).length
-  );
-}
-
-function hasReplacementResultCollectionMismatch(
-  state: AgentGenerationProjectPersistedState | undefined | null
-) {
-  const normalized = normalizeAgentGenerationProjectReplacementResultState(
-    state?.replacementResultState
-  );
-  const resultCollections = state?.resultCollections || {};
-  const countModeRecords = (
-    modeType: "detail_replacement" | "sku_replacement"
-  ) =>
-    Object.values(normalized[modeType] || {}).filter((record) =>
-      Boolean(record.url)
-    ).length;
-  const countModeCollection = (
-    modeType: "detail_replacement" | "sku_replacement"
-  ) => normalizeResultCollectionUrls(resultCollections[modeType]).length;
-
-  return (["detail_replacement", "sku_replacement"] as const).some(
-    (modeType) => {
-      const recordCount = countModeRecords(modeType);
-      return recordCount > 0 && countModeCollection(modeType) !== recordCount;
-    }
-  );
-}
-
 const AGENT_PROJECT_DRAFT_STORAGE_KEY_PREFIX = "agent-project-draft:";
 
 function getAgentProjectDraftStorageKey(projectId: string) {
@@ -2034,7 +1981,7 @@ export default function CanvasEditorLegacyPage({
   );
   const [activeWorkflowExecutionTaskKey, setActiveWorkflowExecutionTaskKey] =
     useState<string | null>(null);
-  const [isPanelOpen, setIsPanelOpen] = useState(true);
+  const [isPanelOpen, setIsPanelOpen] = useState(() => requestedAgentMode);
   const [floatingPanelWidth, setFloatingPanelWidth] =
     useState(FLOATING_PANEL_WIDTH);
   const [
@@ -2043,8 +1990,7 @@ export default function CanvasEditorLegacyPage({
   ] = useState(false);
   const [isFloatingPanelResizing, setIsFloatingPanelResizing] =
     useState(false);
-  const [areSecondaryPanelsReady, setAreSecondaryPanelsReady] =
-    useState(false);
+  const areSecondaryPanelsReady = true;
   const [isVideoModuleSidebarCollapsed, setIsVideoModuleSidebarCollapsed] =
     useState(false);
   const [videoModuleSectionOpen, setVideoModuleSectionOpen] = useState<
@@ -2067,7 +2013,6 @@ export default function CanvasEditorLegacyPage({
     useState(false);
   // 面板模式: 'chat' 聊天面板, 'fileList' 文件列表
   const [panelMode, setPanelMode] = useState<"chat" | "fileList">("chat");
-  const chatPanelCanvasIdRef = useRef<string | null>(null);
   const [viewportWidth, setViewportWidth] = useState(0);
   const [horizontalFloatingToolbarWidth, setHorizontalFloatingToolbarWidth] =
     useState(0);
@@ -2091,16 +2036,6 @@ export default function CanvasEditorLegacyPage({
     Partial<Record<AgentWorkflowStepKey, string>>
   >({});
 
-  useLayoutEffect(() => {
-    if (!id || isVideoMode || chatPanelCanvasIdRef.current === id) {
-      return;
-    }
-
-    chatPanelCanvasIdRef.current = id;
-    setPanelMode("chat");
-    setIsPanelOpen(true);
-  }, [id, isVideoMode]);
-
   useEffect(() => {
     if (!isVideoMode) {
       setVideoCanvasInsertMenu(null);
@@ -2146,10 +2081,6 @@ export default function CanvasEditorLegacyPage({
     agentProjectDeletedResultCollections,
     setAgentProjectDeletedResultCollections,
   ] = useState<AgentGenerationProjectResultCollections>({});
-  const [
-    agentProjectReplacementResultState,
-    setAgentProjectReplacementResultState,
-  ] = useState<AgentGenerationProjectReplacementResultState>({});
   const [isAgentProjectLoading, setIsAgentProjectLoading] = useState(false);
   const [loadedAgentProjectId, setLoadedAgentProjectId] = useState<
     string | null
@@ -2240,9 +2171,6 @@ export default function CanvasEditorLegacyPage({
   const [aspectRatio, setAspectRatio] = useState("auto");
   const [imageCount, setImageCount] = useState(1);
   const previousNodeIdsRef = useRef<Set<string>>(new Set());
-  const lastLocalCanvasMutationAtRef = useRef(0);
-  const externalCanvasConflictRef = useRef(false);
-  const externalCanvasConflictNotifiedRef = useRef(false);
   const previousBrandForModelRef = useRef("");
   const autoSelectedBrandModelBrandRef = useRef("");
   const autoTitleAttemptedRef = useRef<Set<string>>(new Set());
@@ -3364,17 +3292,8 @@ export default function CanvasEditorLegacyPage({
     }, 700);
   }, [id]);
 
-  useEffect(() => {
-    const timeoutId = window.setTimeout(() => {
-      setAreSecondaryPanelsReady(true);
-    }, 800);
-    return () => window.clearTimeout(timeoutId);
-  }, []);
-
   const hydrateCanvasProject = useCallback(
     (project: CanvasInitialProject) => {
-      externalCanvasConflictRef.current = false;
-      externalCanvasConflictNotifiedRef.current = false;
       useCanvasStore.getState().setProject(id, project.title);
       const projectUpdatedAt = String(project.updatedAt || "");
       useCanvasStore
@@ -3536,7 +3455,6 @@ export default function CanvasEditorLegacyPage({
         setAgentProjectThumbnail(null);
         setAgentProjectResultCollections({});
         setAgentProjectDeletedResultCollections({});
-        setAgentProjectReplacementResultState({});
         setLoadedAgentProjectId(null);
       }
 
@@ -4028,15 +3946,8 @@ export default function CanvasEditorLegacyPage({
           ...resultCollections.sku_replacement,
         ])
       ),
-      replacementResultState: normalizeAgentGenerationProjectReplacementResultState(
-        agentProjectReplacementResultState
-      ),
     };
-  }, [
-    agentProjectDeletedResultCollections,
-    agentProjectReplacementResultState,
-    agentProjectResultCollections,
-  ]);
+  }, [agentProjectDeletedResultCollections, agentProjectResultCollections]);
 
   const buildPersistedAgentProjectState = useCallback(() => {
     const persistedMaterials = appearanceRecognitionEnabled
@@ -4221,9 +4132,6 @@ export default function CanvasEditorLegacyPage({
       setAgentProjectDeletedResultCollections(
         persistedState.deletedResultCollections || {}
       );
-      setAgentProjectReplacementResultState(
-        persistedState.replacementResultState || {}
-      );
       setLoadedAgentProjectId(params.projectId);
     },
     []
@@ -4398,9 +4306,7 @@ export default function CanvasEditorLegacyPage({
       const result = await agentProjectService.updateProject(agentProjectId, {
         title: nextTitle,
         thumbnail: agentProjectThumbnail,
-        projectState:
-          persistedAgentProjectStateRef.current ||
-          buildPersistedAgentProjectState(),
+        projectState: buildPersistedAgentProjectState(),
       });
 
       if (!result.success) {
@@ -4466,27 +4372,9 @@ export default function CanvasEditorLegacyPage({
 
         const serverUpdatedAt =
           Number(new Date(result.data.updatedAt).getTime()) || 0;
-        const serverReplacementResultCount = getReplacementResultUrlCount(
-          result.data.projectState
-        );
-        const localReplacementResultCount = getReplacementResultUrlCount(
-          localDraft?.projectState
-        );
-        const localDraftMissesServerReplacementResults =
-          serverReplacementResultCount > 0 && localReplacementResultCount === 0;
-        const localDraftReplacementResultsDifferFromServer =
-          serverReplacementResultCount > 0 &&
-          localReplacementResultCount > 0 &&
-          localReplacementResultCount !== serverReplacementResultCount;
-        const localDraftHasStaleReplacementCollections =
-          serverReplacementResultCount > 0 &&
-          hasReplacementResultCollectionMismatch(localDraft?.projectState);
         const shouldUseLocalDraft =
           Boolean(localDraft?.projectState) &&
-          Number(localDraft?.savedAt || 0) > serverUpdatedAt &&
-          !localDraftMissesServerReplacementResults &&
-          !localDraftReplacementResultsDifferFromServer &&
-          !localDraftHasStaleReplacementCollections;
+          Number(localDraft?.savedAt || 0) > serverUpdatedAt;
 
         if (shouldUseLocalDraft && localDraft?.projectState) {
           hydrateAgentProjectSnapshot({
@@ -4588,7 +4476,6 @@ export default function CanvasEditorLegacyPage({
   }, [
     agentModeState,
     agentProjectId,
-    agentProjectReplacementResultState,
     agentProjectResultCollections,
     agentProjectThumbnail,
     agentProjectTitle,
@@ -4879,70 +4766,36 @@ export default function CanvasEditorLegacyPage({
   const handleAgentResultPreviewUrlsChange = useCallback(
     (modeType: AgentGenerationResultModeType, urls: string[]) => {
       const normalizedUrls = normalizeResultCollectionUrls(urls);
-      const currentProjectState =
-        persistedAgentProjectStateRef.current ||
-        createEmptyAgentGenerationProjectPersistedState();
-      const currentCollections = currentProjectState.resultCollections || {};
-      const nextCollections: AgentGenerationProjectResultCollections = {
-        ...currentCollections,
-        [modeType]: normalizedUrls,
-      };
+      setAgentProjectResultCollections((current) => {
+        const nextCollections: AgentGenerationProjectResultCollections = {
+          ...current,
+          [modeType]: normalizedUrls,
+        };
+
+        if (areResultCollectionsEqual(current, nextCollections)) {
+          return current;
+        }
 
-      if (!areResultCollectionsEqual(currentCollections, nextCollections)) {
         const nextProjectState: AgentGenerationProjectPersistedState = {
-          ...currentProjectState,
+          ...persistedAgentProjectStateRef.current,
           resultCollections: nextCollections,
           resultImageUrls: getAllResultUrlsFromCollections(nextCollections),
         };
         persistedAgentProjectStateRef.current = nextProjectState;
         writeAgentProjectDraftSnapshot(nextProjectState);
-      }
 
-      setAgentProjectResultCollections((current) =>
-        areResultCollectionsEqual(current, nextCollections)
-          ? current
-          : nextCollections
-      );
-      setAgentProjectThumbnail((currentThumbnail) => {
-        const nextThumbnail =
-          normalizedUrls[0] || getFirstResultUrlFromCollections(nextCollections);
-        return currentThumbnail === nextThumbnail ? currentThumbnail : nextThumbnail;
+        setAgentProjectThumbnail((currentThumbnail) => {
+          const nextThumbnail =
+            normalizedUrls[0] || getFirstResultUrlFromCollections(nextCollections);
+          return currentThumbnail === nextThumbnail ? currentThumbnail : nextThumbnail;
+        });
+
+        return nextCollections;
       });
     },
     [writeAgentProjectDraftSnapshot]
   );
 
-  const handleAgentReplacementResultStateChange = useCallback(
-    (nextState: AgentGenerationProjectReplacementResultState) => {
-      const normalizedState =
-        normalizeAgentGenerationProjectReplacementResultState(nextState);
-
-      const currentProjectState =
-        persistedAgentProjectStateRef.current ||
-        createEmptyAgentGenerationProjectPersistedState();
-      if (
-        !areReplacementResultStatesEqual(
-          currentProjectState.replacementResultState,
-          normalizedState
-        )
-      ) {
-        const nextProjectState: AgentGenerationProjectPersistedState = {
-          ...currentProjectState,
-          replacementResultState: normalizedState,
-        };
-        persistedAgentProjectStateRef.current = nextProjectState;
-        writeAgentProjectDraftSnapshot(nextProjectState);
-      }
-
-      setAgentProjectReplacementResultState((current) =>
-        areReplacementResultStatesEqual(current, normalizedState)
-          ? current
-          : normalizedState
-      );
-    },
-    [writeAgentProjectDraftSnapshot]
-  );
-
   const handleAgentResultImageDelete = useCallback(
     (modeType: AgentGenerationResultModeType, imageUrl: string) => {
       const normalizedUrl = String(imageUrl || "").trim();
@@ -4976,33 +4829,6 @@ export default function CanvasEditorLegacyPage({
           ? current
           : nextDeletedCollections
       );
-      if (modeType === "detail_replacement" || modeType === "sku_replacement") {
-        setAgentProjectReplacementResultState((current) => {
-          const normalizedState =
-            normalizeAgentGenerationProjectReplacementResultState(current);
-          const currentModeState = normalizedState[modeType] || {};
-          const nextModeState = Object.fromEntries(
-            Object.entries(currentModeState).filter(
-              ([, record]) => record.url !== normalizedUrl
-            )
-          );
-          const nextState: AgentGenerationProjectReplacementResultState = {
-            ...normalizedState,
-            [modeType]: nextModeState,
-          };
-          if (areReplacementResultStatesEqual(normalizedState, nextState)) {
-            return current;
-          }
-
-          const nextProjectState: AgentGenerationProjectPersistedState = {
-            ...persistedAgentProjectStateRef.current,
-            replacementResultState: nextState,
-          };
-          persistedAgentProjectStateRef.current = nextProjectState;
-          writeAgentProjectDraftSnapshot(nextProjectState);
-          return nextState;
-        });
-      }
       setAgentProjectThumbnail((current) => {
         const nextThumbnail =
           current === normalizedUrl
@@ -5011,11 +4837,7 @@ export default function CanvasEditorLegacyPage({
         return current === nextThumbnail ? current : nextThumbnail;
       });
     },
-    [
-      agentProjectDeletedResultCollections,
-      agentProjectResultCollections,
-      writeAgentProjectDraftSnapshot,
-    ]
+    [agentProjectDeletedResultCollections, agentProjectResultCollections]
   );
 
   useEffect(() => {
@@ -5088,19 +4910,12 @@ export default function CanvasEditorLegacyPage({
       if (!result.success) {
         console.error(`[Canvas] ${reason} save failed:`, result.error);
         if (result.status === 409) {
-          externalCanvasConflictRef.current = true;
           console.warn("[Canvas] stale save revision handled without user prompt", {
             reason,
             canvasUpdatedAt: result.canvasUpdatedAt,
           });
-          if (!externalCanvasConflictNotifiedRef.current) {
-            externalCanvasConflictNotifiedRef.current = true;
-            toast.warning("画布已被外部操作更新，本地改动未覆盖远端；请刷新后继续编辑");
-          }
         }
       } else if (result.data?.updatedAt) {
-        externalCanvasConflictRef.current = false;
-        externalCanvasConflictNotifiedRef.current = false;
         useCanvasStore
           .getState()
           .setCanvasRevision(String(result.data.updatedAt), String(result.data.updatedAt));
@@ -5127,70 +4942,6 @@ export default function CanvasEditorLegacyPage({
     return () => clearTimeout(saveTimer);
   }, [isAgentMode, isAgentOperationRefreshActive, nodes, isLoading, persistCanvasState]);
 
-  useEffect(() => {
-    if (isLoading || isAgentOperationRefreshActive()) return;
-    lastLocalCanvasMutationAtRef.current = Date.now();
-  }, [isLoading, isAgentOperationRefreshActive, nodes]);
-
-  useEffect(() => {
-    if (isLoading || isAgentMode) return;
-
-    let cancelled = false;
-    const refreshIfExternallyUpdated = async () => {
-      if (
-        cancelled ||
-        document.visibilityState !== "visible" ||
-        isSaving ||
-        externalCanvasConflictRef.current ||
-        Date.now() - lastLocalCanvasMutationAtRef.current < 5000
-      ) {
-        return;
-      }
-
-      try {
-        const revisionResponse = await fetch(`/api/canvas/${id}/revision`, {
-          cache: "no-store",
-        });
-        const revisionPayload = await revisionResponse.json().catch(() => ({}));
-        const remoteRevision = String(
-          revisionPayload?.data?.updatedAt || ""
-        ).trim();
-        const localRevision = String(
-          useCanvasStore.getState().canvasRevision || ""
-        ).trim();
-        if (
-          cancelled ||
-          !revisionResponse.ok ||
-          !remoteRevision ||
-          remoteRevision === localRevision
-        ) {
-          return;
-        }
-
-        const result = await canvasService.getProject(id);
-        if (cancelled || !result.success || !result.data) return;
-        useCanvasStore.getState().markAgentOperationRefresh();
-        hydrateCanvasProject(result.data);
-        lastLocalCanvasMutationAtRef.current = Date.now();
-        toast.success("已同步 OpenClaw 的画布操作");
-      } catch (error) {
-        console.error("[Canvas] external operation refresh failed:", error);
-      }
-    };
-
-    const intervalId = window.setInterval(() => {
-      void refreshIfExternallyUpdated();
-    }, 4000);
-    const handleFocus = () => void refreshIfExternallyUpdated();
-    window.addEventListener("focus", handleFocus);
-
-    return () => {
-      cancelled = true;
-      window.clearInterval(intervalId);
-      window.removeEventListener("focus", handleFocus);
-    };
-  }, [hydrateCanvasProject, id, isAgentMode, isLoading, isSaving]);
-
   // 删除节点时立即保存（按节点ID差集检测），避免删除后快速刷新被回滚
   useEffect(() => {
     if (isLoading || isAgentMode || isAgentOperationRefreshActive()) {
@@ -6989,7 +6740,6 @@ export default function CanvasEditorLegacyPage({
         deletedResultCollections:
           existingPersistedState.deletedResultCollections || {},
         resultImageUrls: existingPersistedState.resultImageUrls || [],
-        replacementResultState: existingPersistedState.replacementResultState || {},
       };
 
       const payload = {
@@ -10276,13 +10026,10 @@ export default function CanvasEditorLegacyPage({
               mode: null,
             });
           }}
-          onPersistProject={() => persistAgentProject("manual")}
-          onReplacementResultStateChange={handleAgentReplacementResultStateChange}
           onResultPreviewUrlsChange={handleAgentResultPreviewUrlsChange}
           onWorkspaceStateChange={setAgentWorkspaceState}
           projectId={agentProjectId}
           key={agentProjectId}
-          replacementResultState={agentProjectReplacementResultState}
           resultCollections={agentProjectResultCollections}
           selectedAgentPresetId={
             isAgentWorkspaceEnabled ? effectiveSelectedAgentPresetId : null
@@ -11035,7 +10782,7 @@ export default function CanvasEditorLegacyPage({
           >
             <Button
               className={cn(
-                "h-10 rounded-full px-3 font-medium text-sm",
+                "h-8 rounded-full px-2.5 text-[12px] font-medium",
                 isVideoMode
                   ? "border border-border/60 bg-background/94 text-foreground shadow-sm backdrop-blur-xl hover:bg-background supports-[backdrop-filter]:bg-background/82"
                   : "border bg-background/90 text-muted-foreground shadow-sm backdrop-blur-md hover:bg-background"
@@ -11043,7 +10790,7 @@ export default function CanvasEditorLegacyPage({
               onClick={() => setIsPanelOpen(true)}
               variant="ghost"
             >
-              <MessageCircle className="mr-1.5 h-4 w-4" />
+              <MessageCircle className="mr-1 h-3.5 w-3.5" />
               对话
             </Button>
           </div>
@@ -11056,7 +10803,7 @@ export default function CanvasEditorLegacyPage({
               "absolute z-10 ease-in-out",
               isFloatingPanelResizing
                 ? "transition-none"
-                : "transition-all duration-300",
+                : "transition-all duration-150",
               isPanelOpen
                 ? "translate-x-0 opacity-100"
                 : "pointer-events-none translate-x-[120%] opacity-0"
@@ -11095,7 +10842,7 @@ export default function CanvasEditorLegacyPage({
               </div>
             ) : null}
             <div className="flex h-full w-full flex-col overflow-hidden border-l bg-white dark:bg-zinc-950">
-              {!areSecondaryPanelsReady ? (
+              {!isPanelOpen ? null : !areSecondaryPanelsReady ? (
                 <CanvasLazyPanelLoader label="正在准备侧边面板..." />
               ) : panelMode === "chat" ? (
                 // AI 对话内容 - 使用 key 强制在 id 变化时重新挂载
@@ -11110,7 +10857,6 @@ export default function CanvasEditorLegacyPage({
                     chatScope="canvas"
                     onClose={() => setIsPanelOpen(false)}
                     onOpenFileList={() => setPanelMode("fileList")}
-                    onRequireLogin={openLoginDialog}
                     selectedAgentPresetId={
                       isCanvasAgentModeEnabled ? selectedAgentPresetId : null
                     }
@@ -11691,60 +11437,60 @@ export default function CanvasEditorLegacyPage({
                 </DropdownMenuTrigger>
                 <DropdownMenuContent
                   align={shouldDockFloatingToolbarToSide ? "start" : "center"}
-                  className="w-[420px] rounded-2xl border bg-background p-0 shadow-2xl"
+                  className="w-[360px] max-w-[calc(100vw-24px)] rounded-[var(--ui-radius-panel)] border bg-background p-0 shadow-xl"
                   side={shouldDockFloatingToolbarToSide ? "right" : "top"}
                 >
-                  <div className="border-b px-4 py-3">
-                    <div className="font-semibold text-foreground text-sm">
+                  <div className="border-b px-3 py-2.5">
+                    <div className="text-[13px] font-semibold text-foreground">
                       视频工作流节点库
                     </div>
-                    <div className="mt-1 text-muted-foreground text-xs">
+                    <div className="mt-0.5 text-[11px] leading-4 text-muted-foreground">
                       这里按参考 APP
                       的节点目录整理，先把结构补齐，再逐步接入具体能力。
                     </div>
                   </div>
                   <ScrollArea className="max-h-[60vh]">
-                    <div className="space-y-4 p-3">
+                    <div className="space-y-3 p-2">
                       {VIDEO_WORKFLOW_LIBRARY_SECTIONS.map((section) => {
                         const sectionNodes = getVideoWorkflowSectionNodes(
                           section.id
                         );
                         return (
-                          <div className="space-y-2" key={section.id}>
-                            <div className="px-2">
-                              <div className="font-semibold text-muted-foreground text-xs uppercase tracking-[0.16em]">
+                          <div className="space-y-1.5" key={section.id}>
+                            <div className="px-1.5">
+                              <div className="text-[10px] font-semibold uppercase text-muted-foreground">
                                 {section.label}
                               </div>
-                              <div className="mt-1 text-muted-foreground text-xs">
+                              <div className="mt-0.5 text-[11px] leading-4 text-muted-foreground">
                                 {section.description}
                               </div>
                             </div>
                             <div className="grid gap-1">
                               {sectionNodes.map((nodeDefinition) => (
                                 <DropdownMenuItem
-                                  className="flex items-start gap-3 rounded-xl px-3 py-3"
+                                  className="flex items-start gap-2 rounded-[var(--ui-radius-control)] px-2.5 py-2"
                                   key={nodeDefinition.type}
                                   onClick={() =>
                                     handleAddWorkflowNode(nodeDefinition.type)
                                   }
                                 >
                                   <div
-                                    className="mt-0.5 h-2.5 w-2.5 rounded-full"
+                                    className="mt-1 h-2 w-2 rounded-full"
                                     style={{
                                       backgroundColor:
                                         nodeDefinition.accentColor,
                                     }}
                                   />
                                   <div className="flex-1">
-                                    <div className="flex items-center justify-between gap-3">
-                                      <span className="font-medium text-foreground text-sm">
+                                    <div className="flex items-center justify-between gap-2">
+                                      <span className="text-[13px] font-medium text-foreground">
                                         {nodeDefinition.label}
                                       </span>
                                       <span className="font-mono text-[10px] text-muted-foreground">
                                         {nodeDefinition.type}
                                       </span>
                                     </div>
-                                    <div className="mt-1 text-muted-foreground text-xs leading-5">
+                                    <div className="mt-0.5 text-[11px] leading-4 text-muted-foreground">
                                       {nodeDefinition.description}
                                     </div>
                                   </div>

app/canvas/[id]/model3d/page.tsx

@@ -1970,18 +1970,15 @@ export default function CanvasModel3DPage() {
           worldImageFile as File,
           "image"
         );
-        const uploadData = uploadResult.data || null;
-        const mediaAssetId = uploadData?.mediaAssetId || null;
-        const sourceUrl = uploadData?.sourceUrl || null;
-        if (!uploadResult.success || !uploadData || (!mediaAssetId && !sourceUrl)) {
+        if (!uploadResult.success || !uploadResult.data?.mediaAssetId) {
           throw new Error(uploadResult.error || "上传世界参考图失败");
         }
         await submitTask({
           provider: "worldlabs-3d",
           payload: {
             mode: "image",
-            ...(mediaAssetId ? { mediaAssetId } : { sourceUrl }),
-            providerId: uploadData.providerId,
+            mediaAssetId: uploadResult.data.mediaAssetId,
+            providerId: uploadResult.data.providerId,
             prompt: normalizedPrompt || undefined,
             displayName: worldDisplayName.trim() || undefined,
             model: worldModel,
@@ -2003,18 +2000,15 @@ export default function CanvasModel3DPage() {
           worldVideoFile as File,
           "video"
         );
-        const uploadData = uploadResult.data || null;
-        const mediaAssetId = uploadData?.mediaAssetId || null;
-        const sourceUrl = uploadData?.sourceUrl || null;
-        if (!uploadResult.success || !uploadData || (!mediaAssetId && !sourceUrl)) {
+        if (!uploadResult.success || !uploadResult.data?.mediaAssetId) {
           throw new Error(uploadResult.error || "上传世界视频失败");
         }
         await submitTask({
           provider: "worldlabs-3d",
           payload: {
             mode: "video",
-            ...(mediaAssetId ? { mediaAssetId } : { sourceUrl }),
-            providerId: uploadData.providerId,
+            mediaAssetId: uploadResult.data.mediaAssetId,
+            providerId: uploadResult.data.providerId,
             prompt: normalizedPrompt || undefined,
             displayName: worldDisplayName.trim() || undefined,
             model: worldModel,
@@ -2049,13 +2043,11 @@ export default function CanvasModel3DPage() {
       }
 
       const mediaAssets = uploads.map(({ slot, result }) => {
-        const mediaAssetId = result.data?.mediaAssetId || null;
-        const sourceUrl = result.data?.sourceUrl || null;
-        if (!result.success || (!mediaAssetId && !sourceUrl)) {
+        if (!result.success || !result.data?.mediaAssetId) {
           throw new Error(result.error || "上传多图世界图片失败");
         }
         return {
-          ...(mediaAssetId ? { mediaAssetId } : { sourceUrl }),
+          mediaAssetId: result.data.mediaAssetId,
           azimuth: slot.azimuth,
         };
       });
@@ -2798,9 +2790,9 @@ export default function CanvasModel3DPage() {
   ]);
 
   useEffect(() => {
-    setWorldFirstPerson(
-      workspaceMode === "world" && worldViewportMode === "splat"
-    );
+    if (workspaceMode !== "world" || worldViewportMode !== "splat") {
+      setWorldFirstPerson(false);
+    }
   }, [workspaceMode, worldViewportMode]);
 
   return (
@@ -4008,7 +4000,6 @@ export default function CanvasModel3DPage() {
               previewImageUrl={currentPreviewImage}
               resetViewToken={viewerResetToken}
               semanticsMetadata={currentWorldAsset?.semanticsMetadata}
-              showInfoOverlay={false}
               showMovementControls={
                 worldViewportMode === "splat" || worldViewportMode === "mesh"
               }

components/agents/AgentGenerationWorkspaceDarkV2.tsx

@@ -82,7 +82,6 @@ import {
   LOCAL_EDIT_MAX_REGIONS,
   createLocalEditReferenceImageId,
   createLocalEditRegionId,
-  hasScaleAdjustTargetChanged,
   reindexLocalEditRegions,
   type LocalEditReferenceImage,
   type LocalEditRegion,
@@ -123,8 +122,6 @@ import type {
   AgentDetailBriefForm,
   AgentDetailGenerationProgressState,
   AgentDetailReplacementStrategy,
-  AgentGenerationProjectReplacementResultState,
-  AgentGenerationReplacementResultRecord,
   AgentGenerationProjectWorkspaceState,
   AgentGenerationProjectResultCollections,
   AgentGenerationResultModeType,
@@ -149,7 +146,6 @@ import {
 import {
   createEmptyAgentGenerationProjectWorkspaceState,
   normalizeAgentGenerationProjectPersistedState,
-  normalizeAgentGenerationProjectReplacementResultState,
 } from "@/lib/agents/generation-project-state";
 
 export interface AgentGenerationWorkspaceDarkV2Props {
@@ -177,10 +173,6 @@ export interface AgentGenerationWorkspaceDarkV2Props {
   onWorkspaceStateChange?: (next: AgentGenerationProjectWorkspaceState) => void;
   resultCollections?: AgentGenerationProjectResultCollections | null;
   deletedResultCollections?: AgentGenerationProjectResultCollections | null;
-  replacementResultState?: AgentGenerationProjectReplacementResultState | null;
-  onReplacementResultStateChange?: (
-    next: AgentGenerationProjectReplacementResultState
-  ) => void;
   onResultPreviewUrlsChange?: (
     modeType: AgentGenerationResultModeType,
     urls: string[]
@@ -189,7 +181,6 @@ export interface AgentGenerationWorkspaceDarkV2Props {
     modeType: AgentGenerationResultModeType,
     imageUrl: string
   ) => void;
-  onPersistProject?: () => Promise<boolean> | boolean;
   topNavRightSlot?: ReactNode;
   showcaseConfig?: AgentWorkflowShowcaseConfig | null;
   workflowStylePanel?: ReactNode;
@@ -256,8 +247,6 @@ type DetailResultLocalEditTarget = {
 
 type DetailResultLocalEditMode = "local_edit" | "scale_adjust";
 
-type DetailResultLocalEditImageSize = "1K" | "2K";
-
 type DetailResultLocalEditRect = {
   x: number;
   y: number;
@@ -280,7 +269,6 @@ type DetailResultLocalEditRegionInteraction = {
 
 type DetailResultLocalEditSubmitParams = {
   imageUrl: string;
-  imageSize: DetailResultLocalEditImageSize;
   mode: DetailResultLocalEditMode;
   title: string;
   regions: LocalEditRegion[];
@@ -481,15 +469,6 @@ function normalizeResultCollectionUrls(urls?: string[] | null) {
   );
 }
 
-function areResultUrlListsEqual(left?: string[] | null, right?: string[] | null) {
-  const normalizedLeft = normalizeResultCollectionUrls(left);
-  const normalizedRight = normalizeResultCollectionUrls(right);
-  return (
-    normalizedLeft.length === normalizedRight.length &&
-    normalizedLeft.every((url, index) => normalizedRight[index] === url)
-  );
-}
-
 function excludeDeletedResultUrls(
   urls: string[] | undefined | null,
   deletedUrls: string[] | undefined | null
@@ -915,7 +894,6 @@ function DetailResultLocalEditDialog({
   const [uploadingRegionId, setUploadingRegionId] = useState<string | null>(null);
   const [drawingTargetRegionId, setDrawingTargetRegionId] = useState<string | null>(null);
   const [mode, setMode] = useState<DetailResultLocalEditMode>("local_edit");
-  const [imageSize, setImageSize] = useState<DetailResultLocalEditImageSize>("1K");
   const dragStartRef = useRef<{ x: number; y: number } | null>(null);
   const editSurfaceRef = useRef<HTMLDivElement | null>(null);
   const isScaleAdjustMode = mode === "scale_adjust";
@@ -940,7 +918,6 @@ function DetailResultLocalEditDialog({
     setRegionInteraction(null);
     setUploadingRegionId(null);
     setDrawingTargetRegionId(null);
-    setImageSize("1K");
     dragStartRef.current = null;
   }, [target?.cardId, target?.imageUrl, target?.mode]);
 
@@ -1234,11 +1211,11 @@ function DetailResultLocalEditDialog({
         return;
       }
       const unchangedRegion = validRegions.find(
-        (region) => !hasScaleAdjustTargetChanged(region.rect, region.targetRect)
+        (region) => deriveDetailScalePercentFromRects(region.rect, region.targetRect) === 0
       );
       if (unchangedRegion) {
         setActiveRegionId(unchangedRegion.id);
-        toast.error(`区域 ${unchangedRegion.index} 的目标框大小和位置均未变化`);
+        toast.error(`区域 ${unchangedRegion.index} 的目标框大小变化不明显，请重新框选`);
         return;
       }
     } else {
@@ -1251,12 +1228,11 @@ function DetailResultLocalEditDialog({
     }
     onSubmit({
       imageUrl: target.imageUrl,
-      imageSize,
       mode,
       title: target.title,
       regions: validRegions,
     });
-  }, [imageSize, isScaleAdjustMode, mode, onSubmit, regions, target, uploadingRegionId]);
+  }, [isScaleAdjustMode, mode, onSubmit, regions, target, uploadingRegionId]);
 
   const completeDraftRegion = useCallback(
     (event: React.PointerEvent<HTMLDivElement>) => {
@@ -1841,36 +1817,6 @@ function DetailResultLocalEditDialog({
 	                ? `先框主体，再框目标大小和位置。最多 ${LOCAL_EDIT_MAX_REGIONS} 个区域。${completionCopy}`
 	                : `框选要局部修改的位置，填写提示词；可为每个区域添加参考图。最多 ${LOCAL_EDIT_MAX_REGIONS} 个区域。${completionCopy}`}
 	            </div>
-            {!activePreviewResult ? (
-              <div className="rounded-2xl border border-white/10 bg-white/[0.035] p-3">
-                <div className="mb-2 text-xs font-semibold uppercase tracking-[0.18em] text-white/38">
-                  输出尺寸
-                </div>
-                <div className="grid grid-cols-2 gap-2">
-                  {(
-                    [
-                      { label: "快速 1K", value: "1K" },
-                      { label: "高清 2K", value: "2K" },
-                    ] as const
-                  ).map((option) => (
-                    <button
-                      className={cn(
-                        "h-9 rounded-xl border px-3 text-sm font-semibold transition",
-                        imageSize === option.value
-                          ? "border-white bg-white text-black"
-                          : "border-white/10 bg-black/20 text-white/58 hover:bg-white/[0.08] hover:text-white"
-                      )}
-                      disabled={submitting}
-                      key={option.value}
-                      onClick={() => setImageSize(option.value)}
-                      type="button"
-                    >
-                      {option.label}
-                    </button>
-                  ))}
-                </div>
-              </div>
-            ) : null}
 	            {!activePreviewResult && isScaleAdjustMode ? (
 	              <div className="rounded-2xl border border-white/10 bg-white/[0.035] p-3 text-sm text-white/58">
 	                <div className="mb-2 text-xs font-semibold uppercase tracking-[0.18em] text-white/38">
@@ -2406,7 +2352,13 @@ type ReplacementModeType = Extract<
   "detail_replacement" | "sku_replacement"
 >;
 
-interface ReplacementResultRecord extends AgentGenerationReplacementResultRecord {}
+interface ReplacementResultRecord {
+  url: string | null;
+  text: string;
+  status: Extract<ReplacementCardStatus, "completed" | "passthrough" | "fallback">;
+  updatedAt: number;
+  compareSourceUrl?: string | null;
+}
 
 interface ReplacementExecutionContext {
   modeType: ReplacementModeType;
@@ -2453,26 +2405,13 @@ type ReplacementResultState = Record<
 const MANUAL_PASSTHROUGH_RESULT_TEXT =
   "已按人工标记沿用参考图，直接应用当前切片，不参与继续生成。";
 
-function normalizeReplacementResultStateForWorkspace(
-  value: AgentGenerationProjectReplacementResultState | null | undefined
-): ReplacementResultState {
-  const normalized = normalizeAgentGenerationProjectReplacementResultState(value);
+function createEmptyReplacementResultState(): ReplacementResultState {
   return {
-    detail_replacement: { ...(normalized.detail_replacement || {}) },
-    sku_replacement: { ...(normalized.sku_replacement || {}) },
+    detail_replacement: {},
+    sku_replacement: {},
   };
 }
 
-function areReplacementResultStatesEqual(
-  left: ReplacementResultState,
-  right: ReplacementResultState
-) {
-  return (
-    JSON.stringify(normalizeAgentGenerationProjectReplacementResultState(left)) ===
-    JSON.stringify(normalizeAgentGenerationProjectReplacementResultState(right))
-  );
-}
-
 function inferReplacementCardStatusFromText(text: string | null | undefined): ReplacementCardStatus | null {
   const normalized = normalizeAssistantText(String(text || ""))
     .replace(/\s+/g, " ")
@@ -3120,12 +3059,9 @@ export function AgentGenerationWorkspaceDarkV2({
   workspaceState = null,
   resultCollections = null,
   deletedResultCollections = null,
-  replacementResultState: persistedReplacementResultState = null,
   onWorkspaceStateChange,
-  onReplacementResultStateChange,
   onResultPreviewUrlsChange,
   onDeleteResultImage,
-  onPersistProject,
   topNavRightSlot,
   showcaseConfig,
   workflowStylePanel,
@@ -3277,7 +3213,7 @@ export function AgentGenerationWorkspaceDarkV2({
     Record<string, string>
   >({});
   const [replacementResultState, setReplacementResultState] = useState<ReplacementResultState>(
-    () => normalizeReplacementResultStateForWorkspace(persistedReplacementResultState)
+    () => createEmptyReplacementResultState()
   );
   const [replacementExecutionContext, setReplacementExecutionContext] =
     useState<ReplacementExecutionContext | null>(null);
@@ -3293,7 +3229,6 @@ export function AgentGenerationWorkspaceDarkV2({
   const [detailWatermarkRemoveCardIds, setDetailWatermarkRemoveCardIds] =
     useState<Set<string>>(() => new Set());
   const processedResultHintTimerRef = useRef<Record<string, number>>({});
-  const transportGenerationStartedAtRef = useRef<number | null>(null);
   const closePsdTemplateDialog = useCallback(() => {
     setIsPsdTemplateDialogOpen(false);
     setPsdTemplateDialogSourceUrl(null);
@@ -3327,22 +3262,6 @@ export function AgentGenerationWorkspaceDarkV2({
     },
     [activeResultModeType, isPsdTemplateEnabled]
   );
-
-  useEffect(() => {
-    const nextState = normalizeReplacementResultStateForWorkspace(
-      persistedReplacementResultState
-    );
-    setReplacementResultState((current) =>
-      areReplacementResultStatesEqual(current, nextState) ? current : nextState
-    );
-  }, [persistedReplacementResultState]);
-
-  useEffect(() => {
-    onReplacementResultStateChange?.(
-      normalizeAgentGenerationProjectReplacementResultState(replacementResultState)
-    );
-  }, [onReplacementResultStateChange, replacementResultState]);
-
   const normalizedDeletedResultCollections = useMemo(
     () => ({
       scene_generation: normalizeResultCollectionUrls(
@@ -4118,15 +4037,7 @@ export function AgentGenerationWorkspaceDarkV2({
           ? "agent-anchor-materials"
           : "agent-anchor-generate";
 
-  const {
-    messages,
-    setMessages,
-    sendMessage,
-    status,
-    stop,
-    error: chatError,
-    clearError,
-  } = useChat<ChatMessage>({
+  const { messages, setMessages, sendMessage, status, stop } = useChat<ChatMessage>({
     id: chatId,
     messages: historyMessages,
     experimental_throttle: 100,
@@ -4591,48 +4502,63 @@ export function AgentGenerationWorkspaceDarkV2({
     skuReplacementReferenceCards,
   ]);
   useEffect(() => {
-    if (latestReplacementResults.length === 0) {
+    setReplacementResultState((current) => {
+      const detailCardIds = new Set(detailReplacementReferenceCards.map((card) => card.id));
+      const skuCardIds = new Set(skuReplacementReferenceCards.map((card) => card.id));
+      let changed = false;
+
+      const nextDetail = Object.fromEntries(
+        Object.entries(current.detail_replacement).filter(([cardId]) => detailCardIds.has(cardId))
+      );
+      if (Object.keys(nextDetail).length !== Object.keys(current.detail_replacement).length) {
+        changed = true;
+      }
+
+      const nextSku = Object.fromEntries(
+        Object.entries(current.sku_replacement).filter(([cardId]) => skuCardIds.has(cardId))
+      );
+      if (Object.keys(nextSku).length !== Object.keys(current.sku_replacement).length) {
+        changed = true;
+      }
+
+      if (!changed) {
+        return current;
+      }
+
+      return {
+        detail_replacement: nextDetail,
+        sku_replacement: nextSku,
+      };
+    });
+  }, [detailReplacementReferenceCards, skuReplacementReferenceCards]);
+  useEffect(() => {
+    if (
+      (currentResultModeType !== "detail_replacement" && currentResultModeType !== "sku_replacement") ||
+      latestReplacementResults.length === 0
+    ) {
       return;
     }
 
-    const detailReferenceCardById = new Map(
-      detailReplacementReferenceCards.map((card) => [card.id, card])
-    );
-    const skuReferenceCardById = new Map(
-      skuReplacementReferenceCards.map((card) => [card.id, card])
-    );
-    const fallbackModeType: ReplacementModeType | null =
-      currentResultModeType === "detail_replacement" || currentResultModeType === "sku_replacement"
-        ? currentResultModeType
-        : null;
+    const cardIds = currentReplacementExecutionCardIds;
+    if (cardIds.length === 0) {
+      return;
+    }
 
     setReplacementResultState((current) => {
-      const nextState: ReplacementResultState = {
-        detail_replacement: { ...current.detail_replacement },
-        sku_replacement: { ...current.sku_replacement },
-      };
+      const nextModeState = { ...current[currentResultModeType] };
       let changed = false;
 
-      const applyResult = (
-        modeType: ReplacementModeType,
-        cardId: string | null | undefined,
-        result: {
-          url: string | null;
-          text: string;
-          replacementCardId: string | null;
-        },
-        referenceCard?: {
-          imageUrl?: string | null;
-          label?: string | null;
-          previewUrl?: string | null;
-        } | null
-      ) => {
+      latestReplacementResults.forEach((result, index) => {
+        const cardId = result.replacementCardId || cardIds[index];
         if (!cardId) {
           return;
         }
         const inferredStatus = inferReplacementCardStatusFromText(result.text);
-        const nextModeState = nextState[modeType];
         const previousRecord = nextModeState[cardId];
+        const referenceCard =
+          currentResultModeType === "detail_replacement"
+            ? detailReplacementReferenceCards.find((card) => card.id === cardId)
+            : skuReplacementReferenceCards.find((card) => card.id === cardId);
         const resultUrl = result.url || null;
         const previousUrl =
           previousRecord?.url && previousRecord.url !== resultUrl
@@ -4652,59 +4578,27 @@ export function AgentGenerationWorkspaceDarkV2({
             resultUrl,
             previousUrl || referenceSourceUrl || previousRecord?.compareSourceUrl || null
           ),
-          referenceImageUrl: referenceCard?.imageUrl || previousRecord?.referenceImageUrl || null,
-          referencePreviewUrl:
-            referenceCard?.previewUrl || previousRecord?.referencePreviewUrl || null,
-          label: referenceCard?.label || previousRecord?.label || null,
         };
         if (
           previousRecord?.url === nextRecord.url &&
           previousRecord?.text === nextRecord.text &&
           previousRecord?.status === nextRecord.status &&
-          previousRecord?.compareSourceUrl === nextRecord.compareSourceUrl &&
-          previousRecord?.referenceImageUrl === nextRecord.referenceImageUrl &&
-          previousRecord?.referencePreviewUrl === nextRecord.referencePreviewUrl &&
-          previousRecord?.label === nextRecord.label
+          previousRecord?.compareSourceUrl === nextRecord.compareSourceUrl
         ) {
           return;
         }
         nextModeState[cardId] = nextRecord;
         changed = true;
-      };
-
-      latestReplacementResults.forEach((result, index) => {
-        const explicitCardId = result.replacementCardId || null;
-        if (explicitCardId) {
-          const detailReferenceCard = detailReferenceCardById.get(explicitCardId);
-          if (detailReferenceCard) {
-            applyResult("detail_replacement", explicitCardId, result, detailReferenceCard);
-            return;
-          }
-
-          const skuReferenceCard = skuReferenceCardById.get(explicitCardId);
-          if (skuReferenceCard) {
-            applyResult("sku_replacement", explicitCardId, result, skuReferenceCard);
-            return;
-          }
-        }
-
-        if (!fallbackModeType) {
-          return;
-        }
-
-        const fallbackCardId = currentReplacementExecutionCardIds[index];
-        const fallbackReferenceCard =
-          fallbackModeType === "detail_replacement"
-            ? detailReferenceCardById.get(fallbackCardId)
-            : skuReferenceCardById.get(fallbackCardId);
-        applyResult(fallbackModeType, fallbackCardId, result, fallbackReferenceCard);
       });
 
       if (!changed) {
         return current;
       }
 
-      return nextState;
+      return {
+        ...current,
+        [currentResultModeType]: nextModeState,
+      };
     });
   }, [
     currentReplacementExecutionCardIds,
@@ -4714,8 +4608,8 @@ export function AgentGenerationWorkspaceDarkV2({
     skuReplacementReferenceCards,
   ]);
   const detailReplacementResultUrls = useMemo(
-    () => {
-      const urlsFromCards = detailReplacementReferenceCards
+    () =>
+      detailReplacementReferenceCards
         .map((card) => {
           const recordUrl = replacementResultState.detail_replacement[card.id]?.url || null;
           const fallbackUrl = !recordUrl && card.passthrough ? card.imageUrl || null : null;
@@ -4725,15 +4619,7 @@ export function AgentGenerationWorkspaceDarkV2({
             ? nextUrl
             : null;
         })
-        .filter((url): url is string => Boolean(url));
-      const urlsFromRecords = Object.values(replacementResultState.detail_replacement)
-        .map((record) => record.url)
-        .filter((url): url is string => Boolean(url))
-        .filter(
-          (url) => !normalizedDeletedResultCollections.detail_replacement.includes(url)
-        );
-      return Array.from(new Set([...urlsFromCards, ...urlsFromRecords]));
-    },
+        .filter((url): url is string => Boolean(url)),
     [
       detailReplacementReferenceCards,
       normalizedDeletedResultCollections.detail_replacement,
@@ -4741,21 +4627,15 @@ export function AgentGenerationWorkspaceDarkV2({
     ]
   );
   const skuReplacementResultUrls = useMemo(
-    () => {
-      const urlsFromCards = skuReplacementReferenceCards
+    () =>
+      skuReplacementReferenceCards
         .map((card) => {
           const nextUrl = replacementResultState.sku_replacement[card.id]?.url || null;
           return nextUrl && !normalizedDeletedResultCollections.sku_replacement.includes(nextUrl)
             ? nextUrl
             : null;
         })
-        .filter((url): url is string => Boolean(url));
-      const urlsFromRecords = Object.values(replacementResultState.sku_replacement)
-        .map((record) => record.url)
-        .filter((url): url is string => Boolean(url))
-        .filter((url) => !normalizedDeletedResultCollections.sku_replacement.includes(url));
-      return Array.from(new Set([...urlsFromCards, ...urlsFromRecords]));
-    },
+        .filter((url): url is string => Boolean(url)),
     [
       normalizedDeletedResultCollections.sku_replacement,
       replacementResultState.sku_replacement,
@@ -4846,20 +4726,24 @@ export function AgentGenerationWorkspaceDarkV2({
           resultCollections?.detail_generation,
           normalizedDeletedResultCollections.detail_generation
         ),
-        detail_replacement:
-          detailReplacementResultUrls.length > 0
-            ? detailReplacementResultUrls
-            : excludeDeletedResultUrls(
-                resultCollections?.detail_replacement,
-                normalizedDeletedResultCollections.detail_replacement
-              ),
-        sku_replacement:
-          skuReplacementResultUrls.length > 0
-            ? skuReplacementResultUrls
-            : excludeDeletedResultUrls(
-                resultCollections?.sku_replacement,
-                normalizedDeletedResultCollections.sku_replacement
-              ),
+        detail_replacement: Array.from(
+          new Set([
+            ...detailReplacementResultUrls,
+            ...excludeDeletedResultUrls(
+              resultCollections?.detail_replacement,
+              normalizedDeletedResultCollections.detail_replacement
+            ),
+          ])
+        ),
+        sku_replacement: Array.from(
+          new Set([
+            ...skuReplacementResultUrls,
+            ...excludeDeletedResultUrls(
+              resultCollections?.sku_replacement,
+              normalizedDeletedResultCollections.sku_replacement
+            ),
+          ])
+        ),
       };
 
       return {
@@ -5065,52 +4949,6 @@ export function AgentGenerationWorkspaceDarkV2({
     skuReplacementBatchDownloadUrls.length > 0
       ? skuReplacementBatchDownloadUrls
       : mergedResultCollections.sku_replacement;
-  const syncReplacementResultCollectionsToParent = useCallback(
-    (targetModeType?: ReplacementModeType) => {
-      if (!onResultPreviewUrlsChange) {
-        return;
-      }
-
-      const syncMode = (modeType: ReplacementModeType, liveUrls: string[]) => {
-        if (targetModeType && targetModeType !== modeType) {
-          return;
-        }
-        const normalizedLiveUrls = normalizeResultCollectionUrls(liveUrls);
-        if (normalizedLiveUrls.length === 0) {
-          return;
-        }
-
-        const deletedUrlSet = new Set(
-          normalizedDeletedResultCollections[modeType]
-        );
-        const nextUrls = Array.from(
-          new Set(normalizedLiveUrls.filter((url) => !deletedUrlSet.has(url)))
-        );
-
-        if (!areResultUrlListsEqual(resultCollections?.[modeType], nextUrls)) {
-          onResultPreviewUrlsChange(modeType, nextUrls);
-        }
-      };
-
-      onReplacementResultStateChange?.(
-        normalizeAgentGenerationProjectReplacementResultState(
-          replacementResultState
-        )
-      );
-      syncMode("detail_replacement", detailReplacementResultUrls);
-      syncMode("sku_replacement", skuReplacementResultUrls);
-    },
-    [
-      detailReplacementResultUrls,
-      normalizedDeletedResultCollections,
-      onReplacementResultStateChange,
-      onResultPreviewUrlsChange,
-      replacementResultState,
-      resultCollections,
-      skuReplacementResultUrls,
-    ]
-  );
-
   const detailRemainingCount = useMemo(
     () =>
       detailResultCards.filter(
@@ -5398,115 +5236,6 @@ export function AgentGenerationWorkspaceDarkV2({
     }
   }, [pendingGeneration, pendingGenerationProgressCount]);
 
-  useEffect(() => {
-    if (!pendingGeneration || !chatError) {
-      return;
-    }
-
-    generationRequestSnapshotRef.current = {
-      hiddenPrompt: null,
-      replacementExecutionCardIds: null,
-      replacementRerunReferenceImages: null,
-    };
-    setPendingGeneration(null);
-    toast.error(chatError.message || "生成请求失败，请稍后重试");
-    clearError();
-  }, [chatError, clearError, pendingGeneration]);
-
-  useEffect(() => {
-    if (!pendingGeneration) {
-      return;
-    }
-
-    const elapsedMs = Date.now() - pendingGeneration.timestamp;
-    const remainingMs = AGENT_PENDING_GENERATION_EXPIRY_MS - elapsedMs;
-    const clearStalePendingGeneration = () => {
-      generationRequestSnapshotRef.current = {
-        hiddenPrompt: null,
-        replacementExecutionCardIds: null,
-        replacementRerunReferenceImages: null,
-      };
-      try {
-        stop();
-      } catch (error) {
-        console.warn(
-          "[AgentGenerationWorkspaceDarkV2] Failed to stop stale generation transport:",
-          error
-        );
-      }
-      transportGenerationStartedAtRef.current = null;
-      setPendingGeneration((current) => {
-        if (
-          !current ||
-          current.chatId !== pendingGeneration.chatId ||
-          current.timestamp !== pendingGeneration.timestamp
-        ) {
-          return current;
-        }
-        return null;
-      });
-      toast.warning("生成请求超过 30 分钟未回传，已结束处理中状态，可重新生成未回传结果。");
-    };
-
-    if (remainingMs <= 0) {
-      clearStalePendingGeneration();
-      return;
-    }
-
-    const timerId = window.setTimeout(clearStalePendingGeneration, remainingMs);
-    return () => window.clearTimeout(timerId);
-  }, [pendingGeneration, stop]);
-
-  useEffect(() => {
-    if (!transportIsGenerating) {
-      transportGenerationStartedAtRef.current = null;
-      return;
-    }
-
-    if (transportGenerationStartedAtRef.current === null) {
-      transportGenerationStartedAtRef.current =
-        pendingGeneration?.timestamp || Date.now();
-    }
-
-    const startedAt = transportGenerationStartedAtRef.current;
-    const elapsedMs = Date.now() - startedAt;
-    const remainingMs = AGENT_PENDING_GENERATION_EXPIRY_MS - elapsedMs;
-    const abortStaleTransport = () => {
-      const currentStartedAt = transportGenerationStartedAtRef.current;
-      if (
-        currentStartedAt === null ||
-        Date.now() - currentStartedAt < AGENT_PENDING_GENERATION_EXPIRY_MS
-      ) {
-        return;
-      }
-
-      generationRequestSnapshotRef.current = {
-        hiddenPrompt: null,
-        replacementExecutionCardIds: null,
-        replacementRerunReferenceImages: null,
-      };
-      try {
-        stop();
-      } catch (error) {
-        console.warn(
-          "[AgentGenerationWorkspaceDarkV2] Failed to abort stale generation transport:",
-          error
-        );
-      }
-      transportGenerationStartedAtRef.current = null;
-      setPendingGeneration(null);
-      toast.warning("生成请求超过 30 分钟未回传，已中断卡住连接，可重新生成未回传结果。");
-    };
-
-    if (remainingMs <= 0) {
-      abortStaleTransport();
-      return;
-    }
-
-    const timerId = window.setTimeout(abortStaleTransport, remainingMs);
-    return () => window.clearTimeout(timerId);
-  }, [pendingGeneration?.timestamp, stop, transportIsGenerating]);
-
   useEffect(() => {
     if (!pendingGeneration || transportIsGenerating) {
       return;
@@ -5544,19 +5273,11 @@ export function AgentGenerationWorkspaceDarkV2({
   ]);
 
   useEffect(() => {
-    if (!onResultPreviewUrlsChange) {
-      return;
-    }
-
-    ([
-      "scene_generation",
-      "detail_generation",
-      "detail_replacement",
-      "sku_replacement",
-    ] as AgentGenerationResultModeType[]).forEach((modeType) => {
-      onResultPreviewUrlsChange(modeType, mergedResultCollections[modeType] || []);
-    });
-  }, [mergedResultCollections, onResultPreviewUrlsChange]);
+    onResultPreviewUrlsChange?.(
+      currentResultModeType,
+      mergedResultCollections[currentResultModeType] || []
+    );
+  }, [currentResultModeType, mergedResultCollections, onResultPreviewUrlsChange]);
 
   useEffect(() => {
     if (activeResultModeUrls.length === 0) {
@@ -5698,7 +5419,6 @@ export function AgentGenerationWorkspaceDarkV2({
     imageUrls: string[];
     zipName: string;
     scope: BatchDownloadScope;
-    modeType?: AgentGenerationResultModeType;
   }) => {
     const normalizedUrls = (params.imageUrls || [])
       .map((item) => String(item || "").trim())
@@ -5708,19 +5428,6 @@ export function AgentGenerationWorkspaceDarkV2({
       return;
     }
 
-    if (
-      params.modeType === "detail_replacement" ||
-      params.modeType === "sku_replacement"
-    ) {
-      syncReplacementResultCollectionsToParent(params.modeType);
-    }
-    const persisted = await Promise.resolve(onPersistProject?.() ?? true).catch(
-      () => false
-    );
-    if (!persisted) {
-      toast.info("结果已保留在当前页面，项目同步稍后会自动重试");
-    }
-
     setBatchDownloadState(params.scope);
     setBatchDownloadDialog({
       scope: params.scope,
@@ -5800,7 +5507,7 @@ export function AgentGenerationWorkspaceDarkV2({
       }));
       toast.error(message);
     }
-  }, [onPersistProject, syncReplacementResultCollectionsToParent]);
+  }, []);
 
   useEffect(() => {
     const taskId = batchDownloadDialog?.taskId;
@@ -5899,9 +5606,6 @@ export function AgentGenerationWorkspaceDarkV2({
     const link = document.createElement("a");
     link.href = batchDownloadDialog.downloadUrl;
     link.download = `${batchDownloadDialog.zipName || "batch-results"}.zip`;
-    link.target = "_blank";
-    link.rel = "noopener noreferrer";
-    link.style.display = "none";
     document.body.appendChild(link);
     link.click();
     link.remove();
@@ -5967,10 +5671,6 @@ export function AgentGenerationWorkspaceDarkV2({
     setReplacementResultState((current) => {
       const currentModeState = current[params.modeType];
       const previousRecord = currentModeState[params.cardId];
-      const referenceCard =
-        params.modeType === "detail_replacement"
-          ? detailReplacementReferenceCards.find((card) => card.id === params.cardId)
-          : skuReplacementReferenceCards.find((card) => card.id === params.cardId);
       const inferredStatus = inferReplacementCardStatusFromText(params.text);
       const explicitCompareSourceUrl =
         params.compareSourceUrl === undefined
@@ -5991,20 +5691,13 @@ export function AgentGenerationWorkspaceDarkV2({
           explicitCompareSourceUrl === undefined
             ? previousRecord?.compareSourceUrl || null
             : explicitCompareSourceUrl,
-        referenceImageUrl: referenceCard?.imageUrl || previousRecord?.referenceImageUrl || null,
-        referencePreviewUrl:
-          referenceCard?.previewUrl || previousRecord?.referencePreviewUrl || null,
-        label: referenceCard?.label || previousRecord?.label || null,
       };
 
       if (
         previousRecord?.url === nextRecord.url &&
         previousRecord?.text === nextRecord.text &&
         previousRecord?.status === nextRecord.status &&
-        previousRecord?.compareSourceUrl === nextRecord.compareSourceUrl &&
-        previousRecord?.referenceImageUrl === nextRecord.referenceImageUrl &&
-        previousRecord?.referencePreviewUrl === nextRecord.referencePreviewUrl &&
-        previousRecord?.label === nextRecord.label
+        previousRecord?.compareSourceUrl === nextRecord.compareSourceUrl
       ) {
         return current;
       }
@@ -6017,7 +5710,7 @@ export function AgentGenerationWorkspaceDarkV2({
         },
       };
     });
-  }, [detailReplacementReferenceCards, skuReplacementReferenceCards]);
+  }, []);
   const handleOpenReplacementTextEdit = useCallback((params: {
     modeType: ReplacementModeType;
     cardId: string;
@@ -6366,15 +6059,7 @@ export function AgentGenerationWorkspaceDarkV2({
       toast.success(`继续处理剩余 ${replacementExecutionCards.length} 张结果图`);
     }
     try {
-      void Promise.resolve(sendMessage({ role: "user", parts })).catch((error) => {
-        generationRequestSnapshotRef.current = {
-          hiddenPrompt: null,
-          replacementExecutionCardIds: null,
-          replacementRerunReferenceImages: null,
-        };
-        setPendingGeneration(null);
-        toast.error(error instanceof Error ? error.message : "发送生成请求失败");
-      });
+      sendMessage({ role: "user", parts });
       if (selectedAgentPreset?.type !== "image") {
         setInput("");
       }
@@ -6961,19 +6646,15 @@ export function AgentGenerationWorkspaceDarkV2({
         : selectedModelId !== "auto"
           ? selectedModelId
           : effectiveDefaultModelId || undefined;
-      const requestedImageSize: DetailResultLocalEditImageSize =
-        params.imageSize === "2K" ? "2K" : "1K";
 
       setDetailLocalEditSubmittingId(cardId);
       setDetailLocalEditSubmittingMode(editMode);
-      toast.info(
-        `${isScaleAdjust ? "正在提交比例调整" : "正在提交局部编辑"}（${requestedImageSize}）...`
-      );
+      toast.info(isScaleAdjust ? "正在提交比例调整..." : "正在提交局部编辑...");
 
       try {
         const submitResult = await imageGenerationService.localEdit({
           aspectRatio: "auto",
-          imageSize: requestedImageSize,
+          imageSize: "2K",
           model:
             resolvedLocalEditModelId && resolvedLocalEditModelId !== "auto"
               ? resolvedLocalEditModelId
@@ -7191,23 +6872,6 @@ export function AgentGenerationWorkspaceDarkV2({
         delete next[normalizedUrl];
         return next;
       });
-      if (modeType === "detail_replacement" || modeType === "sku_replacement") {
-        setReplacementResultState((current) => {
-          const currentModeState = current[modeType];
-          const nextModeState = Object.fromEntries(
-            Object.entries(currentModeState).filter(
-              ([, record]) => record.url !== normalizedUrl
-            )
-          );
-          if (Object.keys(nextModeState).length === Object.keys(currentModeState).length) {
-            return current;
-          }
-          return {
-            ...current,
-            [modeType]: nextModeState,
-          };
-        });
-      }
 
       onDeleteResultImage(modeType, normalizedUrl);
       toast.success("结果图已删除");
@@ -9686,7 +9350,6 @@ export function AgentGenerationWorkspaceDarkV2({
                         imageUrls: detailReplacementOrderedDownloadUrls,
                         zipName: `${selectedAgentPreset?.name || "detail-replacement"}-results`,
                         scope: "detail",
-                        modeType: "detail_replacement",
                       })
                     }
                     disabled={batchDownloadState === "detail"}
@@ -9704,7 +9367,6 @@ export function AgentGenerationWorkspaceDarkV2({
                         imageUrls: mergedResultCollections.detail_generation,
                         zipName: `${selectedAgentPreset?.name || "ai-detail"}-results`,
                         scope: "detail",
-                        modeType: "detail_generation",
                       })
                     }
                     disabled={batchDownloadState === "detail"}
@@ -9722,7 +9384,6 @@ export function AgentGenerationWorkspaceDarkV2({
                         imageUrls: skuReplacementOrderedDownloadUrls,
                         zipName: `${selectedAgentPreset?.name || "sku-replacement"}-results`,
                         scope: "sku",
-                        modeType: "sku_replacement",
                       })
                     }
                     disabled={batchDownloadState === "sku"}
@@ -9739,7 +9400,6 @@ export function AgentGenerationWorkspaceDarkV2({
                         imageUrls: activeResultModeUrls,
                         zipName: `${selectedAgentPreset?.name || "scene-generation"}-results`,
                         scope: "scene",
-                        modeType: "scene_generation",
                       })
                     }
                     disabled={batchDownloadState === "scene"}

components/agents/use-agent-style-performance-monitor.ts

@@ -1,7 +1,6 @@
 "use client";
 
 import { useEffect, type RefObject } from "react";
-import { isAgentModeScopedChatId } from "@/lib/chat/messages-route-access";
 
 export type AgentStyleSection =
   | "brand"
@@ -141,9 +140,6 @@ export function useAgentStylePerformanceMonitor({
   chatId,
   projectId,
 }: UseAgentStylePerformanceMonitorParams) {
-  const persistedChatId =
-    chatId && !isAgentModeScopedChatId(chatId) ? chatId : null;
-
   useEffect(() => {
     if (
       !getBooleanEnvFlag(process.env.NEXT_PUBLIC_AGENT_STYLE_PERF_MONITOR, true) ||
@@ -204,7 +200,7 @@ export function useAgentStylePerformanceMonitor({
         browser,
         path: window.location.pathname,
         projectId: projectId || null,
-        chatId: persistedChatId,
+        chatId: chatId || null,
         timestamp: new Date().toISOString(),
       });
     };
@@ -241,5 +237,5 @@ export function useAgentStylePerformanceMonitor({
       root.removeEventListener("keydown", markAction, true);
       root.removeEventListener("scroll", markAction, true);
     };
-  }, [persistedChatId, projectId, rootRef]);
+  }, [chatId, projectId, rootRef]);
 }

components/ai-cad/zoo-design-studio-frame.tsx

@@ -0,0 +1,64 @@
+"use client";
+
+import { AlertTriangle, RefreshCw } from "lucide-react";
+import { useState } from "react";
+
+type ZooDesignStudioFrameProps = {
+  isReady: boolean;
+  sourceLabel: string;
+  src: string;
+};
+
+export function ZooDesignStudioFrame({
+  isReady,
+  sourceLabel,
+  src,
+}: ZooDesignStudioFrameProps) {
+  const [loaded, setLoaded] = useState(false);
+
+  if (!isReady) {
+    return (
+      <div className="flex h-svh w-full items-center justify-center overflow-hidden bg-[#10100e] p-6 text-[#f8f6ef]">
+        <div className="w-full max-w-xl rounded-lg border border-[#3a352c] bg-[#171510] p-6 shadow-2xl">
+          <div className="flex items-start gap-3">
+            <AlertTriangle className="mt-0.5 h-5 w-5 shrink-0 text-amber-300" />
+            <div className="min-w-0">
+              <h1 className="font-semibold text-lg">
+                HiCAD 官方前端尚未构建
+              </h1>
+              <p className="mt-2 text-[#d3cabb] text-sm leading-6">
+                请运行
+                <code className="mx-1 rounded bg-white/10 px-1.5 py-0.5">
+                  pnpm zoo-modeling-app:vendor
+                </code>
+                生成官方 Zoo Design Studio 前端。生成后刷新本页即可使用。
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="relative h-svh w-full overflow-hidden bg-[#10100e]">
+      {!loaded && (
+        <div className="pointer-events-none absolute inset-0 z-10 flex items-center justify-center bg-[#10100e] text-[#d3cabb]">
+          <div className="flex items-center gap-3 rounded-lg border border-[#3a352c] bg-[#171510]/95 px-4 py-3 shadow-xl">
+            <RefreshCw className="h-4 w-4 animate-spin" />
+            <span className="text-sm">正在加载 {sourceLabel}</span>
+          </div>
+        </div>
+      )}
+      <iframe
+        allow="clipboard-read; clipboard-write; fullscreen; gamepad; pointer-lock; web-share; xr-spatial-tracking"
+        className="h-full w-full border-0"
+        onLoad={() => setLoaded(true)}
+        referrerPolicy="strict-origin-when-cross-origin"
+        sandbox="allow-downloads allow-forms allow-modals allow-pointer-lock allow-popups allow-presentation allow-same-origin allow-scripts"
+        src={src}
+        title="HiCAD"
+      />
+    </div>
+  );
+}

components/canvas/AiWashWorkspace.tsx

@@ -610,9 +610,7 @@ export function AiWashWorkspace({
     [presetExecutionStates, selectedPreviewResult?.presetId, selectedResultId]
   );
   const selectedPresetHasExecutableModel = Boolean(
-    selectedExecutionState?.effectiveModelRef &&
-      selectedExecutionState?.resolvedModel &&
-      selectedExecutionState.resolvedModel.selectable !== false
+    selectedExecutionState?.effectiveModelRef
   );
   const shouldShowUserModelSelector = Boolean(
     !config.hideModelSelector && selectedExecutionState?.usesUserSelectableModel
@@ -759,10 +757,7 @@ export function AiWashWorkspace({
       return;
     }
     if (!selectedPresetHasExecutableModel) {
-      toast.error(
-        selectedExecutionState?.resolvedModel?.disabledReason ||
-          "当前预设没有可用的 AI洗图 生图模型，请先在系统设置中配置模型"
-      );
+      toast.error("当前预设没有可用的 AI洗图 生图模型，请先在系统设置中配置模型");
       return;
     }
 
@@ -823,15 +818,6 @@ export function AiWashWorkspace({
           if (!executionState.effectiveModelRef) {
             throw new Error(`${preset.title} 未配置可用模型`);
           }
-          if (
-            !executionState.resolvedModel ||
-            executionState.resolvedModel.selectable === false
-          ) {
-            throw new Error(
-              executionState.resolvedModel?.disabledReason ||
-                `${preset.title} 配置的模型不可用`
-            );
-          }
 
           const submitResponse = await fetch("/api/ai-wash/generate", {
             method: "POST",
@@ -839,9 +825,7 @@ export function AiWashWorkspace({
             body: JSON.stringify({
               prompt: executionState.resolvedPrompt,
               referenceImage: requestReferenceImage,
-              selectedModelId:
-                executionState.resolvedModel.id ||
-                executionState.effectiveModelRef,
+              selectedModelId: executionState.effectiveModelRef,
               imageSize: config.imageSize,
               promptExtend: config.promptExtend,
               title: preset.title,

components/canvas/LiblibVideoCanvasReplica.tsx

@@ -25147,6 +25147,42 @@ function AssetLibraryPanel({
   );
 }
 
+function SkillsAccessPanel() {
+  return (
+    <div className="space-y-4">
+      <div className="rounded-[8px] border border-white/8 bg-white/5 p-4">
+        <div className="flex items-center justify-between">
+          <div>
+            <div className="font-semibold text-[15px] text-white">OpenAPI Access Key</div>
+            <div className="mt-1 text-[12px] text-white/42">用于接口调用、模型能力和自动化任务。</div>
+          </div>
+          <button
+            className="h-9 rounded-[8px] bg-white px-3 text-[12px] font-semibold text-black hover:bg-white/90"
+            onClick={() => toast.info("Access Key 创建接口待接入。")}
+            type="button"
+          >
+            创建 Key
+          </button>
+        </div>
+        <div className="mt-4 rounded-[8px] border border-white/8 bg-black/20 px-3 py-3 text-[13px] text-white/42">
+          暂无 Access Key
+        </div>
+      </div>
+      <div className="grid grid-cols-5 gap-2">
+        {Object.entries(capturedCounts.byType || {}).map(([type, count]) => {
+          const meta = TOOL_TYPE_META[type] || TOOL_TYPE_META.video;
+          return (
+            <div className="rounded-[8px] bg-white/6 p-3 text-center" key={type}>
+              <div className="text-[18px] text-white">{String(count)}</div>
+              <div className="mt-1 text-[11px] text-white/42">{meta.label}</div>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
 function SkillsAccessModal({
   onClose,
   siteName,
@@ -25155,99 +25191,6 @@ function SkillsAccessModal({
   siteName: string;
 }) {
   const skillsName = `${siteName} Skills`;
-  type AccessKeyItem = {
-    id: string;
-    name: string;
-    tokenPrefix: string;
-    scopes: string[];
-    lastUsedAt: string | null;
-    expiresAt: string | null;
-    revokedAt: string | null;
-    createdAt: string;
-  };
-  const [accessKeys, setAccessKeys] = useState<AccessKeyItem[]>([]);
-  const [createdToken, setCreatedToken] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [isCreating, setIsCreating] = useState(false);
-  const [revokingId, setRevokingId] = useState<string | null>(null);
-
-  const loadAccessKeys = useCallback(async () => {
-    setIsLoading(true);
-    try {
-      const response = await fetch("/api/user/access-keys", { cache: "no-store" });
-      const payload = await response.json().catch(() => ({}));
-      if (!response.ok || !payload?.success) {
-        throw new Error(payload?.error || "加载 Access Key 失败");
-      }
-      setAccessKeys(Array.isArray(payload.data) ? payload.data : []);
-    } catch (error) {
-      toast.error(error instanceof Error ? error.message : "加载 Access Key 失败");
-    } finally {
-      setIsLoading(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    void loadAccessKeys();
-  }, [loadAccessKeys]);
-
-  const handleCreateAccessKey = useCallback(async () => {
-    setIsCreating(true);
-    try {
-      const response = await fetch("/api/user/access-keys", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          name: "OpenClaw",
-          scopes: ["canvas:read", "canvas:write"],
-          expiresInDays: 90,
-        }),
-      });
-      const payload = await response.json().catch(() => ({}));
-      if (!response.ok || !payload?.success || !payload?.data?.token) {
-        throw new Error(payload?.error || "创建 Access Key 失败");
-      }
-      setCreatedToken(String(payload.data.token));
-      toast.success("Access Key 已创建，请立即复制并妥善保存");
-      await loadAccessKeys();
-    } catch (error) {
-      toast.error(error instanceof Error ? error.message : "创建 Access Key 失败");
-    } finally {
-      setIsCreating(false);
-    }
-  }, [loadAccessKeys]);
-
-  const handleRevokeAccessKey = useCallback(
-    async (accessKeyId: string) => {
-      if (!window.confirm("撤销后使用该 Key 的 OpenClaw 将立即失去访问权限，确定继续吗？")) {
-        return;
-      }
-      setRevokingId(accessKeyId);
-      try {
-        const response = await fetch(`/api/user/access-keys/${accessKeyId}`, {
-          method: "DELETE",
-        });
-        const payload = await response.json().catch(() => ({}));
-        if (!response.ok || !payload?.success) {
-          throw new Error(payload?.error || "撤销 Access Key 失败");
-        }
-        setCreatedToken("");
-        toast.success("Access Key 已撤销");
-        await loadAccessKeys();
-      } catch (error) {
-        toast.error(error instanceof Error ? error.message : "撤销 Access Key 失败");
-      } finally {
-        setRevokingId(null);
-      }
-    },
-    [loadAccessKeys]
-  );
-
-  const formatDate = (value: string | null) => {
-    if (!value) return "-";
-    const date = new Date(value);
-    return Number.isNaN(date.getTime()) ? "-" : date.toLocaleString("zh-CN");
-  };
 
   return (
     <div className="fixed inset-0 z-[100] flex items-center justify-center bg-black/58" data-canvas-overlay="true">
@@ -25262,9 +25205,7 @@ function SkillsAccessModal({
                 · 安装使用请戳
                 <button
                   className="ml-1 text-[#2f8bff] underline-offset-2 hover:underline"
-                  onClick={() =>
-                    toast.info("安装包位于 integrations/openclaw，可通过 STDIO MCP 接入。")
-                  }
+                  onClick={() => toast.info("接口文档入口待接入。")}
                   type="button"
                 >
                   接口文档
@@ -25280,95 +25221,19 @@ function SkillsAccessModal({
         <div className="mt-6 flex justify-end">
           <button
             className="h-8 rounded-[8px] bg-white px-4 text-[12px] font-semibold text-black hover:bg-white/90"
-            disabled={isCreating}
-            onClick={() => void handleCreateAccessKey()}
+            onClick={() => toast.info("Access key 创建接口待接入。")}
             type="button"
           >
-            {isCreating ? "创建中..." : "创建新 Access Key"}
+            创建新Access key
           </button>
         </div>
 
-        {createdToken ? (
-          <div className="mt-4 rounded-[8px] border border-[#2f8bff]/40 bg-[#2f8bff]/10 p-3">
-            <div className="text-[12px] font-semibold text-white">仅显示一次，请立即复制</div>
-            <div className="mt-2 flex items-center gap-2">
-              <code className="min-w-0 flex-1 overflow-x-auto rounded bg-black/30 px-2 py-2 text-[11px] text-white/80">
-                {createdToken}
-              </code>
-              <button
-                className="flex h-8 shrink-0 items-center gap-1 rounded-[6px] bg-white px-2 text-[11px] font-medium text-black"
-                onClick={() => {
-                  void navigator.clipboard?.writeText(createdToken);
-                  toast.success("Access Key 已复制");
-                }}
-                type="button"
-              >
-                <Copy className="h-3.5 w-3.5" />
-                复制
-              </button>
-            </div>
-          </div>
-        ) : null}
-
         <div className="mt-4 overflow-hidden rounded-[8px] border border-white/8">
-          <div className="grid h-11 grid-cols-[145px_1fr_130px_54px] bg-white/16 text-[12px] text-white/86">
-            <div className="flex items-center px-3">名称 / 创建日期</div>
-            <div className="flex items-center px-3">Access Key</div>
-            <div className="flex items-center px-3">有效期</div>
-            <div />
+          <div className="grid h-11 grid-cols-[240px_1fr] bg-white/16 text-[13px] text-white/86">
+            <div className="flex items-center px-4">创建日期</div>
+            <div className="flex items-center px-4">Access key</div>
           </div>
-          {isLoading ? (
-            <div className="flex h-[66px] items-center justify-center text-white/45">
-              <Loader2 className="h-4 w-4 animate-spin" />
-            </div>
-          ) : accessKeys.length === 0 ? (
-            <div className="flex h-[66px] items-center px-4 text-[13px] text-white/45">
-              暂无 Access Key
-            </div>
-          ) : (
-            accessKeys.map((item) => {
-              const isRevoked = Boolean(item.revokedAt);
-              return (
-                <div
-                  className="grid min-h-[66px] grid-cols-[145px_1fr_130px_54px] border-white/8 border-t text-[11px]"
-                  key={item.id}
-                >
-                  <div className="flex min-w-0 flex-col justify-center px-3">
-                    <span className="truncate text-white/80">{item.name}</span>
-                    <span className="mt-1 text-white/38">{formatDate(item.createdAt)}</span>
-                  </div>
-                  <div className="flex min-w-0 items-center px-3 text-white/60">
-                    <code className="truncate">{item.tokenPrefix}••••••••</code>
-                  </div>
-                  <div className="flex flex-col justify-center px-3 text-white/48">
-                    <span className={isRevoked ? "text-red-300/80" : undefined}>
-                      {isRevoked ? "已撤销" : formatDate(item.expiresAt)}
-                    </span>
-                    {!isRevoked && item.lastUsedAt ? (
-                      <span className="mt-1">使用于 {formatDate(item.lastUsedAt)}</span>
-                    ) : null}
-                  </div>
-                  <div className="flex items-center justify-center">
-                    {!isRevoked ? (
-                      <button
-                        aria-label="撤销 Access Key"
-                        className="rounded p-2 text-white/40 hover:bg-red-500/10 hover:text-red-300"
-                        disabled={revokingId === item.id}
-                        onClick={() => void handleRevokeAccessKey(item.id)}
-                        type="button"
-                      >
-                        {revokingId === item.id ? (
-                          <Loader2 className="h-4 w-4 animate-spin" />
-                        ) : (
-                          <Trash2 className="h-4 w-4" />
-                        )}
-                      </button>
-                    ) : null}
-                  </div>
-                </div>
-              );
-            })
-          )}
+          <div className="flex h-[66px] items-center px-4 text-[13px] text-white/45">暂无 Access key</div>
         </div>
       </div>
     </div>

components/canvas/chat-panel/canvas-agent-stream.ts

@@ -1,7 +1,4 @@
 import type { CanvasViewOperationPlan } from "@/types/canvas/agent-protocol";
-import type { CanvasCapabilityClientCommand } from "@/lib/canvas/capabilities/client-command";
-
-export type CanvasCapabilityCommandStreamPayload = CanvasCapabilityClientCommand;
 
 export type CanvasMediaStreamPayload = {
   messageId?: string;

components/canvas/chat-panel/canvas-chat-media.ts

@@ -245,267 +245,36 @@ export function extractAssistantImageUrls(
   });
 }
 
-function isMarkdownTableRow(line: string): boolean {
-  const trimmed = String(line || "").trim();
-  if (!trimmed || !trimmed.includes("|")) return false;
-
-  const cells = trimmed
-    .replace(/^\|/, "")
-    .replace(/\|$/, "")
-    .split("|");
-  return cells.length >= 2;
-}
-
-function isMarkdownTableSeparator(line: string): boolean {
-  if (!isMarkdownTableRow(line)) return false;
-
-  const cells = String(line || "")
-    .trim()
-    .replace(/^\|/, "")
-    .replace(/\|$/, "")
-    .split("|")
-    .map((cell) => cell.trim().replace(/\s+/g, ""));
-  return cells.length >= 2 && cells.every((cell) => /^:?-{3,}:?$/.test(cell));
-}
-
-export function getMarkdownTableImageUrlKeys(text: string): Set<string> {
-  const urlKeys = new Set<string>();
-  const lines = String(text || "").replace(/\r\n/g, "\n").split("\n");
-  let inCodeFence = false;
-
-  const addUrl = (url: string) => {
-    const key = normalizeImageIdentityUrl(url);
-    if (key) urlKeys.add(key);
-  };
-  const addUrlsFromTableText = (tableText: string) => {
-    extractAssistantImageUrls(tableText).forEach(addUrl);
-    extractPlainImageUrls(tableText).forEach(addUrl);
-  };
-
-  for (let index = 0; index < lines.length - 1; index += 1) {
-    const line = lines[index] || "";
-    if (/^\s*```/.test(line)) {
-      inCodeFence = !inCodeFence;
-      continue;
-    }
-    if (
-      inCodeFence ||
-      !isMarkdownTableRow(line) ||
-      !isMarkdownTableSeparator(lines[index + 1] || "")
-    ) {
-      continue;
-    }
-
-    let endIndex = index + 2;
-    while (endIndex < lines.length && isMarkdownTableRow(lines[endIndex] || "")) {
-      endIndex += 1;
-    }
-
-    addUrlsFromTableText(lines.slice(index, endIndex).join("\n"));
-    index = endIndex - 1;
-  }
-
-  // Claw may emit pipe tables without a separator row while streaming. Treat a
-  // contiguous block of at least two pipe rows as a table for media deduping.
-  for (let index = 0; index < lines.length; ) {
-    if (!isMarkdownTableRow(lines[index] || "")) {
-      index += 1;
-      continue;
-    }
-    let endIndex = index + 1;
-    while (
-      endIndex < lines.length &&
-      isMarkdownTableRow(lines[endIndex] || "")
-    ) {
-      endIndex += 1;
-    }
-    if (endIndex - index >= 2) {
-      addUrlsFromTableText(lines.slice(index, endIndex).join("\n"));
-    }
-    index = endIndex;
-  }
-
-  const htmlTablePattern = /<table\b[^>]*>[\s\S]*?<\/table>/gi;
-  let htmlTableMatch: RegExpExecArray | null = null;
-  while ((htmlTableMatch = htmlTablePattern.exec(String(text || ""))) !== null) {
-    addUrlsFromTableText(htmlTableMatch[0] || "");
-  }
-
-  return urlKeys;
-}
-
-export function filterStandaloneAssistantImageUrls(
-  text: string,
-  imageUrls: string[]
-): string[] {
-  const tableImageUrlKeys = getMarkdownTableImageUrlKeys(text);
-  if (tableImageUrlKeys.size === 0) return imageUrls;
-
-  return imageUrls.filter((url) => {
-    const key = normalizeImageIdentityUrl(url);
-    return !key || !tableImageUrlKeys.has(key);
-  });
-}
-
-const AUDIO_MEDIA_EXTENSIONS = new Set([
-  "aac",
-  "flac",
-  "m4a",
-  "mp3",
-  "oga",
-  "ogg",
-  "opus",
-  "wav",
-]);
-const VIDEO_MEDIA_EXTENSIONS = new Set([
-  "m3u8",
-  "m4v",
-  "mov",
-  "mp4",
-  "ogv",
-  "webm",
-]);
-
-type ChatMediaKind = "audio" | "video";
-
-function sanitizeExtractedMediaUrl(value: string): string {
-  return String(value || "")
-    .trim()
-    .replace(/&amp;/gi, "&")
-    .replace(/[),.;!?，。；！？]+$/u, "");
-}
-
-function getChatMediaUrlExtension(value: string): string {
-  const raw = sanitizeExtractedMediaUrl(value);
-  if (!raw) return "";
-
-  try {
-    const parsed = new URL(raw);
-    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return "";
-    const pathnameExtension = parsed.pathname.match(/\.([a-z0-9]+)$/i)?.[1];
-    if (pathnameExtension) return pathnameExtension.toLowerCase();
-
-    for (const key of ["format", "ext", "type", "filename", "file", "name"]) {
-      const candidate = parsed.searchParams.get(key) || "";
-      const queryExtension = candidate.match(/(?:^|\.)([a-z0-9]+)$/i)?.[1];
-      if (queryExtension) return queryExtension.toLowerCase();
-    }
-  } catch {
-    return "";
-  }
-
-  return "";
-}
-
-function isChatMediaUrl(value: string, kind: ChatMediaKind): boolean {
-  const extension = getChatMediaUrlExtension(value);
-  return kind === "audio"
-    ? AUDIO_MEDIA_EXTENSIONS.has(extension)
-    : VIDEO_MEDIA_EXTENSIONS.has(extension);
-}
-
-function extractChatMediaUrls(text: string, kind: ChatMediaKind): string[] {
-  if (!text) return [];
-  const urls = new Map<string, string>();
-  const candidates: Array<{
-    forceKind?: ChatMediaKind;
-    index: number;
-    value: string;
-  }> = [];
-  const addUrl = (value: string, forceKind?: ChatMediaKind) => {
-    const url = sanitizeExtractedMediaUrl(value);
-    if (!url || (forceKind !== kind && !isChatMediaUrl(url, kind))) return;
-    try {
-      const parsed = new URL(url);
-      if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return;
-    } catch {
-      return;
-    }
-    if (!urls.has(url)) urls.set(url, url);
-  };
-
-  const tagPattern = /<(audio|video)\b[^>]*\bsrc\s*=\s*["']([^"']+)["'][^>]*>/gi;
-  let match: RegExpExecArray | null = null;
-  while ((match = tagPattern.exec(text)) !== null) {
-    candidates.push({
-      forceKind: match[1]?.toLowerCase() as ChatMediaKind,
-      index: match.index,
-      value: match[2] || "",
-    });
-  }
-
-  const containerPattern = /<(audio|video)\b[^>]*>([\s\S]*?)<\/\1>/gi;
-  while ((match = containerPattern.exec(text)) !== null) {
-    const containerKind = match[1]?.toLowerCase() as ChatMediaKind;
-    const sourcePattern = /<source\b[^>]*\bsrc\s*=\s*["']([^"']+)["'][^>]*>/gi;
-    let sourceMatch: RegExpExecArray | null = null;
-    while ((sourceMatch = sourcePattern.exec(match[2] || "")) !== null) {
-      candidates.push({
-        forceKind: containerKind,
-        index: match.index + sourceMatch.index,
-        value: sourceMatch[1] || "",
-      });
-    }
-  }
-
-  const markdownLinkPattern = /\[([^\]]*)]\((https?:\/\/[^)\s]+)\)/gi;
-  while ((match = markdownLinkPattern.exec(text)) !== null) {
-    const label = String(match[1] || "");
-    const hintedKind = /音频|语音|声音|audio|mp3/i.test(label)
-      ? "audio"
-      : /视频|影片|播放|video/i.test(label)
-        ? "video"
-        : undefined;
-    candidates.push({
-      forceKind: hintedKind,
-      index: match.index,
-      value: match[2] || "",
-    });
-  }
-
-  const plainUrlPattern = /https?:\/\/[^\s"'<>\[\]]+/gi;
-  while ((match = plainUrlPattern.exec(text)) !== null) {
-    candidates.push({ index: match.index, value: match[0] || "" });
-  }
-
-  candidates
-    .sort((left, right) => left.index - right.index)
-    .forEach((candidate) => addUrl(candidate.value, candidate.forceKind));
-
-  return Array.from(urls.values());
-}
-
-export function extractAudioUrls(text: string): string[] {
-  return extractChatMediaUrls(text, "audio");
-}
-
 export function extractVideoUrls(text: string): string[] {
-  return extractChatMediaUrls(text, "video");
+  if (!text) return [];
+  const urls = new Set<string>();
+
+  const videoTagPattern = /<video[^>]+src="([^"]+)"/gi;
+  let match: RegExpExecArray | null = null;
+  while ((match = videoTagPattern.exec(text)) !== null) {
+    if (match[1]) urls.add(match[1]);
+  }
+
+  const markdownVideoPattern = /\[[^\]]*]\((https?:\/\/[^)\s]+\.mp4(?:\?[^)\s]*)?)\)/gi;
+  while ((match = markdownVideoPattern.exec(text)) !== null) {
+    if (match[1]) urls.add(match[1]);
+  }
+
+  const plainVideoPattern = /(https?:\/\/[^\s"'<>]+\.mp4(?:\?[^\s"'<>]+)?)/gi;
+  while ((match = plainVideoPattern.exec(text)) !== null) {
+    if (match[1]) urls.add(match[1]);
+  }
+
+  return Array.from(urls);
 }
 
 export function stripMediaMarkup(text: string): string {
   return String(text || "")
     .replace(/!\[(?:thumb)?\|\|\|[^|]+\|\|\|[^\]]*\]\([^)]+\)/g, "")
     .replace(/<video[\s\S]*?<\/video>/gi, "")
-    .replace(/<video\b[^>]*\/?\s*>/gi, "")
-    .replace(/<audio[\s\S]*?<\/audio>/gi, "")
-    .replace(/<audio\b[^>]*\/?\s*>/gi, "")
     .replace(/<a[\s\S]*?<\/a>/gi, "")
-    .replace(/\[([^\]]*)]\((https?:\/\/[^)\s]+)\)/gi, (match, label, url) => {
-      const hintedMedia = /音频|语音|声音|audio|mp3|视频|影片|播放|video/i.test(
-        String(label || "")
-      );
-      return hintedMedia || isChatMediaUrl(url, "audio") || isChatMediaUrl(url, "video")
-        ? ""
-        : match;
-    })
-    .replace(/https?:\/\/[^\s"'<>\[\]]+/gi, (match) => {
-      const url = sanitizeExtractedMediaUrl(match);
-      if (!isChatMediaUrl(url, "audio") && !isChatMediaUrl(url, "video")) {
-        return match;
-      }
-      return match.slice(url.length);
-    })
+    .replace(/\[[^\]]*]\((https?:\/\/[^)\s]+\.mp4(?:\?[^)\s]*)?)\)/gi, "")
+    .replace(/https?:\/\/[^\s"'<>]+\.mp4(?:\?[^\s"'<>]+)?/gi, "")
     .trim();
 }
 
@@ -548,7 +317,6 @@ export function messageHasAssistantMedia(
     const text = String(part.text || "");
     return (
       extractAssistantImageUrls(text, referenceUrlKeys).length > 0 ||
-      extractAudioUrls(text).length > 0 ||
       extractVideoUrls(text).length > 0
     );
   });

components/canvas/chat-panel/canvas-chat-session.ts

@@ -17,12 +17,6 @@ const ALLOWED_CHAT_MEDIA_TYPES = new Set([
   "image/jpg",
   "image/bmp",
   "image/svg+xml",
-  "video/mp4",
-  "video/quicktime",
-  "video/webm",
-  "video/x-matroska",
-  "application/zip",
-  "application/x-zip-compressed",
 ]);
 
 const GENERIC_CANVAS_PROMPT_SET = new Set([

components/canvas/chat-panel/clawd-request-state.ts

@@ -1,60 +0,0 @@
-export type ClawdRequestState<TProgress> = {
-  userMessageId: string;
-  hint: string | null;
-  progressEvents: TProgress[];
-};
-
-export type ClawdRequestStateByChatId<TProgress> = Record<
-  string,
-  ClawdRequestState<TProgress>
->;
-
-export function startClawdRequestState<TProgress>(
-  previousState: ClawdRequestStateByChatId<TProgress>,
-  chatSessionId: string,
-  userMessageId: string,
-  hint: string | null
-): ClawdRequestStateByChatId<TProgress> {
-  return {
-    ...previousState,
-    [chatSessionId]: {
-      userMessageId,
-      hint,
-      progressEvents: [],
-    },
-  };
-}
-
-export function updateClawdRequestState<TProgress>(
-  previousState: ClawdRequestStateByChatId<TProgress>,
-  chatSessionId: string,
-  userMessageId: string,
-  updater: (
-    currentState: ClawdRequestState<TProgress>
-  ) => ClawdRequestState<TProgress>
-): ClawdRequestStateByChatId<TProgress> {
-  const currentState = previousState[chatSessionId];
-  if (!currentState || currentState.userMessageId !== userMessageId) {
-    return previousState;
-  }
-
-  return {
-    ...previousState,
-    [chatSessionId]: updater(currentState),
-  };
-}
-
-export function clearClawdRequestState<TProgress>(
-  previousState: ClawdRequestStateByChatId<TProgress>,
-  chatSessionId: string,
-  userMessageId: string
-): ClawdRequestStateByChatId<TProgress> {
-  const currentState = previousState[chatSessionId];
-  if (!currentState || currentState.userMessageId !== userMessageId) {
-    return previousState;
-  }
-
-  const nextState = { ...previousState };
-  delete nextState[chatSessionId];
-  return nextState;
-}

components/canvas/model3d/Model3DViewer.tsx

@@ -278,10 +278,6 @@ function configureMaterialTextures(
     geometry.setAttribute("uv2", geometry.attributes.uv);
   }
 
-  if (geometry?.attributes.color && "vertexColors" in materialRecord) {
-    materialRecord.vertexColors = true;
-  }
-
   for (const key of MATERIAL_TEXTURE_KEYS) {
     const texture = materialRecord[key];
     if (!texture?.isTexture) continue;
@@ -291,36 +287,12 @@ function configureMaterialTextures(
         ? THREE.SRGBColorSpace
         : THREE.NoColorSpace;
     }
-    texture.anisotropy = Math.max(Number(texture.anisotropy || 1), 8);
     texture.needsUpdate = true;
   }
 
   material.needsUpdate = true;
 }
 
-function cloneSceneWithIndependentMaterials(scene: Object3D) {
-  const clonedScene = scene.clone(true);
-
-  clonedScene.traverse((node) => {
-    if (!isMesh(node)) return;
-
-    const sourceMaterials = Array.isArray(node.material)
-      ? node.material
-      : [node.material];
-    const clonedMaterials = sourceMaterials.map((material) => {
-      const clonedMaterial = material.clone();
-      configureMaterialTextures(clonedMaterial, node.geometry);
-      return clonedMaterial;
-    });
-
-    node.material = Array.isArray(node.material)
-      ? clonedMaterials
-      : clonedMaterials[0] || node.material;
-  });
-
-  return clonedScene;
-}
-
 function resolveSceneGroundY(
   scene: Object3D,
   modelRotation?: [number, number, number]
@@ -377,10 +349,7 @@ function ModelScene({
       loader.setKTX2Loader(ktx2Loader);
     },
   );
-  const scene = useMemo(
-    () => cloneSceneWithIndependentMaterials(model.scene),
-    [model.scene]
-  );
+  const scene = useMemo(() => model.scene.clone(), [model.scene]);
   const meta = useMemo(() => collectSceneMeta(scene), [scene]);
   const modelRotationKey = modelRotation?.join("|") || "";
   const groundY = useMemo(
@@ -405,20 +374,6 @@ function ModelScene({
     }
   }, [layerVisibility, meta.meshRefs]);
 
-  useEffect(() => {
-    return () => {
-      scene.traverse((node) => {
-        if (!isMesh(node)) return;
-        const materials = Array.isArray(node.material)
-          ? node.material
-          : [node.material];
-        for (const material of materials) {
-          material.dispose();
-        }
-      });
-    };
-  }, [scene]);
-
   useEffect(() => {
     for (const { mesh } of meta.meshRefs) {
       mesh.castShadow = true;
@@ -428,6 +383,7 @@ function ModelScene({
         : [mesh.material];
       for (const material of materials) {
         if (!material) continue;
+        configureMaterialTextures(material, mesh.geometry);
         if ("wireframe" in material) {
           (material as any).wireframe = settings.wireframe;
         }
@@ -696,7 +652,7 @@ export function Model3DViewer({
   const resolvedModelUrl = useMemo(() => {
     return buildThreeAssetUrl(modelUrl);
   }, [modelUrl]);
-  const gridY = Number.isFinite(groundY) ? groundY - 0.08 : -0.08;
+  const gridY = Number.isFinite(groundY) ? groundY - 0.01 : -0.01;
   const handleGroundYChange = React.useCallback((nextGroundY: number) => {
     setGroundY((previousGroundY) =>
       Math.abs(previousGroundY - nextGroundY) < 0.001

components/canvas/nodes/ImageNode.tsx

@@ -97,7 +97,6 @@ import {
   createLocalEditRegionId,
   getLocalEditRegionsFromMetadata,
   getNormalizedRectOverlayStyle,
-  hasScaleAdjustTargetChanged,
   isHttpImageUrl,
   LOCAL_EDIT_COLORS,
   LOCAL_EDIT_MAX_REFERENCE_IMAGES_PER_REGION,
@@ -220,9 +219,6 @@ import {
 } from "@/lib/ai-wash/config";
 import { normalizeOptionalHexColor } from "@/lib/canvas/text-edit-colors";
 import { isCanvasImageUploadPending } from "@/lib/canvas/local-upload-state";
-import { createCanvasCapabilityClientCommand } from "@/lib/canvas/capabilities/client-command";
-import { getCanvasCapabilityByClientAction } from "@/lib/canvas/capabilities/registry";
-import type { CanvasCapabilityClientAction } from "@/lib/canvas/capabilities/types";
 import { cn, fetcher } from "@/lib/utils";
 import type {
   CanvasTextEditPayloadItem,
@@ -1805,8 +1801,7 @@ export function ImageNode({
         : "",
     [aiWashQuickLevels, selectedAiWashQuickPreset]
   );
-  const shouldShowAiWashQuickModelSelector =
-    !aiWashQuickConfig.hideModelSelector && !aiWashQuickAdminModelRef;
+  const shouldShowAiWashQuickModelSelector = !aiWashQuickAdminModelRef;
   const effectiveAiWashQuickModelRef =
     aiWashQuickAdminModelRef || String(aiWashQuickModelId || "").trim();
   const selectedAiWashQuickModel = useMemo(
@@ -1816,11 +1811,6 @@ export function ImageNode({
       null,
     [aiWashQuickModelId, aiWashQuickModelOptionByRef, effectiveAiWashQuickModelRef]
   );
-  const aiWashQuickHasExecutableModel = Boolean(
-    effectiveAiWashQuickModelRef &&
-      selectedAiWashQuickModel &&
-      selectedAiWashQuickModel.selectable !== false
-  );
   const aiWashQuickPrompt = useMemo(
     () =>
       selectedAiWashQuickPreset
@@ -2053,7 +2043,6 @@ export function ImageNode({
   const selectNode = useCanvasStore((state) => state.selectNode);
   const projectId = useCanvasStore((state) => state.projectId);
   const getCanvasState = useCanvasStore((state) => state.getCanvasState);
-  const loadCanvas = useCanvasStore((state) => state.loadCanvas);
   const addPendingChatAttachment = useCanvasStore(
     (state) => state.addPendingChatAttachment
   );
@@ -2282,7 +2271,7 @@ export function ImageNode({
       pointsEnabled && pointsSystemConfig.enhanceProPricing.enabled === true,
   });
   const aiWashQuickCostShortLabel =
-    pointsEnabled && !aiWashQuickConfig.hideModelSelector && selectedAiWashQuickModel
+    pointsEnabled && selectedAiWashQuickModel
       ? formatImageNodeFeatureCostShortLabel({
           cost: selectedAiWashQuickModel.unitCost,
           isHighVip,
@@ -4423,11 +4412,15 @@ export function ImageNode({
         toast.error(`请为区域 ${missingTargetRegion.index} 框选青色目标框`);
         return;
       }
-      const unchangedRegion = validRegions.find(
-        (region) => !hasScaleAdjustTargetChanged(region.rect, region.targetRect)
-      );
+      const unchangedRegion = validRegions.find((region) => {
+        const regionScalePercent = deriveCanvasScalePercentFromRects(
+          region.rect,
+          region.targetRect
+        );
+        return Math.abs(regionScalePercent) < 1;
+      });
       if (unchangedRegion) {
-        toast.error(`请调整区域 ${unchangedRegion.index} 的青色目标框大小或位置`);
+        toast.error(`请调整区域 ${unchangedRegion.index} 的青色目标框大小`);
         return;
       }
     } else {
@@ -6478,11 +6471,8 @@ export function ImageNode({
       toast.error("当前没有可执行的 AI洗图预设，请联系管理员完成配置");
       return;
     }
-    if (!aiWashQuickHasExecutableModel || !selectedAiWashQuickModel) {
-      toast.error(
-        selectedAiWashQuickModel?.disabledReason ||
-          "当前 AI洗图模型不可用，请在后台重新配置模型"
-      );
+    if (!effectiveAiWashQuickModelRef) {
+      toast.error("请先选择一个可用的生图模型");
       return;
     }
     if (isProcessing || isSubmittingAiWashQuick) {
@@ -6538,7 +6528,7 @@ export function ImageNode({
         body: JSON.stringify({
           prompt: aiWashQuickPrompt,
           referenceImage: data.src,
-          selectedModelId: selectedAiWashQuickModel.id || effectiveAiWashQuickModelRef,
+          selectedModelId: effectiveAiWashQuickModelRef,
           imageSize: aiWashQuickConfig.imageSize,
           promptExtend: aiWashQuickConfig.promptExtend,
           title: selectedAiWashQuickPreset.title,
@@ -6635,7 +6625,6 @@ export function ImageNode({
   }, [
     addNode,
     aiWashQuickConfig.enabled,
-    aiWashQuickConfig.hideModelSelector,
     aiWashQuickConfig.imageSize,
     aiWashQuickConfig.promptExtend,
     aiWashQuickLevels,
@@ -6643,7 +6632,6 @@ export function ImageNode({
     aiWashQuickPrompt,
     data.src,
     displayTitle,
-    aiWashQuickHasExecutableModel,
     effectiveAiWashQuickModelRef,
     isProcessing,
     isSubmittingAiWashQuick,
@@ -6651,66 +6639,14 @@ export function ImageNode({
     resetBoxCutoutState,
     resetLocalEditState,
     selectNode,
-    selectedAiWashQuickModel?.disabledReason,
     selectedAiWashQuickModel?.displayName,
-    selectedAiWashQuickModel?.id,
     selectedAiWashQuickModel?.modelId,
     selectedAiWashQuickPreset,
     updateNode,
   ]);
 
-  const executeSharedToolbarCapability = async (
-    action: "rmbg" | "watermark" | "enhance" | "extend" | "layer-split"
-  ) => {
-    if (!projectId) {
-      toast.error("画布还在加载，请稍后再试");
-      return;
-    }
-    const capability = getCanvasCapabilityByClientAction(action);
-    if (!capability) {
-      toast.error("画布能力未注册");
-      return;
-    }
-
-    setIsCreatingDetachedResultNode(false);
-    setIsProcessing(true);
-    try {
-      const command = createCanvasCapabilityClientCommand({
-        capabilityId: capability.id,
-        nodeIds: [node.id],
-        projectId,
-        source: "toolbar",
-      });
-      const response = await fetch(`/api/canvas/${projectId}/capabilities`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(command),
-      });
-      const payload = await response.json().catch(() => ({}));
-      if (!response.ok || payload?.success !== true) {
-        throw new Error(payload?.error || `${capability.title}失败`);
-      }
-
-      const projectResult = await canvasService.getProject(projectId);
-      if (!projectResult.success || !projectResult.data?.canvasData) {
-        throw new Error(projectResult.error || "结果已生成，但画布同步失败");
-      }
-      loadCanvas(projectResult.data.canvasData);
-      toast.success(`${capability.title}完成`);
-    } catch (error) {
-      const message =
-        error instanceof Error ? error.message : `${capability.title}失败`;
-      toast.error(message);
-    } finally {
-      setIsCreatingDetachedResultNode(false);
-      setIsProcessing(false);
-    }
-  };
-
-  // 处理图片编辑操作
-  const handleAction = async (
-    action: CanvasCapabilityClientAction | "scene-fusion" | "annotate"
-  ) => {
+  // 处理图片编辑操作 - 集成我们现有的 API
+  const handleAction = async (action: string) => {
     if (!data.src) {
       toast.error("请先上传图片");
       return;
@@ -6813,7 +6749,34 @@ export function ImageNode({
         toast.info("图层拆分功能未开启");
         return;
       }
-      await executeSharedToolbarCapability("layer-split");
+      setIsCreatingDetachedResultNode(true);
+      setIsProcessing(true);
+      try {
+        const result = await imageGenerationService.splitImageLayers(data.src);
+        const layers = result.data?.layers || [];
+
+        if (!result.success || layers.length === 0) {
+          toast.error(result.error || "图层拆分失败");
+          return;
+        }
+
+        const addedLayerCount = handleLayerSplitComplete(
+          layers.map((layer) => ({
+            originalUrl: layer.originalUrl,
+            title: layer.title,
+            layerIndex: layer.layerIndex,
+            totalLayers: layer.totalLayers,
+            bounds: layer.bounds ?? null,
+          }))
+        );
+        toast.success(`图层拆分完成，已新增 ${addedLayerCount} 个图层结果`);
+      } catch (error) {
+        console.error("图层拆分失败:", error);
+        toast.error("图层拆分失败");
+      } finally {
+        setIsCreatingDetachedResultNode(false);
+        setIsProcessing(false);
+      }
       return;
     }
     if (action === "box-cutout") {
@@ -6875,13 +6838,102 @@ export function ImageNode({
       return;
     }
 
-    if (
-      action === "rmbg" ||
-      action === "watermark" ||
-      action === "enhance" ||
-      action === "extend"
-    ) {
-      await executeSharedToolbarCapability(action);
+    const actionName = getActionName(action);
+
+    setImageAdjustPanelOpen(false);
+    setCropPanelOpen(false);
+    setCropInteraction(null);
+    setFlipRotatePanelOpen(false);
+    setAnglePanelOpen(false);
+    setIsCreatingDetachedResultNode(true);
+    setIsProcessing(true);
+    // 先创建一个"处理中"状态的节点，显示在原图右侧
+    const newNodeId = addNode({
+      type: "image",
+      position: {
+        x: node.position.x + node.size.width + 20,
+        y: node.position.y,
+      },
+      size: { width: node.size.width, height: node.size.height },
+      data: {
+        src: "", // 暂时没有图片
+        status: "generating",
+        prompt: `${actionName}处理中...`,
+        title: `${displayTitle}-${actionName}`,
+        originalSrc: data.src,
+      },
+      connections: [node.id],
+    });
+
+    let result;
+
+    try {
+      switch (action) {
+        case "rmbg":
+          result = await imageGenerationService.removeBackground(data.src);
+          break;
+        case "watermark":
+          result = await imageGenerationService.removeWatermark(data.src);
+          break;
+        case "enhance":
+          result = await imageGenerationService.enhanceImage(data.src);
+          break;
+        case "extend":
+          result = await imageGenerationService.extendImage(data.src);
+          break;
+        default:
+          // 删除创建的节点
+          if (newNodeId) deleteNode(newNodeId);
+          return;
+      }
+
+      if (result?.success && result.data?.url) {
+        // 更新节点为完成状态
+        if (newNodeId) {
+          updateNode(newNodeId, {
+            data: {
+              src: result.data.url,
+              status: "completed",
+              prompt: `${actionName}结果`,
+              title: `${displayTitle}-${actionName}`,
+              originalSrc: data.src,
+            },
+          });
+        }
+        toast.success(`${actionName}处理完成`);
+      } else {
+        // 更新节点为失败状态
+        if (newNodeId) {
+          updateNode(newNodeId, {
+            data: {
+              src: "",
+              status: "failed",
+              prompt: `${actionName}失败`,
+              title: `${displayTitle}-${actionName}-失败`,
+              originalSrc: data.src,
+            },
+          });
+        }
+        toast.error(result?.error || "处理失败");
+      }
+    } catch (error) {
+      console.error(`${action} 处理失败:`, error);
+      // 更新节点为失败状态
+      if (newNodeId) {
+        updateNode(newNodeId, {
+          data: {
+            src: "",
+            status: "failed",
+            prompt: `${actionName}失败`,
+            title: `${displayTitle}-${actionName}-失败`,
+            originalSrc: data.src,
+          },
+        });
+      }
+      toast.error("处理失败，请重试");
+    } finally {
+      setIsCreatingDetachedResultNode(false);
+      setIsProcessing(false);
     }
   };
 
@@ -6925,16 +6977,7 @@ export function ImageNode({
       const action = customEvent.detail?.action;
 
       if (!targetNodeId || !action || targetNodeId !== node.id) return;
-      if (action === "scene-fusion" || action === "annotate") {
-        void handleAction(action);
-        return;
-      }
-      const capability = getCanvasCapabilityByClientAction(
-        action as CanvasCapabilityClientAction
-      );
-      if (capability) {
-        void handleAction(capability.clientAction);
-      }
+      void handleAction(action);
     };
 
     window.addEventListener(
@@ -8057,9 +8100,20 @@ export function ImageNode({
     setIsCreatingDetachedResultNode(true);
     setIsProcessing(true);
     try {
+      const uploadResult = await worldLabsGenerationService.uploadMediaFromUrl(
+        sourceImageUrl,
+        "image"
+      );
+      if (!uploadResult.success || !uploadResult.data?.mediaAssetId) {
+        throw new Error(uploadResult.error || "上传世界参考图失败");
+      }
+
+      const providerId = uploadResult.data.providerId || null;
+      const providerName = uploadResult.data.providerName || null;
       const createResult = await worldLabsGenerationService.createTask({
         mode: "image",
-        sourceUrl: sourceImageUrl,
+        mediaAssetId: uploadResult.data.mediaAssetId,
+        providerId,
         prompt: promptText || undefined,
         displayName: displayTitle || promptText || "画布图生世界",
         model: modelVersion,
@@ -8072,6 +8126,8 @@ export function ImageNode({
 
       const createAssetPayload = {
         ...(createResult.data.assetPayload || {}),
+        providerId,
+        providerName,
         sourceImageUrl,
       };
       updateNode(newNodeId, {
@@ -8113,8 +8169,8 @@ export function ImageNode({
       void pollCanvasWorld3DTask({
         nodeId: newNodeId,
         taskId: createResult.data.taskId,
-        providerId: createAssetPayload.providerId || null,
-        providerName: createAssetPayload.providerName || null,
+        providerId,
+        providerName,
         promptText,
         modelVersion,
         sourceImageUrl,
@@ -9911,7 +9967,7 @@ export function ImageNode({
         typeof document !== "undefined" &&
         createPortal(
           <div
-            className="fixed z-[10000] overflow-hidden rounded-[14px] border border-slate-200 bg-white text-slate-950 shadow-[0_18px_44px_rgba(15,23,42,0.18)] dark:border-white/12 dark:bg-slate-950 dark:text-white"
+            className="fixed z-[10000] overflow-hidden rounded-[var(--ui-radius-panel)] border border-slate-200 bg-white text-slate-950 shadow-[0_14px_36px_rgba(15,23,42,0.16)] dark:border-white/12 dark:bg-slate-950 dark:text-white"
             data-canvas-no-drag="true"
             onClick={(event) => event.stopPropagation()}
             onMouseDown={(event) => event.stopPropagation()}
@@ -9925,21 +9981,21 @@ export function ImageNode({
               scrollbarWidth: "none",
             }}
           >
-            <div className="flex items-center justify-between gap-3 border-b border-slate-100 px-4 py-3 dark:border-white/10">
-              <div className="flex min-w-0 items-center gap-3">
-                <span className="flex h-6 w-6 shrink-0 items-center justify-center text-slate-950 dark:text-white">
+            <div className="flex items-center justify-between gap-2 border-b border-slate-100 px-3 py-2.5 dark:border-white/10">
+              <div className="flex min-w-0 items-center gap-2">
+                <span className="flex h-5 w-5 shrink-0 items-center justify-center text-slate-950 dark:text-white">
                   <CanvasToolbarIcon
-                    className="h-5 w-5"
+                    className="h-4 w-4"
                     fallback={Sparkles}
                     iconUrl={aiWashQuickConfig.modeIconUrl}
                   />
                 </span>
-                <div className="min-w-0 truncate text-[17px] font-semibold tracking-[-0.02em]">
+                <div className="min-w-0 truncate text-[14px] font-semibold">
                   {aiWashQuickModeLabel}
                 </div>
               </div>
               <button
-                className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-slate-400 transition hover:bg-slate-100 hover:text-slate-950 dark:text-white/54 dark:hover:bg-white/10 dark:hover:text-white"
+                className="flex h-7 w-7 shrink-0 items-center justify-center rounded-[var(--ui-radius-control)] text-slate-400 transition hover:bg-slate-100 hover:text-slate-950 dark:text-white/54 dark:hover:bg-white/10 dark:hover:text-white"
                 onClick={() => setAiWashQuickPanelOpen(false)}
                 title="关闭"
                 type="button"
@@ -9949,20 +10005,20 @@ export function ImageNode({
             </div>
 
             {aiWashConfigLoading ? (
-              <div className="flex items-center gap-2 border-b border-slate-100 px-4 py-3 text-[13px] text-slate-500 dark:border-white/10 dark:text-white/58">
+              <div className="flex items-center gap-2 border-b border-slate-100 px-3 py-2.5 text-[12px] text-slate-500 dark:border-white/10 dark:text-white/58">
                 <Loader2 className="h-3.5 w-3.5 animate-spin" />
                 正在加载 AI洗图 配置...
               </div>
             ) : null}
 
             <div className="divide-y divide-slate-100 dark:divide-white/10">
-              <div className="px-4 py-3">
-                <div className="mb-2 flex items-center justify-between gap-2">
-                  <div className="flex items-center gap-2 text-[14px] font-semibold text-slate-950 dark:text-white">
+              <div className="px-3 py-2.5">
+                <div className="mb-1.5 flex items-center justify-between gap-2">
+                  <div className="flex items-center gap-2 text-[13px] font-semibold text-slate-950 dark:text-white">
                     <SlidersHorizontal className="h-4 w-4" />
                     目标
                   </div>
-                  <span className="rounded-full border border-slate-200 bg-white px-2 py-0.5 text-[12px] text-slate-500 dark:border-white/10 dark:bg-white/8 dark:text-white/58">
+                  <span className="rounded-[5px] border border-slate-200 bg-white px-1.5 py-0.5 text-[10px] text-slate-500 dark:border-white/10 dark:bg-white/8 dark:text-white/58">
                     {getAiWashStatusLabel(aiWashQuickStatus)}
                   </span>
                 </div>
@@ -9973,7 +10029,7 @@ export function ImageNode({
                   }}
                   value={selectedAiWashQuickPreset?.id || aiWashQuickPresetId}
                 >
-                  <SelectTrigger className="h-10 rounded-[10px] border-slate-200 bg-white px-3 text-[14px] shadow-none dark:border-white/10 dark:bg-white/8">
+                  <SelectTrigger className="h-9 border-slate-200 bg-white px-2.5 text-[13px] shadow-none dark:border-white/10 dark:bg-white/8">
                     <SelectValue placeholder="选择渲染目标" />
                   </SelectTrigger>
                   <SelectContent className="border-slate-200 bg-white text-slate-950 dark:border-white/10 dark:bg-slate-950 dark:text-white">
@@ -9991,8 +10047,8 @@ export function ImageNode({
                 ) : null}
               </div>
 
-              <div className="px-4 py-3">
-                <div className="mb-2 text-[14px] font-semibold text-slate-950 dark:text-white">
+              <div className="px-3 py-2.5">
+                <div className="mb-1.5 text-[13px] font-semibold text-slate-950 dark:text-white">
                   参数
                 </div>
                 {shouldShowAiWashQuickModelSelector ? (
@@ -10004,7 +10060,7 @@ export function ImageNode({
                       onValueChange={setAiWashQuickModelId}
                       value={selectedAiWashQuickModel?.id || aiWashQuickModelId}
                     >
-                      <SelectTrigger className="h-10 rounded-[10px] border-slate-200 bg-white px-3 text-[14px] shadow-none dark:border-white/10 dark:bg-white/8">
+                      <SelectTrigger className="h-9 border-slate-200 bg-white px-2.5 text-[13px] shadow-none dark:border-white/10 dark:bg-white/8">
                         <SelectValue placeholder="选择生图模型" />
                       </SelectTrigger>
                       <SelectContent className="border-slate-200 bg-white text-slate-950 dark:border-white/10 dark:bg-slate-950 dark:text-white">
@@ -10040,9 +10096,16 @@ export function ImageNode({
                           : "没有可选模型"}
                     </div>
                   </div>
+                ) : selectedAiWashQuickModel ? (
+                  <div className="mb-3 rounded-[var(--ui-radius-control)] border border-slate-200 bg-slate-50 px-2.5 py-2 text-[12px] text-slate-500 dark:border-white/10 dark:bg-white/6 dark:text-white/52">
+                    {selectedAiWashQuickModel.displayName}
+                    {selectedAiWashQuickModel.unitCost > 0
+                      ? ` · ${selectedAiWashQuickModel.unitCost} 积分/张`
+                      : ""}
+                  </div>
                 ) : null}
 
-                <div className="-mx-4 divide-y divide-slate-100 dark:divide-white/10">
+                <div className="-mx-3 divide-y divide-slate-100 dark:divide-white/10">
                   {aiWashQuickControls.map((control) => {
                     const selectedIndex =
                       aiWashQuickLevels[control.id] ?? control.defaultLevel;
@@ -10052,14 +10115,14 @@ export function ImageNode({
                       null;
                     return (
                       <div
-                        className="px-4 py-3"
+                        className="px-3 py-2.5"
                         key={control.id}
                       >
-                        <div className="mb-2 flex items-center justify-between gap-2">
-                          <div className="text-[14px] font-semibold">
+                        <div className="mb-1.5 flex items-center justify-between gap-2">
+                          <div className="text-[13px] font-semibold">
                             {control.label}
                           </div>
-                          <span className="min-w-8 rounded-full border border-slate-200 bg-white px-2 py-0.5 text-center text-[12px] text-slate-600 dark:border-white/10 dark:bg-white/8 dark:text-white/64">
+                          <span className="min-w-7 rounded-[5px] border border-slate-200 bg-white px-1.5 py-0.5 text-center text-[10px] text-slate-600 dark:border-white/10 dark:bg-white/8 dark:text-white/64">
                             {activeLevel?.label || selectedIndex + 1}
                           </span>
                         </div>
@@ -10085,13 +10148,13 @@ export function ImageNode({
                 </div>
               </div>
 
-              <div className="px-3 py-3">
+              <div className="px-3 py-2.5">
               <Button
-                className="h-10 w-full rounded-[10px] bg-slate-950 text-[14px] font-semibold text-white shadow-none hover:bg-slate-900 hover:text-white disabled:bg-slate-100 disabled:text-slate-300 disabled:shadow-none dark:bg-white dark:text-slate-950 dark:hover:bg-slate-100 dark:disabled:bg-white/12 dark:disabled:text-white/30"
+                className="h-9 w-full bg-slate-950 text-[13px] font-semibold text-white shadow-none hover:bg-slate-900 hover:text-white disabled:bg-slate-100 disabled:text-slate-300 disabled:shadow-none dark:bg-white dark:text-slate-950 dark:hover:bg-slate-100 dark:disabled:bg-white/12 dark:disabled:text-white/30"
                 disabled={
                   isSubmittingAiWashQuick ||
                   !selectedAiWashQuickPreset ||
-                  !aiWashQuickHasExecutableModel
+                  !effectiveAiWashQuickModelRef
                 }
                 onClick={() => void handleSubmitAiWashQuick()}
                 type="button"
@@ -10104,10 +10167,9 @@ export function ImageNode({
                 {isSubmittingAiWashQuick
                   ? "生成中"
                   : `${aiWashQuickModeLabel}${
-                      !aiWashQuickConfig.hideModelSelector &&
                       selectedAiWashQuickModel?.unitCost
                         ? ` · ${selectedAiWashQuickModel.unitCost} 积分`
-                        : ""
+                      : ""
                     }`}
               </Button>
               </div>
@@ -11620,7 +11682,7 @@ export function ImageNode({
         typeof document !== "undefined" &&
         createPortal(
           <div
-            className="fixed z-[9999] w-[360px] rounded-xl border border-slate-200 bg-white shadow-2xl dark:border-zinc-800 dark:bg-zinc-950"
+            className="fixed z-[9999] w-[340px] max-w-[calc(100vw-24px)] rounded-[var(--ui-radius-panel)] border border-slate-200 bg-white shadow-xl dark:border-zinc-800 dark:bg-zinc-950"
             onClick={(e) => e.stopPropagation()}
             onMouseDown={(e) => e.stopPropagation()}
             onPointerDown={(e) => e.stopPropagation()}
@@ -11632,7 +11694,7 @@ export function ImageNode({
             <div className="flex items-center justify-between border-border/70 border-b px-4 py-3">
               <div className="flex items-center gap-2">
                 <Type className="h-4 w-4 text-primary" />
-                <span className="font-medium text-sm">编辑文字</span>
+                <span className="text-[13px] font-medium">编辑文字</span>
               </div>
               <Button
                 className="h-7 w-7"
@@ -11645,12 +11707,12 @@ export function ImageNode({
             </div>
 
             <div className="max-h-[360px] space-y-3 overflow-y-auto px-4 py-3">
-              <p className="text-muted-foreground text-xs">
+              <p className="text-[11px] leading-4 text-muted-foreground">
                 识别图片文字后可逐条修改或删除，应用后会在保持画面风格的前提下完成文字更新。
               </p>
 
               {isDetectingText && (
-                <div className="flex items-center gap-2 text-muted-foreground text-sm">
+                <div className="flex items-center gap-2 text-[13px] text-muted-foreground">
                   <Loader2 className="h-4 w-4 animate-spin" />
                   正在识别图片文字...
                 </div>
@@ -11672,7 +11734,7 @@ export function ImageNode({
 
               {textEditItems.map((item, index) => (
                 <div
-                  className="space-y-2 rounded-lg border border-border/70 p-3"
+                  className="space-y-2 rounded-[var(--ui-radius-control)] border border-border/70 p-2.5"
                   key={item.id}
                 >
                   <div className="flex items-center justify-between gap-2">

components/canvas/nodes/Model3DNode.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, { useMemo, useState } from "react";
 import {
   AlertCircle,
   Box,
@@ -43,7 +43,6 @@ import {
   type CanvasToolbarConfig,
 } from "@/lib/canvas-toolbar-config";
 import { useCanvasStore } from "@/store/canvas";
-import { canvasService, model3DGenerationService } from "@/services/canvas";
 import type { CanvasNode, Model3DNodeData } from "@/types/canvas";
 import { cn, fetcher } from "@/lib/utils";
 
@@ -62,15 +61,6 @@ const CANVAS_MODEL_VIEWER_SETTINGS: Model3DViewerSettings = {
   wireframe: false,
 };
 
-const MODEL_3D_RECOVERY_INTERVAL_MS = 5000;
-const MODEL_3D_RECOVERY_MAX_ATTEMPTS = 360;
-
-function isTerminalModelFailureStatus(status: string) {
-  return ["failed", "error", "banned", "expired", "cancelled", "canceled"].includes(
-    status.trim().toLowerCase()
-  );
-}
-
 function inferModelFileName(modelUrl: string | null, nodeId: string) {
   const raw = String(modelUrl || "").trim();
   if (!raw) return `model3d-${nodeId.slice(0, 6)}.glb`;
@@ -103,12 +93,7 @@ export function Model3DNode({
 }: Model3DNodeProps) {
   const data = node.data as Model3DNodeData;
   const [isHovered, setIsHovered] = useState(false);
-  const recoveryAttemptRef = useRef(0);
-  const recoveryTaskRef = useRef<string | null>(null);
   const deleteNode = useCanvasStore((state) => state.deleteNode);
-  const updateNode = useCanvasStore((state) => state.updateNode);
-  const projectId = useCanvasStore((state) => state.projectId);
-  const getCanvasState = useCanvasStore((state) => state.getCanvasState);
   const model3dOpen3dItem = getCanvasToolbarItem(
     canvasToolbarConfig,
     "model3dOpen3d"
@@ -142,17 +127,6 @@ export function Model3DNode({
     "model3dDelete"
   );
   const viewportZoom = useCanvasStore((state) => state.viewport.zoom);
-  const taskId = String(data.metadata?.taskId || "").trim();
-  const assetPayload = readWorldAssetPayload(data);
-  const providerId = String(
-    data.metadata?.providerId || assetPayload?.providerId || ""
-  ).trim();
-  const providerName = String(
-    data.metadata?.providerName || assetPayload?.providerName || ""
-  ).trim();
-  const sourceImageUrl = String(
-    data.metadata?.sourceImageUrl || data.previewImage || ""
-  ).trim();
   const { data: modelAliasConfigResponse } = useSWR<{
     success?: boolean;
     data?: PublicThreeDModelAliasConfig;
@@ -225,224 +199,6 @@ export function Model3DNode({
     [placeholderViewportScale]
   );
 
-  const persistCanvasStateSnapshot = useCallback(() => {
-    if (!projectId || typeof window === "undefined") return;
-    window.setTimeout(() => {
-      void canvasService.saveCanvasState(projectId, getCanvasState());
-    }, 0);
-  }, [getCanvasState, projectId]);
-
-  const persistCanvas3DAsset = useCallback(
-    async (asset: Record<string, unknown>) => {
-      if (!projectId) return;
-      try {
-        await fetch(`/api/canvas/${projectId}/model3d-assets`, {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ asset }),
-        });
-      } catch (error) {
-        console.error("[Model3DNode] 保存 3D 资产失败:", error);
-      }
-    },
-    [projectId]
-  );
-
-  useEffect(() => {
-    if (data.status !== "generating" || !taskId) return;
-    const provider = String(data.metadata?.provider || "tripo-3d").trim();
-    if (provider !== "tripo-3d") return;
-
-    if (recoveryTaskRef.current !== taskId) {
-      recoveryTaskRef.current = taskId;
-      recoveryAttemptRef.current = 0;
-    }
-
-    let cancelled = false;
-    let timer: ReturnType<typeof setTimeout> | null = null;
-    const prompt = String(data.prompt || "图生 3D 模型").trim();
-    const modelVersion = String(data.modelVersion || "tripo-standard").trim();
-    const previewImage = String(data.previewImage || sourceImageUrl).trim();
-
-    const currentData = () => {
-      const currentNode = getCanvasState().nodes.find((item) => item.id === node.id);
-      return (currentNode?.data || data) as Model3DNodeData;
-    };
-
-    const persistTerminalAsset = async (params: {
-      error: string | null;
-      modelUrl: string | null;
-      previewImageUrl: string;
-      progress: number | null;
-      status: "failed" | "success";
-      taskAssetPayload?: Record<string, unknown> | null;
-    }) => {
-      await persistCanvas3DAsset({
-        taskId,
-        provider: "tripo-3d",
-        status: params.status,
-        mode: "image",
-        prompt,
-        modelVersion,
-        progress: params.progress,
-        modelUrl: params.modelUrl,
-        previewImageUrl: params.previewImageUrl,
-        error: params.error,
-        assetPayload: {
-          ...(params.taskAssetPayload || {}),
-          providerId: providerId || null,
-          providerName: providerName || null,
-          sourceImageUrl,
-        },
-        createdAt: Date.now(),
-      });
-      persistCanvasStateSnapshot();
-    };
-
-    const markFailed = async (message: string, progress: number | null) => {
-      const latest = currentData();
-      updateNode(node.id, {
-        data: {
-          ...latest,
-          src: "",
-          previewImage: previewImage || sourceImageUrl,
-          status: "failed",
-          metadata: {
-            ...(latest.metadata || {}),
-            taskId,
-            provider: "tripo-3d",
-            mode: "image",
-            sourceImageUrl,
-            progress,
-            error: message,
-          },
-        } as Model3DNodeData,
-      });
-      await persistTerminalAsset({
-        error: message,
-        modelUrl: null,
-        previewImageUrl: previewImage || sourceImageUrl,
-        progress,
-        status: "failed",
-      });
-      toast.error(message);
-    };
-
-    const scheduleNextPoll = () => {
-      if (cancelled) return;
-      if (recoveryAttemptRef.current >= MODEL_3D_RECOVERY_MAX_ATTEMPTS) {
-        void markFailed("3D 模型任务同步超时，请稍后重试", null);
-        return;
-      }
-      timer = setTimeout(() => {
-        void pollTask();
-      }, MODEL_3D_RECOVERY_INTERVAL_MS);
-    };
-
-    async function pollTask() {
-      if (cancelled) return;
-      recoveryAttemptRef.current += 1;
-      const result = await model3DGenerationService.getTask(taskId, {
-        providerId: providerId || null,
-      });
-      if (cancelled) return;
-      if (!result.success || !result.data) {
-        scheduleNextPoll();
-        return;
-      }
-
-      const status = String(result.data.status || "unknown").toLowerCase();
-      const progress = result.data.progress ?? null;
-      if (status === "success") {
-        const modelUrl = String(result.data.modelUrl || "").trim();
-        const nextPreviewImage = String(
-          result.data.previewImageUrl || previewImage || sourceImageUrl
-        ).trim();
-        if (!modelUrl) {
-          scheduleNextPoll();
-          return;
-        }
-        const taskAssetPayload =
-          result.data.assetPayload && typeof result.data.assetPayload === "object"
-            ? (result.data.assetPayload as Record<string, unknown>)
-            : {};
-        const latest = currentData();
-        updateNode(node.id, {
-          data: {
-            ...latest,
-            src: modelUrl,
-            previewImage: nextPreviewImage,
-            format: inferModelFormat(modelUrl),
-            status: "completed",
-            metadata: {
-              ...(latest.metadata || {}),
-              taskId,
-              provider: "tripo-3d",
-              mode: "image",
-              sourceImageUrl,
-              progress: 100,
-              output: result.data.output || null,
-              assetPayload: {
-                ...taskAssetPayload,
-                providerId: providerId || taskAssetPayload.providerId || null,
-                providerName: providerName || taskAssetPayload.providerName || null,
-                sourceImageUrl,
-              },
-              recoveredAt: new Date().toISOString(),
-            },
-          } as Model3DNodeData,
-        });
-        await persistTerminalAsset({
-          error: null,
-          modelUrl,
-          previewImageUrl: nextPreviewImage,
-          progress: 100,
-          status: "success",
-          taskAssetPayload,
-        });
-        toast.success("3D 模型已生成到画布");
-        return;
-      }
-
-      if (isTerminalModelFailureStatus(status)) {
-        await markFailed(result.data.errorMessage || "3D 模型生成失败", progress);
-        return;
-      }
-
-      const latest = currentData();
-      updateNode(node.id, {
-        data: {
-          ...latest,
-          metadata: {
-            ...(latest.metadata || {}),
-            progress,
-          },
-        } as Model3DNodeData,
-      });
-      scheduleNextPoll();
-    }
-
-    void pollTask();
-    return () => {
-      cancelled = true;
-      if (timer) clearTimeout(timer);
-    };
-  }, [
-    data.modelVersion,
-    data.previewImage,
-    data.prompt,
-    data.status,
-    getCanvasState,
-    node.id,
-    persistCanvas3DAsset,
-    persistCanvasStateSnapshot,
-    providerId,
-    providerName,
-    sourceImageUrl,
-    taskId,
-    updateNode,
-  ]);
-
   const handleOpen = () => {
     if (!primaryOpenUrl) {
       toast.error("暂无可打开的地址");

components/canvas/nodes/image-node/image-node-local-edit.ts

@@ -61,17 +61,6 @@ export const createLocalEditRegionId = () =>
 export const createLocalEditReferenceImageId = () =>
   `local-edit-ref-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
 
-export const hasScaleAdjustTargetChanged = (
-  sourceRect: NormalizedCropRect,
-  targetRect: NormalizedCropRect | null | undefined
-) => {
-  if (!targetRect) return false;
-  const minimumNormalizedChange = 0.001;
-  return (["x", "y", "width", "height"] as const).some(
-    (key) => Math.abs(targetRect[key] - sourceRect[key]) >= minimumNormalizedChange
-  );
-};
-
 export const normalizeLocalEditRect = (value: unknown): NormalizedCropRect | null => {
   if (!value || typeof value !== "object") return null;
   const rect = value as Partial<NormalizedCropRect>;

components/canvas/world3d/World3DViewer.tsx

@@ -103,7 +103,6 @@ type World3DViewerProps = {
   resetViewToken?: number;
   onCaptureReady?: (capture: (() => Promise<Blob | null>) | null) => void;
   showMovementControls?: boolean;
-  showInfoOverlay?: boolean;
 };
 
 const DEFAULT_MESH_SETTINGS: Model3DViewerSettings = {
@@ -118,7 +117,7 @@ const DEFAULT_MESH_SETTINGS: Model3DViewerSettings = {
 const WORLDLABS_ASSET_ROTATION: [number, number, number] = [Math.PI, 0, 0];
 const WORLDLABS_REFERENCE_VIEW_AXIS = new THREE.Vector3(0, 0, 1);
 const WORLDLABS_DISPLAY_GROUND_BIAS_RATIO = 0.08;
-const WORLDLABS_DISPLAY_GROUND_HELPER_BIAS = 0.45;
+const WORLDLABS_DISPLAY_GROUND_HELPER_BIAS = 0.22;
 
 const EMPTY_MOVEMENT_STATE: MovementState = {
   forward: false,
@@ -1495,7 +1494,6 @@ function WorldSplatScene({
     semanticsMetadata?.ground_plane_offset
   );
   const groundHelperOffset = getWorldLabsDisplayGroundHelperOffset(groundPlaneOffset);
-  const shouldShowGroundHelper = groundHelperOffset !== null && !firstPerson;
   const handleOrbitControlsRef = React.useCallback((controls: any | null) => {
     orbitControlsRef.current = controls;
     setControlsMountVersion((version) => version + 1);
@@ -1781,7 +1779,7 @@ function WorldSplatScene({
     <>
       <ambientLight intensity={1.6} />
       <directionalLight intensity={1.25} position={[6, 10, 4]} />
-      {shouldShowGroundHelper ? (
+      {groundHelperOffset !== null ? (
         <gridHelper
           args={[18, 18, "#334155", "#0f172a"]}
           position={[0, groundHelperOffset, 0]}
@@ -2282,7 +2280,6 @@ export function World3DViewer({
   resetViewToken,
   onCaptureReady,
   showMovementControls = false,
-  showInfoOverlay = !minimalFrame,
 }: World3DViewerProps) {
   const resolvedImageUrl = String(imageUrl || previewImageUrl || "").trim() || null;
 
@@ -2389,7 +2386,7 @@ export function World3DViewer({
         minimalFrame={minimalFrame}
         resetViewToken={resetViewToken}
         semanticsMetadata={semanticsMetadata}
-        showInfoOverlay={showInfoOverlay}
+        showInfoOverlay={!minimalFrame}
         showMovementControls={showMovementControls}
         splatUrl={splatUrl}
         splatUrls={splatUrls}

components/elements/response.tsx

@@ -459,7 +459,7 @@ function MarkdownTableImagePreview({
     <>
       <button
         type="button"
-        className="group/table-image relative block h-16 w-16 overflow-hidden rounded-md border border-border/70 bg-muted/40"
+        className="group/table-image relative block h-24 w-24 overflow-hidden rounded-lg border border-border/70 bg-muted/40"
         data-no-drag="true"
         onClick={(event) => {
           event.preventDefault();

components/home/lovart-home.tsx

@@ -74,12 +74,6 @@ import { LovartFeaturedGallery } from "@/components/home/lovart/lovart-featured-
 import { LovartHeroComposer } from "@/components/home/lovart/lovart-hero-composer";
 import { LovartProjectsSection } from "@/components/home/lovart/lovart-projects-section";
 import { LovartSidebar } from "@/components/home/lovart/lovart-sidebar";
-import {
-  LOVART_PROMO_BANNER_HEIGHT,
-  LovartPromoBanner,
-} from "@/components/home/lovart/lovart-promo-banner";
-
-const HOME_PROMO_DISMISS_STORAGE_KEY = "lovart-home-promo-dismissed-v1";
 
 const ImageAnnotatorLazy = dynamic(
   () => import("@/components/image-annotator").then((module) => module.ImageAnnotator),
@@ -453,10 +447,6 @@ export function LovartHome({
   const [activeCategory, setActiveCategory] = useState("全部");
   const [isProjectsOnlyView, setIsProjectsOnlyView] = useState(false);
   const [upgradeDialogOpen, setUpgradeDialogOpen] = useState(false);
-  const [dismissedHomeBannerIdentity, setDismissedHomeBannerIdentity] =
-    useState<string | null>(null);
-  const [hasResolvedHomeBannerDismissal, setHasResolvedHomeBannerDismissal] =
-    useState(false);
   const [accountCenterOpen, setAccountCenterOpen] = useState(false);
   const [accountCenterTab, setAccountCenterTab] = useState<"account" | "usage" | "billing">(
     "account"
@@ -635,10 +625,6 @@ export function LovartHome({
     siteLogoDark?: string | null;
     lovartPromoText?: string | null;
     lovartPromoActionText?: string | null;
-    bannerEnabled?: boolean;
-    bannerText?: string | null;
-    bannerLink?: string | null;
-    bannerActionText?: string | null;
     lovartHeroTitle?: string | null;
     lovartHeroSubtitle?: string | null;
     surpriseCategories?: string[];
@@ -678,32 +664,6 @@ export function LovartHome({
     siteSettingsData?.lovartPromoText ?? initialHeroPromoText;
   const heroPromoActionText =
     siteSettingsData?.lovartPromoActionText ?? initialHeroPromoActionText;
-  const homeBannerText = String(siteSettingsData?.bannerText || "").trim();
-  const homeBannerActionText = String(
-    siteSettingsData?.bannerActionText || "立即查看"
-  ).trim();
-  const rawHomeBannerLink = String(siteSettingsData?.bannerLink || "").trim();
-  const homeBannerLink =
-    /^(https?:\/\/|\/(?!\/))/i.test(rawHomeBannerLink)
-      ? rawHomeBannerLink
-      : "";
-  const homeBannerIdentity = useMemo(
-    () =>
-      homeBannerText
-        ? JSON.stringify({
-            actionText: homeBannerActionText,
-            link: homeBannerLink,
-            text: homeBannerText,
-          })
-        : "",
-    [homeBannerActionText, homeBannerLink, homeBannerText]
-  );
-  const shouldShowHomeBanner = Boolean(
-    siteSettingsData?.bannerEnabled === true &&
-      homeBannerIdentity &&
-      hasResolvedHomeBannerDismissal &&
-      dismissedHomeBannerIdentity !== homeBannerIdentity
-  );
   const heroTitleText =
     siteSettingsData?.lovartHeroTitle ?? initialHeroTitleText;
   const heroSubtitleText =
@@ -716,48 +676,6 @@ export function LovartHome({
       ? siteLogoDark || siteLogo || ""
       : siteLogo || siteLogoDark || "";
 
-  useEffect(() => {
-    if (!homeBannerIdentity) {
-      setDismissedHomeBannerIdentity(null);
-      setHasResolvedHomeBannerDismissal(true);
-      return;
-    }
-
-    try {
-      const storedIdentity = window.localStorage.getItem(
-        HOME_PROMO_DISMISS_STORAGE_KEY
-      );
-      setDismissedHomeBannerIdentity(
-        storedIdentity === homeBannerIdentity ? homeBannerIdentity : null
-      );
-    } catch {
-      setDismissedHomeBannerIdentity(null);
-    }
-    setHasResolvedHomeBannerDismissal(true);
-  }, [homeBannerIdentity]);
-
-  const dismissHomeBanner = useCallback(() => {
-    if (!homeBannerIdentity) return;
-    try {
-      window.localStorage.setItem(
-        HOME_PROMO_DISMISS_STORAGE_KEY,
-        homeBannerIdentity
-      );
-    } catch {
-      // The banner still closes for this page when storage is unavailable.
-    }
-    setDismissedHomeBannerIdentity(homeBannerIdentity);
-  }, [homeBannerIdentity]);
-
-  const openHomeBannerLink = useCallback(() => {
-    if (!homeBannerLink) return;
-    if (homeBannerLink.startsWith("/")) {
-      router.push(homeBannerLink);
-      return;
-    }
-    window.open(homeBannerLink, "_blank", "noopener,noreferrer");
-  }, [homeBannerLink, router]);
-
   const { data: tutorialVideosData } = useSWR<{ videos: TutorialVideo[] }>(
     isSecondaryDataReady && siteSettingsData?.tutorialEnabled
       ? "/api/tutorial-videos"
@@ -1705,19 +1623,9 @@ export function LovartHome({
 
   return (
     <div className="min-h-svh overflow-x-hidden bg-white text-[#171717] dark:bg-[#0a0a0c] dark:text-zinc-100 [&_button]:cursor-pointer [&_input]:cursor-pointer [&_textarea]:cursor-pointer [&_img]:cursor-pointer [&_a]:cursor-pointer [&_[role=button]]:cursor-pointer">
-      {shouldShowHomeBanner ? (
-        <LovartPromoBanner
-          actionText={homeBannerActionText}
-          link={homeBannerLink}
-          onAction={openHomeBannerLink}
-          onDismiss={dismissHomeBanner}
-          text={homeBannerText}
-        />
-      ) : null}
       <BrandTopBar
         contentClassName="pl-[80px]"
         logo={displayLogo}
-        offsetTop={shouldShowHomeBanner ? LOVART_PROMO_BANNER_HEIGHT : 0}
         onLogoClick={() => window.scrollTo({ top: 0, behavior: "smooth" })}
         showBrand={false}
         siteName={siteName || "Lovart"}
@@ -1970,7 +1878,6 @@ export function LovartHome({
         }
         siteLogo={displayLogo}
         siteName={siteName || "Lovart"}
-        topOffset={shouldShowHomeBanner ? LOVART_PROMO_BANNER_HEIGHT : 0}
         toolbox1Enabled={siteSettingsData?.toolbox1Enabled !== false}
         toolbox1Links={toolbox1Links}
         toolbox2Enabled={siteSettingsData?.toolbox2Enabled === true}
@@ -1981,12 +1888,7 @@ export function LovartHome({
         tone={effectiveResolvedTheme === "dark" ? "dark" : "light"}
       />
 
-      <main
-        className={cn(
-          "ml-[92px] mr-10 w-auto max-w-none pb-16 max-lg:mx-5",
-          shouldShowHomeBanner ? "pt-[113px]" : "pt-[68px]"
-        )}
-      >
+      <main className="ml-[92px] mr-10 w-auto max-w-none pb-16 pt-[68px] max-lg:mx-5">
         {!isProjectsOnlyView && (
           <LovartHeroComposer
             composerPlaceholder={composerPlaceholder}

components/home/lovart/lovart-promo-banner.tsx

@@ -1,51 +0,0 @@
-import { ArrowRight, Sparkles, X } from "lucide-react";
-
-type LovartPromoBannerProps = {
-  actionText?: string | null;
-  link?: string | null;
-  onAction: () => void;
-  onDismiss: () => void;
-  text: string;
-};
-
-export const LOVART_PROMO_BANNER_HEIGHT = 45;
-
-export function LovartPromoBanner({
-  actionText,
-  link,
-  onAction,
-  onDismiss,
-  text,
-}: LovartPromoBannerProps) {
-  const showAction = Boolean(link?.trim() && actionText?.trim());
-
-  return (
-    <div className="fixed inset-x-0 top-0 z-[120] h-[45px] bg-[#ddff58] text-[#11130d]">
-      <div className="mx-auto flex h-full max-w-[1440px] items-center justify-center gap-3 px-11 sm:px-12">
-        <Sparkles className="hidden h-4 w-4 shrink-0 sm:block" />
-        <p className="min-w-0 truncate text-center text-[13px] font-normal sm:text-[15px]">
-          {text}
-        </p>
-        {showAction ? (
-          <button
-            className="inline-flex h-8 max-w-[42%] shrink-0 items-center gap-1 px-1 text-[13px] font-medium underline decoration-1 underline-offset-4 transition-opacity hover:opacity-65 sm:max-w-none sm:text-[15px]"
-            onClick={onAction}
-            type="button"
-          >
-            <span className="truncate">{actionText}</span>
-            <ArrowRight className="h-3.5 w-3.5" />
-          </button>
-        ) : null}
-        <button
-          aria-label="关闭首页广告"
-          className="absolute right-2 flex h-8 w-8 items-center justify-center text-black/65 transition hover:text-black sm:right-4"
-          onClick={onDismiss}
-          title="关闭"
-          type="button"
-        >
-          <X className="h-[18px] w-[18px]" />
-        </button>
-      </div>
-    </div>
-  );
-}

components/home/lovart/lovart-sidebar.tsx

@@ -48,7 +48,6 @@ type LovartSidebarProps = {
   toolbox1Links: NavLink[];
   toolbox2Enabled: boolean;
   toolbox2Links: NavLink[];
-  topOffset?: number;
   tutorialEnabled: boolean;
   tutorialVideos: TutorialVideo[];
   videoCanvasEnabled: boolean;
@@ -77,7 +76,6 @@ export function LovartSidebar({
   toolbox1Links,
   toolbox2Enabled,
   toolbox2Links,
-  topOffset = 0,
   tutorialEnabled,
   tutorialVideos,
   videoCanvasEnabled,
@@ -169,7 +167,6 @@ export function LovartSidebar({
           ? "border-white/10 bg-black"
           : "border-[#e9e9e9] bg-white",
       ].join(" ")}
-      style={{ top: topOffset }}
     >
       <TooltipProvider delayDuration={120}>
         <div className="flex h-full w-full flex-col items-center overflow-y-auto overflow-x-hidden px-2 pb-3 pt-3 [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">

components/image-generation-loading.tsx

@@ -26,10 +26,6 @@ const PROVIDER_MODEL_LABEL: Record<string, string> = {
   "fal-image": "FAL 图片",
   "snapgen-image": "SnapGen 图片",
   "openai-image": "OpenAI 图片",
-  bananaimage: "BananaImage 图片",
-  visionary: "Visionary 图片",
-  atlascloud: "Atlas Cloud 图片",
-  vip98k: "VIP98K 图片",
   "stepfun-image": "StepFun 图片",
   midjourney: "Midjourney",
   "volcano-vision": "即梦 4.5",

components/image-params-bar.tsx

@@ -18,7 +18,6 @@ export interface ImageGenerationParams {
   aspectRatio: string;
   imageSize: string;
   imageCount?: number;           // 生成图片数量
-  quality?: "auto" | "low" | "medium" | "high";
   // 🆕 阿里生图专用参数
   size?: string;                 // 自定义分辨率，如 "1024*1024"
   negativePrompt?: string;       // 反向提示词
@@ -48,7 +47,6 @@ interface ImageParamsBarProps {
     supportsNegativePrompt?: boolean;
     supportsWatermark?: boolean;
     supportsSeed?: boolean;
-    supportsQuality?: boolean;
     supportedAspectRatios?: string[];
     supportedImageSizes?: string[];
   };
@@ -146,7 +144,6 @@ export function ImageParamsBar({
       "aspectRatio",
       "imageSize",
       "imageCount",
-      "quality",
       "size",
       "negativePrompt",
       "promptExtend",
@@ -174,10 +171,6 @@ export function ImageParamsBar({
 
     if (
       providerType === "openai-image" ||
-      providerType === "bananaimage" ||
-      providerType === "visionary" ||
-      providerType === "atlascloud" ||
-      providerType === "vip98k" ||
       providerType === "stepfun-image" ||
       providerType === "midjourney"
     ) {
@@ -287,7 +280,6 @@ export function ImageParamsBar({
     a.aspectRatio === b.aspectRatio &&
     a.imageSize === b.imageSize &&
     (a.imageCount || 1) === (b.imageCount || 1) &&
-    (a.quality || "medium") === (b.quality || "medium") &&
     a.size === b.size &&
     a.negativePrompt === b.negativePrompt &&
     a.promptExtend === b.promptExtend &&
@@ -302,7 +294,6 @@ export function ImageParamsBar({
       aspectRatio: inlineTheme === "minimal" ? "1:1" : "auto",
       imageSize: "2K",
       imageCount: 1,
-      quality: "medium",
       promptExtend: true,
       watermark: false,
       ...source,
@@ -316,14 +307,7 @@ export function ImageParamsBar({
     ...buildBaseParams(initialParams),
   });
   const [minimalParamsOpen, setMinimalParamsOpen] = useState(false);
-  const qualityOptions = [
-    { label: "自动", value: "auto" },
-    { label: "高", value: "high" },
-    { label: "中", value: "medium" },
-    { label: "低", value: "low" },
-  ] as const;
-  const qualityLabel =
-    qualityOptions.find((option) => option.value === params.quality)?.label || "中";
+  const [qualityLabel, setQualityLabel] = useState<"自动" | "高" | "中" | "低">("中");
 
   const imageCountOptions = getImageCountOptions();
   const showImageCountSelector = !hideImageCount && imageCountOptions.length > 1;
@@ -514,19 +498,19 @@ export function ImageParamsBar({
               <div>
                 <div className="mb-1.5 text-[12px] font-medium leading-none">质量</div>
                 <div className="grid h-8 grid-cols-4 rounded-[var(--ui-radius-control)] bg-[#f4f4f5] p-0.5 dark:bg-white/8">
-                  {qualityOptions.map((quality) => (
+                  {(["自动", "高", "中", "低"] as const).map((quality) => (
                     <button
-                      key={quality.value}
+                      key={quality}
                       type="button"
                       className={cn(
                         "rounded-[6px] text-[12px] font-medium transition-colors",
-                        params.quality === quality.value
+                        qualityLabel === quality
                           ? "border border-[#c8cdd5] bg-white shadow-[0_1px_4px_rgba(15,23,42,0.1)] dark:border-white/12 dark:bg-white/16"
                           : "text-[#3d434d] hover:bg-white/55 dark:text-zinc-300 dark:hover:bg-white/10"
                       )}
-                      onClick={() => updateParam("quality", quality.value)}
+                      onClick={() => setQualityLabel(quality)}
                     >
-                      {quality.label}
+                      {quality}
                     </button>
                   ))}
                 </div>

components/image-preview.tsx

@@ -184,15 +184,6 @@ export function ImagePreview({
       } else if (src.includes("snapgen-image-thumb-")) {
         originalUrl = src.replace("snapgen-image-thumb-", "snapgen-image-orig-");
         console.log("[ImagePreview] Inferred original URL from snapgen-image-thumb filename");
-      } else if (src.includes("bananaimage-thumb-")) {
-        originalUrl = src.replace("bananaimage-thumb-", "bananaimage-orig-");
-        console.log("[ImagePreview] Inferred original URL from bananaimage-thumb filename");
-      } else if (src.includes("visionary-thumb-")) {
-        originalUrl = src.replace("visionary-thumb-", "visionary-orig-");
-        console.log("[ImagePreview] Inferred original URL from visionary-thumb filename");
-      } else if (src.includes("atlascloud-thumb-")) {
-        originalUrl = src.replace("atlascloud-thumb-", "atlascloud-orig-");
-        console.log("[ImagePreview] Inferred original URL from Atlas Cloud filename");
       } else if (src.includes("/thumb/") || src.includes("-thumb")) {
         // 尝试从S3 URL中推断原图URL（常见格式：xxx-thumb.jpg -> xxx.jpg 或 xxx/thumb/xxx -> xxx/xxx）
         originalUrl = src.replace(/-thumb\./g, ".").replace(/\/thumb\//g, "/");

components/layout/brand-top-bar.tsx

@@ -10,7 +10,6 @@ type BrandTopBarProps = {
   className?: string;
   contentClassName?: string;
   logo?: string | null;
-  offsetTop?: number;
   onLogoClick?: () => void;
   position?: "fixed" | "sticky" | "static";
   showBrand?: boolean;
@@ -23,7 +22,6 @@ export function BrandTopBar({
   className,
   contentClassName,
   logo,
-  offsetTop = 0,
   onLogoClick,
   position = "fixed",
   showBrand = true,
@@ -44,7 +42,6 @@ export function BrandTopBar({
         "h-14 bg-white/90 backdrop-blur dark:bg-[#0a0a0c]/90",
         className
       )}
-      style={position === "fixed" ? { top: offsetTop } : undefined}
     >
       <div
         className={cn(

components/scene-fusion-view.tsx

@@ -8,7 +8,6 @@ import {
   Image as ImageIcon,
   Layers,
   Loader2,
-  Maximize2,
   Plus,
   RefreshCw,
   Sparkles,
@@ -98,7 +97,6 @@ type BatchMode =
   | "random-bg"
   | "rmbg"
   | "enhance"
-  | "extend"
   | "watermark";
 type ItemStatus = "pending" | "processing" | "completed" | "failed";
 
@@ -338,12 +336,6 @@ const modeOptions: Array<{
     description: "多图同步增强画质",
     icon: Sparkles,
   },
-  {
-    id: "extend",
-    label: "批量图像拓展",
-    description: "多图同步扩展画面",
-    icon: Maximize2,
-  },
   {
     id: "watermark",
     label: "批量去水印",
@@ -364,8 +356,6 @@ function getModeActionLabel(mode: BatchMode, count: number) {
       return `批量抠图 (${count} 张)`;
     case "enhance":
       return `批量变清晰 (${count} 张)`;
-    case "extend":
-      return `批量图像拓展 (${count} 张)`;
     case "watermark":
       return `批量去水印 (${count} 张)`;
   }
@@ -377,8 +367,6 @@ function getModePrompt(mode: BatchMode) {
       return "批量处理-抠图";
     case "enhance":
       return "批量处理-变清晰";
-    case "extend":
-      return "批量处理-图像拓展";
     case "watermark":
       return "批量处理-去水印";
     default:
@@ -1783,25 +1771,6 @@ export function SceneFusionView({
       };
     }
 
-    if (mode === "extend") {
-      const payload = await requestLongTaskResult({
-        endpoint: "/api/extend",
-        payload: {
-          image_url: item.image,
-          prompt: getModePrompt(mode),
-          includeBase64: false,
-        },
-      });
-      if (!payload?.success) {
-        throw new Error(payload?.error || payload?.detail || "图像拓展失败");
-      }
-      return {
-        result: payload.thumbnail_url || payload.original_url || item.image,
-        originalUrl:
-          payload.original_url || payload.thumbnail_url || item.image,
-      };
-    }
-
     if (mode === "watermark") {
       const payload = await requestLongTaskResult({
         endpoint: "/api/watermark-remove",
@@ -2829,7 +2798,6 @@ export function SceneFusionView({
 
               {(mode === "rmbg" ||
                 mode === "enhance" ||
-                mode === "extend" ||
                 mode === "watermark") && (
                 <div className="space-y-2">
                   <div className="flex items-center justify-between">

components/top-navbar.tsx

@@ -192,7 +192,7 @@ export function TopNavbar({
     if (trimmed === "商品策划") {
       return "策划";
     }
-    if (trimmed === "HiCAD") {
+    if (trimmed === "AI-CAD") {
       return "CAD";
     }
     if (trimmed === "建筑编辑") {
@@ -432,10 +432,10 @@ export function TopNavbar({
             e.preventDefault();
             window.location.href = "/ai-cad";
           }}
-          title="HiCAD"
+          title="AI-CAD"
         >
           <Box className="h-5 w-5" />
-          <span className={navLabelClass}>{getShortLabel("HiCAD")}</span>
+          <span className={navLabelClass}>{getShortLabel("AI-CAD")}</span>
         </a>
 
         <a

deploy/nginx-hicad-zoo-ws.conf.template

@@ -1,26 +1,6 @@
 # Include inside the authenticated HiCAD HTTPS server block.
 # Replace __AI_CAD_WS_PROXY_SECRET__ during deployment and chmod the rendered file 600.
 
-location ^~ /vendor/zoo-modeling-app/assets {
-    root /var/www/ai-chatbot/public;
-    try_files $uri =404;
-    gzip_static on;
-    add_header Cache-Control "public, max-age=31536000, immutable" always;
-}
-
-location ^~ /vendor/zoo-modeling-app/fonts/ {
-    root /var/www/ai-chatbot/public;
-    try_files $uri =404;
-    add_header Cache-Control "public, max-age=31536000, immutable" always;
-}
-
-location = /vendor/zoo-modeling-app/kcl_wasm_lib_bg.wasm {
-    root /var/www/ai-chatbot/public;
-    try_files $uri =404;
-    gzip_static on;
-    add_header Cache-Control "public, max-age=3600" always;
-}
-
 location = /_hicad_zoo_ws_auth {
     internal;
     proxy_pass http://127.0.0.1:3125/api/ai-cad/zoo-ws-authorize;
@@ -38,12 +18,7 @@ location ^~ /api/ai-cad/zoo-ws/ {
     auth_request /_hicad_zoo_ws_auth;
     auth_request_set $zoo_authorization $upstream_http_x_zoo_authorization;
 
-    # Resolve at request time and skip AAAA records because the production host
-    # has no IPv6 route. This avoids a long failed IPv6 retry on cold connects.
-    resolver 1.1.1.1 8.8.8.8 ipv6=off valid=300s;
-    set $zoo_api_host api.zoo.dev;
-    rewrite ^/api/ai-cad/zoo-ws/(.*)$ /ws/$1 break;
-    proxy_pass https://$zoo_api_host$uri$is_args$args;
+    proxy_pass https://api.zoo.dev/ws/;
     proxy_http_version 1.1;
     proxy_ssl_server_name on;
     proxy_ssl_name api.zoo.dev;

deploy/nginx/pascal-service.conf.template

@@ -17,20 +17,18 @@ location = __PASCAL_BASE_PATH__ {
     return 302 __PASCAL_BASE_PATH__/scenes;
 }
 
-# Production uses Webpack content-hashed chunk names, so changed assets always
-# receive a new URL and can be cached immutably without crossing deployments.
-# Static assets contain no user data and need no auth subrequest.
+# Versioned application chunks and bundled public assets contain no user data.
+# Serving them without an auth subrequest prevents an expired/rotating session
+# from turning a harmless static request into an Nginx 500 response.
 location ^~ __PASCAL_BASE_PATH__/_next/static/ {
     proxy_pass http://__PASCAL_NGINX_UPSTREAM__;
     proxy_http_version 1.1;
     proxy_hide_header X-Powered-By;
-    proxy_hide_header Cache-Control;
-    proxy_hide_header Expires;
     proxy_set_header Host $host;
     proxy_set_header Connection "";
     proxy_buffering on;
-    expires 1y;
-    add_header Cache-Control "public, max-age=31536000, immutable" always;
+    expires 7d;
+    add_header Cache-Control "public, max-age=604800, immutable" always;
 }
 
 location ^~ __PASCAL_BASE_PATH__/icons/ {

docs/OpenClaw-MCP接入.md

@@ -1,88 +0,0 @@
-# OpenClaw MCP 接入
-
-## 功能
-
-当前 MCP 提供四个工具：
-
-- `yedir_get_current_user`：验证 Access Key 和作用域。
-- `yedir_list_canvases`：列出当前用户的画布。
-- `yedir_get_canvas`：读取画布节点、连线和 revision。
-- `yedir_apply_canvas_operation`：执行带版本保护和幂等键的语义画布操作。
-
-## 服务端准备
-
-1. 执行数据库迁移：
-
-   ```bash
-   pnpm db:migrate
-   ```
-
-2. 生产环境建议单独配置 `ACCESS_KEY_PEPPER`。未配置时使用 `AUTH_SECRET`。
-
-3. 在视频画布的 Skills 入口创建 Access Key。Key 只显示一次，默认 90 天过期。
-
-## 第三方按钉钉用户签发 Key
-
-服务端配置一个不少于 32 字符的独立密钥：
-
-```bash
-MCP_KEY_PROVISIONING_SECRET="replace-with-a-random-service-secret"
-```
-
-受信第三方服务可以按钉钉用户名申请一个新的用户级 Key：
-
-```bash
-curl -X POST "https://your-yedir.example.com/api/openapi/v1/access-keys/provision" \
-  -H "Authorization: Bearer $MCP_KEY_PROVISIONING_SECRET" \
-  -H "Content-Type: application/json" \
-  --data '{
-    "dingTalkUsername": "张三",
-    "keyName": "OpenClaw 办公电脑",
-    "scopes": ["canvas:read", "canvas:write"],
-    "expiresInDays": 90
-  }'
-```
-
-返回的 `data.accessKey.token` 只显示一次。接口只匹配已启用且绑定过钉钉的用户；如果姓名重名，会返回 `DINGTALK_USERNAME_AMBIGUOUS`，此时必须同时提供 `dingTalkUserId`。第三方服务密钥只能保存在受信服务端，不得放入浏览器、移动端包或公开脚本。
-
-## 安装本地 MCP
-
-```bash
-cd integrations/openclaw
-npm install
-```
-
-验证 CLI：
-
-```bash
-YEDIR_BASE_URL="https://your-yedir.example.com" \
-YEDIR_ACCESS_TOKEN="ydr_live_..." \
-node ./cli.mjs me
-```
-
-添加到 OpenClaw：
-
-```bash
-openclaw mcp add yedir \
-  --command node \
-  --arg "/absolute/path/to/integrations/openclaw/mcp-server.mjs" \
-  --env "YEDIR_BASE_URL=https://your-yedir.example.com" \
-  --env "YEDIR_ACCESS_TOKEN=ydr_live_..."
-
-openclaw mcp doctor yedir --probe
-```
-
-安装 Skill：
-
-```bash
-openclaw skills install \
-  /absolute/path/to/integrations/openclaw/yedir-canvas \
-  --as yedir-canvas
-```
-
-## 安全约束
-
-- Access Key 仅保存 HMAC-SHA256 哈希，明文只在创建时返回。
-- 当前支持 `canvas:read` 和 `canvas:write` 作用域。
-- 移动、删除、替换媒体必须在用户明确确认后传入 `confirmed: true`。
-- 画布页在没有本地编辑冲突时自动同步外部操作；发生冲突时不会用旧页面状态覆盖远端。

docs/worldlabs-proxy-provider-requirements.md

@@ -1,93 +1,316 @@
-# 3D 世界生成 API 调用规范
+# World Labs 3D 世界生成中转接口兼容要求
 
-当前 3D 世界生成通过智枢外部任务接口调用 World Labs 能力。Base URL 只填写根地址：
+本文档用于说明我方系统接入 World Labs 3D 世界生成功能时，对第三方中转服务的接口兼容要求。
+
+## 核心原则
+
+我方系统会按照 World Labs 官方 API 协议发起请求：
 
 ```text
-https://api.vip98k.com
+{baseUrl} + /marble/v1/...
 ```
 
-不要填写 `/v1`，也不要填写旧的 `/marble/v1`。
+中转服务需要兼容官方路径、请求体、响应体和错误格式。请不要要求我方把 `baseUrl` 配置成某个完整接口地址。
 
-## 鉴权方式
+正确示例：
 
-所有请求都必须携带本站发出的智枢 API Key：
+```text
+http://your-proxy-domain.com
+```
+
+错误示例：
+
+```text
+http://your-proxy-domain.com/marble/v1/worlds:generate
+```
+
+## 我方请求方式
+
+我方后台会在请求中携带：
 
 ```http
-Authorization: Bearer <API_KEY>
+WLT-Api-Key: {配置的 API Key}
 Accept: application/json
 Content-Type: application/json
 ```
 
-不要使用管理员 Key、其他平台 Key，也不要使用旧的 `WLT-Api-Key` 作为主链路鉴权。
+中转服务应支持 `WLT-Api-Key` 请求头。如果中转服务内部自行管理官方 Key，也可以将该字段作为租户标识或鉴权凭据，但不应要求我方改成其他 header。
 
-## 模型目录
+## 必须兼容的接口
 
-正式创建任务前，可以先确认这把 Key 是否开通空间生成分组：
+### 1. 准备上传素材
 
-```bash
-curl "https://api.vip98k.com/api/external/task/models" \
-  -H "Authorization: Bearer <API_KEY>"
+```http
+POST {baseUrl}/marble/v1/media-assets:prepare_upload
 ```
 
-返回内容里应能找到：
+请求体示例：
 
 ```json
 {
-  "modelId": "world-generation"
-}
-```
-
-如果找不到，说明这把 Key 没有勾选空间生成分组。
-
-## 创建任务
-
-```bash
-curl "https://api.vip98k.com/api/external/task/generate" \
-  -X POST \
-  -H "Authorization: Bearer <API_KEY>" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "model": "world-generation",
-    "displayName": "Test scene",
-    "prompt": "A quiet sunlit courtyard with a small stone fountain."
-  }'
-```
-
-正常会先返回 `accepted` 或 `running`，这不是失败：
-
-```json
-{
-  "data": {
-    "taskId": "任务ID",
-    "status": "accepted",
-    "done": false,
-    "resultPath": "/api/external/task/result?taskId=任务ID"
+  "file_name": "input.jpg",
+  "extension": "jpg",
+  "kind": "image",
+  "metadata": {
+    "mime_type": "image/jpeg",
+    "uploaded_from": "canvas_world_mode"
   }
 }
 ```
 
-## 查询结果
-
-```bash
-curl "https://api.vip98k.com/api/external/task/result?taskId=<任务ID>" \
-  -H "Authorization: Bearer <API_KEY>"
-```
-
-建议每隔 5 到 10 秒查询一次，最长等待 10 分钟。直到返回：
+响应必须包含可用的上传信息：
 
 ```json
 {
-  "data": {
-    "status": "succeeded",
-    "done": true
+  "media_asset": {},
+  "upload_info": {
+    "upload_url": "https://...",
+    "upload_method": "PUT",
+    "required_headers": {}
   }
 }
 ```
 
-## 常见错误
+要求：
 
-- 不能用 `/v1/chat/completions`。
-- 不能把模型写成 `marble-1.1`。
-- 不能把 `accepted` 或 `running` 当作调用失败。
-- 不能只等待几十秒就判定超时。
-- 必须携带 `Authorization: Bearer <API_KEY>`。
+- `upload_url` 必须可由我方服务器直接访问。
+- `upload_method` 如为 `PUT`，必须支持 `PUT` 上传文件二进制。
+- `required_headers` 中返回的 header，我方会原样带上。
+- 上传成功时，上传地址必须返回 `2xx`。
+
+### 2. 创建世界生成任务
+
+```http
+POST {baseUrl}/marble/v1/worlds:generate
+```
+
+请求体示例：
+
+```json
+{
+  "display_name": "",
+  "model": "marble-1.1",
+  "permission": {
+    "public": false
+  },
+  "world_prompt": {
+    "type": "image",
+    "image_prompt": {
+      "source": "media_asset",
+      "media_asset_id": "media_asset_id_here"
+    }
+  }
+}
+```
+
+响应需兼容官方 operation 结构，至少包含：
+
+```json
+{
+  "operation_id": "task-id",
+  "done": false,
+  "metadata": {
+    "progress": {
+      "status": "RUNNING"
+    }
+  }
+}
+```
+
+要求：
+
+- `operation_id` 必须稳定，后续查询状态必须使用同一个 id。
+- 不要在创建成功但任务未完成时返回业务失败。
+- 如果余额不足、Key 无效，应返回明确 HTTP 状态码和错误信息。
+
+### 3. 查询任务状态
+
+```http
+GET {baseUrl}/marble/v1/operations/{operation_id}
+```
+
+运行中响应示例：
+
+```json
+{
+  "operation_id": "task-id",
+  "done": false,
+  "metadata": {
+    "progress": {
+      "status": "RUNNING",
+      "description": "World generation in progress"
+    }
+  }
+}
+```
+
+成功响应示例：
+
+```json
+{
+  "operation_id": "task-id",
+  "done": true,
+  "error": null,
+  "metadata": {
+    "progress": {
+      "status": "SUCCEEDED"
+    },
+    "world_id": "world-id"
+  },
+  "response": {
+    "world_id": "world-id",
+    "world_marble_url": "https://marble.worldlabs.ai/world/...",
+    "assets": {
+      "mesh": {
+        "collider_mesh_url": "https://cdn.marble.worldlabs.ai/.../model.glb"
+      },
+      "imagery": {
+        "pano_url": "https://cdn.marble.worldlabs.ai/.../rgb_0.png"
+      },
+      "thumbnail_url": "https://cdn.marble.worldlabs.ai/.../thumbnail.webp",
+      "splats": {
+        "spz_urls": {
+          "100k": "https://cdn.marble.worldlabs.ai/...100k.spz",
+          "150k": "https://cdn.marble.worldlabs.ai/...150k.spz",
+          "500k": "https://cdn.marble.worldlabs.ai/...500k.spz",
+          "full_res": "https://cdn.marble.worldlabs.ai/...full.spz"
+        }
+      }
+    }
+  }
+}
+```
+
+失败响应示例：
+
+```json
+{
+  "operation_id": "task-id",
+  "done": true,
+  "error": {
+    "message": "Insufficient account balance"
+  }
+}
+```
+
+要求：
+
+- `done=false` 表示任务仍在运行。
+- `done=true` 且 `error=null` 表示任务成功。
+- `done=true` 且 `error.message` 存在表示任务失败。
+- 不要把运行中的任务返回为 HTTP 404。
+- 不要因为任务未完成就返回 `Operation not found`。
+
+### 4. 查询世界详情
+
+```http
+GET {baseUrl}/marble/v1/worlds/{world_id}
+```
+
+当 `operations` 成功响应中资产不完整时，我方会调用该接口补充详情。响应应包含与 `response` 内 world 对象兼容的数据结构。
+
+## 错误码要求
+
+建议按以下语义返回：
+
+| 场景 | HTTP 状态码 | message 示例 |
+| --- | --- | --- |
+| API Key 缺失或无效 | `401` | `Unauthorized` |
+| 权限不足 | `403` | `Forbidden` |
+| 余额不足 | `402` 或 `403` | `Insufficient account balance` |
+| 请求体错误 | `400` | `Invalid request body` |
+| 任务不存在 | `404` | `Operation not found` |
+| 上游超时 | `504` | `Upstream timeout` |
+| 上游异常 | `502` | `Upstream error` |
+
+响应体建议：
+
+```json
+{
+  "message": "Insufficient account balance"
+}
+```
+
+或：
+
+```json
+{
+  "error": {
+    "message": "Insufficient account balance"
+  }
+}
+```
+
+## 超时与稳定性要求
+
+- `prepare_upload` 建议 30 秒内返回。
+- `worlds:generate` 建议 60 秒内返回 operation，而不是等待生成完成。
+- `operations/{id}` 建议 10 秒内返回当前状态。
+- 生成任务本身可异步运行，前端会轮询状态。
+- 同一个 `operation_id` 多次查询必须返回同一个任务状态，不应随机切换账号或路由。
+
+## 上传地址要求
+
+`prepare_upload` 返回的 `upload_url` 可以是官方签名地址，也可以是中转服务自己的上传地址，但必须满足：
+
+- 我方服务器可直接访问。
+- 支持返回的 `upload_method`。
+- 支持上传原始文件二进制。
+- 上传成功返回 `2xx`。
+- 上传完成后，后续 `worlds:generate` 使用的 `media_asset_id` 必须可用。
+
+## 安全要求
+
+- 不要在错误信息中返回完整官方 API Key。
+- 日志中建议只记录 Key 前后少量字符，例如 `sk-****abcd`。
+- 中转服务如保存官方 Key，应加密存储。
+- 上传 URL 如有签名，应设置合理过期时间。
+- 不要允许用户通过 `baseUrl` 或 path 注入访问内网地址。
+
+## 我方验收用例
+
+中转服务上线前，请至少通过以下链路：
+
+1. `POST /marble/v1/media-assets:prepare_upload` 返回 `media_asset_id` 和可上传 URL。
+2. 使用返回的 `upload_url` 上传图片，返回 `2xx`。
+3. `POST /marble/v1/worlds:generate` 返回稳定 `operation_id`。
+4. `GET /marble/v1/operations/{operation_id}` 在运行中返回 `done=false`。
+5. 任务完成后返回 `done=true`、`error=null`、`world_id` 和资产 URL。
+6. 资产 URL 中至少应包含 thumbnail、pano、mesh 或 spz 中的一种，最好完整返回。
+7. `GET /marble/v1/worlds/{world_id}` 可返回完整 world 详情。
+
+## 配置示例
+
+我方系统中的 API 地址应填写中转根地址：
+
+```text
+http://23.169.168.133:8080
+```
+
+最终我方会请求：
+
+```text
+http://23.169.168.133:8080/marble/v1/media-assets:prepare_upload
+http://23.169.168.133:8080/marble/v1/worlds:generate
+http://23.169.168.133:8080/marble/v1/operations/{operation_id}
+http://23.169.168.133:8080/marble/v1/worlds/{world_id}
+```
+
+如果切回官方接口，配置为：
+
+```text
+https://api.worldlabs.ai
+```
+
+最终请求：
+
+```text
+https://api.worldlabs.ai/marble/v1/media-assets:prepare_upload
+https://api.worldlabs.ai/marble/v1/worlds:generate
+https://api.worldlabs.ai/marble/v1/operations/{operation_id}
+https://api.worldlabs.ai/marble/v1/worlds/{world_id}
+```
+
+## 结论
+
+中转服务需要做的是兼容 World Labs 官方 API 协议，而不是要求我方修改接口路径。只要中转根地址完整支持 `/marble/v1/...`，我方系统就可以在官方接口和中转接口之间无缝切换。