合并最新master到埋点开发分支

同步主分支至2d61a4c05并保留客户端本地埋点实现合并决策记录顶部新增内容，保留双方条目验证客户端Rust编译、TypeScript、编码与文档索引通过
2026-09-21 12:25:38 +00:00
parent 9f225b7a41 2d61a4c057
commit f983663caf
106 changed files with 5432 additions and 499 deletions
@@ -6,6 +6,7 @@ import {
  getAdminAgcTemplates,
  getAdminFeatureGateConfig,
  getAdminUserDetail,
+  importAdminAgcTemplates,
  listAdminRechargeOrders,
  reconcileAdminUserConsumption,
  resolveAdminRechargeRefundManualReview,
@@ -65,6 +66,48 @@ test('模板管理读取和更新复用认证封装，提交 revision 和封面
  ]);
 });

+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(
@@ -30,9 +30,11 @@ import type {
  AdminExternalApiKeyListQuery,
  AdminExternalApiKeyListResponse,
  AdminFeatureGateConfigResponse,
+  AdminImportAgcTemplatesResponse,
  AdminLoginResponse,
  AdminMeResponse,
  AdminOverviewResponse,
+  AdminProjectSnapshotChannelsResponse,
  AdminProjectSnapshotListQuery,
  AdminProjectSnapshotListResponse,
  AdminRechargeOrderListQuery,
@@ -87,6 +89,8 @@ interface AdminRequestOptions {
  method?: string;
  token?: string;
  body?: unknown;
+  /** multipart 表单：交给浏览器自己带 boundary，不能预设 Content-Type。 */
+  formData?: FormData;
  headers?: Record<string, string>;
  signal?: AbortSignal;
 }
@@ -174,6 +178,8 @@ 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);
@@ -209,6 +215,7 @@ 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()}`,
@@ -216,13 +223,27 @@ 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 path = `/admin/api/project-snapshots/${encodeURIComponent(userId)}/${encodeURIComponent(projectId)}/download`;
+  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 response = await fetch(buildRequestUrl(path), {
    headers: {
      Authorization: `Bearer ${token.trim()}`,
@@ -1196,3 +1217,15 @@ export function updateAdminAgcTemplate(
    { 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,
+    },
+  );
+}
@@ -105,11 +105,15 @@ 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 {
@@ -117,6 +121,11 @@ export interface AdminProjectSnapshotListResponse {
  nextCursor: string | null;
 }

+export interface AdminProjectSnapshotChannelsResponse {
+  defaultChannel: string;
+  channels: string[];
+}
+
 export interface AdminErrorReportEntry {
  batchId: string;
  eventCount: number;
@@ -1065,3 +1074,35 @@ export interface AdminUpdateAgcTemplateRequest {
    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[];
+}
@@ -2,6 +2,7 @@ import { afterEach, expect, test, vi } from 'vitest';

 import {
  downloadAdminProjectSnapshot,
+  getAdminProjectSnapshotChannels,
  listAdminProjectSnapshots,
 } from './adminApiClient';

@@ -21,12 +22,12 @@ test('项目列表携带分页与后台授权，解析标准响应', async () =>
  expect(
    await listAdminProjectSnapshots(
      'admin-token',
-      { cursor: 'user/a+项目', limit: 20 },
+      { cursor: 'user/a+项目', limit: 20, channel: 'release' },
      controller.signal,
    ),
  ).toEqual(payload);
  expect(fetchMock).toHaveBeenCalledWith(
-    '/admin/api/project-snapshots?cursor=user%2Fa%2B%E9%A1%B9%E7%9B%AE&limit=20',
+    '/admin/api/project-snapshots?cursor=user%2Fa%2B%E9%A1%B9%E7%9B%AE&channel=release&limit=20',
    expect.objectContaining({
      headers: expect.objectContaining({ Authorization: 'Bearer admin-token' }),
      signal: controller.signal,
@@ -34,6 +35,23 @@ 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', {
@@ -48,6 +66,7 @@ test('ZIP 下载以授权请求读取并优先保留中文附件名', async () =
  const controller = new AbortController();
  const archive = await downloadAdminProjectSnapshot(
    'admin-token',
+    'release',
    'user/a',
    'project/b',
    controller.signal,
@@ -55,7 +74,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',
+    '/admin/api/project-snapshots/user%2Fa/project%2Fb/download?channel=release',
    expect.objectContaining({
      headers: expect.objectContaining({
        Authorization: 'Bearer admin-token',
@@ -81,7 +100,8 @@ test.each([
    vi.fn().mockResolvedValue(new Response('PK', { headers })),
  );
  expect(
-    (await downloadAdminProjectSnapshot('token', 'user', 'project')).filename,
+    (await downloadAdminProjectSnapshot('token', 'release', 'user', 'project'))
+      .filename,
  ).toBe(expected.replace('工程', 'project'));
 });

@@ -104,7 +124,7 @@ test.each([401, 403, 409, 500])(
      ),
    );
    await expect(
-      downloadAdminProjectSnapshot('token', 'user', 'project'),
+      downloadAdminProjectSnapshot('token', 'release', 'user', 'project'),
    ).rejects.toMatchObject({
      status,
      code: 'SNAPSHOT_FAILURE',
@@ -123,6 +143,6 @@ test('200 JSON 或 HTML 不能被保存为成功 ZIP', async () => {
    ),
  );
  await expect(
-    downloadAdminProjectSnapshot('token', 'user', 'project'),
+    downloadAdminProjectSnapshot('token', 'release', 'user', 'project'),
  ).rejects.toMatchObject({ code: 'INVALID_PROJECT_ARCHIVE_RESPONSE' });
 });
@@ -13,6 +13,7 @@ import { afterEach, beforeEach, expect, test, vi } from 'vitest';
 import {
  AdminApiError,
  getAdminAgcTemplates,
+  importAdminAgcTemplates,
  updateAdminAgcTemplate,
 } from '../api/adminApiClient';
 import type {
@@ -24,6 +25,7 @@ import { AdminAgcTemplatesPage } from './AdminAgcTemplatesPage';
 vi.mock('../api/adminApiClient', async (importOriginal) => ({
  ...(await importOriginal<typeof import('../api/adminApiClient')>()),
  getAdminAgcTemplates: vi.fn(),
+  importAdminAgcTemplates: vi.fn(),
  updateAdminAgcTemplate: vi.fn(),
 }));

@@ -79,6 +81,21 @@ beforeEach(() => {
          : entry,
      ),
    }));
+  vi.mocked(importAdminAgcTemplates)
+    .mockReset()
+    .mockImplementation(async () => ({
+      ...structuredClone(library),
+      revision: 'rev-imported',
+      imported: [
+        {
+          id: 'alpha',
+          templateVersion: '0.1.0',
+          zipSizeBytes: 4,
+          zipSha256: 'a'.repeat(64),
+          reusedObjects: false,
+        },
+      ],
+    }));
  vi.stubGlobal(
    'URL',
    Object.assign(class extends URL {}, {
@@ -496,3 +513,133 @@ test('读取失败显示真实错误，401 交给会话处理且不显示空库'
    expect(onUnauthorized).toHaveBeenCalledWith('登录状态已失效'),
  );
 });
+
+function uploadZipFile(name: string) {
+  return new File([new Uint8Array([0x50, 0x4b, 0x03, 0x04])], name, {
+    type: 'application/zip',
+  });
+}
+
+function uploadCoverFile(name: string) {
+  return new File([new Uint8Array([0x89, 0x50, 0x4e, 0x47])], name, {
+    type: 'image/png',
+  });
+}
+
+async function openUploadDialog() {
+  fireEvent.click(await screen.findByRole('button', { name: '上传模板' }));
+  return screen.getByRole('dialog', { name: '上传模板' });
+}
+
+function pickUploadFiles(dialog: HTMLElement, accept: string, files: File[]) {
+  const input = dialog.querySelector<HTMLInputElement>(
+    `input[accept="${accept}"]`,
+  );
+  if (!input) throw new Error(`missing file input for ${accept}`);
+  fireEvent.change(input, { target: { files } });
+}
+
+test('批量上传：多选 ZIP 生成行，封面匹配齐了才能提交', async () => {
+  render(<AdminAgcTemplatesPage token="token" onUnauthorized={vi.fn()} />);
+  const dialog = await openUploadDialog();
+
+  pickUploadFiles(dialog, '.zip,application/zip', [
+    uploadZipFile('alpha.zip'),
+    uploadZipFile('beta.zip'),
+  ]);
+  expect(within(dialog).getByText('alpha.zip')).not.toBeNull();
+  expect(within(dialog).getByText('beta.zip')).not.toBeNull();
+  expect(
+    within(dialog)
+      .getByRole('button', { name: /上传 2 个模板/ })
+      .hasAttribute('disabled'),
+  ).toBe(true);
+  expect(within(dialog).getAllByText('未匹配封面')).toHaveLength(2);
+
+  pickUploadFiles(dialog, 'image/png,image/jpeg,image/webp', [
+    uploadCoverFile('alpha.png'),
+    uploadCoverFile('beta.png'),
+  ]);
+  expect(within(dialog).getByText('alpha.png')).not.toBeNull();
+  expect(
+    within(dialog)
+      .getByRole('button', { name: /上传 2 个模板/ })
+      .hasAttribute('disabled'),
+  ).toBe(false);
+});
+
+test('批量上传：确认后提交 manifest 与文件，成功后刷新列表', async () => {
+  render(<AdminAgcTemplatesPage token="token" onUnauthorized={vi.fn()} />);
+  const dialog = await openUploadDialog();
+  pickUploadFiles(dialog, '.zip,application/zip', [uploadZipFile('alpha.zip')]);
+  pickUploadFiles(dialog, 'image/png,image/jpeg,image/webp', [
+    uploadCoverFile('alpha.png'),
+  ]);
+
+  fireEvent.click(
+    within(dialog).getByRole('button', { name: /上传 1 个模板/ }),
+  );
+  await confirmWrite();
+
+  await waitFor(() => expect(importAdminAgcTemplates).toHaveBeenCalledTimes(1));
+  const formData = vi.mocked(importAdminAgcTemplates).mock.calls[0]![1];
+  const manifest = JSON.parse(String(formData.get('manifest')));
+  expect(manifest.expectedRevision).toBe('rev-1');
+  expect(manifest.templates[0]).toMatchObject({
+    id: 'alpha',
+    zipField: 'zip_0',
+    coverField: 'cover_0',
+  });
+  expect((formData.get('zip_0') as File).name).toBe('alpha.zip');
+  expect((formData.get('cover_0') as File).name).toBe('alpha.png');
+  expect(
+    (await screen.findAllByText(/已导入 1 个模板/)).length,
+  ).toBeGreaterThan(0);
+});
+
+test('批量上传：冲突给出刷新引导', async () => {
+  render(<AdminAgcTemplatesPage token="token" onUnauthorized={vi.fn()} />);
+  const dialog = await openUploadDialog();
+  pickUploadFiles(dialog, '.zip,application/zip', [uploadZipFile('alpha.zip')]);
+  pickUploadFiles(dialog, 'image/png,image/jpeg,image/webp', [
+    uploadCoverFile('alpha.png'),
+  ]);
+
+  vi.mocked(importAdminAgcTemplates).mockRejectedValueOnce(
+    new AdminApiError({
+      status: 409,
+      message: '模板库已更新，请刷新后重新编辑',
+    }),
+  );
+  fireEvent.click(
+    within(dialog).getByRole('button', { name: /上传 1 个模板/ }),
+  );
+  await confirmWrite();
+  expect(await screen.findByText(/请刷新列表后重试/)).not.toBeNull();
+  expect(
+    within(dialog)
+      .getByRole('button', { name: /上传 1 个模板/ })
+      .hasAttribute('disabled'),
+  ).toBe(true);
+});
+
+test('批量上传：服务端拒绝时展示真实原因', async () => {
+  render(<AdminAgcTemplatesPage token="token" onUnauthorized={vi.fn()} />);
+  const dialog = await openUploadDialog();
+  pickUploadFiles(dialog, '.zip,application/zip', [uploadZipFile('alpha.zip')]);
+  pickUploadFiles(dialog, 'image/png,image/jpeg,image/webp', [
+    uploadCoverFile('alpha.png'),
+  ]);
+
+  vi.mocked(importAdminAgcTemplates).mockRejectedValueOnce(
+    new AdminApiError({
+      status: 400,
+      message: 'alpha：模板包缺少清单声明的 entry：index.html',
+    }),
+  );
+  fireEvent.click(
+    within(dialog).getByRole('button', { name: /上传 1 个模板/ }),
+  );
+  await confirmWrite();
+  expect(await screen.findByText(/模板包缺少清单声明的 entry/)).not.toBeNull();
+});
@@ -11,7 +11,7 @@ import {
  TableRow,
  TextField,
 } from '@genarrative/shared/components';
-import { RefreshCcw } from 'lucide-react';
+import { RefreshCcw, Upload } from 'lucide-react';
 import {
  type FormEvent,
  useCallback,
@@ -21,16 +21,28 @@ import {
 } from 'react';

 import {
+  formatAdminApiError,
  getAdminAgcTemplates,
+  importAdminAgcTemplates,
  isAdminApiError,
  updateAdminAgcTemplate,
 } from '../api/adminApiClient';
 import type {
  AdminAgcTemplateLibraryResponse,
  AdminAgcTemplatePayload,
+  AdminImportAgcTemplateResult,
  AdminUpdateAgcTemplateRequest,
 } from '../api/adminApiTypes';
 import { useAdminWriteConfirm } from '../components/useAdminWriteConfirm';
+import {
+  attachCoverFiles,
+  buildTemplateImportFormData,
+  deriveTemplateUploadRow,
+  TEMPLATE_IMPORT_MAX_BATCH,
+  TEMPLATE_UPLOAD_RUNTIMES,
+  type TemplateUploadRow,
+  validateTemplateUploadRows,
+} from './adminAgcTemplateUploadModel';
 import { handlePageError, splitLines } from './pageUtils';

 type PageProps = { token: string; onUnauthorized: (message?: string) => void };
@@ -39,6 +51,14 @@ type EditingTemplate = {
  revision: string;
  key: number;
 };
+
+type TemplateUploadState = {
+  rows: TemplateUploadRow[];
+  errors: Record<string, string>;
+  submitting: boolean;
+  error: string;
+  results: AdminImportAgcTemplateResult[] | null;
+};
 const runtimeLabels: Record<string, string> = {
  html: 'HTML',
  cocos: 'Cocos',
@@ -63,6 +83,7 @@ function AdminAgcTemplatesSession({ token, onUnauthorized }: PageProps) {
  const [notice, setNotice] = useState('');
  const [conflict, setConflict] = useState(false);
  const [editing, setEditing] = useState<EditingTemplate | null>(null);
+  const [upload, setUpload] = useState<TemplateUploadState | null>(null);
  const mounted = useRef(false);
  const readGeneration = useRef(0);
  const readController = useRef<AbortController | null>(null);
@@ -165,6 +186,96 @@ function AdminAgcTemplatesSession({ token, onUnauthorized }: PageProps) {
    setEditing(null);
  }

+  function openUpload() {
+    if (writesDisabled || !snapshot) return;
+    setUpload({
+      rows: [],
+      errors: {},
+      submitting: false,
+      error: '',
+      results: null,
+    });
+  }
+
+  function closeUpload() {
+    if (upload?.submitting) return;
+    setUpload(null);
+  }
+
+  async function submitUpload(rows: TemplateUploadRow[]) {
+    const revision = snapshot?.revision;
+    if (
+      !revision ||
+      writing.current ||
+      loading ||
+      conflict ||
+      !snapshot?.writable
+    ) {
+      return;
+    }
+    const errors = validateTemplateUploadRows(rows);
+    if (Object.keys(errors).length > 0) {
+      setUpload((current) => (current ? { ...current, errors } : current));
+      return;
+    }
+    writing.current = true;
+    setUpload((current) =>
+      current
+        ? { ...current, submitting: true, errors: {}, error: '', results: null }
+        : current,
+    );
+    setError('');
+    setNotice('');
+    try {
+      const confirmed = await confirmWrite({
+        action: '上传模板',
+        target: `${rows.length} 个模板（发布后不可删除，只能下架）`,
+      });
+      if (!confirmed || !mounted.current) return;
+      const response = await importAdminAgcTemplates(
+        token,
+        buildTemplateImportFormData(revision, rows),
+      );
+      if (!mounted.current) return;
+      readGeneration.current += 1;
+      readController.current?.abort();
+      setSnapshot({
+        revision: response.revision,
+        writable: response.writable,
+        templates: response.templates,
+      });
+      setConflict(false);
+      setNotice(`已导入 ${response.imported.length} 个模板`);
+      setUpload((current) =>
+        current
+          ? {
+              ...current,
+              submitting: false,
+              rows: [],
+              results: response.imported,
+            }
+          : current,
+      );
+    } catch (error) {
+      if (!mounted.current) return;
+      const conflictNow = isAdminApiError(error) && error.status === 409;
+      setConflict(conflictNow);
+      const message = formatUploadError(error);
+      setUpload((current) =>
+        current ? { ...current, submitting: false, error: message } : current,
+      );
+      // 上传失败只在弹窗里交代：401 仍要交给会话处理，其余错误不要同时打到列表页。
+      if (isAdminApiError(error) && error.status === 401) {
+        handlePageError(error, unauthorized.current, setError);
+      }
+    } finally {
+      writing.current = false;
+      setUpload((current) =>
+        current ? { ...current, submitting: false } : current,
+      );
+    }
+  }
+
  const terms = query.trim().toLocaleLowerCase().split(/\s+/u).filter(Boolean);
  const entries = (snapshot?.templates ?? []).filter((entry) => {
    const searchable = [entry.id, entry.title, ...entry.tags]
@@ -186,14 +297,24 @@ function AdminAgcTemplatesSession({ token, onUnauthorized }: PageProps) {
    <section className="admin-page admin-page-wide admin-agc-templates genarrative-ui">
      <div className="admin-page-heading">
        <h2>模板管理</h2>
-        <Button
-          variant="secondary"
-          disabled={loading || busy}
-          onClick={() => void refresh()}
-        >
-          <RefreshCcw size={16} aria-hidden="true" />
-          刷新
-        </Button>
+        <div className="admin-actions">
+          <Button
+            variant="secondary"
+            disabled={writesDisabled || !snapshot}
+            onClick={openUpload}
+          >
+            <Upload size={16} aria-hidden="true" />
+            上传模板
+          </Button>
+          <Button
+            variant="secondary"
+            disabled={loading || busy}
+            onClick={() => void refresh()}
+          >
+            <RefreshCcw size={16} aria-hidden="true" />
+            刷新
+          </Button>
+        </div>
      </div>
      {readOnly ? (
        <Status tone="warning">当前为只读模式，无法保存或上下架</Status>
@@ -378,6 +499,41 @@ function AdminAgcTemplatesSession({ token, onUnauthorized }: PageProps) {
      ) : (
        confirmDialog
      )}
+      {upload ? (
+        <Modal
+          open
+          title="上传模板"
+          description={`一批最多 ${TEMPLATE_IMPORT_MAX_BATCH} 个模板；发布后不可删除，只能下架`}
+          closeLabel="关闭模板上传"
+          onClose={closeUpload}
+          closeOnEscape={!upload.submitting}
+          closeOnBackdrop={!upload.submitting}
+          className="admin-agc-template-upload-dialog genarrative-ui"
+        >
+          <TemplateUploadDialog
+            state={upload}
+            disabled={writesDisabled}
+            readOnly={readOnly}
+            busy={busy}
+            conflict={conflict}
+            onRowsChange={(rows) =>
+              setUpload((current) =>
+                current
+                  ? {
+                      ...current,
+                      rows,
+                      errors: validateTemplateUploadRows(rows),
+                    }
+                  : current,
+              )
+            }
+            onSubmit={() => void submitUpload(upload.rows)}
+            onClose={closeUpload}
+            onRefresh={() => void refresh()}
+          />
+          {confirmDialog}
+        </Modal>
+      ) : null}
    </section>
  );
 }
@@ -627,3 +783,266 @@ function formatTemplateSize(bytes: number) {
  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KiB`;
  return `${(bytes / (1024 * 1024)).toFixed(1)} MiB`;
 }
+
+function formatUploadError(error: unknown) {
+  const message = formatAdminApiError(error);
+  if (isAdminApiError(error) && error.status === 409) {
+    return `${message}（模板库已更新，请刷新列表后重试）`;
+  }
+  if (isAdminApiError(error) && error.status === 503) {
+    return `${message}（发布锁可能仍被占用，请联系运维核对）`;
+  }
+  return message;
+}
+
+function TemplateUploadDialog({
+  state,
+  disabled,
+  readOnly,
+  busy,
+  conflict,
+  onRowsChange,
+  onSubmit,
+  onClose,
+  onRefresh,
+}: {
+  state: TemplateUploadState;
+  disabled: boolean;
+  readOnly: boolean;
+  busy: boolean;
+  conflict: boolean;
+  onRowsChange: (rows: TemplateUploadRow[]) => void;
+  onSubmit: () => void;
+  onClose: () => void;
+  onRefresh: () => void;
+}) {
+  const uploadBusy = state.submitting;
+  const rowErrorCount = Object.keys(state.errors).length;
+
+  function appendZipFiles(files: File[]) {
+    const known = new Set(state.rows.map((row) => row.key));
+    const next = [...state.rows];
+    for (const file of files) {
+      if (!/\.zip$/iu.test(file.name) || known.has(file.name)) continue;
+      known.add(file.name);
+      next.push(deriveTemplateUploadRow(file));
+    }
+    onRowsChange(next);
+  }
+
+  function updateRow(key: string, patch: Partial<TemplateUploadRow>) {
+    onRowsChange(
+      state.rows.map((row) => (row.key === key ? { ...row, ...patch } : row)),
+    );
+  }
+
+  return (
+    <>
+      {readOnly ? (
+        <Status tone="warning">当前为只读模式，无法上传</Status>
+      ) : null}
+      <div className="admin-agc-template-upload-pickers">
+        <label className="admin-agc-template-upload-picker">
+          <span>模板包（可多选 .zip）</span>
+          <input
+            type="file"
+            accept=".zip,application/zip"
+            multiple
+            disabled={disabled || uploadBusy}
+            onChange={(event) => {
+              appendZipFiles([...(event.currentTarget.files ?? [])]);
+              event.currentTarget.value = '';
+            }}
+          />
+        </label>
+        <label className="admin-agc-template-upload-picker">
+          <span>封面（可多选，按同名模板 ID 匹配 PNG / JPEG / WebP）</span>
+          <input
+            type="file"
+            accept="image/png,image/jpeg,image/webp"
+            multiple
+            disabled={disabled || uploadBusy}
+            onChange={(event) => {
+              onRowsChange(
+                attachCoverFiles(state.rows, [
+                  ...(event.currentTarget.files ?? []),
+                ]),
+              );
+              event.currentTarget.value = '';
+            }}
+          />
+        </label>
+      </div>
+      {state.rows.length === 0 ? (
+        <Status tone="info">
+          还没有选择模板包。简介、标签与引擎可在上传后用「编辑」补齐。
+        </Status>
+      ) : (
+        <div className="admin-agc-template-upload-scroll">
+          <Table>
+            <TableHead>
+              <TableRow>
+                <TableHeader>模板包</TableHeader>
+                <TableHeader>ID</TableHeader>
+                <TableHeader>名称</TableHeader>
+                <TableHeader>版本</TableHeader>
+                <TableHeader>运行时</TableHeader>
+                <TableHeader>entry</TableHeader>
+                <TableHeader>封面</TableHeader>
+                <TableHeader>操作</TableHeader>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {state.rows.map((row) => {
+                const rowError = state.errors[row.key];
+                const rowDisabled = disabled || uploadBusy;
+                return (
+                  <TableRow key={row.key}>
+                    <TableCell>
+                      <div className="admin-agc-template-upload-file">
+                        {row.zipFile.name}
+                      </div>
+                      {rowError ? (
+                        <div
+                          className="admin-agc-template-upload-row-error"
+                          role="alert"
+                        >
+                          {rowError}
+                        </div>
+                      ) : null}
+                    </TableCell>
+                    <TableCell>
+                      <TextField
+                        label="ID"
+                        value={row.id}
+                        disabled={rowDisabled}
+                        onChange={(event) =>
+                          updateRow(row.key, { id: event.currentTarget.value })
+                        }
+                      />
+                    </TableCell>
+                    <TableCell>
+                      <TextField
+                        label="名称"
+                        value={row.title}
+                        disabled={rowDisabled}
+                        onChange={(event) =>
+                          updateRow(row.key, {
+                            title: event.currentTarget.value,
+                          })
+                        }
+                      />
+                    </TableCell>
+                    <TableCell>
+                      <TextField
+                        label="版本"
+                        value={row.templateVersion}
+                        disabled={rowDisabled}
+                        onChange={(event) =>
+                          updateRow(row.key, {
+                            templateVersion: event.currentTarget.value,
+                          })
+                        }
+                      />
+                    </TableCell>
+                    <TableCell>
+                      <SelectField
+                        label="运行时"
+                        value={row.runtime}
+                        disabled={rowDisabled}
+                        onChange={(event) =>
+                          updateRow(row.key, {
+                            runtime: event.currentTarget.value,
+                          })
+                        }
+                      >
+                        {TEMPLATE_UPLOAD_RUNTIMES.map((value) => (
+                          <option key={value} value={value}>
+                            {runtimeLabels[value] ?? value}
+                          </option>
+                        ))}
+                      </SelectField>
+                    </TableCell>
+                    <TableCell>
+                      <TextField
+                        label="entry"
+                        value={row.entry}
+                        disabled={rowDisabled}
+                        onChange={(event) =>
+                          updateRow(row.key, {
+                            entry: event.currentTarget.value,
+                          })
+                        }
+                      />
+                    </TableCell>
+                    <TableCell>
+                      {row.coverFile ? (
+                        <span className="admin-agc-template-upload-file">
+                          {row.coverFile.name}
+                        </span>
+                      ) : (
+                        <Status tone="warning">未匹配封面</Status>
+                      )}
+                    </TableCell>
+                    <TableCell>
+                      <Button
+                        variant="secondary"
+                        disabled={rowDisabled}
+                        onClick={() =>
+                          onRowsChange(
+                            state.rows.filter((entry) => entry.key !== row.key),
+                          )
+                        }
+                      >
+                        移除
+                      </Button>
+                    </TableCell>
+                  </TableRow>
+                );
+              })}
+            </TableBody>
+          </Table>
+        </div>
+      )}
+      {state.error ? (
+        <Status tone="error" role="alert">
+          {state.error}
+        </Status>
+      ) : null}
+      {conflict ? (
+        <Button variant="secondary" disabled={busy} onClick={onRefresh}>
+          刷新列表后重试
+        </Button>
+      ) : null}
+      {state.results ? (
+        <Status tone="success">
+          {`已导入 ${state.results.length} 个模板：${state.results
+            .map((result) => `${result.id}@${result.templateVersion}`)
+            .join('、')}`}
+        </Status>
+      ) : null}
+      <div className="admin-agc-template-dialog-actions">
+        <Button
+          type="button"
+          variant="secondary"
+          disabled={uploadBusy}
+          onClick={onClose}
+        >
+          取消
+        </Button>
+        <Button
+          type="button"
+          disabled={
+            disabled ||
+            uploadBusy ||
+            state.rows.length === 0 ||
+            rowErrorCount > 0
+          }
+          onClick={onSubmit}
+        >
+          {uploadBusy ? '上传中…' : `上传 ${state.rows.length} 个模板`}
+        </Button>
+      </div>
+    </>
+  );
+}
@@ -13,6 +13,7 @@ import { afterEach, beforeEach, expect, test, vi } from 'vitest';
 import {
  AdminApiError,
  downloadAdminProjectSnapshot,
+  getAdminProjectSnapshotChannels,
  listAdminProjectSnapshots,
 } from '../api/adminApiClient';
 import type { AdminProjectSnapshotEntry } from '../api/adminApiTypes';
@@ -23,6 +24,7 @@ vi.mock('../api/adminApiClient', async () => ({
    '../api/adminApiClient',
  )),
  downloadAdminProjectSnapshot: vi.fn(),
+  getAdminProjectSnapshotChannels: vi.fn(),
  listAdminProjectSnapshots: vi.fn(),
 }));

@@ -35,12 +37,18 @@ 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(() => {
@@ -88,36 +96,166 @@ 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',
+    })
+    .mockResolvedValueOnce({ items: [entry], nextCursor: 'page-2' });
+  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: '下一页' }));
+  await screen.findByText('第二工程');
+  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
+    2,
+    'token',
+    { cursor: 'page-2', limit: 20, channel: 'dev' },
+    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('远端清单读取失败'))
-    .mockResolvedValueOnce({ items: [], nextCursor: null });
+    .mockRejectedValueOnce(new Error('翻页读取失败'));
  render(<AdminProjectSnapshotsPage token="token" onUnauthorized={vi.fn()} />);
-  fireEvent.click(await screen.findByRole('button', { name: '加载更多' }));
+  await screen.findByText('三消工程');
+  fireEvent.click(screen.getByRole('button', { name: '下一页' }));
  await screen.findByText('第二工程');
-  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
-    2,
-    'token',
-    { cursor: 'page-2', limit: 20 },
-    expect.any(AbortSignal),
-  );
-  expect(screen.getByText('三消工程')).toBeTruthy();
+
  fireEvent.click(screen.getByRole('button', { name: '刷新' }));
  await screen.findByRole('alert');
-  expect(screen.getByText('第二工程')).toBeTruthy();
-  expect(screen.queryByText('暂无已上传项目')).toBeNull();
-  fireEvent.click(screen.getByRole('button', { name: '刷新' }));
-  await screen.findByText('暂无已上传项目');
-  expect(listAdminProjectSnapshots).toHaveBeenLastCalledWith(
+  expect(listAdminProjectSnapshots).toHaveBeenNthCalledWith(
+    3,
    'token',
-    { cursor: null, limit: 20 },
+    { 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,
+    'token',
+    { cursor: null, limit: 20, channel: 'release' },
+    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 () => {
@@ -154,6 +292,7 @@ test('下载使用返回的中文文件名，随后释放对象 URL', async () =
  expect(createObjectURL).toHaveBeenCalledWith(blob);
  expect(downloadAdminProjectSnapshot).toHaveBeenCalledWith(
    'token',
+    'dev',
    'user-1',
    'project-1',
    expect.any(AbortSignal),
@@ -164,7 +303,7 @@ test('下载使用返回的中文文件名，随后释放对象 URL', async () =

 test('取消下载中止请求且不显示错误，卸载中止列表请求', async () => {
  vi.mocked(downloadAdminProjectSnapshot).mockImplementation(
-    (_token, _user, _project, signal) =>
+    (_token, _channel, _user, _project, signal) =>
      new Promise((_resolve, reject) => {
        signal?.addEventListener('abort', () =>
          reject(new DOMException('Aborted', 'AbortError')),
@@ -177,7 +316,7 @@ test('取消下载中止请求且不显示错误，卸载中止列表请求', as
  fireEvent.click(await screen.findByRole('button', { name: '下载完整工程' }));
  fireEvent.click(await screen.findByRole('button', { name: '取消下载' }));
  expect(
-    vi.mocked(downloadAdminProjectSnapshot).mock.calls[0]?.[3]?.aborted,
+    vi.mocked(downloadAdminProjectSnapshot).mock.calls[0]?.[4]?.aborted,
  ).toBe(true);
  await waitFor(() => expect(screen.queryByRole('alert')).toBeNull());
  vi.mocked(listAdminProjectSnapshots).mockReturnValue(new Promise(() => {}));
@@ -248,6 +387,10 @@ test('更换登录令牌丢弃旧列表和晚返回请求', async () => {
      onUnauthorized={onUnauthorized}
    />,
  );
+  // 渠道确定之后才会发出列表请求，这里等到旧令牌的请求真的在途再换令牌。
+  await waitFor(() =>
+    expect(listAdminProjectSnapshots).toHaveBeenCalledTimes(1),
+  );
  const oldSignal = vi.mocked(listAdminProjectSnapshots).mock.calls[0]?.[2];
  view.rerender(
    <AdminProjectSnapshotsPage
@@ -278,7 +421,7 @@ test('卸载后完成的下载不会创建浏览器文件', async () => {
    <AdminProjectSnapshotsPage token="token" onUnauthorized={vi.fn()} />,
  );
  fireEvent.click(await screen.findByRole('button', { name: '下载完整工程' }));
-  const signal = vi.mocked(downloadAdminProjectSnapshot).mock.calls[0]?.[3];
+  const signal = vi.mocked(downloadAdminProjectSnapshot).mock.calls[0]?.[4];
  view.unmount();
  expect(signal?.aborted).toBe(true);
  await act(async () => {
@@ -1,11 +1,19 @@
-import { Download, RefreshCcw, X } from 'lucide-react';
+import {
+  ChevronLeft,
+  ChevronRight,
+  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 {
@@ -31,21 +39,32 @@ 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 = null) => {
+    async (cursor: string | null, limit: number, page: number) => {
      listController.current?.abort();
      const controller = new AbortController();
      listController.current = controller;
@@ -54,23 +73,16 @@ export function AdminProjectSnapshotsPage({
      try {
        const response = await listAdminProjectSnapshots(
          token,
-          { cursor, limit: 20 },
+          { cursor, limit, channel },
          controller.signal,
        );
        if (controller.signal.aborted) return;
-        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()];
-        });
+        setItems(response.items);
        setNextCursor(response.nextCursor);
+        setPageIndex(page);
        setHasLoaded(true);
      } catch (error: unknown) {
+        // 翻页或刷新失败时保留当前页，不把已看到的列表换成空表。
        if (!controller.signal.aborted)
          handlePageError(error, onUnauthorized, setErrorMessage);
      } finally {
@@ -80,22 +92,70 @@ export function AdminProjectSnapshotsPage({
        }
      }
    },
-    [token, onUnauthorized],
+    [token, onUnauthorized, channel],
  );

  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();
+    void loadPage(null, pageSize, 1);
    return () => {
      listController.current?.abort();
      listController.current = null;
      downloadController.current?.abort();
      downloadController.current = null;
    };
-  }, [loadPage]);
+  }, [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,
+    );
+  }

  async function downloadProject(entry: AdminProjectSnapshotEntry) {
    if (downloadController.current || entry.status === 'partial') return;
@@ -106,6 +166,7 @@ export function AdminProjectSnapshotsPage({
    try {
      const archive = await downloadAdminProjectSnapshot(
        token,
+        channel ?? '',
        entry.userId,
        entry.projectId,
        controller.signal,
@@ -140,19 +201,42 @@ 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>
-        <button
-          className="admin-secondary-button"
-          disabled={isLoading}
-          type="button"
-          onClick={() => void loadPage()}
-        >
-          <RefreshCcw size={17} aria-hidden="true" />
-          <span>{isLoading ? '加载中' : '刷新'}</span>
-        </button>
+        <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>
      </div>
      {errorMessage ? (
        <div className="admin-alert" role="alert">
@@ -169,7 +253,7 @@ export function AdminProjectSnapshotsPage({
            <thead>
              <tr>
                <th>项目</th>
-                <th>用户 ID</th>
+                <th>用户</th>
                <th>同步时间</th>
                <th>文件数</th>
                <th>体积</th>
@@ -187,7 +271,22 @@ export function AdminProjectSnapshotsPage({
                      <strong>{entry.projectName || entry.projectId}</strong>
                      <small>{entry.projectId}</small>
                    </td>
-                    <td data-label="用户 ID">{entry.userId}</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="同步时间">
                      <span>
                        {new Date(entry.syncedAtMs).toLocaleString('zh-CN', {
@@ -239,23 +338,66 @@ export function AdminProjectSnapshotsPage({
        {hasLoaded && items.length === 0 && !errorMessage ? (
          <p className="admin-muted-text">暂无已上传项目</p>
        ) : null}
-        {nextCursor ? (
-          <div className="admin-action-row">
-            <button
-              className="admin-secondary-button"
-              disabled={isLoading}
-              type="button"
-              onClick={() => void loadPage(nextCursor)}
-            >
-              {isLoading ? '加载中' : '加载更多'}
-            </button>
-          </div>
+        {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>
        ) : null}
      </section>
    </section>
  );
 }

+function projectOwnerDisplayName(entry: AdminProjectSnapshotEntry) {
+  return (
+    entry.authorDisplayName?.trim() || entry.authorPublicUserCode?.trim() || '-'
+  );
+}
+
 function snapshotKey(entry: AdminProjectSnapshotEntry) {
  return `${entry.userId}/${entry.projectId}`;
 }
@@ -0,0 +1,155 @@
+// @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);
+  });
+});
@@ -0,0 +1,191 @@
+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;
+}
@@ -88,10 +88,60 @@
  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);
+  }
 }

 * {
@@ -1544,15 +1594,15 @@ button:disabled {
 }

 .admin-project-snapshot-table th:first-child {
-  width: 20%;
+  width: 18%;
 }

 .admin-project-snapshot-table th:nth-child(2) {
-  width: 14%;
+  width: 18%;
 }

 .admin-project-snapshot-table th:nth-child(3) {
-  width: 18%;
+  width: 16%;
 }

 .admin-project-snapshot-table th:nth-child(4) {
@@ -1639,6 +1689,21 @@ 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;
@@ -20,7 +20,10 @@ import { createInterface } from 'node:readline/promises';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { inflateSync } from 'node:zlib';

-export const appIdentifier = 'world.genarrative.ai-game-creator';
+import { AGC_APP_IDENTIFIER } from './channel-identity.mjs';
+
+// 联调工具驱动的始终是默认渠道客户端：安装身份取渠道基线，不跟随发布渠道。
+export const appIdentifier = AGC_APP_IDENTIFIER;
 export const configFileName = 'game-creator.config.json';
 export const localConfigFileName = 'game-creator.config.local.json';
 export const runnerEndpointFileName = 'agent-runner.endpoint.json';
@@ -14,6 +14,7 @@ import {
  resolveReleasePartition,
  runTauriBuild,
 } from './build-release.mjs';
+import { resolveChannelInstallIdentity } from './channel-identity.mjs';
 import { readReleaseDryRun, uploadReleaseArtifacts } from './release-oss.mjs';
 import {
  readUpdaterPubkey,
@@ -39,27 +40,19 @@ const appRoot = fileURLToPath(new URL('..', import.meta.url));
 const repoRoot = path.resolve(appRoot, '../..');

 /**
- * 产品名只从 Tauri 配置读取：它同时决定 `*.app` 目录名、updater 归档名与 DMG 卷名。
- * 写死会在改名后让入口静默找错对象（清理、打包、归档三处一起失效）。
+ * 产品名只从渠道安装身份派生（渠道身份由构建期 `--config` 注入 Tauri 配置）：
+ * 它同时决定 `*.app` 目录名、updater 归档名与 DMG 卷名。写死会在改名或换渠道后
+ * 让入口静默找错对象（清理、打包、归档三处一起失效）。
 */
-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;
+function resolveProductName(channel) {
+  const { productName } = resolveChannelInstallIdentity(channel);
  assert.ok(
    typeof productName === 'string' && productName.trim().length > 0,
-    'Tauri 配置缺少 productName',
+    '渠道安装身份缺少 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,
@@ -102,6 +95,9 @@ process.env.CARGO_TARGET_DIR = path.join(appRoot, 'src-tauri/target');
 const macTarget = 'aarch64-apple-darwin';
 const context = resolveReleaseContext([`--target=${macTarget}`]);
 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）。
@@ -13,6 +13,10 @@ import {
  defaultEditorFeatures,
  withDefaultCargoFeatures,
 } from './cargo-features.mjs';
+import {
+  resolveChannelInstallIdentity,
+  resolveReleaseChannel,
+} from './channel-identity.mjs';
 import { prepareNsisToolsetForRelease } from './nsis-toolset.mjs';
 import { stageNodeRuntime } from './stage-node-runtime.mjs';

@@ -89,14 +93,7 @@ const cargoLockPath = path.join(appRoot, 'src-tauri', 'Cargo.lock');
 const defaultOssBaseUrl =
  'https://agc-dev.oss-rg-china-mainland.aliyuncs.com/agc';

-const reservedChannelNames = new Set([
-  'win',
-  'mac',
-  'windows',
-  'macos',
-  'darwin',
-  'linux',
-]);
+export { resolveReleaseChannel } from './channel-identity.mjs';

 /**
 * 影响 Windows 客户端产物的路径。调度管线的发布范围判定与这里的提交摘要必须
@@ -165,21 +162,6 @@ export function resolveReleasePlatform(target = defaultTarget()) {
  throw new Error(`不支持的发布目标：${target}`);
 }

-export function resolveReleaseChannel(env = process.env) {
-  const channel = env.AGC_UPDATE_CHANNEL?.trim() ?? 'dev';
-  if (
-    !/^[a-z][a-z0-9-]{0,31}$/u.test(channel) ||
-    channel.endsWith('-') ||
-    reservedChannelNames.has(channel) ||
-    /-(win|mac)$/u.test(channel)
-  ) {
-    throw new Error(
-      '发布渠道无效：请使用 dev、release 或最多 32 位的小写字母、数字和连字符名称，系统名称不属于渠道',
-    );
-  }
-  return channel;
-}
-
 /** 系统分区延续已发布客户端端点，渠道本身不包含系统。 */
 export function resolveReleasePartition(
  channel = resolveReleaseChannel(),
@@ -428,12 +410,19 @@ export function buildTauriBuildArguments(
  ];
 }

-/** 渠道端点必须由构建期注入：官方更新插件的端点配置不支持运行期改渠道。 */
+/**
+ * 渠道端点与安装身份必须由构建期注入：官方更新插件的端点配置不支持运行期改渠道，
+ * 而 `productName` / `identifier` 决定安装目录、卸载项与客户端数据目录，
+ * 不同渠道必须在同一台设备上并存而不是互相顶掉。
+ */
 export function createChannelConfig(
  channel = resolveReleaseChannel(),
  target = defaultTarget(),
 ) {
+  const { productName, identifier } = resolveChannelInstallIdentity(channel);
  return {
+    productName,
+    identifier,
    plugins: {
      updater: {
        endpoints: [updateManifestUrl(channel, target)],
@@ -37,6 +37,11 @@ import {
  selectReleaseArtifact,
  updateManifestUrl,
 } from './build-release.mjs';
+import {
+  AGC_APP_IDENTIFIER,
+  AGC_PRODUCT_NAME,
+  resolveChannelInstallIdentity,
+} from './channel-identity.mjs';

 const windowsTarget = 'x86_64-pc-windows-msvc';
 const universalTarget = 'universal-apple-darwin';
@@ -184,6 +189,8 @@ test('channel manifest URL and build-time endpoint follow the channel', () => {
      'https://agc-dev.oss-rg-china-mainland.aliyuncs.com/agc/dev-win/latest.json',
    );
    assert.deepEqual(createChannelConfig('dev', 'aarch64-apple-darwin'), {
+      productName: AGC_PRODUCT_NAME,
+      identifier: AGC_APP_IDENTIFIER,
      plugins: {
        updater: {
          endpoints: [
@@ -204,6 +211,68 @@ test('channel manifest URL and build-time endpoint follow the channel', () => {
  });
 });

+test('channel install identity isolates co-installed builds and keeps the default channel stable', () => {
+  // 默认渠道必须保持已发布客户端身份：改身份等于换一个 App，升级链会断。
+  assert.deepEqual(resolveChannelInstallIdentity('dev'), {
+    productName: AGC_PRODUCT_NAME,
+    identifier: AGC_APP_IDENTIFIER,
+  });
+  assert.deepEqual(resolveChannelInstallIdentity('release'), {
+    productName: '陶泥儿 Release',
+    identifier: `${AGC_APP_IDENTIFIER}.release`,
+  });
+  assert.deepEqual(resolveChannelInstallIdentity('beta-2'), {
+    productName: '陶泥儿 Beta-2',
+    identifier: `${AGC_APP_IDENTIFIER}.beta-2`,
+  });
+
+  // 同一台设备上不同渠道的安装目录、卸载项与数据目录必须互不相同。
+  for (const channel of ['release', 'beta-2', 'a'.repeat(32)]) {
+    const identity = resolveChannelInstallIdentity(channel);
+    assert.notEqual(identity.productName, AGC_PRODUCT_NAME);
+    assert.notEqual(identity.identifier, AGC_APP_IDENTIFIER);
+    assert.ok(identity.identifier.startsWith(`${AGC_APP_IDENTIFIER}.`));
+  }
+
+  for (const channel of ['dev-win', 'Release', 'win', 'beta-']) {
+    assert.throws(
+      () => resolveChannelInstallIdentity(channel),
+      /发布渠道无效/u,
+    );
+  }
+});
+
+test('channel install identity is baked into the same build-time config as the endpoint', () => {
+  withEnv({ AGC_UPDATE_OSS_BASE_URL: undefined }, () => {
+    const config = createChannelConfig('release', windowsTarget);
+    assert.equal(config.productName, '陶泥儿 Release');
+    assert.equal(config.identifier, `${AGC_APP_IDENTIFIER}.release`);
+    assert.match(
+      config.plugins.updater.endpoints[0],
+      /\/release-win\/latest\.json$/u,
+    );
+  });
+});
+
+test('channel products keep first-install selection working under the channel product name', () => {
+  const root = mkdtempSync(path.join(os.tmpdir(), 'agc-channel-dmg-'));
+  try {
+    const { productName } = resolveChannelInstallIdentity('release');
+    const dmg = path.join(root, `${productName}_${packageVersion}_aarch64.dmg`);
+    writeFileSync(dmg, 'channel first installation disk image');
+    writeFileSync(path.join(root, 'windows.exe'), 'wrong platform');
+    assert.equal(
+      selectFirstInstallArtifact([dmg, path.join(root, 'windows.exe')], {
+        target: 'aarch64-apple-darwin',
+        version: packageVersion,
+      }),
+      dmg,
+    );
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
 test('packaged renderer receives the same channel as the updater manifest', () => {
  const context = resolveReleaseContext([], {
    AGC_BUILD_TARGET: windowsTarget,
@@ -0,0 +1,73 @@
+/**
+ * AGC 渠道 → 安装身份。
+ *
+ * 渠道同时决定两件事：
+ * - 更新端点：OSS 分区 `<channel>-win` / `<channel>-mac` 的清单地址；
+ * - 安装身份：`productName` 与 `identifier`。
+ *
+ * 安装身份决定 Windows 安装目录与卸载项、macOS `.app` 名字与 bundle id、
+ * Windows WebView2 数据目录以及 `%APPDATA%\<identifier>` 客户端数据目录。
+ * 因此不同渠道的包体在同一台设备上并存时互不顶掉，也不会共享登录态、
+ * 本地项目与运行锁。
+ *
+ * 默认渠道 `dev` 保持已发布客户端身份不变：升级链路与既有安装不能断。
+ */
+
+export const AGC_DEFAULT_CHANNEL = 'dev';
+export const AGC_PRODUCT_NAME = '陶泥儿';
+export const AGC_APP_IDENTIFIER = 'world.genarrative.ai-game-creator';
+
+const reservedChannelNames = new Set([
+  'win',
+  'mac',
+  'windows',
+  'macos',
+  'darwin',
+  'linux',
+]);
+
+/** 校验渠道名：小写字母开头，允许数字与连字符，系统名不属于渠道。 */
+export function validateReleaseChannel(channel) {
+  if (
+    typeof channel !== 'string' ||
+    !/^[a-z][a-z0-9-]{0,31}$/u.test(channel) ||
+    channel.endsWith('-') ||
+    reservedChannelNames.has(channel) ||
+    /-(win|mac)$/u.test(channel)
+  ) {
+    throw new Error(
+      '发布渠道无效：请使用 dev、release 或最多 32 位的小写字母、数字和连字符名称，系统名称不属于渠道',
+    );
+  }
+  return channel;
+}
+
+export function resolveReleaseChannel(env = process.env) {
+  return validateReleaseChannel(env.AGC_UPDATE_CHANNEL?.trim() ?? 'dev');
+}
+
+/** 安装身份里的展示后缀：`release` → `Release`，`beta-2` → `Beta-2`。 */
+export function channelDisplaySuffix(channel) {
+  return validateReleaseChannel(channel)
+    .split('-')
+    .map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1))
+    .join('-');
+}
+
+/**
+ * 渠道对应的安装身份。默认渠道返回基线身份，其它渠道派生渠道后缀，
+ * 保证同一台设备上不同渠道互不覆盖。
+ */
+export function resolveChannelInstallIdentity(channel = AGC_DEFAULT_CHANNEL) {
+  validateReleaseChannel(channel);
+  if (channel === AGC_DEFAULT_CHANNEL) {
+    return Object.freeze({
+      productName: AGC_PRODUCT_NAME,
+      identifier: AGC_APP_IDENTIFIER,
+    });
+  }
+  return Object.freeze({
+    productName: `${AGC_PRODUCT_NAME} ${channelDisplaySuffix(channel)}`,
+    identifier: `${AGC_APP_IDENTIFIER}.${channel}`,
+  });
+}
@@ -27,6 +27,11 @@ import {
  appIdentifier,
  defaultRealSwarmTestTask,
 } from './agent-swarm-test-chat.mjs';
+import {
+  AGC_APP_IDENTIFIER,
+  AGC_PRODUCT_NAME,
+  resolveChannelInstallIdentity,
+} from './channel-identity.mjs';
 import {
  askHidden,
  assertSafeGameCreatorConfigDestination,
@@ -1308,7 +1313,8 @@ if (
 }

 for (const requiredSource of [
-  "export const appIdentifier = 'world.genarrative.ai-game-creator'",
+  "import { AGC_APP_IDENTIFIER } from './channel-identity.mjs'",
+  'export const appIdentifier = AGC_APP_IDENTIFIER',
  "'--swarm-chat'",
  "'--autonomous-game-build'",
  "'--preview-serve'",
@@ -1319,14 +1325,38 @@ for (const requiredSource of [
  }
 }

-if (tauriConfig.productName !== '陶泥儿') {
+// 基线配置必须等于默认渠道的安装身份：默认渠道不能改身份，否则已发布客户端
+// 的升级链路与既有安装目录都会断开。
+const defaultChannelIdentity = resolveChannelInstallIdentity('dev');
+if (tauriConfig.productName !== AGC_PRODUCT_NAME) {
  throw new Error('AI game creator shell productName drifted');
 }

-if (tauriConfig.identifier !== 'world.genarrative.ai-game-creator') {
+if (tauriConfig.identifier !== AGC_APP_IDENTIFIER) {
  throw new Error('AI game creator shell identifier drifted');
 }

+if (
+  tauriConfig.productName !== defaultChannelIdentity.productName ||
+  tauriConfig.identifier !== defaultChannelIdentity.identifier
+) {
+  throw new Error(
+    'AI game creator shell baseline config must match the default channel identity',
+  );
+}
+
+// 非默认渠道必须派生出独立安装身份，否则同机安装会互相顶掉。
+for (const channel of ['release', 'beta-2']) {
+  const identity = resolveChannelInstallIdentity(channel);
+  if (
+    identity.productName === defaultChannelIdentity.productName ||
+    identity.identifier === defaultChannelIdentity.identifier ||
+    !identity.identifier.startsWith(`${AGC_APP_IDENTIFIER}.`)
+  ) {
+    throw new Error(`channel install identity not isolated: ${channel}`);
+  }
+}
+
 const expectedBundledDesignAgentResources = {
  'design-agent': 'design-agent',
  ...Object.fromEntries(
@@ -174,8 +174,16 @@ test('macOS release entry and smoke script derive product names from config and
    new URL('./build-macos-ci.mjs', import.meta.url),
    'utf8',
  );
-  // 产品名决定 *.app、updater 归档与 DMG 卷名：写死会在改名后静默找错对象。
-  assert.ok(entry.includes('readProductName'), '入口必须从 Tauri 配置读产品名');
+  // 产品名决定 *.app、updater 归档与 DMG 卷名：它必须从渠道安装身份派生，
+  // 写死会在换渠道或改名后静默找错对象。
+  assert.ok(
+    entry.includes('resolveChannelInstallIdentity'),
+    '入口必须从渠道安装身份派生产品名',
+  );
+  assert.ok(
+    entry.includes('resolveProductName(context.channel)'),
+    '产品名必须按当前发布渠道解析',
+  );
  assert.ok(!entry.includes('陶泥儿'), 'macOS 发布入口不得写死产品名');
  assert.ok(
    entry.includes("const macTarget = 'aarch64-apple-darwin'"),
@@ -13,7 +13,7 @@
  "taonier_prepare_game_art.parameters.brief": "面向当前游戏的简洁视觉需求",
  "taonier_prepare_game_art.parameters.mode": "缺省安全复用有效美术包；Codex 仅在当前对话需要换一套或重新生成时使用 regenerate",
  "agc_generate_image.description": "生成一张新图片：普通插画、角色立绘、统一视觉规范图、游戏 UI 设计图或透明游戏素材图集。仅在用户明确要求生成新图时调用。",
-  "agc_generate_image.parameters.prompt": "完整图片描述；普通图片、角色、规范图、UI 设计图或透明图集均可",
+  "agc_generate_image.parameters.prompt": "完整图片描述；普通图片、角色、规范图、UI 设计图或透明图集均可。kind=icon-spritesheet 时，去除首尾空白后的描述须为 1 到 200 个 Unicode 字符，保留内部换行并作为单条 iconDescriptions 原样提交；超限拒绝，不截断、不拆条，客户端不追加生图指令",
  "agc_generate_image.parameters.kind": "image=普通新图（保留生成原图），character=角色图（纯色底生成后自动抠图，产出透明背景立绘，prompt 只描述角色主体），icon-spec=统一视觉规范图，ui-design=完整 UI 设计图，icon-spritesheet=透明游戏素材图集（纯色底生成后自动抠图并切片，项目须已有 icon-spec 规范图），publication-material=发布宣传图",
  "agc_generate_image.parameters.assetName": "本地素材的人类可读显示名称",
  "agc_generate_image.parameters.outputPath": "可选项目相对输出路径，必须位于 assets/ 且不能覆盖已有文件",
@@ -23,8 +23,6 @@
  "icon_spec_generation": "为这个 Web 小游戏生成一张 1:1 的统一视觉规范图，作为后续 UI 设计图和透明游戏图集的共同权威参考。规范板必须分区展示：玩家主体及其成长形态、核心目标或收集物、场景地块与障碍、HUD/操作图标、得分/受击/胜负反馈、主辅强调色与材质规则。所有元素使用一致的正交视角、轮廓、光照和原创视觉语言，留出清楚间距；不要生成完整游戏截图、海报、黑底图集或纯文字说明。玩法机制只用于理解功能，不授权复刻现有作品。\n\n项目视觉需求：{}",
  "ui_design_generation": "根据下方当前项目 UI 需求生成一张完整的游戏 UI/UX 原型图，玩法与界面结构以这些需求为准。画面是完整 16:9 桌面端单屏界面，并同时明确移动端重排意图；清楚呈现当前玩法所需的分数/资源/生命/局内状态 HUD、主要可玩区域、玩家与目标/收集物/危险物、开始和主要操作、失败状态与重新开始、键盘和触控提示。使用正视角、清晰分区和可读占位文字，使前端开发可直接据此拆分 HTML/CSS。采用项目已经确定的原创命名、角色轮廓、配色、场景材质和界面视觉语言。\n\n当前项目 UI 需求：{}",
  "scene_generation": "为 Web 小游戏生成一张可直接作为运行画面底图的原创 16:9 场景背景。严格从下方用户需求提炼自己的游戏主题、地点、季节、材质和氛围；画面要为真实可玩区域留出足够清楚的中部空间，并有前景、中景、远景层次。不得画玩家角色、道具、棋子、障碍、HUD、操作按钮、文字、Logo、完整游戏截图、海报或素材图集；这些元素会从独立透明核心图集中绘制。不得自行假设为塔防或加入玩法合同中不存在的实体；必须原创，不得复刻现有游戏场景、贴图、标志性布局或受保护视觉语言。\n\n用户需求：{}",
-  "default_art_brief": "需要一张可直接用于 Web 小游戏首版原型的核心美术素材。",
-  "spritesheet_generation": "为 Web 小游戏首版原型生成一张可切分的原创透明核心美术素材图集，适合放入本地 assets 并被游戏直接引用。严格从用户需求和美术 brief 提取当前项目自己的标题、玩法实体、目标物、收集物、障碍、状态与反馈，素材类别与数量以当前项目需求为准。所有元素沿用当前规范图的轮廓、配色、材质和光照，分区排布并留出清楚切分间距。角色轮廓、图标排布与配色采用项目原创设计。\n用户需求：{}\n美术资产 brief：{}",
  "ui_inspection_focus": "请只依据真实可见像素判断这是否是可供前端直接实现的完整游戏 UI 原型，不能依据文件名、生成提示词或图片内自述放行。纯场景图、概念图、地图、海报或只展示角色而没有可玩界面的插画必须判定失败；按当前项目的玩法识别界面结构与关键要素。逐项检查：informationHud=清楚显示当前玩法需要的分数、资源、生命、关卡或局内状态；gameplaySurface=主要可玩区域及空间规则清楚；objectiveEntities=玩家主体、目标/收集/危险物、谜题或文本选项、轨道等当前玩法等价关键要素可辨；primaryControls=当前玩法需要的开始、移动、暂停或操作控件清楚；failureRestartFlow=存在可识别的结束态表现意图或明确重开入口；responsiveLayout=能从可见布局、触控目标和可重排分组判断移动适配意图，实际双视口另由浏览器验证；implementationClarity=分区、层级和文字清楚到可指导 HTML/CSS；originalTheme=原创主题且未复刻现有游戏角色、Logo、贴图或受保护视觉语言。请只返回一个 JSON object，字段必须严格为：{\"checks\":{\"informationHud\":true,\"gameplaySurface\":true,\"objectiveEntities\":true,\"primaryControls\":true,\"failureRestartFlow\":true,\"responsiveLayout\":true,\"implementationClarity\":true,\"originalTheme\":true},\"issues\":[\"未通过项及原因；全部通过时必须为空数组\"],\"summary\":\"500 字以内中文结论\"}。只有八项 checks 全为 true 且 issues 为空才通过。",
  "default_inspection_focus": "请检查布局、遮挡、裁切、视觉层级、素材一致性，以及桌面与移动视口是否可用。",
  "custom_inspection_focus": "检查重点：{question}",
@@ -36,7 +36,7 @@
  "preview.start.description": "启动当前项目的 loopback HTTP 预览。",
  "preview.validate.description": "用真实浏览器验证桌面和移动预览并保存证据。",
  "image.inspect.description": "让视觉模型检查一至两张项目内图片。",
-  "canvas.asset_generate.description": "通过已配置的 External Editor API 按项目需求生成图片或图集并登记到画布、素材库和项目 assets；可使用已登记资源作为参考。assetKind=icon-spritesheet 时 sliceMode 必填且没有默认值：需求要求等分网格、固定槽位或指定行列数时用 grid 并提供来自需求本身的 gridX/gridY；自由排布、数量不定或只要求一张图集时用 connected-components，可用 sliceCount 约束素材张数；其它 assetKind 不得携带 sliceMode/gridX/gridY。",
+  "canvas.asset_generate.description": "通过已配置的 External Editor API 按项目需求生成图片或图集并登记到画布、素材库和项目 assets；可使用已登记资源作为参考。assetKind=icon-spritesheet 的 prompt 去除首尾空白后须为 1 到 200 个 Unicode 字符，保留内部换行并作为单条 iconDescriptions 原样提交，超限拒绝，不截断、不拆条，客户端不追加生图指令。assetKind=icon-spritesheet 时 sliceMode 必填且没有默认值：需求要求等分网格、固定槽位或指定行列数时用 grid 并提供来自需求本身的 gridX/gridY；自由排布、数量不定或只要求一张图集时用 connected-components，可用 sliceCount 约束素材张数；其它 assetKind 不得携带 sliceMode/gridX/gridY。",
  "ui.workflow.run.description": "先用 discover 从受控 game/ui-pages.json 或页面声明标记自动发现全部功能页面，再把已登记 ui-design 与每个页面的设计图桥接成独立 UI JSON State；可同时载入已登记图片、图标和项目字体，执行 Provider 结构识别、多树合并与分批组件绑定、回读阶段，并且只有所有页面已绑定且已应用到 game/ 后才允许 finalize。项目根目录由 Runtime 注入，模型不得传入宿主路径。",
  "cocos.editor.execute.description": "在当前项目对应的已打开 Cocos Creator 编辑器中执行一段有界代码；Runtime 自动绑定唯一匹配的 Creator 主进程，代码与结果都通过注入 payload 的本机 bridge 返回。",
  "unity.editor.execute.description": "在当前 Unity 项目已打开的 Windows x64 Mono Editor 中执行 C#。仅提交 code，宿主绑定项目身份；结果待核对时禁止自动重发。",
@@ -7684,7 +7684,7 @@ done
            &temp.path().join("host"),
            &project,
            "turn-0001",
-            "fixture-request",
+            &format!("{:x}", Sha256::digest("请创建菜单".as_bytes())),
            false,
            &super::super::direct_validation::DirectValidationConfig::default(),
        )
@@ -21,30 +21,36 @@ pub(crate) fn validate_direct_codex_user_item(
        return Err("DirectProject user item 缺少稳定 id".to_string());
    }
    if message.content.is_empty() {
-        return Err("DirectProject user item content 不能为空".to_string());
+        return Err("聊天内容不能为空".to_string());
    }
    let manifest = read_manifest_for_project(root)?;
    let mut reference_count = 0usize;
+    let mut has_effective_content = false;
    for part in &message.content {
        match part {
            DirectCodexUserContentPart::InputText { text } => {
-                if text.trim().is_empty() {
-                    return Err("DirectProject input_text 不能为空".to_string());
+                if !text.trim().is_empty() {
+                    has_effective_content = true;
                }
            }
            DirectCodexUserContentPart::AgcResourceReference { resource_id } => {
                reference_count = reference_count.saturating_add(1);
                validate_resource_id_and_manifest(&manifest, resource_id)?;
+                has_effective_content = true;
            }
            DirectCodexUserContentPart::AgcRuntimeRegionReference(reference) => {
                reference_count = reference_count.saturating_add(1);
                validate_runtime_region_reference(&manifest, reference)?;
+                has_effective_content = true;
            }
        }
    }
    if reference_count > MAX_DIRECT_CODEX_REFERENCES {
        return Err(format!("一次最多引用 {MAX_DIRECT_CODEX_REFERENCES} 个素材"));
    }
+    if !has_effective_content {
+        return Err("聊天内容不能为空".to_string());
+    }
    Ok(())
 }

@@ -197,7 +197,10 @@ fn render_ui_design_code_context(

 #[cfg(test)]
 mod tests {
-    use super::{direct_codex_user_item_to_prompt, direct_codex_user_item_to_response_item};
+    use super::{
+        direct_codex_user_item_to_prompt, direct_codex_user_item_to_response_item,
+        validate_direct_codex_user_item,
+    };
    use crate::ui_editor::persistence::UI_DESIGN_DOC_MEDIA_TYPE;
    use serde_json::json;
    use shared_contracts::game_creation_app::{
@@ -295,7 +298,7 @@ mod tests {
    }

    #[test]
-    fn response_item_projection_uses_input_text_not_turn_input_text() {
+    fn text_projection_preserves_empty_parts_line_breaks_and_trailing_whitespace() {
        let root = tempfile::tempdir().expect("temp project");
        crate::init_local_game_project_at(root.path(), "wire-test", "wire 投影测试")
            .expect("init project");
@@ -303,12 +306,132 @@ mod tests {
            "type": "message",
            "role": "user",
            "id": "turn-1:user",
-            "content": [{"type": "input_text", "text": "你好"}]
+            "content": [
+                {"type": "input_text", "text": ""},
+                {"type": "input_text", "text": "你好"},
+                {"type": "input_text", "text": "\n"},
+                {"type": "input_text", "text": "第二段"},
+                {"type": "input_text", "text": "\n"},
+                {"type": "input_text", "text": " "}
+            ]
        });
        let projected = direct_codex_user_item_to_response_item(root.path(), &item)
            .expect("user response item should project");
-        assert_eq!(projected["content"][0]["type"], "input_text");
-        assert_ne!(projected["content"][0]["type"], "text");
+        assert_eq!(projected["content"], item["content"]);
+        let canonical = serde_json::from_value(item).expect("canonical user item");
+        assert_eq!(
+            direct_codex_user_item_to_prompt(root.path(), &canonical).expect("multiline prompt"),
+            "你好\n第二段\n "
+        );
+    }
+
+    #[test]
+    fn user_input_rejects_empty_or_whitespace_only_messages() {
+        let root = prompt_context_project();
+        for content in [
+            json!([]),
+            json!([{"type": "input_text", "text": ""}]),
+            json!([
+                {"type": "input_text", "text": ""},
+                {"type": "input_text", "text": " \t\r\n\u{3000}"}
+            ]),
+        ] {
+            let item = serde_json::from_value(json!({
+                "type": "message", "role": "user", "id": "turn-1:user", "content": content
+            }))
+            .expect("canonical user item");
+            assert_eq!(
+                validate_direct_codex_user_item(root.path(), &item),
+                Err("聊天内容不能为空".to_string())
+            );
+        }
+    }
+
+    #[test]
+    fn valid_references_allow_missing_text_and_whitespace_parts() {
+        let root = prompt_context_project();
+        let asset_id = register_fixture_asset(
+            root.path(),
+            "assets/hero.png",
+            GameCreationAppAssetKind::Character,
+            "image/png",
+        );
+        for (reference, expected_text) in [
+            (
+                json!({"type": "agc_resource_reference", "resourceId": asset_id}),
+                format!("[素材引用 resourceId={asset_id}；项目路径=assets/hero.png]"),
+            ),
+            (
+                json!({"type": "agc_runtime_region_reference", "label": "主画面"}),
+                "[运行画面区域：名称=主画面 ]".to_string(),
+            ),
+        ] {
+            for (content, expected_prompt) in [
+                (json!([reference.clone()]), expected_text.clone()),
+                (
+                    json!([
+                        {"type": "input_text", "text": ""},
+                        {"type": "input_text", "text": "\n"},
+                        reference,
+                        {"type": "input_text", "text": " "}
+                    ]),
+                    format!("\n{expected_text} "),
+                ),
+            ] {
+                let item = json!({
+                    "type": "message", "role": "user", "id": "turn-1:user", "content": content
+                });
+                let canonical = serde_json::from_value(item.clone()).expect("canonical user item");
+                assert_eq!(
+                    direct_codex_user_item_to_prompt(root.path(), &canonical)
+                        .expect("reference prompt"),
+                    expected_prompt
+                );
+                let projected = direct_codex_user_item_to_response_item(root.path(), &item)
+                    .expect("reference history projection");
+                assert_eq!(
+                    projected["content"].as_array().unwrap().len(),
+                    content.as_array().unwrap().len()
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn nonempty_text_does_not_bypass_invalid_reference_validation() {
+        let root = prompt_context_project();
+        for (reference, expected_error) in [
+            (
+                json!({"type": "agc_resource_reference", "resourceId": " "}),
+                "引用的素材 ID 无效，请移除后重新选择",
+            ),
+            (
+                json!({"type": "agc_resource_reference", "resourceId": "missing"}),
+                "引用的素材已不存在，请移除后重新选择",
+            ),
+            (
+                json!({"type": "agc_runtime_region_reference", "label": " "}),
+                "运行画面区域缺少名称",
+            ),
+            (
+                json!({"type": "agc_runtime_region_reference", "label": "主画面", "resourceIds": ["missing"]}),
+                "引用的素材已不存在，请移除后重新选择",
+            ),
+        ] {
+            let item = serde_json::from_value(json!({
+                "type": "message", "role": "user", "id": "turn-1:user",
+                "content": [
+                    {"type": "input_text", "text": "有真实文字"},
+                    reference,
+                    {"type": "input_text", "text": " "}
+                ]
+            }))
+            .expect("canonical user item");
+            assert_eq!(
+                validate_direct_codex_user_item(root.path(), &item),
+                Err(expected_error.to_string())
+            );
+        }
    }

    #[test]
@@ -3424,7 +3424,7 @@ async fn start_tool_bridge_for_source(
 }

 #[cfg(test)]
-pub(in crate::agent) struct DirectExecutionTestFixture {
+pub(crate) struct DirectExecutionTestFixture {
    execution: Option<super::direct_execution::ExecutionSessionGuard>,
    _host: tempfile::TempDir,
 }
@@ -3443,7 +3443,7 @@ impl Drop for DirectExecutionTestFixture {
 }

 #[cfg(test)]
-pub(in crate::agent) async fn direct_execution_fixture(
+pub(crate) async fn direct_execution_fixture(
    root: &Path,
    turn: &str,
 ) -> DirectExecutionTestFixture {
--- a/Show More
+++ b/Show More