另一架构切片不得借用宿主 npm

- runtimeSourceForTarget 对非宿主架构返回 npmCli: null，明令按该发行版自己的安装目录查找 npm
- 覆盖经 npm run 触发（npm_execpath 指向宿主 npm）时两份切片仍各带自己那份 npm 的用例

.codex/skills/genarrative-external-editor-api/references/api-operations.md

@@ -102,7 +102,7 @@ Use OpenAPI as the final authority; these common values are a routing aid:
 
 - Image `kind`: `spec`, `character`, `quick-edit`, `ui-design`, `publication-material`; ordinary image generation may omit it.
 - External v1 currently has no structured game-scene generation operation. Do not send `kind: "scene"` or `assetKind: "scene"` through generic image generation; the server rejects both before queueing.
-- Image `model`: `gpt-image-2.5`, `gemini-3.1-flash-image-preview`, `nanobanana2`, `nano-banana`. Persisted `gpt-image-2` is a legacy value resolved only when submitting a new task; the retired `gpt-image-2-c` is no longer accepted and is handled as an unsupported value.
+- Image `model`: `gpt-image-2`, `gemini-3.1-flash-image-preview`, `nanobanana2`, `nano-banana`.
 - Image `aspectRatio`: `1:1`, `2:3`, `3:2`, `9:16`, `16:9`.
 - Image `imageSize`: `0.5K`, `1K`, `2K`.
 - Video `model`: `seedance2.0`, `seedance2.0-fast`, `kling3.0`, `kling3.0-omni`, `veo3.1`, `veo3.1-fast`.

.codex/skills/gpt-image-2-apimart/SKILL.md

@@ -1,17 +1,11 @@
 ---
 name: gpt-image-2-apimart
-description: Generate or inspect project image assets through this repository's Tiantoken GPT Image 2.5 workflow. Use when Codex needs to create puzzle template sample images, reproduce the server-rs image request body, dry-run image prompts, batch-generate local project thumbnails, or debug TIANTOKEN_BASE_URL / TIANTOKEN_API_KEY image-generation configuration without exposing secrets. The directory name is historical.
+description: Generate or inspect project image assets through this repository's VectorEngine gpt-image-2 workflow with gpt-image-2-c fallback. Use when Codex needs to create puzzle template sample images, reproduce the server-rs image request body, dry-run image prompts, batch-generate local project thumbnails, or debug VECTOR_ENGINE_BASE_URL / VECTOR_ENGINE_API_KEY image-generation configuration without exposing secrets. The directory name is historical.
 ---
 
-# GPT Image 2.5 project image workflow
+# gpt-image-2 VectorEngine
 
-Use this skill for project-local image asset generation that must match the repository's image request contract. Provider routing is owned by `server-rs`; when this skill talks to the provider directly it must send the concrete provider model and the matching provider credentials, because the provider side only accepts concrete models:
-
-- generation (no reference images): `gpt-image-2.5-flare-c` through Tiantoken
-- edits (any reference image): `gpt-image-2.5-sunburst-c` through Tiantoken
-- nanobanana (`gemini-3.1-flash-image-preview`) stays on VectorEngine
-
-The business model name `gpt-image-2.5` is resolved to a concrete key by `server-rs` at the task boundary and is never sent to a provider directly. This client must not perform a cross-model fallback. The folder still contains `apimart` in its name for compatibility with existing local plugin references.
+Use this skill for project-local image asset generation that must match the repository's `server-rs` VectorEngine image path. Keep the product/price model identifier and primary provider request as `gpt-image-2`, then fall back once to `gpt-image-2-c` for eligible provider failures. The folder still contains `apimart` in its name for compatibility with existing local plugin references.
 
 ## Workflow
 
@@ -30,15 +24,15 @@ The business model name `gpt-image-2.5` is resolved to a concrete key by `server
    ```
 
 5. Save final project assets under `public/` or another explicitly requested workspace path.
-6. Never print `TIANTOKEN_API_KEY`. Report only whether configuration exists.
+6. Never print `VECTOR_ENGINE_API_KEY`. Report only whether configuration exists.
 
 ## Request Contract
 
 The repository image path uses:
 
 ```text
-POST {TIANTOKEN_BASE_URL}/v1/images/generations
-Authorization: Bearer {TIANTOKEN_API_KEY}
+POST {VECTOR_ENGINE_BASE_URL}/v1/images/generations
+Authorization: Bearer {VECTOR_ENGINE_API_KEY}
 Content-Type: application/json
 ```
 
@@ -46,7 +40,7 @@ Default body:
 
 ```json
 {
-  "model": "gpt-image-2.5-flare-c",
+  "model": "gpt-image-2",
   "prompt": "<prompt>",
   "n": 1,
   "size": "1024x1024"
@@ -56,22 +50,22 @@ Default body:
 For visual references, use the edit endpoint instead of the create endpoint:
 
 ```text
-POST {TIANTOKEN_BASE_URL}/v1/images/edits
-Authorization: Bearer {TIANTOKEN_API_KEY}
+POST {VECTOR_ENGINE_BASE_URL}/v1/images/edits
+Authorization: Bearer {VECTOR_ENGINE_API_KEY}
 Content-Type: multipart/form-data
 ```
 
 Multipart fields:
 
 ```text
-model=gpt-image-2.5-sunburst-c
+model=gpt-image-2
 prompt=<prompt>
 n=1
 size=1024x1024
 image=@reference.png
 ```
 
-In this repository, calls with no reference images use `POST /v1/images/generations` with `gpt-image-2.5-flare-c`; calls with any reference image use `POST /v1/images/edits` with `gpt-image-2.5-sunburst-c` and pass references as one or more `image` form parts. Server-side calls still submit the business model `gpt-image-2.5` and let `server-rs` resolve the concrete key; provider routing and retry policy remain server-owned, and pricing follows the same reference-image rule (generation with a reference image is charged at the edit tier). Match3D container UI generation embeds `public/match3d-background-references/pot-fused-reference.png` into the edit request as an `image` part.
+In this repository, calls with no reference images use `POST /v1/images/generations`; calls with any reference image use `POST /v1/images/edits` and pass references as one or more `image` form parts. Both paths prefer `gpt-image-2`; on an eligible upstream/model failure they retry with `gpt-image-2-c`. Do not fall back for authentication, local validation, request-budget exhaustion, uncertain send/connection failure, content-safety rejection, or a generated image URL download failure. Match3D container UI generation embeds `public/match3d-background-references/pot-fused-reference.png` into the edit request as an `image` part.
 
 Accept image output from `data[].url`, `data[].b64_json`, or direct nested `url` fields. VectorEngine image generation currently returns synchronously; do not poll APIMart task endpoints.
 
@@ -81,14 +75,12 @@ Load environment values from process env first, then `.env.secrets.local`, `.env
 
 Required for live generation:
 
-- `TIANTOKEN_BASE_URL`
-- `TIANTOKEN_API_KEY`
+- `VECTOR_ENGINE_BASE_URL`
+- `VECTOR_ENGINE_API_KEY`
 
 Optional:
 
-- `TIANTOKEN_IMAGE_REQUEST_TIMEOUT_MS`
-
-`VECTOR_ENGINE_*` values no longer serve GPT Image 2.5: those credentials belong to VectorEngine, which only serves nanobanana. Do not fall back from `TIANTOKEN_*` to `VECTOR_ENGINE_*`.
+- `VECTOR_ENGINE_IMAGE_REQUEST_TIMEOUT_MS`
 
 If the key or base URL is missing, stop after dry-run or explain the missing configuration. Do not ask the user to paste the key in chat.
 

.codex/skills/gpt-image-2-apimart/scripts/generate-anthro-cat-illustrations.mjs

@@ -9,9 +9,8 @@ const skillRoot = path.resolve(__dirname, '..');
 const repoRoot = path.resolve(skillRoot, '..', '..', '..');
 const defaultOutDir = path.join(repoRoot, 'public', 'anthro-cat-illustrations');
 const defaultTimeoutMs = 1000000;
-// GPT Image 2.5 生成任务只接受 concrete provider model；业务模型名 `gpt-image-2.5`
-// 由 server-rs 在任务边界解析，脚本直连 provider 时必须自己给出 concrete key。
-const preferredImageModel = 'gpt-image-2.5-flare-c';
+const preferredImageModel = 'gpt-image-2';
+const fallbackImageModel = 'gpt-image-2-c';
 
 const prompts = [
   {
@@ -102,18 +101,18 @@ function resolveEnv() {
     ...process.env,
   };
   return {
-    baseUrl: String(loaded.TIANTOKEN_BASE_URL || '')
+    baseUrl: String(loaded.VECTOR_ENGINE_BASE_URL || '')
       .trim()
       .replace(/\/+$/u, ''),
-    apiKey: String(loaded.TIANTOKEN_API_KEY || '').trim(),
+    apiKey: String(loaded.VECTOR_ENGINE_API_KEY || '').trim(),
     timeoutMs: Number.parseInt(
-      String(loaded.TIANTOKEN_IMAGE_REQUEST_TIMEOUT_MS || defaultTimeoutMs),
+      String(loaded.VECTOR_ENGINE_IMAGE_REQUEST_TIMEOUT_MS || defaultTimeoutMs),
       10,
     ),
   };
 }
 
-function buildTiantokenImagesGenerationUrl(baseUrl) {
+function buildVectorEngineImagesGenerationUrl(baseUrl) {
   return baseUrl.endsWith('/v1')
     ? `${baseUrl}/images/generations`
     : `${baseUrl}/v1/images/generations`;
@@ -234,22 +233,22 @@ async function fetchJson(url, options, timeoutMs) {
     const text = await response.text();
     if (!response.ok) {
       const error = new Error(
-        `Tiantoken ${response.status}: ${text.slice(0, 600)}`,
+        `VectorEngine ${response.status}: ${text.slice(0, 600)}`,
       );
-      error.providerStatus = response.status;
-      error.providerBody = text;
+      error.vectorEngineStatus = response.status;
+      error.vectorEngineBody = text;
       throw error;
     }
     try {
       return JSON.parse(text);
     } catch (error) {
-      error.providerResponseParse = true;
-      error.providerBody = text;
+      error.vectorEngineResponseParse = true;
+      error.vectorEngineBody = text;
       throw error;
     }
   } catch (error) {
     if (error?.name === 'AbortError') {
-      throw new Error(`Tiantoken request timed out after ${timeoutMs}ms`);
+      throw new Error(`VectorEngine request timed out after ${timeoutMs}ms`);
     }
     throw error;
   } finally {
@@ -257,35 +256,81 @@ async function fetchJson(url, options, timeoutMs) {
   }
 }
 
-async function requestImagePayload(env, entry) {
-  const model = preferredImageModel;
-  const requestBody = {
-    model,
-    prompt: buildPrompt(entry),
-    n: 1,
-    size: '1024x1024',
-  };
-  const payload = await fetchJson(
-    buildTiantokenImagesGenerationUrl(env.baseUrl),
-    {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${env.apiKey}`,
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    },
-    env.timeoutMs,
-  );
-  const base64Image = decodeStrictBase64Image(extractBase64Images(payload)[0]);
-  if (extractImageUrls(payload)[0] || base64Image) {
-    return payload;
+function shouldFallbackImageModel(error) {
+  const raw =
+    `${error?.message || ''}\n${error?.vectorEngineBody || ''}`.toLowerCase();
+  if (error?.vectorEngineResponseParse) {
+    return !containsContentRejection(raw);
   }
-  const error = new Error(`Tiantoken returned no image for ${entry.id}`);
-  error.providerResponseParse = true;
-  error.providerBody = JSON.stringify(payload).slice(0, 600);
-  throw error;
+  const status = Number(error?.vectorEngineStatus || 0);
+  if (status === 408 || status >= 500) {
+    return true;
+  }
+  if (status === 429) {
+    return !containsContentRejection(raw);
+  }
+  const mentionsImageModel =
+    raw.includes('model') ||
+    raw.includes('模型') ||
+    raw.includes(preferredImageModel) ||
+    raw.includes(fallbackImageModel);
+  return (
+    [400, 404, 422].includes(status) &&
+    mentionsImageModel &&
+    /(not found|not supported|unsupported|unavailable|does not exist|invalid model|unknown model|不存在|不支持|不可用|未开通)/u.test(
+      raw,
+    )
+  );
+}
+
+function containsContentRejection(raw) {
+  return /(invalid_prompt|safety|content[_ ]policy|moderation|prompt rejected|content rejected|prompt refusal|content refusal|rejected by safety|rejected by moderation|敏感|违规|安全策略|内容审核|提示词拒绝|内容拒绝)/u.test(
+    raw,
+  );
+}
+
+async function requestImagePayload(env, entry) {
+  for (const model of [preferredImageModel, fallbackImageModel]) {
+    const requestBody = {
+      model,
+      prompt: buildPrompt(entry),
+      n: 1,
+      size: '1024x1024',
+    };
+    try {
+      const payload = await fetchJson(
+        buildVectorEngineImagesGenerationUrl(env.baseUrl),
+        {
+          method: 'POST',
+          headers: {
+            Authorization: `Bearer ${env.apiKey}`,
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(requestBody),
+        },
+        env.timeoutMs,
+      );
+      const base64Image = decodeStrictBase64Image(
+        extractBase64Images(payload)[0],
+      );
+      if (extractImageUrls(payload)[0] || base64Image) {
+        return payload;
+      }
+      const error = new Error(`VectorEngine returned no image for ${entry.id}`);
+      error.vectorEngineResponseParse = true;
+      error.vectorEngineBody = JSON.stringify(payload).slice(0, 600);
+      throw error;
+    } catch (error) {
+      if (model !== preferredImageModel || !shouldFallbackImageModel(error)) {
+        throw error;
+      }
+      console.warn(
+        `VectorEngine ${preferredImageModel} failed, retrying with ${fallbackImageModel}: ${error.message}`,
+      );
+    }
+  }
+  throw new Error(`VectorEngine returned no image for ${entry.id}`);
 }
 
 async function downloadUrl(url, timeoutMs) {
@@ -328,7 +373,7 @@ async function generateOne(env, entry, outDir) {
     const bytes = decodeStrictBase64Image(b64Images[0]);
     if (!bytes) {
       throw new Error(
-        `Tiantoken returned invalid base64 image for ${entry.id}`,
+        `VectorEngine returned invalid base64 image for ${entry.id}`,
       );
     }
     image = {
@@ -336,7 +381,7 @@ async function generateOne(env, entry, outDir) {
       extension: inferExtensionFromBytes(bytes),
     };
   } else {
-    throw new Error(`Tiantoken returned no image for ${entry.id}`);
+    throw new Error(`VectorEngine returned no image for ${entry.id}`);
   }
 
   mkdirSync(outDir, { recursive: true });
@@ -363,6 +408,7 @@ if (dryRun) {
         requests: selectedPrompts.map((entry) => ({
           id: entry.id,
           title: entry.title,
+          fallbackModel: fallbackImageModel,
           body: {
             model: preferredImageModel,
             prompt: buildPrompt(entry),
@@ -383,7 +429,7 @@ if (!env.baseUrl || !env.apiKey) {
   console.error(
     JSON.stringify({
       ok: false,
-      error: 'Missing TIANTOKEN_BASE_URL or TIANTOKEN_API_KEY',
+      error: 'Missing VECTOR_ENGINE_BASE_URL or VECTOR_ENGINE_API_KEY',
       hasBaseUrl: Boolean(env.baseUrl),
       hasApiKey: Boolean(env.apiKey),
     }),

.codex/skills/gpt-image-2-apimart/scripts/generate-template-samples.mjs

@@ -18,9 +18,8 @@ const defaultOutDir = path.join(
   'puzzle-creation-templates',
 );
 const defaultTimeoutMs = 1000000;
-// GPT Image 2.5 生成任务只接受 concrete provider model；业务模型名 `gpt-image-2.5`
-// 由 server-rs 在任务边界解析，脚本直连 provider 时必须自己给出 concrete key。
-const preferredImageModel = 'gpt-image-2.5-flare-c';
+const preferredImageModel = 'gpt-image-2';
+const fallbackImageModel = 'gpt-image-2-c';
 
 const args = new Map();
 for (let index = 2; index < process.argv.length; index += 1) {
@@ -72,18 +71,18 @@ function resolveEnv() {
     ...process.env,
   };
   return {
-    baseUrl: String(loaded.TIANTOKEN_BASE_URL || '')
+    baseUrl: String(loaded.VECTOR_ENGINE_BASE_URL || '')
       .trim()
       .replace(/\/+$/u, ''),
-    apiKey: String(loaded.TIANTOKEN_API_KEY || '').trim(),
+    apiKey: String(loaded.VECTOR_ENGINE_API_KEY || '').trim(),
     timeoutMs: Number.parseInt(
-      String(loaded.TIANTOKEN_IMAGE_REQUEST_TIMEOUT_MS || defaultTimeoutMs),
+      String(loaded.VECTOR_ENGINE_IMAGE_REQUEST_TIMEOUT_MS || defaultTimeoutMs),
       10,
     ),
   };
 }
 
-function buildTiantokenImagesGenerationUrl(baseUrl) {
+function buildVectorEngineImagesGenerationUrl(baseUrl) {
   return baseUrl.endsWith('/v1')
     ? `${baseUrl}/images/generations`
     : `${baseUrl}/v1/images/generations`;
@@ -204,22 +203,22 @@ async function fetchJson(url, options, timeoutMs) {
     const text = await response.text();
     if (!response.ok) {
       const error = new Error(
-        `Tiantoken ${response.status}: ${text.slice(0, 600)}`,
+        `VectorEngine ${response.status}: ${text.slice(0, 600)}`,
       );
-      error.providerStatus = response.status;
-      error.providerBody = text;
+      error.vectorEngineStatus = response.status;
+      error.vectorEngineBody = text;
       throw error;
     }
     try {
       return JSON.parse(text);
     } catch (error) {
-      error.providerResponseParse = true;
-      error.providerBody = text;
+      error.vectorEngineResponseParse = true;
+      error.vectorEngineBody = text;
       throw error;
     }
   } catch (error) {
     if (error?.name === 'AbortError') {
-      throw new Error(`Tiantoken request timed out after ${timeoutMs}ms`);
+      throw new Error(`VectorEngine request timed out after ${timeoutMs}ms`);
     }
     throw error;
   } finally {
@@ -227,35 +226,83 @@ async function fetchJson(url, options, timeoutMs) {
   }
 }
 
-async function requestImagePayload(env, template) {
-  const model = preferredImageModel;
-  const requestBody = {
-    model,
-    prompt: buildPrompt(template),
-    n: 1,
-    size: '1024x1024',
-  };
-  const payload = await fetchJson(
-    buildTiantokenImagesGenerationUrl(env.baseUrl),
-    {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${env.apiKey}`,
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    },
-    env.timeoutMs,
-  );
-  const base64Image = decodeStrictBase64Image(extractBase64Images(payload)[0]);
-  if (extractImageUrls(payload)[0] || base64Image) {
-    return payload;
+function shouldFallbackImageModel(error) {
+  const raw =
+    `${error?.message || ''}\n${error?.vectorEngineBody || ''}`.toLowerCase();
+  if (error?.vectorEngineResponseParse) {
+    return !containsContentRejection(raw);
   }
-  const error = new Error(`Tiantoken returned no image for ${template.id}`);
-  error.providerResponseParse = true;
-  error.providerBody = JSON.stringify(payload).slice(0, 600);
-  throw error;
+  const status = Number(error?.vectorEngineStatus || 0);
+  if (status === 408 || status >= 500) {
+    return true;
+  }
+  if (status === 429) {
+    return !containsContentRejection(raw);
+  }
+  const mentionsImageModel =
+    raw.includes('model') ||
+    raw.includes('模型') ||
+    raw.includes(preferredImageModel) ||
+    raw.includes(fallbackImageModel);
+  return (
+    [400, 404, 422].includes(status) &&
+    mentionsImageModel &&
+    /(not found|not supported|unsupported|unavailable|does not exist|invalid model|unknown model|不存在|不支持|不可用|未开通)/u.test(
+      raw,
+    )
+  );
+}
+
+function containsContentRejection(raw) {
+  return /(invalid_prompt|safety|content[_ ]policy|moderation|prompt rejected|content rejected|prompt refusal|content refusal|rejected by safety|rejected by moderation|敏感|违规|安全策略|内容审核|提示词拒绝|内容拒绝)/u.test(
+    raw,
+  );
+}
+
+async function requestImagePayload(env, template) {
+  for (const model of [preferredImageModel, fallbackImageModel]) {
+    const requestBody = {
+      model,
+      prompt: buildPrompt(template),
+      n: 1,
+      size: '1024x1024',
+    };
+    try {
+      const payload = await fetchJson(
+        buildVectorEngineImagesGenerationUrl(env.baseUrl),
+        {
+          method: 'POST',
+          headers: {
+            Authorization: `Bearer ${env.apiKey}`,
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(requestBody),
+        },
+        env.timeoutMs,
+      );
+      const base64Image = decodeStrictBase64Image(
+        extractBase64Images(payload)[0],
+      );
+      if (extractImageUrls(payload)[0] || base64Image) {
+        return payload;
+      }
+      const error = new Error(
+        `VectorEngine returned no image for ${template.id}`,
+      );
+      error.vectorEngineResponseParse = true;
+      error.vectorEngineBody = JSON.stringify(payload).slice(0, 600);
+      throw error;
+    } catch (error) {
+      if (model !== preferredImageModel || !shouldFallbackImageModel(error)) {
+        throw error;
+      }
+      console.warn(
+        `VectorEngine ${preferredImageModel} failed, retrying with ${fallbackImageModel}: ${error.message}`,
+      );
+    }
+  }
+  throw new Error(`VectorEngine returned no image for ${template.id}`);
 }
 
 async function downloadUrl(url, timeoutMs) {
@@ -298,7 +345,7 @@ async function generateOne(env, template, outDir) {
     const bytes = decodeStrictBase64Image(b64Images[0]);
     if (!bytes) {
       throw new Error(
-        `Tiantoken returned invalid base64 image for ${template.id}`,
+        `VectorEngine returned invalid base64 image for ${template.id}`,
       );
     }
     image = {
@@ -306,7 +353,7 @@ async function generateOne(env, template, outDir) {
       extension: inferExtensionFromBytes(bytes),
     };
   } else {
-    throw new Error(`Tiantoken returned no image for ${template.id}`);
+    throw new Error(`VectorEngine returned no image for ${template.id}`);
   }
 
   mkdirSync(outDir, { recursive: true });
@@ -337,6 +384,7 @@ if (dryRun) {
         requests: selectedTemplates.map((template) => ({
           id: template.id,
           title: template.title,
+          fallbackModel: fallbackImageModel,
           body: {
             model: preferredImageModel,
             prompt: buildPrompt(template),
@@ -357,7 +405,7 @@ if (!env.baseUrl || !env.apiKey) {
   console.error(
     JSON.stringify({
       ok: false,
-      error: 'Missing TIANTOKEN_BASE_URL or TIANTOKEN_API_KEY',
+      error: 'Missing VECTOR_ENGINE_BASE_URL or VECTOR_ENGINE_API_KEY',
       hasBaseUrl: Boolean(env.baseUrl),
       hasApiKey: Boolean(env.apiKey),
     }),

CONTEXT.md

@@ -44,35 +44,6 @@ _Avoid_: 把同一资源的全局元数据和某一次摆放坐标混在同一
 由图片生成或图片修改流程产生的画布资源，必须记录来源资源、提示词、实际提示词、模型、provider、任务 ID 和生成时间；本期 `/editor` 的生成修改先允许 mock 生成资源，但仍按生成资源元数据形状保存。
 _Avoid_: 无来源的静态素材、只显示在 UI 但不落工程资源记录的生成结果
 
-**图片模型历史值与使用端解析**:
-图片资源中已持久化的 `gpt-image-2` 是历史业务事实，读回时保持原值；新任务使用业务模型值 `gpt-image-2.5`。当用户基于历史资源再次发起生成或编辑任务时，服务端只在新任务的使用端把历史值解析为当前业务模型，不改写历史资源。provider route 属于服务端执行与审计边界，前端不接收、不持久化、不展示，也不据此分支。
-_Avoid_: 读取数据库时改写历史模型值、把 provider route 暴露为前端模型选项或公开 DTO
-
-**图片 provider 显式路由**:
-api-server 在任务入口按业务语义显式选择具体 provider model name（生成或编辑），并把同一具体名传给图片平台适配器和后台定价解析；图片平台适配器不从参考图数量或前端字段猜测任务。具体 provider model name 只存在于服务端调用、定价配置和审计边界。
-后台管理 Web/API 是明确例外，可以查看和编辑两个具体定价 key；主站普通前端与公开定价 API 不接收这些 key。
-_Avoid_: 让图片适配器隐式猜路由、让主站前端携带 provider model name
-
-**业务模型**:
-面向任务与产品契约的稳定模型值；当前 GPT 图片新任务的业务模型是 `gpt-image-2.5`。业务模型不等同于 provider 的具体计费/请求 model，也不暴露 provider 凭证或 endpoint。
-_Avoid_: 把 provider concrete model 当作前端业务选项、用业务模型值直接推断 provider 凭证
-
-**具体模型**:
-服务端发送请求和定价使用的 concrete model name。GPT Image 2.5 生成与编辑分别是 `gpt-image-2.5-flare-c` 和 `gpt-image-2.5-sunburst-c`；nanobanana 仍使用 `gemini-3.1-flash-image-preview`。具体模型只在服务端执行、定价和审计边界出现。
-_Avoid_: 把具体模型写入普通前端 DTO、让未知字符串自动选择 provider
-
-**provider client**:
-按具体模型选出的外部图片 provider 连接配置，包含 provider identity、base URL 和 API key；VectorEngine 与 Tiantoken client 共享图片协议执行器，不复制请求/响应业务逻辑。两套 required client 在 api-server 启动时构造。
-_Avoid_: 在首次请求时才创建 client、在 provider client 中复制尺寸/重试/审计逻辑、跨 provider credential fallback
-
-**历史模型值**:
-已持久化的 `gpt-image-2` 字符串，只作为历史事实原样读取和审计；基于历史资源提交新任务时，在使用端解析为当前 GPT Image 2.5 业务任务，不回写历史记录，也不把旧值作为现役 provider route。已退役的 `gpt-image-2-c` 已从代码整体删除，只有数据库里的历史审计字符串原样保留，任何入口传入该值都按不支持的值处理。
-_Avoid_: 数据库批量改写历史值、把历史值重新路由到 VectorEngine、把兼容解析扩散到普通前端、为已删除的 `gpt-image-2-c` 重新加回常量或解析分支
-
-**GPT Image 2.5 新生成展示名**:
-`GPT Image 2.5` 是新生成任务的产品展示名；历史资源与既有编辑上下文不因新模型上线而改写展示语义。
-_Avoid_: 把新生成展示名扩散到历史记录、历史生成器或旧编辑上下文
-
 **系列素材图集生成**:
 一组同类素材的统一批量生成方式，采用批量规划、sheet 生图、后端切图、透明化、OSS 持久化和局部重生成的通用流水线。
 _Avoid_: 为每个玩法单独发明素材流水线、把系列素材建模成任一玩法专属 DTO

apps/admin-web/src/api/adminApiClient.test.ts

@@ -3,15 +3,12 @@ import { afterEach, expect, test, vi } from 'vitest';
 import {
   createAdminAccount,
   executeAdminRechargeRefund,
-  getAdminAgcTemplates,
   getAdminFeatureGateConfig,
   getAdminUserDetail,
-  importAdminAgcTemplates,
   listAdminRechargeOrders,
   reconcileAdminUserConsumption,
   resolveAdminRechargeRefundManualReview,
   updateAdminAccount,
-  updateAdminAgcTemplate,
   uploadAdminEditorShowcaseCampaignImage,
   upsertAdminFeatureGateConfig,
   upsertProfileWalletConfig,
@@ -21,95 +18,6 @@ afterEach(() => {
   vi.unstubAllGlobals();
 });
 
-test('模板管理读取和更新复用认证封装，提交 revision 和封面但不提交 ZIP 或版本', async () => {
-  const library = { revision: 'revision-new', writable: true, templates: [] };
-  const fetchMock = vi.fn().mockImplementation(
-    async () =>
-      new Response(JSON.stringify({ ok: true, data: library }), {
-        status: 200,
-      }),
-  );
-  vi.stubGlobal('fetch', fetchMock);
-  const controller = new AbortController();
-  expect(await getAdminAgcTemplates('admin-token', controller.signal)).toEqual(
-    library,
-  );
-  const update = {
-    expectedRevision: 'revision-old',
-    title: '空白模板',
-    summary: '简介',
-    tags: ['2D'],
-    enabled: true,
-    cover: { contentType: 'image/png', dataBase64: 'aW1hZ2U=' },
-  };
-  expect(
-    await updateAdminAgcTemplate('admin-token', 'template/1', update),
-  ).toEqual(library);
-  expect(fetchMock.mock.calls[0]).toEqual([
-    '/admin/api/agc-templates',
-    expect.objectContaining({
-      method: 'GET',
-      signal: controller.signal,
-      headers: expect.objectContaining({ Authorization: 'Bearer admin-token' }),
-    }),
-  ]);
-  expect(fetchMock.mock.calls[1]).toEqual([
-    '/admin/api/agc-templates/template%2F1',
-    expect.objectContaining({
-      method: 'PUT',
-      headers: expect.objectContaining({
-        Authorization: 'Bearer admin-token',
-        'Content-Type': 'application/json',
-      }),
-      body: JSON.stringify(update),
-    }),
-  ]);
-});
-
-test('模板批量导入走 multipart，不预设 JSON Content-Type', async () => {
-  const imported = {
-    revision: 'rev-2',
-    writable: true,
-    templates: [],
-    imported: [
-      {
-        id: 'alpha',
-        templateVersion: '0.1.0',
-        zipSizeBytes: 4,
-        zipSha256: 'a'.repeat(64),
-        reusedObjects: false,
-      },
-    ],
-  };
-  const fetchMock = vi
-    .fn()
-    .mockImplementation(
-      async () =>
-        new Response(JSON.stringify({ ok: true, data: imported }), {
-          status: 200,
-        }),
-    );
-  vi.stubGlobal('fetch', fetchMock);
-
-  const form = new FormData();
-  form.append(
-    'manifest',
-    JSON.stringify({ expectedRevision: 'rev-1', templates: [] }),
-  );
-  form.append(
-    'zip_0',
-    new File([new Uint8Array([1])], 'alpha.zip', { type: 'application/zip' }),
-  );
-
-  expect(await importAdminAgcTemplates('admin-token', form)).toEqual(imported);
-  const [url, init] = fetchMock.mock.calls[0]!;
-  expect(url).toBe('/admin/api/agc-templates/import');
-  expect(init.method).toBe('POST');
-  expect(init.body).toBe(form);
-  expect(init.headers).not.toHaveProperty('Content-Type');
-  expect(init.headers.Authorization).toBe('Bearer admin-token');
-});
-
 test('后台账号创建和更新同时携带 Tab 与独立操作权限', async () => {
   const fetchMock = vi.fn().mockImplementation(() =>
     Promise.resolve(

apps/admin-web/src/api/adminApiClient.ts

@@ -1,6 +1,5 @@
 import type {
   AdminAccountListResponse,
-  AdminAgcTemplateLibraryResponse,
   AdminConfirmEditorShowcaseCampaignImageUploadRequest,
   AdminCreateAccountRequest,
   AdminCreateAccountResponse,
@@ -30,11 +29,9 @@ import type {
   AdminExternalApiKeyListQuery,
   AdminExternalApiKeyListResponse,
   AdminFeatureGateConfigResponse,
-  AdminImportAgcTemplatesResponse,
   AdminLoginResponse,
   AdminMeResponse,
   AdminOverviewResponse,
-  AdminProjectSnapshotChannelsResponse,
   AdminProjectSnapshotListQuery,
   AdminProjectSnapshotListResponse,
   AdminRechargeOrderListQuery,
@@ -50,7 +47,6 @@ import type {
   AdminTrackingEventListResponse,
   AdminUpdateAccountRequest,
   AdminUpdateAccountResponse,
-  AdminUpdateAgcTemplateRequest,
   AdminUploadedEditorShowcaseCampaignImage,
   AdminUpsertEditorShowcaseCampaignRequest,
   AdminUpsertFeatureGateConfigRequest,
@@ -89,8 +85,6 @@ interface AdminRequestOptions {
   method?: string;
   token?: string;
   body?: unknown;
-  /** multipart 表单：交给浏览器自己带 boundary，不能预设 Content-Type。 */
-  formData?: FormData;
   headers?: Record<string, string>;
   signal?: AbortSignal;
 }
@@ -178,8 +172,6 @@ export async function request<T>(
   if (typeof options.body !== 'undefined') {
     headers['Content-Type'] = 'application/json';
     init.body = JSON.stringify(options.body);
-  } else if (options.formData) {
-    init.body = options.formData;
   }
 
   const response = await fetch(buildRequestUrl(path), init);
@@ -215,7 +207,6 @@ export function listAdminProjectSnapshots(
 ) {
   const params = new URLSearchParams();
   if (query.cursor) params.set('cursor', query.cursor);
-  if (query.channel) params.set('channel', query.channel);
   params.set('limit', String(query.limit ?? 20));
   return request<AdminProjectSnapshotListResponse>(
     `/admin/api/project-snapshots?${params.toString()}`,
@@ -223,27 +214,13 @@ export function listAdminProjectSnapshots(
   );
 }
 
-export function getAdminProjectSnapshotChannels(
-  token: string,
-  signal?: AbortSignal,
-) {
-  return request<AdminProjectSnapshotChannelsResponse>(
-    '/admin/api/project-snapshots/channels',
-    { token, signal },
-  );
-}
-
 export async function downloadAdminProjectSnapshot(
   token: string,
-  channel: string,
   userId: string,
   projectId: string,
   signal?: AbortSignal,
 ) {
-  const params = new URLSearchParams();
-  if (channel) params.set('channel', channel);
-  const query = params.toString();
-  const path = `/admin/api/project-snapshots/${encodeURIComponent(userId)}/${encodeURIComponent(projectId)}/download${query ? `?${query}` : ''}`;
+  const path = `/admin/api/project-snapshots/${encodeURIComponent(userId)}/${encodeURIComponent(projectId)}/download`;
   const response = await fetch(buildRequestUrl(path), {
     headers: {
       Authorization: `Bearer ${token.trim()}`,
@@ -1199,33 +1176,3 @@ export function saveAgcModelCatalog(
     { token, method: 'PUT', body },
   );
 }
-
-export function getAdminAgcTemplates(token: string, signal?: AbortSignal) {
-  return request<AdminAgcTemplateLibraryResponse>('/admin/api/agc-templates', {
-    token,
-    signal,
-  });
-}
-
-export function updateAdminAgcTemplate(
-  token: string,
-  id: string,
-  body: AdminUpdateAgcTemplateRequest,
-) {
-  return request<AdminAgcTemplateLibraryResponse>(
-    `/admin/api/agc-templates/${encodeURIComponent(id)}`,
-    { token, method: 'PUT', body },
-  );
-}
-
-/** 批量导入模板包：manifest 与 zip_N / cover_N 一起走 multipart，一批一次锁一次提交。 */
-export function importAdminAgcTemplates(token: string, formData: FormData) {
-  return request<AdminImportAgcTemplatesResponse>(
-    '/admin/api/agc-templates/import',
-    {
-      token,
-      method: 'POST',
-      formData,
-    },
-  );
-}

apps/admin-web/src/api/adminApiTypes.ts

@@ -105,15 +105,11 @@ export interface AdminProjectSnapshotEntry {
   fileCount: number;
   totalBytes: number;
   status: 'ready' | 'partial' | 'unverified';
-  channel: string;
-  authorDisplayName?: string | null;
-  authorPublicUserCode?: string | null;
 }
 
 export interface AdminProjectSnapshotListQuery {
   cursor?: string | null;
   limit?: number;
-  channel?: string | null;
 }
 
 export interface AdminProjectSnapshotListResponse {
@@ -121,11 +117,6 @@ export interface AdminProjectSnapshotListResponse {
   nextCursor: string | null;
 }
 
-export interface AdminProjectSnapshotChannelsResponse {
-  defaultChannel: string;
-  channels: string[];
-}
-
 export interface AdminErrorReportEntry {
   batchId: string;
   eventCount: number;
@@ -1042,67 +1033,3 @@ export interface AdminAgcModelCatalog {
   defaultModelId: string;
   models: AdminAgcModel[];
 }
-
-export interface AdminAgcTemplatePayload {
-  id: string;
-  title: string;
-  summary: string;
-  tags: string[];
-  runtime: string;
-  engine: string;
-  engineVersion: string;
-  templateVersion: string;
-  enabled: boolean;
-  coverUrl: string;
-  zipSizeBytes: number;
-}
-
-export interface AdminAgcTemplateLibraryResponse {
-  revision: string;
-  writable: boolean;
-  templates: AdminAgcTemplatePayload[];
-}
-
-export interface AdminUpdateAgcTemplateRequest {
-  expectedRevision: string;
-  title: string;
-  summary: string;
-  tags: string[];
-  enabled: boolean;
-  cover?: {
-    contentType: string;
-    dataBase64: string;
-  };
-}
-
-export interface AdminImportAgcTemplateItemPayload {
-  id: string;
-  title: string;
-  summary: string;
-  tags: string[];
-  runtime: string;
-  engine: string;
-  engineVersion: string;
-  templateVersion: string;
-  entry: string;
-  zipField: string;
-  coverField: string;
-}
-
-export interface AdminImportAgcTemplatesManifest {
-  expectedRevision: string;
-  templates: AdminImportAgcTemplateItemPayload[];
-}
-
-export interface AdminImportAgcTemplateResult {
-  id: string;
-  templateVersion: string;
-  zipSizeBytes: number;
-  zipSha256: string;
-  reusedObjects: boolean;
-}
-
-export interface AdminImportAgcTemplatesResponse
-  extends AdminAgcTemplateLibraryResponse {
-  imported: AdminImportAgcTemplateResult[];
-}

apps/admin-web/src/api/adminProjectSnapshotApi.test.ts

@@ -2,7 +2,6 @@ import { afterEach, expect, test, vi } from 'vitest';
 
 import {
   downloadAdminProjectSnapshot,
-  getAdminProjectSnapshotChannels,
   listAdminProjectSnapshots,
 } from './adminApiClient';
 
@@ -22,12 +21,12 @@ test('项目列表携带分页与后台授权，解析标准响应', async () =>
   expect(
     await listAdminProjectSnapshots(
       'admin-token',
-      { cursor: 'user/a+项目', limit: 20, channel: 'release' },
+      { cursor: 'user/a+项目', limit: 20 },
       controller.signal,
     ),
   ).toEqual(payload);
   expect(fetchMock).toHaveBeenCalledWith(
-    '/admin/api/project-snapshots?cursor=user%2Fa%2B%E9%A1%B9%E7%9B%AE&channel=release&limit=20',
+    '/admin/api/project-snapshots?cursor=user%2Fa%2B%E9%A1%B9%E7%9B%AE&limit=20',
     expect.objectContaining({
       headers: expect.objectContaining({ Authorization: 'Bearer admin-token' }),
       signal: controller.signal,
@@ -35,23 +34,6 @@ test('项目列表携带分页与后台授权，解析标准响应', async () =>
   );
 });
 
-test('渠道列表按后台授权读取，解析本部署渠道', async () => {
-  const payload = { defaultChannel: 'release', channels: ['dev', 'release'] };
-  const fetchMock = vi
-    .fn()
-    .mockResolvedValue(
-      new Response(JSON.stringify({ ok: true, data: payload })),
-    );
-  vi.stubGlobal('fetch', fetchMock);
-  expect(await getAdminProjectSnapshotChannels('admin-token')).toEqual(payload);
-  expect(fetchMock).toHaveBeenCalledWith(
-    '/admin/api/project-snapshots/channels',
-    expect.objectContaining({
-      headers: expect.objectContaining({ Authorization: 'Bearer admin-token' }),
-    }),
-  );
-});
-
 test('ZIP 下载以授权请求读取并优先保留中文附件名', async () => {
   const fetchMock = vi.fn().mockResolvedValue(
     new Response('PK\u0003\u0004', {
@@ -66,7 +48,6 @@ test('ZIP 下载以授权请求读取并优先保留中文附件名', async () =
   const controller = new AbortController();
   const archive = await downloadAdminProjectSnapshot(
     'admin-token',
-    'release',
     'user/a',
     'project/b',
     controller.signal,
@@ -74,7 +55,7 @@ test('ZIP 下载以授权请求读取并优先保留中文附件名', async () =
   expect(archive.filename).toBe('三消-r2.zip');
   expect(archive.blob.type).toBe('application/zip');
   expect(fetchMock).toHaveBeenCalledWith(
-    '/admin/api/project-snapshots/user%2Fa/project%2Fb/download?channel=release',
+    '/admin/api/project-snapshots/user%2Fa/project%2Fb/download',
     expect.objectContaining({
       headers: expect.objectContaining({
         Authorization: 'Bearer admin-token',
@@ -100,8 +81,7 @@ test.each([
     vi.fn().mockResolvedValue(new Response('PK', { headers })),
   );
   expect(
-    (await downloadAdminProjectSnapshot('token', 'release', 'user', 'project'))
-      .filename,
+    (await downloadAdminProjectSnapshot('token', 'user', 'project')).filename,
   ).toBe(expected.replace('工程', 'project'));
 });
 
@@ -124,7 +104,7 @@ test.each([401, 403, 409, 500])(
       ),
     );
     await expect(
-      downloadAdminProjectSnapshot('token', 'release', 'user', 'project'),
+      downloadAdminProjectSnapshot('token', 'user', 'project'),
     ).rejects.toMatchObject({
       status,
       code: 'SNAPSHOT_FAILURE',
@@ -143,6 +123,6 @@ test('200 JSON 或 HTML 不能被保存为成功 ZIP', async () => {
     ),
   );
   await expect(
-    downloadAdminProjectSnapshot('token', 'release', 'user', 'project'),
+    downloadAdminProjectSnapshot('token', 'user', 'project'),
   ).rejects.toMatchObject({ code: 'INVALID_PROJECT_ARCHIVE_RESPONSE' });
 });

apps/admin-web/src/app/AdminApp.tsx

@@ -19,7 +19,6 @@ import {
 } from '../auth/adminAuthStore';
 import { AdminAccountsPage } from '../pages/AdminAccountsPage';
 import { AdminAgcModelsPage } from '../pages/AdminAgcModelsPage';
-import { AdminAgcTemplatesPage } from '../pages/AdminAgcTemplatesPage';
 import { AdminDashboardPage } from '../pages/AdminDashboardPage';
 import { AdminDatabaseTablesPage } from '../pages/AdminDatabaseTablesPage';
 import { AdminDebugHttpPage } from '../pages/AdminDebugHttpPage';
@@ -295,12 +294,6 @@ export function AdminApp() {
       {activeRouteId === 'agc-models' ? (
         <AdminAgcModelsPage token={token} onUnauthorized={handleUnauthorized} />
       ) : null}
-      {activeRouteId === 'agc-templates' ? (
-        <AdminAgcTemplatesPage
-          token={token}
-          onUnauthorized={handleUnauthorized}
-        />
-      ) : null}
       {activeRouteId === 'editor-showcase' ? (
         <AdminEditorShowcaseReviewPage
           token={token}

apps/admin-web/src/app/AdminShell.tsx

@@ -53,7 +53,6 @@ const routeIcons = {
   'project-snapshots': FolderArchive,
   accounts: Users,
   'agc-models': ListChecks,
-  'agc-templates': Images,
 } satisfies Record<AdminRouteId, typeof LayoutDashboard>;
 
 export function AdminShell({

apps/admin-web/src/app/adminRoutes.test.ts

@@ -147,30 +147,3 @@ test('项目工程入口对 owner 与已授权 member 开放且可分配权限',
     }),
   ).not.toContainEqual(route);
 });
-
-test('模板管理只对 owner 或具有 agc-templates 权限的 member 可见', () => {
-  expect(adminRoutes).toContainEqual({
-    id: 'agc-templates',
-    label: '模板管理',
-    hash: '#agc-templates',
-  });
-  expect(resolveAdminRoute('#agc-templates')).toBe('agc-templates');
-  expect(routeHash('agc-templates')).toBe('#agc-templates');
-  expect(
-    getAccessibleAdminRoutes({ accountRole: 'owner', tabPermissions: [] }).some(
-      (route) => route.id === 'agc-templates',
-    ),
-  ).toBe(true);
-  expect(
-    getAccessibleAdminRoutes({
-      accountRole: 'member',
-      tabPermissions: ['agc-templates'],
-    }).map((route) => route.id),
-  ).toEqual(['agc-templates']);
-  expect(
-    getAccessibleAdminRoutes({
-      accountRole: 'member',
-      tabPermissions: ['editor-assets'],
-    }).some((route) => route.id === 'agc-templates'),
-  ).toBe(false);
-});

apps/admin-web/src/app/adminRoutes.ts

@@ -18,7 +18,6 @@ export type AdminRouteId =
   | 'editor-assets'
   | 'project-snapshots'
   | 'agc-models'
-  | 'agc-templates'
   | 'accounts';
 
 export type AdminTabPermission = Exclude<
@@ -54,7 +53,6 @@ export const adminRoutes: AdminRouteDefinition[] = [
     hash: '#editor-generation-pricing',
   },
   { id: 'agc-models', label: 'AGC 模型', hash: '#agc-models', ownerOnly: true },
-  { id: 'agc-templates', label: '模板管理', hash: '#agc-templates' },
   { id: 'editor-showcase', label: '精选审核', hash: '#editor-showcase' },
   { id: 'editor-assets', label: '素材查询', hash: '#editor-assets' },
   { id: 'project-snapshots', label: '项目工程', hash: '#project-snapshots' },

apps/admin-web/src/main.tsx

@@ -1,4 +1,3 @@
-import '@genarrative/shared/styles.css';
 import './styles/admin.css';
 
 import { StrictMode } from 'react';

apps/admin-web/src/pages/AdminProjectSnapshotsPage.test.tsx

@@ -13,7 +13,6 @@ import { afterEach, beforeEach, expect, test, vi } from 'vitest';
 import {
   AdminApiError,
   downloadAdminProjectSnapshot,
-  getAdminProjectSnapshotChannels,
   listAdminProjectSnapshots,
 } from '../api/adminApiClient';
 import type { AdminProjectSnapshotEntry } from '../api/adminApiTypes';
@@ -24,7 +23,6 @@ vi.mock('../api/adminApiClient', async () => ({
     '../api/adminApiClient',
   )),
   downloadAdminProjectSnapshot: vi.fn(),
-  getAdminProjectSnapshotChannels: vi.fn(),
   listAdminProjectSnapshots: vi.fn(),
 }));
 
@@ -37,18 +35,12 @@ const entry: AdminProjectSnapshotEntry = {
   fileCount: 12,
   totalBytes: 2048,
   status: 'ready',
-  channel: 'dev',
-  authorDisplayName: '陶泥作者',
-  authorPublicUserCode: 'SY-00000007',
 };
 
 beforeEach(() => {
   vi.mocked(listAdminProjectSnapshots)
     .mockReset()
     .mockResolvedValue({ items: [entry], nextCursor: null });
-  vi.mocked(getAdminProjectSnapshotChannels)
-    .mockReset()
-    .mockResolvedValue({ defaultChannel: 'dev', channels: ['dev'] });
   vi.mocked(downloadAdminProjectSnapshot).mockReset();
 });
 afterEach(() => {
@@ -96,166 +88,36 @@ test('按项目展示完整性并限制未完成工程下载', async () => {
   ).toBe(false);
 });
 
-test('按游标翻页回到上一页时复用已取得的游标', async () => {
+test('加载更多合并项目，刷新失败保留列表和错误，重试从首页开始', async () => {
   vi.mocked(listAdminProjectSnapshots)
     .mockResolvedValueOnce({ items: [entry], nextCursor: 'page-2' })
     .mockResolvedValueOnce({
       items: [{ ...entry, projectId: 'project-2', projectName: '第二工程' }],
-      nextCursor: 'page-3',
+      nextCursor: null,
     })
-    .mockResolvedValueOnce({ items: [entry], nextCursor: 'page-2' });
+    .mockRejectedValueOnce(new Error('远端清单读取失败'))
+    .mockResolvedValueOnce({ items: [], nextCursor: null });
   render(<AdminProjectSnapshotsPage token="token" onUnauthorized={vi.fn()} />);
-  await screen.findByText('三消工程');
-  const pagination = await screen.findByRole('navigation', {
-    name: '项目工程分页',
-  });
-  expect(pagination.textContent).toContain('第 1 页');
-  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
-    1,
-    'token',
-    { cursor: null, limit: 20, channel: 'dev' },
-    expect.any(AbortSignal),
-  );
-  expect(
-    screen.getByRole('button', { name: '上一页' }).hasAttribute('disabled'),
-  ).toBe(true);
-
-  fireEvent.click(screen.getByRole('button', { name: '下一页' }));
+  fireEvent.click(await screen.findByRole('button', { name: '加载更多' }));
   await screen.findByText('第二工程');
   expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
     2,
     'token',
-    { cursor: 'page-2', limit: 20, channel: 'dev' },
+    { cursor: 'page-2', limit: 20 },
     expect.any(AbortSignal),
   );
-  expect(screen.queryByText('三消工程')).toBeNull();
-  expect(pagination.textContent).toContain('第 2 页');
-  expect(
-    screen.getByRole('button', { name: '下一页' }).hasAttribute('disabled'),
-  ).toBe(false);
-
-  fireEvent.click(screen.getByRole('button', { name: '上一页' }));
-  await screen.findByText('三消工程');
-  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
-    3,
-    'token',
-    { cursor: null, limit: 20, channel: 'dev' },
-    expect.any(AbortSignal),
-  );
-  expect(pagination.textContent).toContain('第 1 页');
-});
-
-test('切换每页条数从第一页按新条数重新加载', async () => {
-  vi.mocked(listAdminProjectSnapshots)
-    .mockResolvedValueOnce({ items: [entry], nextCursor: 'page-2' })
-    .mockResolvedValueOnce({
-      items: [{ ...entry, projectId: 'project-2', projectName: '第二工程' }],
-      nextCursor: 'page-3',
-    })
-    .mockResolvedValueOnce({ items: [entry], nextCursor: null });
-  render(<AdminProjectSnapshotsPage token="token" onUnauthorized={vi.fn()} />);
-  await screen.findByText('三消工程');
-  fireEvent.click(screen.getByRole('button', { name: '下一页' }));
-  await screen.findByText('第二工程');
-  const pagination = screen.getByRole('navigation', { name: '项目工程分页' });
-  expect(pagination.textContent).toContain('第 2 页');
-
-  fireEvent.change(screen.getByLabelText('每页条数'), {
-    target: { value: '50' },
-  });
-  await screen.findByText('三消工程');
-  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
-    3,
-    'token',
-    { cursor: null, limit: 50, channel: 'dev' },
-    expect.any(AbortSignal),
-  );
-  // 重新加载时页脚会重建，必须重新取节点再断言。
-  expect(
-    screen.getByRole('navigation', { name: '项目工程分页' }).textContent,
-  ).toContain('第 1 页');
-});
-
-test('刷新重载当前页，翻页失败保留当前页并提示错误', async () => {
-  vi.mocked(listAdminProjectSnapshots)
-    .mockResolvedValueOnce({ items: [entry], nextCursor: 'page-2' })
-    .mockResolvedValueOnce({
-      items: [{ ...entry, projectId: 'project-2', projectName: '第二工程' }],
-      nextCursor: null,
-    })
-    .mockRejectedValueOnce(new Error('翻页读取失败'));
-  render(<AdminProjectSnapshotsPage token="token" onUnauthorized={vi.fn()} />);
-  await screen.findByText('三消工程');
-  fireEvent.click(screen.getByRole('button', { name: '下一页' }));
-  await screen.findByText('第二工程');
-
+  expect(screen.getByText('三消工程')).toBeTruthy();
   fireEvent.click(screen.getByRole('button', { name: '刷新' }));
   await screen.findByRole('alert');
-  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
-    3,
-    'token',
-    { cursor: 'page-2', limit: 20, channel: 'dev' },
-    expect.any(AbortSignal),
-  );
-  const pagination = screen.getByRole('navigation', { name: '项目工程分页' });
-  expect(pagination.textContent).toContain('第 2 页');
   expect(screen.getByText('第二工程')).toBeTruthy();
   expect(screen.queryByText('暂无已上传项目')).toBeNull();
-
-  vi.mocked(listAdminProjectSnapshots).mockResolvedValueOnce({
-    items: [],
-    nextCursor: null,
-  });
   fireEvent.click(screen.getByRole('button', { name: '刷新' }));
   await screen.findByText('暂无已上传项目');
-  expect(screen.queryByRole('alert')).toBeNull();
-});
-
-test('用户列与素材查询同口径展示昵称、陶泥号和用户详情入口', async () => {
-  render(<AdminProjectSnapshotsPage token="token" onUnauthorized={vi.fn()} />);
-  const row = (await screen.findByText('三消工程')).closest('tr')!;
-  expect(within(row).getByText('陶泥作者')).toBeTruthy();
-  expect(within(row).getByText('SY-00000007')).toBeTruthy();
-  expect(
-    within(row).getByRole('button', { name: '查看用户信息' }),
-  ).toBeTruthy();
-  expect(within(row).queryByText('user-1')).toBeNull();
-});
-
-test('默认查询本部署渠道，切换渠道后从第一页按该渠道重新查询', async () => {
-  vi.mocked(getAdminProjectSnapshotChannels).mockResolvedValue({
-    defaultChannel: 'release',
-    channels: ['dev', 'release'],
-  });
-  vi.mocked(listAdminProjectSnapshots)
-    .mockResolvedValueOnce({ items: [entry], nextCursor: 'page-2' })
-    .mockResolvedValueOnce({ items: [entry], nextCursor: null })
-    .mockResolvedValueOnce({
-      items: [{ ...entry, channel: 'dev', projectName: 'dev 工程' }],
-      nextCursor: null,
-    });
-  render(<AdminProjectSnapshotsPage token="token" onUnauthorized={vi.fn()} />);
-  await screen.findByText('三消工程');
-  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
-    1,
+  expect(listAdminProjectSnapshots).toHaveBeenLastCalledWith(
     'token',
-    { cursor: null, limit: 20, channel: 'release' },
+    { cursor: null, limit: 20 },
     expect.any(AbortSignal),
   );
-  const channelSelect = screen.getByLabelText('项目工程渠道');
-  expect((channelSelect as HTMLSelectElement).value).toBe('release');
-
-  fireEvent.click(screen.getByRole('button', { name: '下一页' }));
-  await screen.findByText('第 2 页，本页 1 个项目');
-  fireEvent.change(channelSelect, { target: { value: 'dev' } });
-  await screen.findByText('dev 工程');
-  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
-    3,
-    'token',
-    { cursor: null, limit: 20, channel: 'dev' },
-    expect.any(AbortSignal),
-  );
-  expect(screen.getByText('第 1 页，本页 1 个项目')).toBeTruthy();
 });
 
 test('下载使用返回的中文文件名，随后释放对象 URL', async () => {
@@ -292,7 +154,6 @@ test('下载使用返回的中文文件名，随后释放对象 URL', async () =
   expect(createObjectURL).toHaveBeenCalledWith(blob);
   expect(downloadAdminProjectSnapshot).toHaveBeenCalledWith(
     'token',
-    'dev',
     'user-1',
     'project-1',
     expect.any(AbortSignal),
@@ -303,7 +164,7 @@ test('下载使用返回的中文文件名，随后释放对象 URL', async () =
 
 test('取消下载中止请求且不显示错误，卸载中止列表请求', async () => {
   vi.mocked(downloadAdminProjectSnapshot).mockImplementation(
-    (_token, _channel, _user, _project, signal) =>
+    (_token, _user, _project, signal) =>
       new Promise((_resolve, reject) => {
         signal?.addEventListener('abort', () =>
           reject(new DOMException('Aborted', 'AbortError')),
@@ -316,7 +177,7 @@ test('取消下载中止请求且不显示错误，卸载中止列表请求', as
   fireEvent.click(await screen.findByRole('button', { name: '下载完整工程' }));
   fireEvent.click(await screen.findByRole('button', { name: '取消下载' }));
   expect(
-    vi.mocked(downloadAdminProjectSnapshot).mock.calls[0]?.[4]?.aborted,
+    vi.mocked(downloadAdminProjectSnapshot).mock.calls[0]?.[3]?.aborted,
   ).toBe(true);
   await waitFor(() => expect(screen.queryByRole('alert')).toBeNull());
   vi.mocked(listAdminProjectSnapshots).mockReturnValue(new Promise(() => {}));
@@ -387,10 +248,6 @@ test('更换登录令牌丢弃旧列表和晚返回请求', async () => {
       onUnauthorized={onUnauthorized}
     />,
   );
-  // 渠道确定之后才会发出列表请求，这里等到旧令牌的请求真的在途再换令牌。
-  await waitFor(() =>
-    expect(listAdminProjectSnapshots).toHaveBeenCalledTimes(1),
-  );
   const oldSignal = vi.mocked(listAdminProjectSnapshots).mock.calls[0]?.[2];
   view.rerender(
     <AdminProjectSnapshotsPage
@@ -421,7 +278,7 @@ test('卸载后完成的下载不会创建浏览器文件', async () => {
     <AdminProjectSnapshotsPage token="token" onUnauthorized={vi.fn()} />,
   );
   fireEvent.click(await screen.findByRole('button', { name: '下载完整工程' }));
-  const signal = vi.mocked(downloadAdminProjectSnapshot).mock.calls[0]?.[4];
+  const signal = vi.mocked(downloadAdminProjectSnapshot).mock.calls[0]?.[3];
   view.unmount();
   expect(signal?.aborted).toBe(true);
   await act(async () => {

apps/admin-web/src/pages/AdminProjectSnapshotsPage.tsx

@@ -1,19 +1,11 @@
-import {
-  ChevronLeft,
-  ChevronRight,
-  Download,
-  RefreshCcw,
-  X,
-} from 'lucide-react';
+import { Download, RefreshCcw, X } from 'lucide-react';
 import { useCallback, useEffect, useRef, useState } from 'react';
 
 import {
   downloadAdminProjectSnapshot,
-  getAdminProjectSnapshotChannels,
   listAdminProjectSnapshots,
 } from '../api/adminApiClient';
 import type { AdminProjectSnapshotEntry } from '../api/adminApiTypes';
-import { AdminUserReferenceButton } from '../components/AdminUserReferenceButton';
 import { handlePageError } from './pageUtils';
 
 interface AdminProjectSnapshotsPageProps {
@@ -39,32 +31,21 @@ const snapshotStatuses = {
   },
 };
 
-const DEFAULT_PAGE_SIZE = 20;
-const PAGE_SIZE_OPTIONS = [20, 50, 100];
-
 export function AdminProjectSnapshotsPage({
   token,
   onUnauthorized,
 }: AdminProjectSnapshotsPageProps) {
   const [items, setItems] = useState<AdminProjectSnapshotEntry[]>([]);
   const [nextCursor, setNextCursor] = useState<string | null>(null);
-  const [pageIndex, setPageIndex] = useState(1);
-  const [pageSize, setPageSize] = useState(DEFAULT_PAGE_SIZE);
-  // null 表示渠道还没确定：先读完可选渠道再发列表请求，避免用错渠道白跑一次。
-  const [channel, setChannel] = useState<string | null>(null);
-  const [channelOptions, setChannelOptions] = useState<string[]>([]);
   const [isLoading, setIsLoading] = useState(false);
   const [hasLoaded, setHasLoaded] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
   const [downloadingKey, setDownloadingKey] = useState<string | null>(null);
   const listController = useRef<AbortController | null>(null);
   const downloadController = useRef<AbortController | null>(null);
-  // 远端按游标分页且不给总数：第 N 页的起始游标只能由前 N-1 页依次返回，
-  // 因此按页记录已取得的游标，翻页只在这些游标之间移动。
-  const pageCursors = useRef<(string | null)[]>([null]);
 
   const loadPage = useCallback(
-    async (cursor: string | null, limit: number, page: number) => {
+    async (cursor: string | null = null) => {
       listController.current?.abort();
       const controller = new AbortController();
       listController.current = controller;
@@ -73,16 +54,23 @@ export function AdminProjectSnapshotsPage({
       try {
         const response = await listAdminProjectSnapshots(
           token,
-          { cursor, limit, channel },
+          { cursor, limit: 20 },
           controller.signal,
         );
         if (controller.signal.aborted) return;
-        setItems(response.items);
+        setItems((current) => {
+          if (!cursor) return response.items;
+          const entries = new Map(
+            current.map((entry) => [snapshotKey(entry), entry]),
+          );
+          response.items.forEach((entry) =>
+            entries.set(snapshotKey(entry), entry),
+          );
+          return [...entries.values()];
+        });
         setNextCursor(response.nextCursor);
-        setPageIndex(page);
         setHasLoaded(true);
       } catch (error: unknown) {
-        // 翻页或刷新失败时保留当前页，不把已看到的列表换成空表。
         if (!controller.signal.aborted)
           handlePageError(error, onUnauthorized, setErrorMessage);
       } finally {
@@ -92,70 +80,22 @@ export function AdminProjectSnapshotsPage({
         }
       }
     },
-    [token, onUnauthorized, channel],
+    [token, onUnauthorized],
   );
 
   useEffect(() => {
-    // 换令牌或首次进入时取一次可选渠道；已选渠道保持不变，只在还没选时落到本部署渠道。
-    const controller = new AbortController();
-    void (async () => {
-      try {
-        const response = await getAdminProjectSnapshotChannels(
-          token,
-          controller.signal,
-        );
-        if (controller.signal.aborted) return;
-        setChannelOptions(response.channels);
-        setChannel((current) => current ?? response.defaultChannel);
-      } catch (error: unknown) {
-        if (controller.signal.aborted) return;
-        // 渠道列表失败不阻塞查询：不带渠道按本部署渠道查询，并提示失败原因。
-        handlePageError(error, onUnauthorized, setErrorMessage);
-        setChannel((current) => current ?? '');
-      }
-    })();
-    return () => controller.abort();
-  }, [token, onUnauthorized]);
-
-  useEffect(() => {
-    if (channel === null) return undefined;
-    pageCursors.current = [null];
     setItems([]);
     setNextCursor(null);
-    setPageIndex(1);
     setHasLoaded(false);
     setDownloadingKey(null);
-    void loadPage(null, pageSize, 1);
+    void loadPage();
     return () => {
       listController.current?.abort();
       listController.current = null;
       downloadController.current?.abort();
       downloadController.current = null;
     };
-  }, [loadPage, pageSize, channel]);
-
-  function goToNextPage() {
-    if (!nextCursor) return;
-    pageCursors.current[pageIndex] = nextCursor;
-    void loadPage(nextCursor, pageSize, pageIndex + 1);
-  }
-
-  function goToPreviousPage() {
-    if (pageIndex <= 1) return;
-    void loadPage(
-      pageCursors.current[pageIndex - 2] ?? null,
-      pageSize,
-      pageIndex - 1,
-    );
-  }
-
-  function refreshCurrentPage() {
-    void loadPage(
-      pageCursors.current[pageIndex - 1] ?? null,
-      pageSize,
-      pageIndex,
-    );
-  }
+  }, [loadPage]);
 
   async function downloadProject(entry: AdminProjectSnapshotEntry) {
     if (downloadController.current || entry.status === 'partial') return;
@@ -166,7 +106,6 @@ export function AdminProjectSnapshotsPage({
     try {
       const archive = await downloadAdminProjectSnapshot(
         token,
-        channel ?? '',
         entry.userId,
         entry.projectId,
         controller.signal,
@@ -201,42 +140,19 @@ export function AdminProjectSnapshotsPage({
     setDownloadingKey(null);
   }
 
-  // 渠道列表读取失败时至少保留当前渠道，避免选择框空掉后看不出在查哪个渠道。
-  const visibleChannelOptions = channelOptions.length
-    ? channelOptions
-    : channel
-      ? [channel]
-      : [];
-
   return (
     <section className="admin-page admin-page-wide">
       <div className="admin-page-heading">
         <h2>项目工程</h2>
-        <div className="admin-action-row">
-          <label className="admin-field admin-field-compact">
-            <span>渠道</span>
-            <select
-              aria-label="项目工程渠道"
-              value={channel ?? ''}
-              onChange={(event) => setChannel(event.target.value)}
-            >
-              {visibleChannelOptions.map((option) => (
-                <option key={option} value={option}>
-                  {option}
-                </option>
-              ))}
-            </select>
-          </label>
-          <button
-            className="admin-secondary-button"
-            disabled={isLoading}
-            type="button"
-            onClick={refreshCurrentPage}
-          >
-            <RefreshCcw size={17} aria-hidden="true" />
-            <span>{isLoading ? '加载中' : '刷新'}</span>
-          </button>
-        </div>
+        <button
+          className="admin-secondary-button"
+          disabled={isLoading}
+          type="button"
+          onClick={() => void loadPage()}
+        >
+          <RefreshCcw size={17} aria-hidden="true" />
+          <span>{isLoading ? '加载中' : '刷新'}</span>
+        </button>
       </div>
       {errorMessage ? (
         <div className="admin-alert" role="alert">
@@ -253,7 +169,7 @@ export function AdminProjectSnapshotsPage({
             <thead>
               <tr>
                 <th>项目</th>
-                <th>用户</th>
+                <th>用户 ID</th>
                 <th>同步时间</th>
                 <th>文件数</th>
                 <th>体积</th>
@@ -271,22 +187,7 @@ export function AdminProjectSnapshotsPage({
                       <strong>{entry.projectName || entry.projectId}</strong>
                       <small>{entry.projectId}</small>
                     </td>
-                    <td data-label="用户">
-                      <div className="admin-inline-identity">
-                        <div>
-                          {projectOwnerDisplayName(entry)}
-                          <small>
-                            {entry.authorPublicUserCode?.trim() || '-'}
-                          </small>
-                        </div>
-                        <AdminUserReferenceButton
-                          token={token}
-                          userId={entry.userId}
-                          publicUserCode={entry.authorPublicUserCode}
-                          onUnauthorized={onUnauthorized}
-                        />
-                      </div>
-                    </td>
+                    <td data-label="用户 ID">{entry.userId}</td>
                     <td data-label="同步时间">
                       <span>
                         {new Date(entry.syncedAtMs).toLocaleString('zh-CN', {
@@ -338,66 +239,23 @@ export function AdminProjectSnapshotsPage({
         {hasLoaded && items.length === 0 && !errorMessage ? (
           <p className="admin-muted-text">暂无已上传项目</p>
         ) : null}
-        {hasLoaded ? (
-          <nav
-            className="admin-action-row admin-project-snapshot-pagination"
-            aria-label="项目工程分页"
-          >
-            <span className="admin-project-snapshot-pagination-info">
-              第 {pageIndex} 页
-              {items.length ? `，本页 ${items.length} 个项目` : ''}
-            </span>
-            <div className="admin-action-row">
-              <label className="admin-field admin-field-compact">
-                <span>每页</span>
-                <select
-                  aria-label="每页条数"
-                  value={pageSize}
-                  onChange={(event) => setPageSize(Number(event.target.value))}
-                >
-                  {PAGE_SIZE_OPTIONS.map((option) => (
-                    <option key={option} value={option}>
-                      {option}
-                    </option>
-                  ))}
-                </select>
-              </label>
-              <button
-                aria-label="上一页"
-                className="admin-secondary-button"
-                disabled={isLoading || pageIndex <= 1}
-                title="上一页"
-                type="button"
-                onClick={goToPreviousPage}
-              >
-                <ChevronLeft size={17} aria-hidden="true" />
-                <span>上一页</span>
-              </button>
-              <button
-                aria-label="下一页"
-                className="admin-secondary-button"
-                disabled={isLoading || !nextCursor}
-                title="下一页"
-                type="button"
-                onClick={goToNextPage}
-              >
-                <span>下一页</span>
-                <ChevronRight size={17} aria-hidden="true" />
-              </button>
-            </div>
-          </nav>
+        {nextCursor ? (
+          <div className="admin-action-row">
+            <button
+              className="admin-secondary-button"
+              disabled={isLoading}
+              type="button"
+              onClick={() => void loadPage(nextCursor)}
+            >
+              {isLoading ? '加载中' : '加载更多'}
+            </button>
+          </div>
         ) : null}
       </section>
     </section>
   );
 }
 
-function projectOwnerDisplayName(entry: AdminProjectSnapshotEntry) {
-  return (
-    entry.authorDisplayName?.trim() || entry.authorPublicUserCode?.trim() || '-'
-  );
-}
-
 function snapshotKey(entry: AdminProjectSnapshotEntry) {
   return `${entry.userId}/${entry.projectId}`;
 }

apps/admin-web/src/pages/adminAgcTemplateUploadModel.test.ts

@@ -1,155 +0,0 @@
-// @vitest-environment jsdom
-import { describe, expect, it } from 'vitest';
-
-import {
-  attachCoverFiles,
-  buildTemplateImportFormData,
-  deriveTemplateUploadRow,
-  parseTemplateTags,
-  sanitizeTemplateId,
-  TEMPLATE_IMPORT_MAX_BATCH,
-  type TemplateUploadRow,
-  validateTemplateUploadRows,
-} from './adminAgcTemplateUploadModel';
-
-function zipFile(name: string) {
-  return new File([new Uint8Array([0x50, 0x4b, 0x03, 0x04])], name, {
-    type: 'application/zip',
-  });
-}
-
-function coverFile(name: string) {
-  return new File([new Uint8Array([0x89, 0x50, 0x4e, 0x47])], name, {
-    type: 'image/png',
-  });
-}
-
-function row(zipName: string, patch: Partial<TemplateUploadRow> = {}) {
-  return { ...deriveTemplateUploadRow(zipFile(zipName)), ...patch };
-}
-
-describe('sanitizeTemplateId', () => {
-  it('lowercases, keeps whitelisted characters and drops traversal', () => {
-    expect(sanitizeTemplateId('Cocos Empty 2D.zip')).toBe('cocos-empty-2d');
-    expect(sanitizeTemplateId('../../evil.zip')).toBe('evil');
-    expect(sanitizeTemplateId('a..b.zip')).toBe('a.b');
-    expect(sanitizeTemplateId('__hidden__')).toBe('hidden__');
-    expect(sanitizeTemplateId(`${'x'.repeat(90)}.zip`)).toHaveLength(64);
-  });
-});
-
-describe('deriveTemplateUploadRow', () => {
-  it('starts from safe defaults so a batch only needs covers attached', () => {
-    const derived = row('my-template.zip');
-    expect(derived.id).toBe('my-template');
-    expect(derived.title).toBe('my-template');
-    expect(derived.runtime).toBe('html');
-    expect(derived.templateVersion).toBe('0.1.0');
-    expect(derived.entry).toBe('index.html');
-    expect(derived.coverFile).toBeNull();
-  });
-});
-
-describe('attachCoverFiles', () => {
-  it('matches covers by template id and ignores non-image files', () => {
-    const rows = [row('alpha.zip'), row('beta.zip')];
-    const covers = [
-      coverFile('alpha.png'),
-      coverFile('beta.webp'),
-      coverFile('notes.txt'),
-    ];
-
-    const next = attachCoverFiles(rows, covers);
-
-    expect(next[0]?.coverFile?.name).toBe('alpha.png');
-    expect(next[1]?.coverFile?.name).toBe('beta.webp');
-  });
-
-  it('keeps an already matched cover when the new selection has no partner', () => {
-    const rows = [row('alpha.zip', { coverFile: coverFile('alpha.png') })];
-    const next = attachCoverFiles(rows, [coverFile('other.png')]);
-    expect(next[0]?.coverFile?.name).toBe('alpha.png');
-  });
-});
-
-describe('validateTemplateUploadRows', () => {
-  it('accepts a complete batch', () => {
-    const rows = [
-      row('alpha.zip', { coverFile: coverFile('alpha.png') }),
-      row('beta.zip', { coverFile: coverFile('beta.png'), runtime: 'cocos' }),
-    ];
-    expect(validateTemplateUploadRows(rows)).toEqual({});
-  });
-
-  it('reports missing cover, duplicate id and invalid fields per row', () => {
-    const rows = [
-      row('alpha.zip'),
-      row('alpha.zip', { coverFile: coverFile('alpha.png'), key: 'second' }),
-      row('gamma.zip', {
-        coverFile: coverFile('gamma.png'),
-        runtime: 'docker',
-        templateVersion: 'Bad Version',
-        entry: '../escape.js',
-        title: '   ',
-      }),
-    ];
-    const errors = validateTemplateUploadRows(rows);
-    expect(errors['alpha.zip']).toContain('缺少封面');
-    expect(errors.second).toContain('ID 在本批次内重复');
-    expect(errors['gamma.zip']).toContain('名称必须是 1-80 个字符');
-  });
-
-  it('rejects a batch larger than the server limit', () => {
-    const rows = Array.from(
-      { length: TEMPLATE_IMPORT_MAX_BATCH + 1 },
-      (_, index) =>
-        row(`template-${index}.zip`, {
-          coverFile: coverFile(`template-${index}.png`),
-        }),
-    );
-    const errors = validateTemplateUploadRows(rows);
-    expect(Object.keys(errors)).toHaveLength(TEMPLATE_IMPORT_MAX_BATCH + 1);
-    expect(errors['template-0.zip']).toContain('单批最多上传');
-  });
-});
-
-describe('buildTemplateImportFormData', () => {
-  it('writes manifest field names and attaches zip / cover per row', () => {
-    const rows = [
-      row('alpha.zip', {
-        coverFile: coverFile('alpha.png'),
-        tags: '起步, 起步 2d',
-        title: ' Alpha ',
-      }),
-      row('beta.zip', { coverFile: coverFile('beta.png') }),
-    ];
-
-    const form = buildTemplateImportFormData('a'.repeat(64), rows);
-    const manifest = JSON.parse(String(form.get('manifest')));
-
-    expect(manifest.expectedRevision).toBe('a'.repeat(64));
-    expect(manifest.templates).toHaveLength(2);
-    expect(manifest.templates[0]).toMatchObject({
-      id: 'alpha',
-      title: 'Alpha',
-      tags: ['起步', '2d'],
-      zipField: 'zip_0',
-      coverField: 'cover_0',
-    });
-    expect(manifest.templates[1]).toMatchObject({
-      id: 'beta',
-      zipField: 'zip_1',
-      coverField: 'cover_1',
-    });
-    expect((form.get('zip_0') as File).name).toBe('alpha.zip');
-    expect((form.get('cover_1') as File).name).toBe('beta.png');
-  });
-
-  it('parses tags with dedupe and caps them at the server limit', () => {
-    expect(parseTemplateTags(' a, a，b  c ')).toEqual(['a', 'b', 'c']);
-    const many = Array.from({ length: 20 }, (_, index) => `t${index}`).join(
-      ',',
-    );
-    expect(parseTemplateTags(many)).toHaveLength(16);
-  });
-});

apps/admin-web/src/pages/adminAgcTemplateUploadModel.ts

@@ -1,191 +0,0 @@
-import type {
-  AdminImportAgcTemplateItemPayload,
-  AdminImportAgcTemplatesManifest,
-} from '../api/adminApiTypes';
-
-/** 与服务端 module-assets 的导入上限保持一致；超出请分批或改走 CLI。 */
-export const TEMPLATE_IMPORT_MAX_BATCH = 20;
-export const TEMPLATE_UPLOAD_RUNTIMES = [
-  'html',
-  'unity',
-  'godot',
-  'cocos',
-] as const;
-const TEMPLATE_ID_PATTERN = /^[a-z0-9][a-z0-9._-]{0,63}$/u;
-const TEMPLATE_VERSION_PATTERN = /^[a-z0-9][a-z0-9._-]{0,31}$/u;
-const ENTRY_PATTERN = /^(?![\\/:])(?!.*\.\.)[^\s\\:]+$/u;
-const COVER_EXTENSION_PATTERN = /\.(png|jpe?g|webp)$/iu;
-
-export interface TemplateUploadRow {
-  /** 稳定行标识：用 ZIP 文件名，重选文件后不会串行。 */
-  key: string;
-  zipFile: File;
-  coverFile: File | null;
-  id: string;
-  title: string;
-  summary: string;
-  tags: string;
-  runtime: string;
-  engine: string;
-  engineVersion: string;
-  templateVersion: string;
-  entry: string;
-}
-
-/** 文件名 → 模板 ID：小写、只留白名单字符，并去掉 `..` 与开头的非字母数字。 */
-export function sanitizeTemplateId(value: string) {
-  return value
-    .replace(/\.zip$/iu, '')
-    .trim()
-    .toLowerCase()
-    .replace(/\.{2,}/gu, '.')
-    .replace(/[^a-z0-9._-]+/gu, '-')
-    .replace(/^[^a-z0-9]+/u, '')
-    .slice(0, 64);
-}
-
-export function deriveTemplateUploadRow(zipFile: File): TemplateUploadRow {
-  const id = sanitizeTemplateId(zipFile.name);
-  return {
-    key: zipFile.name,
-    zipFile,
-    coverFile: null,
-    id,
-    title: id,
-    summary: '',
-    tags: '',
-    runtime: 'html',
-    engine: '',
-    engineVersion: '',
-    templateVersion: '0.1.0',
-    entry: 'index.html',
-  };
-}
-
-/** 封面按「与模板 ID 同名的图片」匹配，一次多选即可覆盖整批。 */
-export function attachCoverFiles(
-  rows: TemplateUploadRow[],
-  coverFiles: File[],
-): TemplateUploadRow[] {
-  const covers = new Map<string, File>();
-  for (const file of coverFiles) {
-    if (!COVER_EXTENSION_PATTERN.test(file.name)) continue;
-    const stem = sanitizeTemplateId(
-      file.name.replace(COVER_EXTENSION_PATTERN, ''),
-    );
-    if (!covers.has(stem)) covers.set(stem, file);
-  }
-  return rows.map((row) => {
-    const matched = covers.get(row.id.trim().toLowerCase()) ?? null;
-    return matched ? { ...row, coverFile: matched } : row;
-  });
-}
-
-export function parseTemplateTags(value: string) {
-  const seen = new Set<string>();
-  const tags: string[] = [];
-  for (const raw of value.split(/[,，\s]+/u)) {
-    const tag = raw.trim();
-    if (!tag || seen.has(tag)) continue;
-    seen.add(tag);
-    tags.push(tag);
-  }
-  return tags.slice(0, 16);
-}
-
-/** 逐行校验：返回 row.key → 错误文案；空对象表示整批可以提交。 */
-export function validateTemplateUploadRows(
-  rows: TemplateUploadRow[],
-): Record<string, string> {
-  const errors: Record<string, string> = {};
-  const seen = new Set<string>();
-  const fail = (row: TemplateUploadRow, message: string) => {
-    if (!errors[row.key]) errors[row.key] = message;
-  };
-  if (rows.length === 0) return errors;
-  if (rows.length > TEMPLATE_IMPORT_MAX_BATCH) {
-    for (const row of rows) {
-      fail(row, `单批最多上传 ${TEMPLATE_IMPORT_MAX_BATCH} 个模板`);
-    }
-    return errors;
-  }
-  for (const row of rows) {
-    const id = row.id.trim();
-    if (!TEMPLATE_ID_PATTERN.test(id)) {
-      fail(
-        row,
-        'ID 必须是 1-64 位小写字母、数字、点、下划线或连字符，且以字母数字开头',
-      );
-    } else if (seen.has(id)) {
-      fail(row, 'ID 在本批次内重复');
-    } else {
-      seen.add(id);
-    }
-    if (!row.title.trim() || row.title.trim().length > 80) {
-      fail(row, '名称必须是 1-80 个字符');
-    }
-    if (row.summary.trim().length > 1000) {
-      fail(row, '简介最多 1000 个字符');
-    }
-    if (!TEMPLATE_VERSION_PATTERN.test(row.templateVersion.trim())) {
-      fail(row, '版本号必须是 1-32 位小写字母、数字、点、下划线或连字符');
-    }
-    if (
-      !TEMPLATE_UPLOAD_RUNTIMES.includes(
-        row.runtime as (typeof TEMPLATE_UPLOAD_RUNTIMES)[number],
-      )
-    ) {
-      fail(row, `运行时只能是 ${TEMPLATE_UPLOAD_RUNTIMES.join(' / ')}`);
-    }
-    if (!ENTRY_PATTERN.test(row.entry.trim())) {
-      fail(row, 'entry 必须是模板包内的相对路径');
-    }
-    if (!row.coverFile) {
-      fail(row, '缺少封面：请上传与模板 ID 同名的 PNG / JPEG / WebP');
-    }
-  }
-  return errors;
-}
-
-export function buildTemplateImportManifest(
-  expectedRevision: string,
-  rows: TemplateUploadRow[],
-): AdminImportAgcTemplatesManifest {
-  return {
-    expectedRevision,
-    templates: rows.map((row, index) => {
-      const item: AdminImportAgcTemplateItemPayload = {
-        id: row.id.trim(),
-        title: row.title.trim(),
-        summary: row.summary.trim(),
-        tags: parseTemplateTags(row.tags),
-        runtime: row.runtime,
-        engine: row.engine.trim(),
-        engineVersion: row.engineVersion.trim(),
-        templateVersion: row.templateVersion.trim(),
-        entry: row.entry.trim(),
-        zipField: `zip_${index}`,
-        coverField: `cover_${index}`,
-      };
-      return item;
-    }),
-  };
-}
-
-export function buildTemplateImportFormData(
-  expectedRevision: string,
-  rows: TemplateUploadRow[],
-): FormData {
-  const form = new FormData();
-  form.append(
-    'manifest',
-    JSON.stringify(buildTemplateImportManifest(expectedRevision, rows)),
-  );
-  rows.forEach((row, index) => {
-    form.append(`zip_${index}`, row.zipFile, row.zipFile.name);
-    if (row.coverFile) {
-      form.append(`cover_${index}`, row.coverFile, row.coverFile.name);
-    }
-  });
-  return form;
-}

apps/admin-web/src/styles/admin.css

@@ -13,137 +13,6 @@
   text-rendering: optimizeLegibility;
 }
 
-.admin-agc-templates {
-  min-width: 0;
-}
-
-.admin-agc-template-filters {
-  display: grid;
-  grid-template-columns: minmax(180px, 1fr) repeat(2, minmax(130px, 190px));
-  gap: 14px;
-}
-
-.admin-agc-template-table {
-  min-width: 850px;
-}
-
-.admin-agc-template-table td:nth-child(2) {
-  min-width: 230px;
-  max-width: 380px;
-}
-
-.admin-agc-template-cover {
-  display: block;
-  width: 88px;
-  height: 62px;
-  border-radius: 8px;
-  object-fit: cover;
-  background: #f8efe7;
-}
-
-.admin-agc-template-summary {
-  display: -webkit-box;
-  overflow: hidden;
-  margin: 8px 0;
-  color: #866954;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-
-.admin-agc-template-tags,
-.admin-agc-template-actions {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: 8px;
-}
-
-.admin-agc-template-tags span {
-  padding: 3px 7px;
-  border-radius: 5px;
-  background: #f8efe7;
-  font-size: 12px;
-}
-
-.admin-agc-template-dialog {
-  border-radius: 10px;
-}
-
-.admin-agc-template-editor,
-.admin-agc-template-conflict {
-  display: grid;
-  gap: 14px;
-}
-
-.admin-agc-template-cover-preview {
-  display: block;
-  width: min(100%, 300px);
-  max-height: 180px;
-  border-radius: 8px;
-  object-fit: contain;
-  background: #f8efe7;
-}
-
-.admin-agc-template-dialog .admin-confirm-backdrop {
-  z-index: 1100;
-}
-
-.admin-actions {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  justify-content: flex-end;
-}
-
-.admin-agc-template-upload-dialog {
-  border-radius: 10px;
-  max-width: min(1180px, calc(100vw - 24px));
-}
-
-.admin-agc-template-upload-pickers {
-  display: grid;
-  gap: 10px;
-  grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
-}
-
-.admin-agc-template-upload-picker {
-  display: grid;
-  gap: 6px;
-  font-size: 13px;
-}
-
-.admin-agc-template-upload-picker input[type='file'] {
-  width: 100%;
-  font-size: 12px;
-}
-
-/* 上传行数多时表格自己滚动，窄屏不撑坏整页布局。 */
-.admin-agc-template-upload-scroll {
-  max-height: min(52vh, 520px);
-  overflow: auto;
-}
-
-.admin-agc-template-upload-file {
-  font-size: 12px;
-  word-break: break-all;
-}
-
-.admin-agc-template-upload-row-error {
-  margin-top: 4px;
-  color: #b3261e;
-  font-size: 12px;
-}
-
-@media (max-width: 680px) {
-  .admin-agc-template-filters {
-    grid-template-columns: minmax(0, 1fr);
-  }
-
-  .admin-agc-template-upload-dialog {
-    max-width: calc(100vw - 12px);
-  }
-}
-
 * {
   box-sizing: border-box;
 }
@@ -1594,15 +1463,15 @@ button:disabled {
 }
 
 .admin-project-snapshot-table th:first-child {
-  width: 18%;
+  width: 20%;
 }
 
 .admin-project-snapshot-table th:nth-child(2) {
-  width: 18%;
+  width: 14%;
 }
 
 .admin-project-snapshot-table th:nth-child(3) {
-  width: 16%;
+  width: 18%;
 }
 
 .admin-project-snapshot-table th:nth-child(4) {
@@ -1689,21 +1558,6 @@ button:disabled {
   }
 }
 
-.admin-project-snapshot-pagination {
-  justify-content: space-between;
-  gap: 12px;
-}
-
-.admin-project-snapshot-pagination-info {
-  color: #755a49;
-  font-size: 13px;
-  font-weight: 700;
-}
-
-.admin-project-snapshot-pagination .admin-field {
-  min-width: 92px;
-}
-
 .admin-recharge-table {
   min-width: 1080px;
   table-layout: fixed;

apps/ai-game-creator-shell/package.json

@@ -9,7 +9,6 @@
     "dev-stack": "node scripts/start-dev-stack.mjs",
     "build": "node scripts/build-release.mjs",
     "release:upload": "node scripts/release-upload.mjs",
-    "nsis:prepare": "node scripts/ensure-nsis-toolset.mjs",
     "skill-pack:check": "node scripts/check-skill-pack.mjs",
     "skill-pack:sync": "node scripts/check-skill-pack.mjs --write",
     "skill-pack:test": "node --test scripts/check-skill-pack.test.mjs",
@@ -76,7 +75,6 @@
     "@types/react-dom": "^19.2.3",
     "@types/react-window": "^1.8.8",
     "@types/three": "^0.184.1",
-    "jszip": "^3.10.1",
     "tailwindcss": "^4.1.14",
     "typescript": "~5.8.2",
     "vitest": "^0.34.6"

apps/ai-game-creator-shell/scripts/agc-global-version.test.mjs

@@ -185,12 +185,7 @@ test('nextVersion 只在 patch 位递增', () => {
 
 test('ossutil 参数默认使用 v1 签名，并可按需带 region 与 v4', () => {
   const base = {
-    args: [
-      'cp',
-      '--force',
-      '/tmp/a.json',
-      'oss://agc-dev/agc/global-version.json',
-    ],
+    args: ['cp', '--force', '/tmp/a.json', 'oss://agc-dev/agc/global-version.json'],
     endpoint: 'oss-rg-china-mainland.aliyuncs.com',
     accessKeyId: 'id',
     accessKeySecret: 'secret',

apps/ai-game-creator-shell/scripts/agent-swarm-test-chat.mjs

@@ -20,10 +20,7 @@ import { createInterface } from 'node:readline/promises';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { inflateSync } from 'node:zlib';
 
-import { AGC_APP_IDENTIFIER } from './channel-identity.mjs';
-
-// 联调工具驱动的始终是默认渠道客户端：安装身份取渠道基线，不跟随发布渠道。
-export const appIdentifier = AGC_APP_IDENTIFIER;
+export const appIdentifier = 'world.genarrative.ai-game-creator';
 export const configFileName = 'game-creator.config.json';
 export const localConfigFileName = 'game-creator.config.local.json';
 export const runnerEndpointFileName = 'agent-runner.endpoint.json';

apps/ai-game-creator-shell/scripts/build-macos-ci.mjs

@@ -9,12 +9,10 @@ import { fileURLToPath } from 'node:url';
 import {
   generateUpdateManifest,
   prepareReleaseVersion,
-  resolveManifestPlatformKeys,
   resolveReleaseContext,
   resolveReleasePartition,
   runTauriBuild,
 } from './build-release.mjs';
-import { resolveChannelInstallIdentity } from './channel-identity.mjs';
 import { readReleaseDryRun, uploadReleaseArtifacts } from './release-oss.mjs';
 import {
   readUpdaterPubkey,
@@ -22,13 +20,10 @@ import {
 } from './verify-updater-signature.mjs';
 
 /**
- * AGC macOS 分区（`<channel>-mac`）发布入口：构建 arm64 单架构包 → arm64 隔离 smoke → 生成 arm64 DMG
+ * AGC macOS 分区（`<channel>-mac`）发布入口：构建 universal 包 → 双架构 smoke → 生成 universal DMG
  * → 生成分区清单 latest.json → 用产物内烘焙的公钥验签 → 按 dry-run 决定是否上传 OSS。
  *
  * 边界：
- * - 只出 Apple Silicon（arm64）单架构：清单只登记 `darwin-aarch64`。Intel 侧要可用，前提是随包 Node
- *   也能按架构各带一份（`stage-node-runtime.mjs` 对 universal 目标失败关闭）；在实现之前**不得**
- *   把 arm64 产物登记成 `darwin-x86_64`，否则 Intel 客户端会装到跑不起来的包。
  * - Apple 签名与公证暂缺：本入口剥离 `APPLE_*` 凭据让 Tauri 跳过 Apple 签名，但**不能传
  *   `--no-sign`** —— 该标志同时会跳过 updater 的 minisign 签名，产物就没有 `.sig`；
  *   未签名 + 未公证必须显式记录而非静默通过；
@@ -40,19 +35,27 @@ const appRoot = fileURLToPath(new URL('..', import.meta.url));
 const repoRoot = path.resolve(appRoot, '../..');
 
 /**
- * 产品名只从渠道安装身份派生（渠道身份由构建期 `--config` 注入 Tauri 配置）：
- * 它同时决定 `*.app` 目录名、updater 归档名与 DMG 卷名。写死会在改名或换渠道后
- * 让入口静默找错对象（清理、打包、归档三处一起失效）。
+ * 产品名只从 Tauri 配置读取：它同时决定 `*.app` 目录名、updater 归档名与 DMG 卷名。
+ * 写死会在改名后让入口静默找错对象（清理、打包、归档三处一起失效）。
  */
-function resolveProductName(channel) {
-  const { productName } = resolveChannelInstallIdentity(channel);
+function readProductName() {
+  const read = (file) =>
+    JSON.parse(fs.readFileSync(path.join(appRoot, 'src-tauri', file), 'utf8'));
+  const base = read('tauri.conf.json');
+  const macosPath = path.join(appRoot, 'src-tauri', 'tauri.macos.conf.json');
+  const productName = fs.existsSync(macosPath)
+    ? (read('tauri.macos.conf.json').productName ?? base.productName)
+    : base.productName;
   assert.ok(
     typeof productName === 'string' && productName.trim().length > 0,
-    '渠道安装身份缺少 productName',
+    'Tauri 配置缺少 productName',
   );
   return productName;
 }
 
+const productName = readProductName();
+const appBundleName = `${productName}.app`;
+const updaterArtifactName = `${productName}.app.tar.gz`;
 assert.equal(process.platform, 'darwin', '只能在 macOS Agent 执行');
 assert.equal(
   process.env.JENKINS_URL?.length > 0,
@@ -91,17 +94,11 @@ process.env.AGC_UPDATE_OSS_BASE_URL ||= `https://${bucket}.${endpoint}/agc`;
 const dryRun = readReleaseDryRun();
 
 process.env.CARGO_TARGET_DIR = path.join(appRoot, 'src-tauri/target');
-// 单架构目标：清单侧 `resolveManifestPlatformKeys` 只为它登记 darwin-aarch64。
-const macTarget = 'aarch64-apple-darwin';
-const context = resolveReleaseContext([`--target=${macTarget}`]);
+const context = resolveReleaseContext(['--target=universal-apple-darwin']);
 const partition = resolveReleasePartition(context.channel, context.target);
-const productName = resolveProductName(context.channel);
-const appBundleName = `${productName}.app`;
-const updaterArtifactName = `${productName}.app.tar.gz`;
 const version = await prepareReleaseVersion(context);
-// 首装包名必须让清单侧的单架构分支唯一匹配：`<产品名>_<版本>_<架构>.dmg`，
-// 架构段用 Tauri 的 aarch64 口径（不是 updater 平台键的 arm64 / x86_64）。
-const firstInstallName = `${productName}_${version}_aarch64.dmg`;
+// 首装包名必须保持 `<产品名>_<版本>_universal.dmg`：清单侧按该后缀唯一匹配本次产物。
+const firstInstallName = `${productName}_${version}_universal.dmg`;
 
 // 幂等边界：workspace 会保留上一轮产物。先删掉本次将要写出的对象，否则
 //  1) hdiutil 会因同名 DMG 已存在直接失败（首次实跑即命中）；
@@ -120,7 +117,7 @@ for (const stale of [
 }
 
 const args = [
-  `--target=${macTarget}`,
+  '--target=universal-apple-darwin',
   '--bundles',
   'app',
   '--ci',
@@ -135,13 +132,16 @@ const command = (binary, argv, options = {}) =>
 runTauriBuild(args, context);
 
 const app = path.join(context.bundleRoot, 'macos', appBundleName);
-command(process.execPath, [
-  path.join(appRoot, 'scripts/check-macos-bundle.mjs'),
-  app,
-  'arm64',
-]);
+for (const architecture of ['arm64', 'x86_64']) {
+  command(process.execPath, [
+    path.join(appRoot, 'scripts/check-macos-bundle.mjs'),
+    app,
+    architecture,
+    '--universal',
+  ]);
+}
 
-// DMG 放在 bundle 根目录下：渠道清单的首装包选择会扫描该目录，命名必须匹配 `_<version>_aarch64.dmg`。
+// DMG 放在 bundle 根目录下：渠道清单的首装包选择会扫描该目录，命名必须匹配 `_<version>_universal.dmg`。
 const dmgDirectory = path.join(context.bundleRoot, 'macos');
 fs.mkdirSync(dmgDirectory, { recursive: true });
 const dmg = path.join(dmgDirectory, firstInstallName);
@@ -170,7 +170,7 @@ const release = await generateUpdateManifest(context);
 assert.equal(
   path.resolve(release.downloadArtifact),
   path.resolve(dmg),
-  '首装包必须锁定本次生成的 arm64 DMG',
+  '首装包必须锁定本次生成的 universal DMG',
 );
 
 // 上传前门禁：用产物里烘焙的公钥复核更新包签名。验不过就停在这里，绝不写 OSS。
@@ -266,9 +266,8 @@ fs.writeFileSync(
         firstInstallSha256: dmgHash,
         manifest: 'latest.json',
       },
-      // 单架构发布：只跑 arm64 隔离 smoke；Intel 未支持（清单里没有 darwin-x86_64 键）。
-      smokes: ['arm64'],
-      manifestPlatformKeys: resolveManifestPlatformKeys(context.target),
+      smokes: ['arm64', 'x86_64'],
+      intelSmoke: process.arch === 'arm64' ? 'Rosetta' : 'native',
     },
     null,
     2,