diff --git a/apps/admin-web/src/api/adminApiTypes.ts b/apps/admin-web/src/api/adminApiTypes.ts
index 0322d9e9d..0cc109130 100644
--- a/apps/admin-web/src/api/adminApiTypes.ts
+++ b/apps/admin-web/src/api/adminApiTypes.ts
@@ -553,6 +553,8 @@ export interface AdminUpsertProfileRedeemCodeRequest {
   enabled: boolean;
   allowedUserIds: string[];
   allowedPublicUserCodes: string[];
+  startsAt?: string | null;
+  expiresAt?: string | null;
 }
 
 export interface AdminUpsertProfileInviteCodeRequest {
@@ -614,6 +616,8 @@ export interface ProfileRedeemCodeAdminResponse {
   globalUsedCount: number;
   enabled: boolean;
   allowedUserIds: string[];
+  startsAt?: string | null;
+  expiresAt?: string | null;
   createdBy: string;
   createdAt: string;
   updatedAt: string;
diff --git a/apps/admin-web/src/pages/AdminRedeemCodePage.test.tsx b/apps/admin-web/src/pages/AdminRedeemCodePage.test.tsx
new file mode 100644
index 000000000..2e3884bdd
--- /dev/null
+++ b/apps/admin-web/src/pages/AdminRedeemCodePage.test.tsx
@@ -0,0 +1,166 @@
+/* @vitest-environment jsdom */
+
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { beforeEach, expect, test, vi } from 'vitest';
+
+import {
+  disableProfileRedeemCode,
+  listProfileRedeemCodes,
+  upsertProfileRedeemCode,
+} from '../api/adminApiClient';
+import type { ProfileRedeemCodeAdminResponse } from '../api/adminApiTypes';
+import { AdminRedeemCodePage } from './AdminRedeemCodePage';
+
+vi.mock('../api/adminApiClient', () => ({
+  disableProfileRedeemCode: vi.fn(),
+  formatAdminApiError: vi.fn((error: unknown) =>
+    error instanceof Error ? error.message : '请求失败',
+  ),
+  isAdminApiError: vi.fn(() => false),
+  listProfileRedeemCodes: vi.fn(),
+  upsertProfileRedeemCode: vi.fn(),
+}));
+
+const baseEntry: ProfileRedeemCodeAdminResponse = {
+  code: 'LONG-LIVED',
+  mode: 'public',
+  rewardPoints: 100,
+  maxUses: 1,
+  globalUsedCount: 0,
+  enabled: true,
+  allowedUserIds: [],
+  startsAt: null,
+  expiresAt: null,
+  createdBy: 'admin',
+  createdAt: '2026-07-13T01:00:00Z',
+  updatedAt: '2026-07-13T01:00:00Z',
+};
+
+const entries: ProfileRedeemCodeAdminResponse[] = [
+  baseEntry,
+  {
+    ...baseEntry,
+    code: 'PENDING',
+    startsAt: '2999-01-01T00:00:00Z',
+  },
+  {
+    ...baseEntry,
+    code: 'EXPIRED',
+    expiresAt: '2000-01-01T00:00:00Z',
+  },
+  {
+    ...baseEntry,
+    code: 'ACTIVE',
+    startsAt: '2000-01-01T00:00:00Z',
+    expiresAt: '2999-01-01T00:00:00Z',
+  },
+  {
+    ...baseEntry,
+    code: 'DISABLED',
+    enabled: false,
+    startsAt: '2000-01-01T00:00:00Z',
+    expiresAt: '2999-01-01T00:00:00Z',
+  },
+];
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  vi.mocked(listProfileRedeemCodes).mockResolvedValue({
+    entries,
+    operations: [],
+  });
+  vi.mocked(upsertProfileRedeemCode).mockResolvedValue(baseEntry);
+  vi.mocked(disableProfileRedeemCode).mockResolvedValue({
+    ...baseEntry,
+    enabled: false,
+  });
+});
+
+test('兑换码列表展示生效状态与日期范围', async () => {
+  render(<AdminRedeemCodePage token="admin-token" onUnauthorized={vi.fn()} />);
+
+  expect((await rowForCode('LONG-LIVED')).textContent).toContain('长期有效');
+  expect((await rowForCode('LONG-LIVED')).textContent).toContain('立即 / 长期');
+  expect((await rowForCode('PENDING')).textContent).toContain('未生效');
+  expect((await rowForCode('EXPIRED')).textContent).toContain('已过期');
+  expect((await rowForCode('ACTIVE')).textContent).toContain('有效');
+  expect((await rowForCode('DISABLED')).textContent).toContain('停用');
+});
+
+test('点击兑换码回填本地日期输入', async () => {
+  const user = userEvent.setup();
+  render(<AdminRedeemCodePage token="admin-token" onUnauthorized={vi.fn()} />);
+
+  await user.click(await screen.findByRole('button', { name: 'ACTIVE' }));
+
+  expect((screen.getByLabelText('开始时间') as HTMLInputElement).value).toBe(
+    toLocalInputValue('2000-01-01T00:00:00Z'),
+  );
+  expect((screen.getByLabelText('截止时间') as HTMLInputElement).value).toBe(
+    toLocalInputValue('2999-01-01T00:00:00Z'),
+  );
+});
+
+test('兑换码拒绝截止时间不晚于开始时间的配置', async () => {
+  render(<AdminRedeemCodePage token="admin-token" onUnauthorized={vi.fn()} />);
+  await screen.findByRole('button', { name: 'LONG-LIVED' });
+
+  fireEvent.change(screen.getByLabelText('Code'), {
+    target: { value: 'INVALID' },
+  });
+  fireEvent.change(screen.getByLabelText('开始时间'), {
+    target: { value: '2026-07-13T10:00' },
+  });
+  fireEvent.change(screen.getByLabelText('截止时间'), {
+    target: { value: '2026-07-13T10:00' },
+  });
+
+  expect(screen.getByText('截止时间必须晚于开始时间')).toBeTruthy();
+  expect(
+    (screen.getByRole('button', { name: '保存' }) as HTMLButtonElement)
+      .disabled,
+  ).toBe(true);
+  expect(upsertProfileRedeemCode).not.toHaveBeenCalled();
+});
+
+test('兑换码保存时把本地时间转换为 ISO 并保留空边界', async () => {
+  const user = userEvent.setup();
+  render(<AdminRedeemCodePage token="admin-token" onUnauthorized={vi.fn()} />);
+  await screen.findByRole('button', { name: 'LONG-LIVED' });
+
+  fireEvent.change(screen.getByLabelText('Code'), {
+    target: { value: 'WINDOWED' },
+  });
+  fireEvent.change(screen.getByLabelText('开始时间'), {
+    target: { value: '2026-07-13T10:30' },
+  });
+  await user.click(screen.getByRole('button', { name: '保存' }));
+  await user.click(screen.getByRole('button', { name: '确认' }));
+
+  await waitFor(() => {
+    expect(upsertProfileRedeemCode).toHaveBeenCalledWith(
+      'admin-token',
+      expect.objectContaining({
+        code: 'WINDOWED',
+        startsAt: new Date('2026-07-13T10:30').toISOString(),
+        expiresAt: null,
+      }),
+    );
+  });
+});
+
+async function rowForCode(code: string) {
+  const button = await screen.findByRole('button', { name: code });
+  const row = button.closest('tr');
+  if (!row) {
+    throw new Error(`未找到兑换码 ${code} 所在行`);
+  }
+  return row;
+}
+
+function toLocalInputValue(value: string) {
+  const date = new Date(value);
+  const offsetMs = date.getTimezoneOffset() * 60 * 1000;
+  return new Date(date.getTime() - offsetMs).toISOString().slice(0, 16);
+}
diff --git a/apps/admin-web/src/pages/AdminRedeemCodePage.tsx b/apps/admin-web/src/pages/AdminRedeemCodePage.tsx
index f1df9c315..6afe195d5 100644
--- a/apps/admin-web/src/pages/AdminRedeemCodePage.tsx
+++ b/apps/admin-web/src/pages/AdminRedeemCodePage.tsx
@@ -34,6 +34,8 @@ export function AdminRedeemCodePage({
   const [rewardPoints, setRewardPoints] = useState('100');
   const [maxUses, setMaxUses] = useState('1');
   const [enabled, setEnabled] = useState(true);
+  const [startsAt, setStartsAt] = useState('');
+  const [expiresAt, setExpiresAt] = useState('');
   const [allowedUserIds, setAllowedUserIds] = useState('');
   const [allowedPublicUserCodes, setAllowedPublicUserCodes] = useState('');
   const [disableCode, setDisableCode] = useState('');
@@ -73,6 +75,12 @@ export function AdminRedeemCodePage({
     }
 
     setErrorMessage('');
+    const validityError = validateValidityWindow(startsAt, expiresAt);
+    if (validityError) {
+      setErrorMessage(validityError);
+      return;
+    }
+
     const confirmed = await confirmWrite({
       action: '保存兑换码',
       target: code.trim(),
@@ -92,6 +100,8 @@ export function AdminRedeemCodePage({
         allowedUserIds: mode === 'private' ? splitLines(allowedUserIds) : [],
         allowedPublicUserCodes:
           mode === 'private' ? splitLines(allowedPublicUserCodes) : [],
+        startsAt: startsAt ? toIsoDateTime(startsAt) : null,
+        expiresAt: expiresAt ? toIsoDateTime(expiresAt) : null,
       });
       fillForm(response);
       await refreshRedeemCodes();
@@ -137,11 +147,15 @@ export function AdminRedeemCodePage({
     setRewardPoints(String(entry.rewardPoints));
     setMaxUses(String(entry.maxUses));
     setEnabled(entry.enabled);
+    setStartsAt(toDateTimeLocalValue(entry.startsAt));
+    setExpiresAt(toDateTimeLocalValue(entry.expiresAt));
     setAllowedUserIds(entry.allowedUserIds.join('\n'));
     setAllowedPublicUserCodes('');
     setDisableCode(entry.code);
   }
 
+  const validityError = validateValidityWindow(startsAt, expiresAt);
+
   return (
     <section className="admin-page">
       <div className="admin-page-heading">
@@ -222,6 +236,25 @@ export function AdminRedeemCodePage({
             </label>
           </div>
 
+          <div className="admin-form-row">
+            <label className="admin-field">
+              <span>开始时间</span>
+              <input
+                type="datetime-local"
+                value={startsAt}
+                onChange={(event) => setStartsAt(event.target.value)}
+              />
+            </label>
+            <label className="admin-field">
+              <span>截止时间</span>
+              <input
+                type="datetime-local"
+                value={expiresAt}
+                onChange={(event) => setExpiresAt(event.target.value)}
+              />
+            </label>
+          </div>
+
           {mode === 'private' ? (
             <div className="admin-form-row">
               <label className="admin-field">
@@ -250,6 +283,11 @@ export function AdminRedeemCodePage({
               {errorMessage}
             </div>
           ) : null}
+          {validityError && validityError !== errorMessage ? (
+            <div className="admin-alert" role="status">
+              {validityError}
+            </div>
+          ) : null}
 
           <button
             className="admin-primary-button"
@@ -257,7 +295,8 @@ export function AdminRedeemCodePage({
               isSaving ||
               !code.trim() ||
               !parsePositiveInteger(rewardPoints) ||
-              !parsePositiveInteger(maxUses)
+              !parsePositiveInteger(maxUses) ||
+              Boolean(validityError)
             }
             type="submit"
           >
@@ -280,6 +319,7 @@ export function AdminRedeemCodePage({
                       <th>Code</th>
                       <th>奖励</th>
                       <th>状态</th>
+                      <th>有效期</th>
                     </tr>
                   </thead>
                   <tbody>
@@ -296,7 +336,16 @@ export function AdminRedeemCodePage({
                           <small>{redeemModeLabel(entry.mode)}</small>
                         </td>
                         <td>{entry.rewardPoints}</td>
-                        <td>{entry.enabled ? '启用' : '停用'}</td>
+                        <td>
+                          <span
+                            className={`admin-status ${redeemValidityClass(entry)}`}
+                          >
+                            {redeemValidityLabel(entry)}
+                          </span>
+                        </td>
+                        <td>
+                          <small>{formatValidityWindow(entry)}</small>
+                        </td>
                       </tr>
                     ))}
                   </tbody>
@@ -400,3 +449,76 @@ function formatDateTime(value: string) {
   }
   return date.toLocaleString('zh-CN', {hour12: false});
 }
+
+function validateValidityWindow(startsAt: string, expiresAt: string) {
+  if (!startsAt || !expiresAt) {
+    return '';
+  }
+
+  const startsAtTime = Date.parse(toIsoDateTime(startsAt));
+  const expiresAtTime = Date.parse(toIsoDateTime(expiresAt));
+  if (!Number.isFinite(startsAtTime) || !Number.isFinite(expiresAtTime)) {
+    return '有效期时间无效';
+  }
+
+  return startsAtTime < expiresAtTime ? '' : '截止时间必须晚于开始时间';
+}
+
+function toIsoDateTime(value: string) {
+  const time = Date.parse(value);
+  if (!Number.isFinite(time)) {
+    throw new Error('有效期时间无效');
+  }
+  return new Date(time).toISOString();
+}
+
+function toDateTimeLocalValue(value?: string | null) {
+  if (!value) {
+    return '';
+  }
+
+  const date = new Date(value);
+  if (!Number.isFinite(date.getTime())) {
+    return '';
+  }
+
+  const offsetMs = date.getTimezoneOffset() * 60 * 1000;
+  return new Date(date.getTime() - offsetMs).toISOString().slice(0, 16);
+}
+
+function redeemValidityLabel(entry: ProfileRedeemCodeAdminResponse) {
+  if (!entry.enabled) {
+    return '停用';
+  }
+
+  const now = Date.now();
+  const startsAtTime = entry.startsAt ? Date.parse(entry.startsAt) : null;
+  const expiresAtTime = entry.expiresAt ? Date.parse(entry.expiresAt) : null;
+  if (startsAtTime !== null && Number.isFinite(startsAtTime) && now < startsAtTime) {
+    return '未生效';
+  }
+  if (expiresAtTime !== null && Number.isFinite(expiresAtTime) && now >= expiresAtTime) {
+    return '已过期';
+  }
+  if (entry.startsAt || entry.expiresAt) {
+    return '有效';
+  }
+  return '长期有效';
+}
+
+function redeemValidityClass(entry: ProfileRedeemCodeAdminResponse) {
+  const label = redeemValidityLabel(entry);
+  if (label === '停用' || label === '已过期') {
+    return 'admin-status-error';
+  }
+  if (label === '未生效') {
+    return 'admin-status-pending';
+  }
+  return 'admin-status-ok';
+}
+
+function formatValidityWindow(entry: ProfileRedeemCodeAdminResponse) {
+  const startsAt = entry.startsAt ? formatDateTime(entry.startsAt) : '立即';
+  const expiresAt = entry.expiresAt ? formatDateTime(entry.expiresAt) : '长期';
+  return `${startsAt} / ${expiresAt}`;
+}
diff --git a/apps/admin-web/src/styles/admin.css b/apps/admin-web/src/styles/admin.css
index f71fc107b..bbee95ac6 100644
--- a/apps/admin-web/src/styles/admin.css
+++ b/apps/admin-web/src/styles/admin.css
@@ -121,17 +121,21 @@ button:disabled {
 
 .admin-shell {
   display: grid;
+  height: 100dvh;
   min-height: 100dvh;
   grid-template-columns: 232px minmax(0, 1fr);
+  overflow: hidden;
 }
 
 .admin-sidebar {
   display: flex;
+  min-height: 0;
   flex-direction: column;
   gap: 24px;
   border-right: 1px solid #e1ccbb;
   background: #ffffff;
   padding: 22px 18px;
+  overflow-y: auto;
 }
 
 .admin-brand strong {
@@ -176,7 +180,9 @@ button:disabled {
 .admin-main {
   display: grid;
   min-width: 0;
+  min-height: 0;
   grid-template-rows: 64px minmax(0, 1fr);
+  overflow: hidden;
 }
 
 .admin-topbar {
@@ -205,6 +211,7 @@ button:disabled {
 
 .admin-content {
   min-width: 0;
+  min-height: 0;
   padding: 24px;
   overflow: auto;
 }
diff --git a/apps/admin-web/src/styles/admin.test.ts b/apps/admin-web/src/styles/admin.test.ts
new file mode 100644
index 000000000..a03443925
--- /dev/null
+++ b/apps/admin-web/src/styles/admin.test.ts
@@ -0,0 +1,33 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+import { describe, expect, test } from 'vitest';
+
+const stylesheet = fs.readFileSync(
+  path.resolve(process.cwd(), 'apps/admin-web/src/styles/admin.css'),
+  'utf8',
+);
+
+describe('admin shell scrolling contract', () => {
+  test('desktop shell keeps sidebar separate from the scrollable content', () => {
+    expect(ruleFor('.admin-shell')).toContain('\n  height: 100dvh;');
+    expect(ruleFor('.admin-shell')).toContain('overflow: hidden');
+    expect(ruleFor('.admin-sidebar')).toContain('min-height: 0');
+    expect(ruleFor('.admin-sidebar')).toContain('overflow-y: auto');
+    expect(ruleFor('.admin-main')).toContain('min-height: 0');
+    expect(ruleFor('.admin-main')).toContain('overflow: hidden');
+    expect(ruleFor('.admin-content')).toContain('min-height: 0');
+    expect(ruleFor('.admin-content')).toContain('overflow: auto');
+  });
+});
+
+function ruleFor(selector: string) {
+  const escapedSelector = selector.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const match = stylesheet.match(
+    new RegExp(`${escapedSelector}\\s*\\{([^}]*)\\}`),
+  );
+  if (!match) {
+    throw new Error(`Missing CSS rule for ${selector}`);
+  }
+  return match[1];
+}
diff --git a/deploy/nginx/genarrative-dev-http.conf b/deploy/nginx/genarrative-dev-http.conf
index 336a486e8..24701af41 100644
--- a/deploy/nginx/genarrative-dev-http.conf
+++ b/deploy/nginx/genarrative-dev-http.conf
@@ -298,6 +298,7 @@ server {
 
     location / {
         error_page 503 /maintenance.html;
+        error_page 404 /404.html;
 
         if ($genarrative_maintenance) {
             return 503;
diff --git a/deploy/nginx/genarrative.conf b/deploy/nginx/genarrative.conf
index c3b202613..eb880a129 100644
--- a/deploy/nginx/genarrative.conf
+++ b/deploy/nginx/genarrative.conf
@@ -318,6 +318,7 @@ server {
 
     location / {
         error_page 503 /maintenance.html;
+        error_page 404 /404.html;
 
         if ($genarrative_maintenance) {
             return 503;
diff --git a/deploy/nginx/snippets/genarrative-maintenance.conf b/deploy/nginx/snippets/genarrative-maintenance.conf
index e101c488f..bd4f16e77 100644
--- a/deploy/nginx/snippets/genarrative-maintenance.conf
+++ b/deploy/nginx/snippets/genarrative-maintenance.conf
@@ -10,7 +10,26 @@ if ($genarrative_internal_client) {
 }
 
 location = /maintenance.html {
-    root /srv/genarrative/web;
+    root /var/lib/genarrative/maintenance;
+    try_files /page.html @genarrative_default_maintenance;
+    add_header Cache-Control "no-store";
+    internal;
+}
+
+location @genarrative_default_maintenance {
+    root /srv/genarrative/web;
+    try_files /maintenance.html =503;
+    add_header Cache-Control "no-store";
+    internal;
+}
+
+location = /404.html {
+    if ($http_accept !~* "text/html") {
+        return 404;
+    }
+
+    root /srv/genarrative/web;
+    try_files /404.html =404;
     add_header Cache-Control "no-store";
     internal;
 }
diff --git a/deploy/pingora/pingora-gateway.env.example b/deploy/pingora/pingora-gateway.env.example
index 67b1bc3ff..fc12d4a58 100644
--- a/deploy/pingora/pingora-gateway.env.example
+++ b/deploy/pingora/pingora-gateway.env.example
@@ -25,6 +25,7 @@ GENARRATIVE_PINGORA_GATEWAY_SPACETIME_UPSTREAM=127.0.0.1:3101
 GENARRATIVE_PINGORA_GATEWAY_WEB_ROOT=/srv/genarrative/web
 GENARRATIVE_PINGORA_GATEWAY_ACME_ROOT=/var/www/html
 GENARRATIVE_PINGORA_GATEWAY_MAINTENANCE_FILE=/var/lib/genarrative/maintenance/enabled
+GENARRATIVE_PINGORA_GATEWAY_MAINTENANCE_PAGE_FILE=/var/lib/genarrative/maintenance/page.html
 
 GENARRATIVE_PINGORA_GATEWAY_FORWARDED_PROTO=http
 GENARRATIVE_PINGORA_GATEWAY_MAX_API_BODY_BYTES=67108864
diff --git a/docs/openapi/genarrative-external-v1.openapi.json b/docs/openapi/genarrative-external-v1.openapi.json
index 67596e4dd..acc09d755 100644
--- a/docs/openapi/genarrative-external-v1.openapi.json
+++ b/docs/openapi/genarrative-external-v1.openapi.json
@@ -2925,6 +2925,14 @@
               "null"
             ]
           },
+          "assetLabel": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "maxLength": 80,
+            "description": "写入素材库时使用的图标图集名称；空白或省略时使用自动名称。"
+          },
           "canvasCompletion": {
             "anyOf": [
               {
@@ -3064,6 +3072,24 @@
           }
         }
       },
+      "EditorIconSpritesheetSliceWarning": {
+        "type": "object",
+        "required": [
+          "code",
+          "reason"
+        ],
+        "properties": {
+          "code": {
+            "type": "string",
+            "description": "自动拆分未完成的稳定原因码。"
+          },
+          "reason": {
+            "type": "string",
+            "description": "自动拆分未完成的可诊断原因。"
+          }
+        },
+        "additionalProperties": false
+      },
       "EditorIconSpritesheetGenerationResponse": {
         "type": "object",
         "required": [
@@ -3090,11 +3116,22 @@
           },
           "iconImageSrcs": {
             "type": "array",
-            "description": "兼容旧客户端的切片素材列表；图标素材生成固定为空，UI 设计图提取素材可返回切片。",
+            "description": "按图集 alpha 连通域拆分并持久化的独立素材列表。",
             "items": {
               "$ref": "#/components/schemas/EditorIconSpritesheetIconResult"
             }
           },
+          "sliceWarning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EditorIconSpritesheetSliceWarning"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "图集已成功持久化，但自动拆分未完成时返回；此时 iconImageSrcs 为空，调用方仍应使用整张图集。"
+          },
           "prompt": {
             "type": "string"
           },
@@ -3256,6 +3293,21 @@
               "string",
               "null"
             ]
+          },
+          "assetFolderId": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "description": "角色动作绿幕预览视频写入账号素材库的文件夹；省略时写入默认项目素材文件夹。"
+          },
+          "assetLabel": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "maxLength": 80,
+            "description": "角色动作素材名称；空白或省略时使用自动名称。原始预览视频以该名称追加（原始视频）保存。"
           }
         },
         "additionalProperties": false
diff --git a/docs/project-memory/shared-memory/decision-log.md b/docs/project-memory/shared-memory/decision-log.md
index f270f125b..7b5bb9966 100644
--- a/docs/project-memory/shared-memory/decision-log.md
+++ b/docs/project-memory/shared-memory/decision-log.md
@@ -23,6 +23,23 @@
 - 验证方式：`cargo test -p shared-contracts --manifest-path server-rs/Cargo.toml editor_agent`、`cargo test -p api-server --manifest-path server-rs/Cargo.toml editor_agent`、`npm run test -- src/components/image-editor/EditorAgentConversation/EditorAgentConversationPanelView.test.tsx src/components/image-editor/EditorAgentConversation/useEditorAgentConversation.test.tsx src/services/image-editor/editorAgentClient.test.ts`、`npm run typecheck`、`npm run check:encoding`、`git diff --check`。
 - 关联文档：`docs/【编辑器】画布Agent对话面板-2026-07-03.md`、`docs/adr/【ADR】画布Agent会话消息存OSS-2026-07-03.md`。
 
+## 2026-07-13 图片画布生成资源支持提交前统一命名
+
+- 背景：图片画布的普通图片、规范、角色、图标图集、UI 设计、宣发素材、视频和音频默认使用“类型 + 数字”命名，用户只能在生成后单独重命名素材，画布图层、项目资源和素材库名称容易不一致。
+- 决策：主生成状态统一使用可选 `assetLabel`，所有生成面板提供同一个资源名称输入。名称最多 80 个字符，提交时去除首尾空格；留空时继续使用现有自动编号名称。一次提交解析出的名称必须同时用于 `assetLabel`、`canvasCompletion.title`、本地结果图层标题、项目资源和账号素材库，不允许各链路自行生成不同名称。
+- 派生产物：图标和角色动作后端契约补齐 `assetLabel`。带背景原图、图片修改 provider 原始输出等中间产物基于主名称追加“（原图）”或“（原始输出）”；图标切片继续按用户填写的图标描述命名，不继承图集名称覆盖独立素材语义。
+- 影响范围：图片画布生成状态与面板、提交模型、图标和角色动作请求契约、项目资源 / 素材库持久化和相关编辑器文档。
+- 验证方式：覆盖自定义名、空白回退、长度限制，以及图片 / 图标 / 视频 / 音频 / 角色动作的请求名称、完成快照标题和素材名称一致性；运行前端定向测试、Rust 契约与 API 定向测试、`npm run typecheck`、`npm run check:encoding`、`git diff --check`。
+
+## 2026-07-13 图片画布多产物生成任务必须保存全部可恢复产物
+
+- 背景：角色形象、图标 spritesheet 和 UI 素材提取会先得到带纯色背景的原图，再执行抠图或拆分；图片修改会先得到模型对齐尺寸的原始输出，角色动作会先得到绿幕预览视频，再抽帧和抠图。此前部分原始产物只登记到 OSS，或者要等后处理成功后才进入项目资源，用户无法在失败后找回已经生成成功的内容。
+- 决策：凡一次资产生成任务产生多个可恢复产物，后端必须先把上游已返回的中间产物写入 OSS、`asset_object`、项目资源和账号素材库，再执行抠图、尺寸恢复、抽帧或拆分；未指定素材文件夹时进入默认“项目”文件夹。角色形象、图标 spritesheet 和 UI 素材提取同时保留纯色背景原图与透明后处理结果；图片修改保留模型原始输出与尺寸恢复结果；角色动作把绿幕预览视频作为一个可复用素材保存，逐帧源图继续留在同一任务 OSS 路径，不把 32 至 48 帧逐张灌入素材库。普通图片、去背景、音频等没有独立上游中间产物的任务不制造重复副本。
+- 画布与降级：有项目上下文的图片多产物继续由同一次 `canvasCompletion` 写入权威画布快照，生成器 `generatedLayerId` 锚定主后处理结果。图标和 UI 图集自动拆分是 best-effort；识别或切片持久化失败仍完成整张透明图集，并在 inline、队列轮询和刷新后任务列表中提示非阻断 warning，不得借用失败错误字段。
+- 影响范围：`server-rs/crates/api-server/src/editor_project.rs`、`character_animation_assets.rs`、外部生成任务摘要、图片画布完成快照、账号素材库和前端生成提示。
+- 验证方式：覆盖中间产物登记先于后处理、默认素材文件夹、图集拆分降级、inline / queue warning 和主结果锚定的定向测试，并运行 `cargo check -p api-server --manifest-path server-rs/Cargo.toml`、`npm run check:spacetime-schema`、前端定向测试、`npm run check:encoding`、`git diff --check`。
+- 关联文档：`docs/【编辑器】生成类面板Lovart统一改造方案-2026-06-17.md`、`docs/technical/【前端架构】图片画布编辑器MVP接入方案-2026-06-11.md`。
+
 ## 2026-07-12 泥点充值收敛为四档并统一资产入口
 
 - 背景：主站与图片画板的泥点余额入口、余额明细和充值弹窗存在不同实现，旧充值口径仍展示六档泥点、首充双倍和会员购买 / 升级入口，容易让展示、商品资格与后端余额真相发生漂移。
@@ -325,7 +342,7 @@
 ## 2026-06-18 图片画布 UI 设计图提取素材保留图集
 
 - 背景：UI 设计图需要从成图中继续抽取可复用独立素材；原图标素材生成只把拆分后的图标放入画布，spritesheet 原图没有保留，后续追溯和二次切图不方便。
-- 决策：`assetKind="ui-design"` 图层浮动工具栏新增 `提取素材`，点击后先进入红框素材框选编辑态，默认矩形框选，并支持椭圆框选和画笔自由框选。至少存在一个框选区域后才能提交；前端把红色轮廓绘入原 UI 设计图并将合成图作为 `/api/editor/ui-designs/assets/extractions` 的参考图。后端固定 `gpt-image-2` 和纯色背景素材提取提示词，返回结构复用图标 spritesheet 响应。UI 提取把 spritesheet 图集作为 `assetKind="icon-spritesheet"` 图层放到画布，再放拆分后的 `assetKind="icon"` 素材；图标素材生成只保留透明 spritesheet 图集，不再额外铺独立图标。2026-07-03 起，UI 提取的纯色背景由 `screenColor` 选择并经 BgFilter 透明化。
+- 决策：`assetKind="ui-design"` 图层浮动工具栏新增 `提取素材`，点击后先进入红框素材框选编辑态，默认矩形框选，并支持椭圆框选和画笔自由框选。至少存在一个框选区域后才能提交；前端把红色轮廓绘入原 UI 设计图并将合成图作为 `/api/editor/ui-designs/assets/extractions` 的参考图。后端固定 `gpt-image-2` 和纯色背景素材提取提示词，返回结构复用图标 spritesheet 响应。UI 提取把 spritesheet 图集作为 `assetKind="icon-spritesheet"` 图层放到画布，再放拆分后的 `assetKind="icon"` 素材。2026-07-03 起，UI 提取的纯色背景由 `screenColor` 选择并经 BgFilter 透明化。2026-07-13 起，图标素材生成先把带背景原图和透明 spritesheet 同时写入项目资源、账号素材库并回填画布，未指定文件夹时落默认“项目”文件夹，再 best-effort 按 alpha 连通域拆分独立图标；拆分失败不改变生成成功状态，响应以空 `iconImageSrcs` 和结构化 `sliceWarning` 返回原因，用户可从图集工具栏手动重试。手动拆分不计费，限制单边 `4096`、总像素 `2048×2048`、最多 `64` 个切片，所有切片用 `sourceResourceId` 指向透明图集。本条新决策取代“图标素材生成只保留图集”的旧口径。
 - 影响范围：图片画布浮动工具栏、编辑器图片生成 BFF、`platform-image` 图集连通域拆分、画布图层类型和编辑器文档。
 - 验证方式：运行图片画布工具栏 / 图集落层 / 生成提交相关前端测试，`cargo test -p platform-image generated_asset_sheets --manifest-path server-rs/Cargo.toml`，以及 `cargo test -p api-server editor_ui_design_asset_extraction_prompt_is_fixed --manifest-path server-rs/Cargo.toml`。
 - 关联文档：`docs/【编辑器】画板UI设计图生成入口设计-2026-06-17.md`、`docs/【编辑器】画板图标素材生成入口设计-2026-06-15.md`。
@@ -3984,6 +4001,7 @@
 
 - 背景：主站 Nginx 和 Pingora 原先会把任意未知路径回退到 `index.html`，导致 soft 404；共享 `index.html` 也缺少首页 SEO head，robots 和 sitemap 请求会落入 SPA fallback。
 - 决策：新增真实 `robots.txt` 和仅首页的 `sitemap.xml`，首页共享 head 提供基础 SEO/OG/JSON-LD 文本但不使用未确认的 image/logo URL；首页 DOM 只保留一个稳定产品定位 H1。Nginx 与 Pingora 只允许当前完整 SPA 路径回退 `index.html`，同前缀未知路径必须返回 404；`/admin` 继续走独立子应用。路由变化必须同步三套 Nginx、Pingora、route parity matrix 和自动门禁。
+- 2026-07-13 补充：浏览器导航到 Web 未知路径时继续保持 HTTP `404`，但正文统一返回 `public/404.html` 品牌页面和 `public/branding/taonier-404-page.png`；API、探针及非 HTML 请求仍返回原有 `404` 响应，不得把品牌页 HTML 混入接口响应。Nginx 最终 Web catch-all 与 Pingora `Accept: text/html` 分支保持一致。
 - 影响范围：`index.html`、`public/robots.txt`、`public/sitemap.xml`、首页组件、三套 Nginx、Pingora 网关和路由 parity 门禁。
 - 验证方式：前端定向测试与构建、`npm run check:nginx-spa-routes`、`npm run check:pingora-route-parity`、`npm run check:pingora-gateway-smoke`、`npm run check:encoding`、`git diff --check`，部署后同时抽查根级未知路径和 `/creation/not-exist` 等同前缀未知路径。
 
@@ -4027,3 +4045,36 @@
 - 边界：查单使用订单所属用户的小程序 `openid`，不把 AppKey、AppSecret、access token 或 `openid` 下发前端；虚拟支付不得误用微信支付 V3 查单。
 - 历史单：升级前遗留的 pending 订单不会被 expiration catch-up 覆盖，使用 `spacetime:wechat-virtual-payment:reconcile` 逐单 dry-run，再使用当次 `applyFingerprint` 明确 `--apply`。脚本每次重读本地订单与微信查单结果，指纹漂移、非 `2/3/4`、单号/金额/支付类型 `order_type=0/7` 不一致或非官方 endpoint 时默认拒绝入账。
 - 验证方式：`cargo test -p platform-wechat --manifest-path server-rs/Cargo.toml`、`cargo test -p api-server --manifest-path server-rs/Cargo.toml virtual_payment_query`、`npm run check:wechat-virtual-payment-reconcile`、`npm run check:encoding`、`git diff --check`。
+
+## 2026-07-13 临时维护公告改为 release 外运行态覆盖
+
+- 背景：一次性停服公告曾直接提交到 `public/maintenance.html`，后续 Web Build 将它持续打入 `web.tar.gz`，每次 Web Deploy 或再次进入维护都会重新显示已经过期的公告。
+- 决策：`public/maintenance.html` 永久作为无日期、无具体时段的默认维护页，并使用 `public/branding/taonier-maintenance-page.png` 作为品牌视觉；生产 Web 打包必须对最终 `web/maintenance.html` 执行临时文案门禁。临时公告通过 `maintenance-on.sh --page-file <公告HTML>` 原子安装到 `/var/lib/genarrative/maintenance/page.html`，Nginx 与 Pingora 优先读取该运行态文件，缺失时回退 Web 制品默认页。
+- 生命周期：新维护窗口未提供 `--page-file` 时清理 marker 外残留公告；同一窗口内 Stdb / API 发布重复调用 `maintenance-on.sh` 时保留已安装公告；`maintenance-off.sh` 同时清理 marker 和公告页。Web Deploy 不再拥有临时公告事实源。
+- 影响范围：默认维护页、维护开关脚本、Nginx snippet、Pingora 配置与 smoke、生产 Web 发布包门禁和生产运维文档。
+- 验证方式：`npm run check:maintenance-page`、`npm run check:nginx-spa-routes`、`cargo test -p pingora-gateway --manifest-path server-rs/Cargo.toml`、`npm run check:pingora-gateway-smoke`、`npm run check:production-ops`、`npm run check:encoding`、`git diff --check`。
+
+## 2026-07-13 兑换码生效日期范围对齐邀请码
+
+- 背景：后台邀请码已支持可选开始时间和截止时间，但兑换码只有启用状态，运营无法预设活动时间窗口，用户兑换也没有后端时间边界校验。
+- 决策：`profile_redeem_code` 在已有字段末尾追加可空 `starts_at` / `expires_at`，默认均为空；后台请求和响应使用可空 `startsAt` / `expiresAt`。时间窗口与邀请码一致：空边界合法，双边界必须严格满足开始早于截止，有效区间为 `[starts_at, expires_at)`。
+- 兑换边界：时间是后端事实，`redeem_profile_reward_code` 必须用经后端构造的 `redeemed_at_micros` 拒绝未生效或已过期的兑换码；前端的状态标签只用于运营展示，不代替后端校验。
+- 影响范围：`module-runtime` 兑换码命令与校验、`spacetime-module` schema / migration / procedure、生成 bindings、`spacetime-client`、`shared-contracts` / `packages/shared`、`api-server` 和 `apps/admin-web` 兑换码页。
+
+## 2026-07-13 后台侧边栏与主内容独立滚动
+
+- 背景：后台壳层只给 `.admin-shell` 设置 `min-height: 100dvh`，长页面会撑高 document；滚动时侧边栏与主内容一起移出视口，`.admin-content` 上的 `overflow: auto` 没有成为真正滚动容器。
+- 决策：后台壳层固定为 `height: 100dvh` 并隐藏壳层 overflow；桌面侧边栏使用独立 `overflow-y: auto`，`.admin-main` 通过 `min-height: 0` 和 `overflow: hidden` 约束网格，`.admin-content` 使用 `min-height: 0; overflow: auto` 独立滚动。
+- 响应式边界：小于等于 `980px` 时仍隐藏桌面侧边栏，主内容在视口高度内滚动，底部导航继续固定。
+- 验证方式：`apps/admin-web/src/styles/admin.test.ts` 锁定壳层滚动契约；桌面浏览器滚动后应保持 `window.scrollY = 0`、侧边栏 `top = 0`，只改变 `.admin-content.scrollTop`；移动视口继续由 `.admin-content` 滚动。
+
+## 2026-07-13 公开作品资产使用派生精确读授权
+
+- 背景：资产 ACL 严格执行后，已登记为 `private` 的作品封面和正式资产不能再依赖 generated 前缀匿名读取；但公开作品仍需要允许访客读取它实际展示和运行的资产。
+- 决策：已登记 `asset_object` 继续保持 `private`，新增匿名派生 view `public_work_asset_read_grant`。view 只从 `Published + visible` 作品（`custom-world` 另要求未删除）正式发布快照中收集实际使用的资产，历史作品随 view 计算自动补齐；资产读取 procedure 在同一事务快照内组合 `asset_object` 与该 view，不从连接级长期订阅 cache 判断 ACL。
+- 授权边界：grant 携带作品 owner，API 只有在它与 `asset_object.owner_user_id` 一致，且 `asset_object_id` 或精确 `object_key` 命中时才允许匿名读取。隐藏、删除或取消发布会使 grant 自动消失；参考图、未选中候选图和 `generationInputs` 明确排除。Custom World 只遍历角色、地标、营地、章节和 opening CG 等已知正式根，不能递归 legacy payload 的未知预览 / 编辑字段。
+- 禁止项：不得通过放开 `generated-*` 前缀或批量把历史对象改为 `PublicRead` 修复公开作品，两种方式都会让作品可见性生命周期与资产授权脱节，并重新引入跨账号读取。
+- 影响范围：`module-assets` 公开资产授权判定、`spacetime-module` 跨玩法公开资产 view 与权威读取 procedure、`spacetime-client` facade 和 `api-server` 资产读取 ACL。
+- 权威查询：`asset_object` 不进入 client 长期订阅。API 通过仅 runtime service identity 可调用的 procedure，按主键或 `(bucket, object_key)` 服务端索引读取事务内 metadata；只有位置查询明确返回不存在时才允许进入 legacy curated 前缀兼容，procedure 失败、超时或重复位置一律失败关闭。
+- 一致性：隐藏、删除或取消发布提交后，后续读取 procedure 的事务快照立即按新状态判断，不等待任意池连接追上订阅水位。公开派生授权、`PublicRead` 和 legacy 兼容读取签名 URL 的有效期最多 600 秒，因此该能力仍不是对既有签名的瞬时吊销机制；owner / admin 读取保持原有效期口径。
+- 验证方式：公开可见作品的正式资产可匿名读取；未选候选图、参考图、跨 owner 伪造 key 仍返回不存在；隐藏、删除或取消发布后新的读取请求立即拒绝，再恢复公开可见时新的读取请求立即恢复；超长公开 `expireSeconds` 被截断为 600 秒。
diff --git a/docs/project-memory/shared-memory/pitfalls.md b/docs/project-memory/shared-memory/pitfalls.md
index 70370cf09..7b76e0806 100644
--- a/docs/project-memory/shared-memory/pitfalls.md
+++ b/docs/project-memory/shared-memory/pitfalls.md
@@ -152,11 +152,11 @@
 - 验证：`cargo test -p platform-audio --manifest-path server-rs/Cargo.toml --test vector_engine_audio` 中音效请求体测试必须同时断言 `prompt` 与 `sound`；必要时用线上生成音效 smoke 确认不再出现 `missing field sound`。
 - 关联：`server-rs/crates/platform-audio/src/request.rs`、`server-rs/crates/platform-audio/tests/vector_engine_audio.rs`、`docs/【编辑器】画板音乐生成入口设计-2026-06-18.md`。
 
-## Suno 任务完成不代表已经拿到 wav 下载地址
+## Suno 任务完成或返回 audiopipe 不代表已经拿到稳定下载地址
 
-- 现象：画板生成背景音乐时，前端报 `音频生成尚未返回可下载地址(requestId:...)`；画板生成音效时，前端可能报 `获取 Suno 音效 wav 失败(requestId:...)`。上游任务可能已经完成，但 wav 下载地址还没就绪。
-- 原因：VectorEngine Suno `/suno/fetch/{task_id}` 可能先在 `data` 中返回歌曲 / 音效 clip id，而不是直接返回 `.wav` / `.mp3` URL；需要再调用 `/suno/act/wav/{clipId}` 获取 `wav_file_url`。如果只兼容 `data` 是字符串，会漏掉 `data` 对象 / 数组里的 `id`、`clip_id`、`audioId` 或 `songId`。
-- 处理：`platform-audio` 查询 Suno 结果时先提取直接音频 URL；没有 URL 时，从 `data` 字符串、对象或数组提取 clip id，逐个调用 `/suno/act/wav/{clipId}`。已拿到 clip id 但 wav 地址仍未就绪，或 wav 子请求暂时返回上游错误时，都保持 `processing` 让上层继续轮询，不能直接判定为缺少可下载地址或 wav 获取失败。
+- 现象：画板生成背景音乐时，前端可能报 `音频生成尚未返回可下载地址(requestId:...)`、`获取 Suno 音效 wav 失败(requestId:...)` 或 `读取生成音频内容失败：error decoding response body`。上游任务可能已经完成并返回 `https://audiopipe.suno.ai/?item_id=...`，但该地址仍可能以 `200 + chunked` 开始响应后不返回完整正文。
+- 原因：VectorEngine Suno `/suno/fetch/{task_id}` 可能先在 `data` 中返回歌曲 / 音效 clip id，或返回只携带 `item_id` 的 audiopipe 流式中转地址，而不是稳定 `.wav` / `.mp3` 文件 URL；需要再调用 `/suno/act/wav/{clipId}` 获取实际文件地址。如果只在“完全没有 URL”时回退 wav，会误把 audiopipe 当最终文件并让 worker 在正文读取阶段卡满请求超时。
+- 处理：`platform-audio` 查询 Suno 结果时保留普通直接音频 URL；遇到 audiopipe 时不直接下载，而是从查询结果的 `id` / `clip_id` / `audioId` / `songId` 或 audiopipe `item_id` 提取 clip id，逐个调用 `/suno/act/wav/{clipId}`。已拿到 clip id 但 wav 地址仍未就绪，或 wav 子请求暂时返回上游错误时，都保持 `processing` 让上层继续轮询，不能直接判定为缺少可下载地址或 wav 获取失败。
 - 验证：`cargo test -p platform-audio --manifest-path server-rs/Cargo.toml`；`cargo test -p api-server vector_engine_audio_generation --manifest-path server-rs/Cargo.toml`。
 - 关联：`server-rs/crates/platform-audio/src/client.rs`、`server-rs/crates/platform-audio/src/response.rs`、`docs/【编辑器】画板音乐生成入口设计-2026-06-18.md`。
 
@@ -368,12 +368,12 @@
 - 验证：`npm run test -- src/services/image-editor/editorProjectClient.test.ts src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.test.tsx -- --runInBand`；后端验证至少覆盖 `editor_image_edit_request_omits_price_mud_points` 和 `editor_image_edit_can_complete_by_replacing_target_layer`。
 - 关联：`src/services/image-editor/editorProjectClient.ts`、`src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.ts`、`server-rs/crates/api-server/src/editor_project.rs`。
 
-## 图片画布快速编辑尺寸要区分业务目标和 provider 对齐尺寸
+## 图片画布快速编辑尺寸要区分用户目标和 provider 对齐尺寸
 
 - 现象：原图经过快速编辑后 Resolution 变成近似比例的 1K / 2K 预设；原图或框选标记图宽高不是 16 的倍数时，VectorEngine edits 直接拒绝请求。
 - 原因：前端已有源图精确 `originalWidth/originalHeight`，提交时却按最近常用比例和 K 档重新计算 `size`；后端又把非 16 倍数的目标尺寸和原始参考图字节直接放进 multipart，并以 provider 回图宽高落库和覆盖画布图层。
-- 处理：画布快速编辑提交源图精确尺寸作为业务目标；api-server 只在 provider 边界向右、向下复制边缘像素，把每张参考图和目标尺寸临时补齐到 16 的倍数，收到回图后裁回业务目标尺寸再持久化。若上游异常返回其他尺寸，先按目标比例裁切缩放；临时对齐尺寸不能进入 OSS 元数据、`editor_project_resource`、`editor_asset` 或画布 Resolution。前端 inline 回填也保留源图显示尺寸和 Resolution，避免旧回包再次放大图层。
-- 验证：`npm run test -- src/components/image-editor/ImageCanvasGenerationSubmissionModel.test.ts src/components/image-editor/ImageCanvasGenerationLayerModel.test.ts src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.test.tsx` 覆盖 `1537x1025` 精确提交和源图回填；`cargo test -p api-server editor_image_edit_aligns_provider_images_and_restores_source_dimensions --manifest-path server-rs/Cargo.toml` 覆盖 provider `1552x1040`、额外参考图独立对齐和回图恢复。
+- 处理：画布快速编辑展示与常规图片生成一致的模型、比例和尺寸参数，默认继承来源生成器参数；缺少来源生成器时使用图层模型，并按真实分辨率推导比例和尺寸。用户当前选定的比例和尺寸共同决定业务目标分辨率，允许覆盖源图旧分辨率；api-server 只在 provider 边界向右、向下复制边缘像素，把每张参考图和目标尺寸临时补齐到 16 的倍数，收到回图后裁回业务目标尺寸再持久化。若上游异常返回其他尺寸，先按目标比例裁切缩放；临时对齐尺寸不能进入 OSS 元数据、`editor_project_resource`、`editor_asset` 或画布 Resolution。结果覆盖目标图层时更新原始分辨率，并保持图层中心位置不跳动。
+- 验证：`npm run test -- src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts src/components/image-editor/ImageCanvasQuickEditPanelView.test.tsx src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.test.tsx` 覆盖来源参数继承、模型参数切换、目标尺寸提交和图层回填；`cargo test -p api-server editor_image_edit --manifest-path server-rs/Cargo.toml` 覆盖图标类拒绝、provider 尺寸对齐和回图恢复。
 - 关联：`src/components/image-editor/ImageCanvasGenerationSubmissionModel.ts`、`src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.ts`、`src/components/image-editor/ImageCanvasGenerationLayerModel.ts`、`server-rs/crates/api-server/src/editor_project.rs`。
 
 ## 图片画布快速编辑元数据必须记录原图引用
@@ -2964,8 +2964,8 @@
 
 - 现象：`/not-exist` 已返回 404，但 `/creation/not-exist`、`/runtime/not-exist` 或 `/puzzle/not-exist` 仍返回 200 首页，搜索引擎继续判定为 soft 404。
 - 原因：Nginx 或 Pingora 使用 `/creation/*`、`/runtime/*` 等宽前缀作为 SPA fallback，前端对未知路径又回到平台首页；只验收根级未知 URL 无法发现该问题。
-- 处理：SPA fallback 必须精确匹配当前真实完整路径，同时允许前端已有的大小写归一和尾部斜杠；最终 catch-all 只提供真实静态文件，失败返回 404。路由增删同步三套 Nginx、Pingora、route parity matrix 和路由门禁。
-- 验证：除全部真实 SPA 路径外，至少检查 `/not-exist`、`/creation/not-exist`、`/runtime/not-exist` 和 `/puzzle/not-exist` 均返回 404；维护模式仍保持页面 503 优先语义。
+- 处理：SPA fallback 必须精确匹配当前真实完整路径，同时允许前端已有的大小写归一和尾部斜杠；最终 catch-all 只提供真实静态文件。浏览器 HTML 导航失败时返回品牌 `404.html`，但状态码仍为 404；API、探针和非 HTML 请求保持原有 404 响应。路由增删同步三套 Nginx、Pingora、route parity matrix 和路由门禁。
+- 验证：除全部真实 SPA 路径外，至少检查 `/not-exist`、`/creation/not-exist`、`/runtime/not-exist` 和 `/puzzle/not-exist` 均返回 404；带 `Accept: text/html` 的未知 Web 路径正文命中品牌页，不带 HTML Accept 的请求不得命中品牌页；维护模式仍保持页面 503 优先语义。
 - 关联：`src/routing/appRoutes.tsx`、`src/routing/appPageRoutes.ts`、`deploy/nginx/`、`deploy/container/nginx.conf`、`server-rs/crates/pingora-gateway/src/main.rs`。
 
 ## Jenkins Job UI 参数会被 SCM Jenkinsfile 覆盖
@@ -2991,6 +2991,14 @@
 - 处理：Full 使用 `EXIT_MAINTENANCE_MODE_AFTER_COMPLETION` 表达产品选择，Stdb Publish 和 API Deploy 全程固定保持维护，Web Deploy 成功后才进入独立最终退出阶段；API Deploy 的独立 `KEEP_MAINTENANCE_MODE` 再转换为脚本 `--keep-maintenance-mode`。API deploy 还必须把 `production-api-deploy.sh`、`maintenance-on.sh` 和 `maintenance-off.sh` 从同一 build artifact 复制进 current release，否则 Full 最终阶段即使有选项也找不到随包退出脚本。默认值仍在 Full 结束时退出维护，避免定时 dev 发布行为变化。
 - 验证：API deploy fixture 必须覆盖成功发布并保留 marker，还要断言 current release 中三个部署 / 维护脚本存在；生产运维静态门禁同时反查 Full 参数、下游透传、API Deploy 参数和脚本 flag。推送后用 fail-closed 首阶段运行刷新 live Job 参数，再核对 `config.xml`，不能只看仓库文件。
 
+## 临时维护公告不能提交进版本化默认页
+
+- 现象：现场已恢复通用维护页，但后续 Web Deploy 或下一次进入维护后，又显示昨天的“今天晚上 HH:MM~HH:MM”公告。
+- 原因：`public/maintenance.html` 会被 Vite 复制进 `web.tar.gz`，Web Deploy 解包后把 `/srv/genarrative/web` 指向新制品；临时公告一旦进入该源码，就会成为每次发布都恢复的长期内容。旧维护 on / off 只控制 marker，浏览器缓存不是根因。
+- 处理：版本化默认页只保留无日期通用文案；临时公告用 `maintenance-on.sh --page-file <公告HTML>` 安装到 `/var/lib/genarrative/maintenance/page.html`。Nginx / Pingora 优先读取运行态公告，退出维护时同步清理；不要再原地编辑 `/srv/genarrative/web/maintenance.html` 或提交临时公告到 `public/`。
+- 验证：`npm run check:maintenance-page` 必须拒绝相对日期、具体日期和具体时间，并覆盖公告安装、同窗口保留、退出清理与新窗口清残留；Pingora smoke 必须证明运行态公告优先且删除后回退默认页。
+- 关联：`public/maintenance.html`、`scripts/deploy/maintenance-on.sh`、`scripts/deploy/maintenance-off.sh`、`deploy/nginx/snippets/genarrative-maintenance.conf`、`server-rs/crates/pingora-gateway/src/main.rs`。
+
 ## 遮罩点击关闭必须校验完整指针序列
 
 - 现象：在弹窗内容内按下鼠标，拖到弹窗外的遮罩上松开时，弹窗被误关闭。
@@ -2998,3 +3006,13 @@
 - 处理：共享弹窗统一记录 `pointerdown` 与 `pointerup` 的目标，只有按下和松开都发生在遮罩自身时才允许关闭。新增弹窗优先复用 `UnifiedModal`，不要继续复制只判断最终 `click` 目标的手写遮罩逻辑。
 - 验证：回归测试同时覆盖“弹窗内按下、遮罩松开不关闭”和“遮罩按下、遮罩松开正常关闭”。
 - 关联：`src/components/common/UnifiedModal.tsx`、`src/components/common/UnifiedModal.test.tsx`、`src/components/auth/PlatformAuthModalShell.test.tsx`。
+
+## 公开作品资产不能用 generated 前缀或 PublicRead 批量放行
+
+- 现象：资产 ACL 收紧后，公开页面读取其他作者作品资产集中返回 `404`；对象在 OSS 中真实存在，但已登记 `asset_object.access_policy = private`。
+- 原因：“作品公开”不等于“作者账号下所有 generated 对象永久公开”。只按 profile / session 关联也会误公开同会话的未选候选图、参考图或生成输入；批量改 `PublicRead` 则无法随作品隐藏、删除或取消发布自动撤销。
+- 处理：已登记对象继续保持 `private`，通过 `public_work_asset_read_grant` 只派生 `Published + visible`（`custom-world` 还必须未删除）正式发布快照实际使用资产的匿名读授权。API 必须同时校验 grant owner 与资产 owner 一致，以及 `asset_object_id` 或精确 `object_key` 命中；明确排除参考图、未选候选图和 `generationInputs`。Custom World 只能扫描角色、地标、营地、章节和 opening CG 等正式根，不能遍历 legacy payload 的未知根。历史作品交给 view 现算补齐，不做永久 ACL 数据补丁。
+- 权威查询边界：不能从 `asset_object` 或 `public_work_asset_read_grant` 的连接级订阅 cache 推断当前 ACL；池连接水位不一致会让刚撤销的 grant 继续签发 URL，也会让刚公开的作品短暂 404。资产定位和公开授权必须通过受 runtime service identity 限制的 procedure 在同一事务快照中计算，失败时拒绝读取；同时不要在每个池连接订阅复制全量 private 资产表。公开派生授权、`PublicRead` 和 legacy 兼容读取的签名 URL 最长 600 秒，owner / admin 不受该公开上限影响。
+- Remix 边界：拼图、Custom World 和大鱼现有 Remix 会把源资产引用复制到新 owner，但没有持久化不可伪造的资产来源。不得因此放宽跨 owner grant；源作品隐藏后仍公开的 Remix 资产，需要后续通过 Remix 时复制资产或持久化 provenance 解决。
+- 验证：资产 owner 本人仍可读；公开可见作品的正式资产可匿名读；跨 owner、只命中前缀、参考图、未选候选图和 `generationInputs` 仍返回不存在；作品隐藏、删除或取消发布后 grant 消失。
+- 关联：`server-rs/crates/spacetime-module/src/public_asset_access.rs`、`server-rs/crates/spacetime-client/src/assets.rs`、`server-rs/crates/api-server/src/assets.rs`、`docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md`。
diff --git a/docs/technical/【前端架构】图片画布编辑器MVP接入方案-2026-06-11.md b/docs/technical/【前端架构】图片画布编辑器MVP接入方案-2026-06-11.md
index ebff57a16..7f4bc6fef 100644
--- a/docs/technical/【前端架构】图片画布编辑器MVP接入方案-2026-06-11.md
+++ b/docs/technical/【前端架构】图片画布编辑器MVP接入方案-2026-06-11.md
@@ -22,6 +22,7 @@
 - 对生成资源执行重绘时，在右侧创建新的生成结果图层，并自动调整视图显示原图和新图；重绘面板不因提交成功自动关闭，便于连续改提示词。重绘 / 改造输入框只允许从 `generationInputs.fields` 中恢复用户可见输入快照，例如普通生成提示词、视频描述、音效 `prompt`、背景音乐 `gpt_description_prompt`、角色设定、UI 用户输入、图标素材描述、规范表单和宣发素材字段；禁止回退展示资源 `prompt` / `actualPrompt` 中的后端拼接 Prompt、固定生成模板或模型默认提示词。没有用户输入快照的旧图层打开改造时保持空输入，等待用户重新填写。
 - 图片生成 / 修改统一经 api-server BFF 接入 VectorEngine。普通生成、生成规范和重绘保留既有 `gpt-image-2` 路径；图片快速编辑统一打开框选区域 + 单提示词 + 模型选择面板，默认沿用原图模型，不展示参考图或比例 / 尺寸控件；其中生成规范类图片固定 `16:9`、`2K`、`gpt-image-2`，面板底部用与可编辑面板一致的比例 / 尺寸 / 模型胶囊按钮展示固定参数，但按钮为禁用态，不允许在该面板改比例、尺寸或模型。`生成角色形象` 与 `生成图标素材` 支持 `nanobanana2`（`gemini-3.1-flash-image-preview`）和 `gpt-image-2`，默认 `nanobanana2`，并在两类面板之间沿用用户上次选择的模型；两类面板不展示抠图背景色或抠图模型选择；前端用户路径固定提交 `screenColor=auto` 和 `segModel=birefnet`，由后端自动决策具体抠图背景色，`anime-seg` 作为内部保留能力不在用户界面暴露。`nanobanana2` 走 `/v1beta/models/{model}:generateContent`，请求体写入 `generationConfig.imageConfig.aspectRatio/imageSize`；`gpt-image-2` 走 `/v1/images/generations` 或 `/v1/images/edits`，请求体按 VectorEngine 文档映射 `size`。宣发素材三个工作流（游戏首图、详情五图、运营海报）固定使用 `gpt-image-2`，面板模型胶囊为禁用态，不提供 `nanobanana2` 入口；前端按 workflow 同时提交 `outputSize`、`aspectRatio` 和 `imageSize`，其中游戏首图为 `720x540 / 4:3`、详情单图为 `720x1280 / 9:16`、运营海报为 `1280x720 / 16:9`；后端收到 `kind: "publication-material"` 时也强制归一为 `gpt-image-2` 生成和计费，生成回填图层优先使用生成占位的 `originalWidth/originalHeight`，即使上游回包尺寸漂移也不得把宣发素材卡片变成随机 `1:1` 或 `4:3`。纯文本生成走 `/api/editor/images/generations`，重绘在前端读入当前图层图片 Data URL 后走同一图片生成 BFF，并在原图右侧生成一张新图；普通图层重绘作为 `quick-edit` 参考图提交，角色图层重绘必须按 `kind: "character"` 提交，继续套用角色生成器提示词限定、透明 PNG 后处理和角色资产持久化。`生成视频` 走 `/api/editor/videos/generations`，前端模型入口仅展示 Seedance 2.0 Fast / Seedance 2.0 / Kling 3.0 / Kling 3.0 Omni，不展示 Veo 入口，默认 Seedance 2.0 Fast；视频参数按当前正式面板支持的比例、时长、清晰度和声音开关提交，且 Seedance Fast 与 Seedance 标准版必须按各自真实模型 ID 独立映射，不得混用。生成结果以视频图层加入画布。纯文本生成入口采用 Lovart 式画布内占位图 + 锚定生成输入框：点击生成图片后以当前视口世界中心为目标，经统一 placement 避让后创建选中的灰色占位框，输入框跟随占位框显示；待生成、生成中和失败后保留的占位图都必须继续支持拖动，生成完成时真实生成图或视频落在最新占位框位置，输入框继续跟随新生成图层；占位图失焦时隐藏高亮边框、左上角生成器名称和右上角原始尺寸，重新聚焦时再显示，且名称 / 尺寸在画布缩小时按 viewport 反向缩放保持屏幕尺寸稳定；点击所有图片 / 视频生成入口并确认请求开始后，必须隐藏对应设置面板，只保留画布内占位图或原图预览，并在预览上显示 Lovart 式生成中遮罩，避免“面板仍占屏”或“预览一起消失”。图片快速编辑和重绘在调用图片 BFF 前必须把当前图层图片源读取为图片 Data URL；视频素材快速编辑走视频生成 BFF，不允许走图片模型；角色动作的 `生成动画` 仍固定使用 `seedance2.0-fast` 动作 / 视频模型，角色动作素材的 `快速编辑` 按当前帧图片走图片编辑。前端不持有 provider 密钥；上游失败或配置缺失时恢复当前生成设置面板展示失败，不创建 mock 成功图。
 - 图片画布抠图分两类：手动去除背景面向用户任意图片，走登录态同源 BFF `POST /api/editor/images/background-removals` 并转发远端 BiRefNet；编辑器自己生成的标准纯色背景抠图资产在保存源图后统一调用独立 BgFilter 服务 `GENARRATIVE_EDITOR_BGFILTER_BASE_URL/remove-background`，默认 `http://58.87.105.82/bgfilter/remove-background`，默认请求超时 `180000ms`（BgFilter CPU 推理）。角色形象生成、图标 spritesheet 生成和 UI 设计图素材提取的前端用户路径都固定把 `screenColor=auto` 注入请求体，但用户可见 `generationInputs.fields` 不再记录 `抠图背景色` 或 `抠图模型`；api-server 在组装 prompt 前调用背景决策模块，从 12 个候选色中选择具体 hex，最多重试 3 次，失败后兜底 `#CFEFFF`。后端仍保留手动 hex 解析能力供内部兼容。最终生图 prompt 和 BgFilter `screen_color` multipart 字段只接收解析后的具体 hex，不透传 `auto`。三条 BgFilter 路径还必须固定把默认 `segModel=birefnet` 传为 `seg_model`；后端仍保留识别 `anime-seg` 的内部兼容能力，但前端用户入口不展示也不提交该值。这里的 `birefnet` 只是 BgFilter 管线内部后端，不等同于手动去背景的独立 BiRefNet 服务。后端在调用 BgFilter 前必须先把带纯色背景 / 绿幕源图写入 OSS；BgFilter 请求失败、返回非成功状态、空图片或非法图片时，以及连续失败达到 `GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_FAILURE_THRESHOLD=3` 后的 `GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_COOLDOWN_SECONDS=300` 秒熔断期，api-server 都先调用阿里云通用抠图，只有阿里云失败才用本地 `editor_green_screen` 按同一 `screenColor` 兜底去背。角色动作生成的序列帧背景色已与生图统一：前端固定提交 `screenColor=auto`，后端视觉决策出具体 hex 并把源角色图合成到该背景色后再图生视频；抽帧后逐帧优先阿里云通用抠图，失败降级本地 `editor_green_screen`（按选定背景色，而非固定 `#00FF00`）。BiRefNet 手动去背景服务地址为 `GENARRATIVE_EDITOR_BACKGROUND_REMOVAL_BASE_URL/remove-background`，默认 `http://58.87.105.82/remove-background`；BgFilter 可选访问令牌来自 `GENARRATIVE_EDITOR_BGFILTER_TOKEN`，未配置时复用 `GENARRATIVE_EDITOR_BACKGROUND_REMOVAL_TOKEN`，所有令牌都只在服务端注入，前端不持有令牌。api-server 对上游结果做响应字节和图片尺寸上限保护，并先落 OSS / asset object，再返回 `imageSrc/objectKey/assetObjectId/taskId`；queue 模式下手动去背景进入 SpacetimeDB 外部生成队列，画布任务侧栏只展示服务器任务阶段，生成中才显示耗时，不显示百分比；有项目上下文时前端同时创建去背景生成占位并把 `canvasCompletion` 交给后端，完成后由后端写入结果图层和最新项目快照。
+- 多产物生成以后端项目快照为唯一画布真相：同一任务的原始产物、抠图 / 透明化结果和拆分结果都要先登记为 `editor_project_resource`，再通过一次 `canvasCompletion` 原子写入画布。角色形象、图标 spritesheet 和 UI 素材提取的纯色背景原图不能只留在 OSS；透明后处理结果保持主图层和 `generatedLayerId` 锚点，原图及其它附属产物从主结果右侧开始错开放置。无项目上下文时不创建项目资源或画布图层。
 - 图片快速编辑面板只保留一个提示词输入框和模型选择，不展示额外参考图或比例 / 尺寸控件；原图 / 原素材作为 `/api/editor/images/edits` 的 `sourceImageSrc` 直接提交，不作为 `referenceImageSrcs`。打开快速编辑时画布必须自动平移缩放，让原素材完整落在可视区上半部分，底部面板固定出现在素材下方且不遮挡内容，竖屏 UI 素材也必须完整展示。快速编辑右侧显示矩形、椭圆、画笔框选工具，但进入时不默认启用；点击工具后显示选中态，再点同一工具取消启用。完成框选后，画布红色细框显示连续序号，提示词可按这些编号填写每个区域怎么改。点击 `修改` 后仍停留在当前快速编辑面板显示修改中，不创建独立 `Quick Edit Generator` 画布占位；生成成功后直接用结果覆盖原图图层，失败时保留当前面板并显示错误。
 - 底部生成类按钮每次点击都必须创建独立的画布生成对象；新建规范、角色形象或图标素材时，只切换当前编辑面板，不得销毁此前尚未生成或已生成后的其它生成对象状态。归档为非当前编辑对象的生成占位仍可拖动、删除和等待异步完成，完成 / 失败回写必须按生成对象 ID 读取最新占位状态，不能使用提交瞬间的旧快照。
 - 画布右上角提供自动隐藏任务侧栏。列表为空且侧栏关闭时只保留图标开关；生成或去背景任务进入时默认打开；用户可手动切换开关状态。
@@ -55,6 +56,7 @@
 - 登录态上传和生成结果必须先落 OSS / asset object，再向 `editor_project_resource` / `editor_asset` 写入轻量 `imageSrc: "/<objectKey>"`、`objectKey` 和 `assetObjectId`；未登录演示态可以在内存里使用 Data URL 预览，但项目、素材库、项目资源和 `editor_canvas.layers_json` 不得写入 `data:image/*`、`data:video/*`、`data:audio/*` 或 `blob:`。旧数据读取时如果已有 `objectKey`，`imageSrc` 归一成 `/<objectKey>`；没有 `objectKey` 的旧 Data URL 需要走修复上传并回写轻量引用。裁扩在项目上下文中虽然由前端 canvas 本地渲染 PNG，也必须先上传 OSS / asset object 并创建 `editor_project_resource`，再把带正式 `resourceId/objectKey/assetObjectId` 的裁扩图层加入画布；不能先把 `local-resource-*` + Data URL 图层交给项目保存或后续去背景。上传到生成面板参考图槽位的图片必须先创建 `editor_project_resource` 行；没有当前工程 ID 时才创建账号级 `editor_asset` 行，随后把对应 `resourceId` 或 `assetId` 写入参考图临时状态，生成请求仍使用临时状态中的图片源或 `objectKey`。
 - 资源表保存资源和素材级元数据；图层位置、层级、分组选中所需 ID 和 groupId 保存在 `editor_canvas` 的布局 JSON。布局 JSON 是混合数组：普通图层按 `layerId/resourceId` 保存，生成器占位和生成器对话框按 `itemType: "generation-dialog"` 保存，不新增单独表。普通图层的新保存不再把 `assetKind/generationInputs` 写入布局 JSON；刷新时优先从 `editor_project_resource` 恢复，旧布局中的同名字段只作为兼容兜底。生成器快照必须包含生成器 ID、模式、提示词、参数、参考图、状态、占位框位置和可选 `generatedLayerId`；角色、图标等纯色抠图生成器的前端用户路径不保存或恢复 `screenColor` / `segModel`，同源重绘也不再从 `generationInputs.fields` 恢复 `抠图背景色` 或 `抠图模型`；宣发素材生成器还必须保存并恢复 `publicationWorkflowId`、`publicationGameInfo` 和 `publicationReferences`，避免刷新后生成卡片字段或参考图丢失。生成器快照中的参考图同样只保存 `resourceId/sourceAssetId` 行引用和展示所需 label，不保存图片 Data URL、signed URL 或 `objectKey`；刷新时用 `editor_project_resource` / `editor_asset` 行恢复临时生成请求所需图片源。生成成功后仍保存该快照，只是渲染时由 `generatedLayerId` 锚定到成品图层而不重复显示灰色占位框。`generationInputs.references` 是用户可见输入快照中的行级索引，只允许保存 `{ title, label, refType, refId }`；生成接口所需的图片 Data URL、signed URL 或 `objectKey` 只存在于提交前的临时参考图状态和请求体字段，不进入资源 / 素材元数据。图层展示尺寸不再作为独立 `Size` 真相保存，刷新与新建图层均按 `Resolution`（`originalWidth/originalHeight`）原分辨率显示。图层组第一版是画布内布局语义，不单独建表。
 - 图片类、生成视频和音频结果除作为 `editor_project_resource` 和画布图层保存外，还要写入账号级 `editor_asset` 素材库；该写入由生成 BFF 在请求携带 `assetFolderId` 时完成。`GENARRATIVE_EXTERNAL_GENERATION_MODE=queue` 下，画布图片、改图、图标素材、UI 素材提取、角色动作、视频、音效和背景音乐生成都先返回 `queueState`，前端轮询 `/api/runtime/external-generation/jobs/{jobId}` 到完成后重新读取项目快照；`inline` 或无项目上下文时才使用响应中的 resource / asset 快照做本地落画布兜底，不再把同一生成结果二次调用素材创建接口。生成请求失败、inline 完成或 queue 任务终态完成 / 失败后，右上角泥点 chip 必须通过 `/profile/dashboard` 回读余额，不做本地乐观扣减。生成视频会单独抽取首帧封面并写入 `thumbnailSrc`，素材栏和拖回画布时沿用该封面作为 poster。
+- 生成面板的资源命名统一写入可选 `assetLabel`，最大 80 字符并在提交时 trim。留空时提交模型保留原有自动编号；非空时同一个名称必须贯穿 `assetLabel`、`canvasCompletion.title`、项目资源、账号素材和本地兜底图层，刷新后不得退回模板名。图标图集与角色动作请求同样支持该字段，中间原图使用主名称加固定后缀，拆分素材继续按素材描述命名。
 - 画布 Agent 会话按“SpacetimeDB 元数据 + OSS 消息正文”存储：`editor_agent_conversation` 只保存 `conversationId/projectId/ownerUserId/title/messagesObjectKey/deleted/createdAt/updatedAt` 等会话元数据；消息正文整体保存为私有 OSS JSON 文档 `editor-agent/{conversationId}.json`。消息文档单对象上限为 2 MiB，同一会话的消息追加和 SSE 最终写回由 api-server 按 `conversationId` 串行化，避免“读 OSS → 改消息 → 写 OSS”并发覆盖。前端只通过 api-server BFF 读取和发送会话，不直接读写 SpacetimeDB，也不直接读写 OSS。
 - Agent 消息附件只允许引用当前工程画布资源或账号素材库图片，来源类型为 `canvas_resource` / `library_asset`，最多 9 张。附件请求可携带展示用 `imageSrc/thumbnailSrc/objectKey/width/height/label`，但持久化真相仍以后端校验后的 resource / asset 行和 OSS 对象为准；不得把 Data URL、signed URL 或 blob URL 当作会话长期事实。
 - 前端不直接订阅 SpacetimeDB，统一通过 api-server 的 `/api/editor/projects*` BFF 读写。
diff --git a/docs/technical/【开发运维】Pingora独立网关试点-2026-06-11.md b/docs/technical/【开发运维】Pingora独立网关试点-2026-06-11.md
index 7a11eb150..9077b7003 100644
--- a/docs/technical/【开发运维】Pingora独立网关试点-2026-06-11.md
+++ b/docs/technical/【开发运维】Pingora独立网关试点-2026-06-11.md
@@ -545,7 +545,7 @@ dev 根盘空间在安装后曾接近满盘；2026-06-17 进入 canary 前已清
 | 主站 SPA allowlist                                                                        | 只对当前前端完整路由及兼容恢复路径 `/creation/rpg/agent` 失败回退 `/index.html`；匹配大小写不敏感并允许一个尾部斜杠，HTML 默认 `no-cache`。 |
 | 其它 Web 路径                                                                             | 只读取真实静态文件或目录 index，缺失时返回真实 404；`/creation/not-exist`、`/runtime/not-exist`、`/puzzle/not-exist` 不进入 SPA fallback。 |
 
-维护模式下，公网 API-like 路由返回 JSON `503`，公网 Web 静态路由优先返回 `maintenance.html`，不存在时返回纯文本 `503`。IPv4 loopback / RFC1918 / link-local 和 IPv6 loopback / ULA / link-local 来源绕过整站维护闸，主站页面与静态资源、普通 API、后台页面与后台 API、SpacetimeDB 路由均按非维护状态继续处理；应用层登录、管理员鉴权和其它业务鉴权保持不变。Pingora 直连按 TCP peer 判定来源；仅当 peer 是 loopback 的同机 Nginx 时才接受 Nginx 强制覆盖的 `X-Real-IP`，绝不使用客户端可伪造的 `X-Forwarded-For` 做维护放行。该放行只绕过网关维护响应；若 `pause-after-stdb` 已停止 api-server，内网普通 API 和后台 API 仍不可用。
+维护模式下，公网 API-like 路由返回 JSON `503`；公网 Web 静态路由先读取 `GENARRATIVE_PINGORA_GATEWAY_MAINTENANCE_PAGE_FILE` 指向的 release 外运行态公告，缺失时回退 `GENARRATIVE_PINGORA_GATEWAY_WEB_ROOT/maintenance.html`，两者都不存在时返回纯文本 `503`。版本化默认页不得包含日期或具体时段，临时公告由 `maintenance-on.sh --page-file` 安装并在 `maintenance-off.sh` 时清理。IPv4 loopback / RFC1918 / link-local 和 IPv6 loopback / ULA / link-local 来源绕过整站维护闸，主站页面与静态资源、普通 API、后台页面与后台 API、SpacetimeDB 路由均按非维护状态继续处理；应用层登录、管理员鉴权和其它业务鉴权保持不变。Pingora 直连按 TCP peer 判定来源；仅当 peer 是 loopback 的同机 Nginx 时才接受 Nginx 强制覆盖的 `X-Real-IP`，绝不使用客户端可伪造的 `X-Forwarded-For` 做维护放行。该放行只绕过网关维护响应；若 `pause-after-stdb` 已停止 api-server，内网普通 API 和后台 API 仍不可用。
 代理失败时，API / SpacetimeDB 等代理路由返回统一 JSON 网关错误；本地静态路由仍保持对应 HTTP 错误状态。
 静态 `Range` 只支持单段 bytes range；多段 range 暂按完整文件返回，避免在正式替换前引入 multipart 响应面。`If-None-Match` / `If-Modified-Since` 优先于 `Range` 判定，命中时仍返回 `304`；`If-Range` 日期匹配时继续返回 `206`，日期旧于文件或弱 ETag 校验器时回完整 `200`；`206` / `304` / `416` 不做 gzip 压缩，避免 `Content-Range` 语义被响应体改写破坏。Gateway smoke 会用固定 `X-Request-Id` 对账静态 `304`、`405`、`206`、`416` 的 Pingora access log 行，确认本地响应状态也进入正式切换证据链。
 静态路由只允许 `GET` / `HEAD` 读取；其它方法在确认命中静态候选后返回 `405` 并写入 `Allow: GET, HEAD`，缺失文件仍返回 `404`，避免直连后错误客户端把静态入口当作可写接口。
diff --git a/docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md b/docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md
index 42818aef7..58253180e 100644
--- a/docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md
+++ b/docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md
@@ -58,7 +58,7 @@ npm run check:server-rs-ddd
 - 认证与账号：`/api/auth/*`、`/api/profile/me`，包括短信、密码、微信、refresh session、多端会话和登出。
 - 个人中心：`/api/profile/*`，包括钱包流水、任务、领奖、充值、反馈、邀请和兑换等账号侧能力。
 - 平台基础能力：`/api/llm/*`、`/api/speech/volcengine/*`，只保留通用 LLM 和语音代理。
-- 资产基础能力：`/api/assets/direct-upload-tickets`、`/api/assets/sts-upload-credentials`、`/api/assets/objects/*`、`/api/assets/read-url`、`/api/assets/read-bytes`，负责直传、确认、绑定和读取。两个读取入口共用同一授权函数，并先按配置 bucket 与精确 key 查询 `asset_object`：一旦存在 metadata，即使 key 命中 legacy 前缀，也必须按 `PublicRead` 或当前登录 owner 授权；只有同 bucket / key 未登记 metadata 的历史对象，才允许显式 `legacyPublicPath` 命中 `platform_oss::LEGACY_PUBLIC_PREFIXES` curated 白名单后匿名兼容。任意未登记 `objectKey`、跨 owner 和匿名私有读取统一返回不存在，`read-bytes` 不得成为绕过 `read-url` 授权的同源代理。
+- 资产基础能力：`/api/assets/direct-upload-tickets`、`/api/assets/sts-upload-credentials`、`/api/assets/objects/*`、`/api/assets/read-url`、`/api/assets/read-bytes`，负责直传、确认、绑定和读取。两个读取入口共用同一授权函数，并通过受 runtime service identity 限制的 procedure 在同一事务快照内按配置 bucket 与精确 key 权威查询 `asset_object`、计算 `public_work_asset_read_grant`；不得把任意连接的订阅 cache miss 或命中解释为当前授权真相。一旦存在 metadata，即使 key 命中 legacy 前缀，也必须按 `PublicRead`、当前登录 owner，或同 owner 的公开作品派生授权精确读取；只有同 bucket / key 的权威查询确认未登记时，才允许显式 `legacyPublicPath` 命中 `platform_oss::LEGACY_PUBLIC_PREFIXES` curated 白名单后匿名兼容。已登记资产继续保持 `private`，公开作品只获得与正式发布快照生命周期一致的派生读授权，不得批量改为 `PublicRead` 或放开 `generated-*` 前缀。任意未登记 `objectKey`、跨 owner 和未获授权的匿名私有读取统一返回不存在，`read-bytes` 不得成为绕过 `read-url` 授权的同源代理；公开派生授权、`PublicRead` 和 legacy 兼容读取签发的 URL 统一限制为最长 600 秒，owner / admin 读取保持原有有效期口径。
 - 外部 OpenAPI：`/api/external/v1/openapi.json`、`/api/external/v1/assets/direct-upload-tickets`、`/api/external/v1/assets/objects/confirm`、`/api/external/v1/assets/read-url`、`/api/external/v1/editor/*`，使用 Bearer API Key 鉴权；API Key 管理仍在登录态 `/api/profile/api-keys`，不进入外部 OpenAPI JSON。主站和 External 的 asset object confirm 都必须从已认证主体派生 owner，不能信任请求体 owner；同 bucket / key 已登记后不得改变 owner。
 - 创作 / 游玩支撑能力：`/api/creation-entry/config`、`/api/ai/tasks*`、`/api/runtime/frontend-config`、`/api/runtime/chat/*`、`/api/runtime/settings`、`/api/runtime/save/snapshot`、`/api/profile/browse-history`、`/api/profile/save-archives*`、`/api/profile/play-stats`、`/api/assets/history`、`/api/assets/character-visual/*`、`/api/assets/character-animation/*`、`/api/assets/character-workflow-cache*`、`/api/assets/hyper3d/*`、`/api/runtime/custom-world/asset-studio/*`、`/api/editor/projects*`、`/api/editor/projects/{projectId}/agent-conversations`、`/api/editor/agent-conversations/{conversationId}*`。`/api/runtime/frontend-config` 由 `api-server` 从运行时环境变量下发非敏感 UI 开关；画板右侧 Agent 入口由 `GENARRATIVE_ENABLE_IMAGE_EDITOR_AGENT_SIDEBAR` 控制，默认关闭，前端不再读取 `VITE_*` 构建期变量决定生产显示。`/api/runtime/custom-world/asset-studio/*` 解析默认角色形象 / 动作提示词时可以在 OSS 缓存不可用或未配置时按无缓存返回默认提示；保存 workflow 缓存和真实素材读写仍必须要求 OSS 正常可用。
 - 后台入口配置：`/admin/api/creation-entry/config`、`/admin/api/creation-entry/config/banners` 和 `/admin/api/creation-entry/config/interactions`。
@@ -172,7 +172,7 @@ npm run check:server-rs-ddd
 4. 删除字段、改名、重排字段、改类型或修改字段属性前，必须先询问用户并确认迁移计划。
 5. Vec 字段不要直接写无法 const 求值的 default；需要默认空集合时优先使用 `Option<Vec<T>>` 加 `#[default(None::<Vec<T>>)]`，业务层归一为空数组。
 6. 运行态读表必须按已声明索引访问。只要 table 上存在覆盖查询前缀的 `#[index(...)]` 或主键 / unique accessor，列表、详情、快照组装和计数都先用对应 accessor `.filter(...)` / `.find(...)`，再在内存中处理索引无法覆盖的残余条件；不得用 `.iter().filter(...)` 扫整表替代现成索引。
-7. 面向公开列表的只读投影优先做成 public view / public 读模型表，并由 `api-server` 的 `spacetime-client` 长期订阅后读本地 cache。跨玩法公开作品统一主读模型是 `public_work_gallery_entry` 和 `public_work_detail_entry`；各玩法既有 `*_gallery_card_view` / `*_gallery_view` / `custom_world_gallery_entry` 保留为 source view 和兼容路径。短期不把作品列表整体交给浏览器前端直接订阅；不要让 HTTP 列表接口每次请求都调用 procedure 重新组装全量列表。需要请求时间窗口的轻量统计可订阅 `public_work_play_daily_stat` 后在 `api-server` 本地聚合，需要写入副作用的详情、点赞、游玩记录仍走玩法 procedure / reducer。前端不得直接订阅 `puzzle_work_profile`、`custom_world_profile` 等领域源表，也不得自己做 join、聚合或权限逻辑。首屏、排序、字段归一、权限降级和 HTTP fallback 由 `api-server` BFF 维持。
+7. 面向公开列表的只读投影优先做成 public view / public 读模型表，并由 `api-server` 的 `spacetime-client` 长期订阅后读本地 cache。跨玩法公开作品统一主读模型是 `public_work_gallery_entry` 和 `public_work_detail_entry`；公开作品资产读取授权投影是 `public_work_asset_read_grant`；各玩法既有 `*_gallery_card_view` / `*_gallery_view` / `custom_world_gallery_entry` 保留为 source view 和兼容路径。短期不把作品列表整体交给浏览器前端直接订阅；不要让 HTTP 列表接口每次请求都调用 procedure 重新组装全量列表。需要请求时间窗口的轻量统计可订阅 `public_work_play_daily_stat` 后在 `api-server` 本地聚合，需要写入副作用的详情、点赞、游玩记录仍走玩法 procedure / reducer。前端不得直接订阅 `puzzle_work_profile`、`custom_world_profile` 等领域源表，也不得自己做 join、聚合或权限逻辑。首屏、排序、字段归一、权限降级和 HTTP fallback 由 `api-server` BFF 维持。
 8. 多列索引按 SpacetimeDB 绑定生成的元组参数直接传入，例如 `.filter((source_type, profile_id, played_day))`；前缀查询只传前缀元组，例如 `.filter((scope_kind, scope_id.as_str()))`。不要为了绕过类型问题退回整表遍历。
 9. procedure result 必须返回 typed snapshot / typed value。`spacetime-client` mapper 不得再通过 `row_json/session_json/work_json/items_json/run_json/event_json/feedback_json: Option<String>` 做跨层 JSON 字符串传输，也不得在 mapper 里反序列化旧 `*JsonRecord` 兼容结构。业务内部持久化字段如 `profile_payload_json`、`levels_json` 等不属于 procedure result 载荷例外，仍按各自表契约处理。
 10. 修改后运行：
@@ -270,13 +270,13 @@ npm run check:server-rs-ddd
 - Rust 结构体：`ExternalGenerationJob`
 - 源码：`server-rs/crates/spacetime-module/src/external_generation.rs`
 - 用途：外部生成 worker 的内部持久任务队列；`GENARRATIVE_EXTERNAL_GENERATION_MODE=queue` 时，`api-server` HTTP 角色只入队，`external-generation-worker` 角色通过 claim lease 领取、续租、执行，并用 `lease_token` 栅栏回写完成 / 失败。队列行继续保存 worker 执行、计费与滚动发布兼容所需字段，但用户可见任务列表、价格、状态、未确认终态数量和通知确认时间的正式读取事实源已经迁到 `external_generation_job_summary`；BFF 不得再为列表 / 详情 / acknowledge 读取该大表。拼图 `compile_puzzle_draft` 的前置 `compile_puzzle_agent_draft`、`generate_puzzle_images` 与 `generate_puzzle_ui_background` 的业务写回也在对应 SpacetimeDB transaction 内校验 `job_id + worker_id + lease_token`、job kind、owner 和 source entity，避免过期 worker 写 session / work profile；图片画布编辑器的 `editor_image_generation`、`editor_image_edit`、`editor_background_removal`、`editor_icon_spritesheet_generation`、`editor_ui_design_asset_extraction`、`editor_character_animation_generation`、`editor_video_generation`、`editor_sound_effect_generation` 和 `editor_background_music_generation` 复用同一队列表，worker 成功后经 `api-server` facade 写入 `editor_project_resource` / `editor_asset` / `editor_canvas.layers_json`，前端只通过 BFF job 状态轮询和项目快照读取恢复完成态。`GENARRATIVE_EXTERNAL_GENERATION_MODE=inline` 时不创建该队列行，三个 external generation guard 字段必须同时为空才允许 api-server 受控同步写回，半空 guard 仍会拒绝。worker 成功写回业务事实后才能 complete job；业务失败态写回成功后才能 fail job，失败态未写回时保留租约等待后续重领。
-- 载荷约束：本次先对 `source_module = editor-canvas` 的 `request_payload_json` / `result_payload_json` 实施有限大小合法 JSON、任意层级禁止 `data:` / `blob:` 的双层门禁，只保存 worker 执行必需的普通参数和已登记媒体引用；其它玩法在完成各自参考图资源化之前不由本次门禁静默改变既有请求契约。该主表只供 worker claim / 执行和受控维护读取；正式用户任务列表、单任务状态、队列概览与 acknowledge 不得再返回或解析这两个 payload。
+- 载荷约束：本次先对 `source_module = editor-canvas` 的 `request_payload_json` / `result_payload_json` 实施有限大小合法 JSON、任意层级禁止 `data:` / `blob:` 的双层门禁，只保存 worker 执行必需的普通参数和已登记媒体引用；图标图集生成和 UI 素材提取成功但自动拆分降级时，worker 的 `result_payload_json` 只额外保存有界的 `warning.code/reason`，不保存 spritesheet、切片列表或媒体 URL。其它玩法在完成各自参考图资源化之前不由本次门禁静默改变既有请求契约。该主表只供 worker claim / 执行和受控维护读取；正式用户任务列表、单任务状态、队列概览与 acknowledge 不得再返回或解析这两个 payload。
 
 ### `external_generation_job_summary`
 
 - Rust 结构体：`ExternalGenerationJobSummary`
 - 源码：`server-rs/crates/spacetime-module/src/external_generation.rs`
-- 用途：外部生成正式任务列表的轻量投影，按 `job_id` 保存 owner、来源、状态、价格、有界错误摘要、通知确认时间、各阶段时间和入队时提取的 `request_prompt`，不包含 request/result payload、worker lease 或 dedupe 内部字段。错误摘要统一拒绝内联媒体并限制为 2048 字符；列表在单次 owner 扫描中同时计数并只保留请求 limit 的固定大小 top-N，不得先收集全量历史再截断。enqueue、claim、renew、complete、fail 事务同步投影；acknowledge 只更新该轻量表并写审计事件，后续主任务同步必须保留已有确认时间，禁止为了写确认时间加载 / 重写大 payload 行。BFF 的列表、状态和确认只调用 summary procedure。历史终态任务由迁移操作员的游标分批 maintenance procedure 在压缩 payload 时同步回填摘要，正式列表不得为兼容旧数据回扫完整主表。
+- 用途：外部生成正式任务列表的轻量投影，按 `job_id` 保存 owner、来源、状态、价格、有界错误摘要、有界非阻断告警 `warning_message`、通知确认时间、各阶段时间和入队时提取的 `request_prompt`，不包含 request/result payload、worker lease 或 dedupe 内部字段。错误与告警摘要都不复制内联媒体并限制为 2048 字符；`warning_message` 由完成任务的轻量 `result_payload_json.warning.reason` 提取，complete 和历史 backfill 共用同一构建路径。列表在单次 owner 扫描中同时计数并只保留请求 limit 的固定大小 top-N，不得先收集全量历史再截断。enqueue、claim、renew、complete、fail 事务同步投影；acknowledge 只更新该轻量表并写审计事件，后续主任务同步必须保留已有确认时间，禁止为了写确认时间加载 / 重写大 payload 行。BFF 的列表、状态和确认只调用 summary procedure。历史终态任务由迁移操作员的游标分批 maintenance procedure 在压缩 payload 时同步回填摘要，正式列表不得为兼容旧数据回扫完整主表。
 - 正式读取 procedure 为 `get_external_generation_job_summary_and_return`、`list_external_generation_job_summaries_and_return` 和 `acknowledge_external_generation_job_summaries_and_return`。历史维护 procedure 为 `compact_external_generation_job_payloads_and_return` 与 `backfill_external_generation_job_summaries_and_return`，仅 migration operator 可调用；运维入口统一使用 `npm run spacetime:external-generation:maintain -- ...`，默认 dry-run、单批最多 25 条。B-tree cursor 选择阶段最多反序列化 `limit + 1` 行，apply 再按主键逐条读取选中行；怀疑存在单行异常巨型 JSON 时必须先使用 `--limit 1`。payload 压缩额外固定使用 `source_module = editor-canvas` 的复合 cursor 索引，不得静默改写其它玩法历史任务。
 
 ### `external_generation_job_event`
@@ -309,7 +309,14 @@ npm run check:server-rs-ddd
 
 - Rust 结构体：`AssetObject`
 - 源码：`server-rs/crates/spacetime-module/src/asset_metadata/objects.rs`
-- 说明：对象 metadata 以 bucket / key 标识正式对象及其 owner、访问策略。确认接口的 owner 必须来自登录会话或 External API Key 绑定的认证主体，不接受请求体指定 owner；同 bucket / key 首次登记后，重复 confirm 不得改变 owner。资产读取必须先查询同 bucket / key metadata，存在时严格执行 `PublicRead` / owner ACL；只有 metadata 不存在的历史对象才能进入 curated legacy 白名单兼容。
+- 说明：对象 metadata 以 bucket / key 标识正式对象及其 owner、访问策略。确认接口的 owner 必须来自登录会话或 External API Key 绑定的认证主体，不接受请求体指定 owner；同 bucket / key 首次登记后，重复 confirm 不得改变 owner。已登记对象默认并继续保持 `private`。API 通过 `get_asset_object_by_location_and_return` / `get_asset_object_by_id_and_return` 在服务端索引上权威查询 private table；资产读取 ACL 使用 `get_asset_read_access_by_location_and_return` 在同一事务快照内同时返回位置查询与公开作品派生授权，procedure 只允许 runtime service identity 调用。`spacetime-client` 不订阅全量 `asset_object`，也不把公开资产授权 view 的连接级 cache 当成安全判断。位置查询发现重复 bucket / key 时失败关闭，不能任选一条继续授权。只有权威位置查询返回不存在的历史对象才能进入 curated legacy 白名单兼容。
+
+### SpacetimeDB view：`public_work_asset_read_grant`
+
+- Rust view：`public_work_asset_read_grant`
+- 返回类型：`Vec<PublicWorkAssetReadGrant>`
+- 源码：`server-rs/crates/spacetime-module/src/public_asset_access.rs`
+- 说明：匿名公开派生授权投影，仅从 `Published + visible` 作品（`custom-world` 还必须满足未删除）的正式发布快照收集实际使用的已登记资产。每条 grant 都携带作品 owner，读取时必须与 `asset_object.owner_user_id` 一致，并且只能按 `asset_object_id` 或精确 `object_key` 命中；跨 owner、同前缀或相似 key 不构成授权。历史公开作品由 view 现算自动补齐；资产读取 procedure 在自己的事务快照中直接执行该 view，作品隐藏、删除或取消发布提交后不能再被不同连接的陈旧订阅 cache 继续授权。已签发的公开 URL 最长保留 600 秒，能力本身不承诺撤销已经签出的 OSS URL。投影明确排除参考图、未选中候选图和 `generationInputs`；Custom World 只扫描角色、地标、营地、章节和 opening CG 等正式根，不递归 legacy payload 未知字段，避免把预览、编辑输入或同会话其他私有资产扩大为公开资产。
 
 ### `auth_identity`
 
@@ -709,6 +716,7 @@ npm run check:server-rs-ddd
 
 - Rust 结构体：`ProfileInviteCode`
 - 源码：`server-rs/crates/spacetime-module/src/runtime/profile.rs`
+- 生效时间：`starts_at` / `expires_at` 均可为空；两者同时存在时必须满足 `starts_at < expires_at`。开始时刻计入有效区间，截止时刻不计入有效区间。
 
 ### `profile_code_operation`
 
@@ -756,6 +764,8 @@ npm run check:server-rs-ddd
 
 - Rust 结构体：`ProfileRedeemCode`
 - 源码：`server-rs/crates/spacetime-module/src/runtime/profile.rs`
+- 生效时间：复用邀请码时间窗口语义，`starts_at` / `expires_at` 均可为空；两者同时存在时必须满足 `starts_at < expires_at`。开始时刻计入有效区间，截止时刻不计入有效区间。用户兑换时以后端接收的 `redeemed_at_micros` 判定：未到开始时间拒绝为“兑换码未生效”，到达或超过截止时间拒绝为“兑换码已过期”。
+- 后台契约：`AdminUpsertProfileRedeemCodeRequest` 通过可空 `startsAt` / `expiresAt` 接收 RFC3339 时间，列表与保存响应同步返回这两个字段；后台页只负责输入、回填和显示，真正兑换判定留在后端事务路径。
 
 ### `profile_redeem_code_usage`
 
@@ -942,7 +952,8 @@ npm run check:server-rs-ddd
 - `SELECT * FROM public_work_play_daily_stat WHERE source_type = 'puzzle-clear'`
 - `SELECT * FROM creation_entry_config`
 - `SELECT * FROM creation_entry_type_config`
-- `SELECT * FROM asset_object`
+
+private `asset_object` 不进入长期订阅；安全判断通过受限 procedure 在服务端按主键或 `(bucket, object_key)` 索引读取事务内真相，避免全表复制、订阅失败和增量同步延迟把已登记私有对象误判为 legacy 未登记对象。
 
 跨玩法公开作品列表 / 详情主读模型是 `public_work_gallery_entry` 与 `public_work_detail_entry`。拼图、自定义世界等旧玩法公开列表 HTTP 路由保留原响应 shape，由 BFF mapper 从统一 public cache 映射回当前 DTO；旧 `*_gallery_card_view` / `*_gallery_view` / `custom_world_gallery_entry` 继续作为 source view 和兼容缓存。各玩法的个人作品列表、详情、发布、点赞、游玩记录、Remix 和其它需要鉴权或写入副作用的路径继续走 procedure / reducer；不要为了公开列表性能把这些 owner-specific 或 mutation 语义混进 public view。
 
diff --git a/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md b/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md
index ccc313d62..cf5084de7 100644
--- a/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md
+++ b/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md
@@ -411,7 +411,7 @@ Nginx 与 Pingora 在维护 marker 存在时对内网来源绕过整站维护闸
 
 该规则只绕过网关维护响应，不会自动拉起 api-server、SpacetimeDB 或其它已停止的服务。人工执行 `maintenance-on.sh` 且后端仍运行时，可以从内网继续访问整站和修改后台数据；`pause-after-stdb` 会停止旧 API/controller/worker，在 API 被停期间静态页面可能仍可加载，但普通 API 与 `/admin/api/**` 仍不可用。验证使用 `npm run check:nginx-spa-routes`、`npm run check:pingora-route-parity`、`cargo test -p pingora-gateway --manifest-path server-rs/Cargo.toml`、`npm run check:pingora-gateway-smoke` 和 `npm run check:production-ops`，不要在 live 机器上为测试临时创建维护 marker。
 
-维护页源码固定为 `public/maintenance.html`，正常 Web 构建由 Vite 复制到发布包根目录的 `web/maintenance.html`。计划内停服需要临时更新公告时，先更新该源码，避免后续 Web Deploy 把现场公告覆盖回旧内容；现场紧急替换必须原子写入当前 `/srv/genarrative/web/maintenance.html`，并同时用 `genarrative.world` 与 `www.genarrative.world` 的真实 HTTPS 响应校验 `503` 和公告正文。
+版本化默认维护页固定为 `public/maintenance.html`，使用 `public/branding/taonier-maintenance-page.png` 作为品牌视觉，只允许保存无日期、无具体时段的通用文案；正常 Web 构建由 Vite 复制到发布包根目录的 `web/maintenance.html`，并由 `check-maintenance-page.mjs` 在打包前拒绝“今天 / 今晚”、具体日期或 `HH:MM` 等临时公告。计划内停服的临时公告必须放在 release 外文件中，通过 `/opt/genarrative/current/scripts/deploy/maintenance-on.sh --page-file <公告HTML> <维护原因>` 原子安装到 `/var/lib/genarrative/maintenance/page.html`。Nginx 与 Pingora 在该文件存在时优先返回它，缺失时回退当前 Web 制品的默认维护页；同一维护窗口内 Stdb / API 的后续 `maintenance-on.sh` 调用保留已安装公告，`maintenance-off.sh` 同时删除 marker 和运行态公告，避免下次维护复活旧内容。公告启用后同时用 `genarrative.world` 与 `www.genarrative.world` 的真实 HTTPS 响应校验 `503` 和公告正文。
 
 生产 Jenkins 的 `Pipeline script from SCM` 由 Jenkins controller 读取 Jenkinsfile。`Genarrative-Server-Provision` 是服务器初始化流水线，Job 配置里的 SCM URL 必须使用 controller 本机可访问的仓库路径或内网 Gitea 地址，不能使用 `https://git.genarrative.world/...`；否则日志一开始的 `Checking out git ... to read jenkins/Jenkinsfile.production-server-provision` 就会先从公网拉 Jenkinsfile。构建类流水线和 `Genarrative-Server-Provision` 的 Jenkinsfile 内部源码准备阶段统一使用 `ssh://git@192.168.35.82:2222/GenarrativeAI/Genarrative.git`，并显式传入 Jenkins SSH 凭据 `genarrative-local-gitea-ssh`；不再配置 `https://git.genarrative.world/...` 公网 fallback，也不再默认使用 `http://genarrative-station/git/GenarrativeAI/Genarrative.git`。所有 `GitSCM checkout` 都必须保留单分支 refspec、`shallow=true`、`depth=1`、`noTags=true` 与 `honorRefspec=true`。API / Web / Stdb 发布类流水线不在目标机器 checkout Git，统一执行上游构建归档里的部署脚本，避免产物 commit 与部署脚本 commit 漂移；Server-Provision 也不在目标 dev / release agent checkout Git，而是由 Jenkins 构建节点先准备 provision 脚本与配置并上传给目标 agent。
 
diff --git a/docs/【编辑器】生成类面板Lovart统一改造方案-2026-06-17.md b/docs/【编辑器】生成类面板Lovart统一改造方案-2026-06-17.md
index a9f89c1de..00d6c6e7d 100644
--- a/docs/【编辑器】生成类面板Lovart统一改造方案-2026-06-17.md
+++ b/docs/【编辑器】生成类面板Lovart统一改造方案-2026-06-17.md
@@ -18,7 +18,7 @@
 - `快速编辑`
 
 `角色动画生成面板` 同步纳入本次生成类面板交互统一：点击角色图只聚焦图层，不自动弹出底部重绘或角色动画面板；点击 `生成动画` 后像新建图片一样创建 `角色动作` 画布占位，面板跟随占位底部，参考图首行、单文本无边界、参数按钮向上弹出、生成按钮明确展示泥点。
-`快速编辑` 由选中图片后的浮动工具栏显式打开，图片类素材统一进入框选区域 + 单提示词 + 模型选择的修改面板，不再恢复原来源生成器，也不展示参考图或尺寸控件。
+`快速编辑` 由选中图片后的浮动工具栏显式打开，图片类素材统一进入框选区域 + 单提示词 + 比例 / 尺寸 + 模型选择的修改面板，不再恢复原来源生成器，也不展示额外参考图。`icon` 与 `icon-spritesheet` 图标类素材不支持快速编辑，`icon-spec` 图标规范仍按普通图片支持快速编辑。
 
 ## 统一布局
 
@@ -68,7 +68,7 @@
 - 生成图片和生成视频文本输入框紧贴参考图下方，取消旧网格预留导致的空白高度。
 - 生成规范类图片固定使用 `16:9·2K · gpt-image-2`。这三个参数在面板底部沿用可编辑参数按钮的胶囊样式展示，但控件保持禁用不可点击，不提供比例、尺寸或模型修改入口。
 - 宣发素材的 `游戏首图`、`详情五图`、`运营海报` 固定使用 `gpt-image-2`。面板底部只显示禁用态 `gpt-image-2` 模型胶囊和生成按钮，不出现 `nanobanana2` 选项；后端收到 `publication-material` 旧请求时也必须强制归一为 `gpt-image-2`。
-- 图片快速编辑只保留一个提示词输入框和模型选择；提示词 placeholder 为 `写下每个编号要怎么改`，提交按钮显示 `修改`，不展示比例 / 尺寸或参考图控件。
+- 图片快速编辑保留一个提示词输入框，并展示与常规图片生成一致的比例 / 尺寸和模型选择；提示词 placeholder 为 `你希望素材如何修改？`，提交按钮显示 `修改`，不展示额外参考图控件。打开面板时优先继承原图关联生成器记录的模型、比例和尺寸；没有关联生成器时使用图层模型，并按原图真实分辨率推导比例和尺寸；模型缺失或已不受支持时回落到当前默认图片模型。切换模型后只展示该模型支持的参数，不兼容的当前值回落到该模型默认值，按钮泥点按选定模型和尺寸同步刷新。
 - 不再在底部常驻展开全部可选项。
 
 ## 泥点显示
@@ -99,7 +99,7 @@
 - 图片类待生成占位尺寸必须与面板当前比例和尺寸同步：普通图片、角色形象、图标素材、UI 设计图按当前 `aspectRatio + imageSize` 计算像素尺寸；生成规范固定为 `16:9·2K`，占位为 `2048 x 1152`；宣发素材按 workflow 输出尺寸创建占位。
 - 视频待生成占位必须与面板当前比例和清晰度同步：默认 `16:9 · 480p` 为 `854 x 480`，切换比例、`720p` 或 `1080p` 后按比例和清晰度重算偶数宽度；调整参数时保持占位中心点不变。
 - 面板中用户修改比例、尺寸或清晰度后，已有空白待生成占位立即同步更新 `width / height / originalWidth / originalHeight`，且保持中心点不跳动。
-- 快速编辑点击修改后不创建独立 `Quick Edit Generator` 画布生成占位；当前快速编辑面板显示修改中，生成成功后结果直接覆盖源图，失败时保留当前面板并显示错误。需要新建占位的是生成图片、生成视频、重绘、去背景和角色动作等会产出新图层的入口。
+- 快速编辑点击修改后不创建独立 `Quick Edit Generator` 画布生成占位；当前快速编辑面板显示修改中，生成成功后结果直接覆盖源图，失败时保留当前面板并显示错误。用户选定的比例和尺寸是新的业务目标分辨率，覆盖旧的“始终保持源图精确分辨率”约束；替换时更新图层原始分辨率，并保持图层中心位置不跳动。需要新建占位的是生成图片、生成视频、重绘、去背景和角色动作等会产出新图层的入口。
 - 任何会打开画布内 composer / 面板的入口，必须在面板渲染后通过统一 overlay 可见性校正检查真实 DOM 矩形；如果面板超出画布视口，或底部工具栏 / 左下 dock 会遮住面板，就只平移当前 viewport 让面板完整进入安全区域。新增生成类入口不要在按钮 handler 里手写单独的避让偏移。
 - 画布Agent对话入口例外：画布Agent对话（右侧对话面板）触发的生成不创建"即将生成"画布占位，生成中状态由对话消息流内的条目承载（阶段提示、模型标注、进行中动画）；生成完成后结果图才按统一 placement 避让模型落画板为新图层，并在对话消息内显示缩略图。工具失败时也必须在对话消息内保留失败 generation record，而不是只弹一次性错误气泡。该例外仅限画布Agent对话入口，其余生成入口仍必须先落占位。详见 docs/【编辑器】画布Agent对话面板-2026-07-03.md。
 
@@ -116,6 +116,10 @@
 - 生成占位图和生成器对话框不是临时浮层，必须作为画布布局数据保存。
 - 保存时在现有画布布局数组中追加 `itemType: "generation-dialog"` 项，记录生成器 ID、模式、提示词、参数、参考图、状态、占位框位置和 `generatedLayerId`。
 - 生成成功后仍保留生成器快照；画布渲染优先用 `generatedLayerId` 锚定到成品图层，不再重复显示灰色占位框。
+- 一次生成任务产生多个可复用产物时，全部产物都必须由后端登记为项目资源并随同一次完成快照加入画布，不能只保留最终产物或由前端临时追加。角色形象、图标 spritesheet 和 UI 素材提取至少同时回填纯色背景原图与透明后处理结果；UI 素材提取继续一并回填拆分素材。`generatedLayerId` 仍锚定透明后处理主结果，附属产物从主结果右侧开始错开放置。
+- 多产物任务的可恢复中间产物还必须进入账号素材库，未传 `assetFolderId` 时落默认“项目”文件夹，并在抠图、尺寸恢复、抽帧或拆分前完成登记。图片修改保存模型对齐尺寸的原始输出；角色动作把绿幕预览视频保存为一个素材，逐帧绿幕源图只保留在同一任务 OSS 路径，避免素材库一次新增 32 至 48 张帧图。普通图片、去背景和音频等没有独立上游中间产物的任务不重复复制最终结果。
+- 图标和 UI 图集自动拆分属于非阻断附加动作；识别或切片持久化失败时整张透明图集仍完成并回填，前端通过 warning toast 提示用户可手动重试。inline 响应、worker 队列终态和刷新后的任务列表必须使用同一 warning 语义，不能把已完成图集标记为失败。
+- 普通图片、图片修改、规范、角色、图标、UI 设计、宣发素材、视频、音效、背景音乐和角色动作生成面板统一提供“资源名称”输入，状态字段沿用请求契约 `assetLabel`。输入最多 80 个字符，提交时 trim；留空继续使用现有“类型 + 编号”名称。最终解析出的同一个名称必须同时写入画布图层、`editor_project_resource`、`editor_asset` 和 `canvasCompletion.title`。中间原图在主名称后追加“（原图）/（原始输出）”，拆分图标仍使用各自素材描述。
 - 图片、视频和音频生成结果都要写入账号级素材库；视频 / 音频结果由后端持久化到 OSS 并回传 `objectKey` / `assetObjectId`，前端保存素材库时一并记录，后续预览和再次加入画布走统一换签链路。
 - 刷新项目后，画布需要同时恢复图层、生成器快照和生成输入框跟随关系。
 
@@ -177,7 +181,7 @@
 - `生成音乐` 选项面板出现在音乐按钮上方，不再固定在底栏中间。
 - 规范面板比图片生成面板更紧凑，字段间距和输入高度更小，但外层 shell、首行参考图和底部按钮区必须继续对齐生成图片 / 生成角色 / 生成视频。
 - 生成规范类图片底部展示禁用态参数按钮 `16:9·2K` 和 `gpt-image-2`，视觉对齐可编辑面板的比例 / 尺寸 / 模型按钮；提交参数也固定为这三项，不出现可展开选项。
-- 图片快速编辑底部只展示模型选择和 `修改` 按钮；原图或红框序号标注图作为 `sourceImageSrc` 直接编辑，不展示参考图条或比例 / 尺寸控件。
+- 图片快速编辑底部左侧展示比例 / 尺寸组合选择，右侧展示模型选择和 `修改` 按钮；原图或红框序号标注图作为 `sourceImageSrc` 直接编辑，不展示额外参考图条。图标与图集素材不展示快速编辑入口，图标规范仍可快速编辑。
 - 快速编辑打开后画布自动缩放平移到原图完整展示，并让面板位于原图下方且不遮挡原图；原图右侧出现竖向矩形 / 椭圆 / 画笔自由框选按钮。进入快速编辑不默认启用框选，点击工具启用并保持高亮，再点同一工具取消；完成框选后画布红色细框显示连续序号，输入框同步追加 `对N号红色圈选框里的内容做以下修改：`。
 - 快速编辑提交前保留提示词里对原图的 `原图`、`当前图片`、`当前图` 或 `图1` 引用，不再改写成 `图N`。
 - 快速编辑提交给后端时只把原图或已绘制红框和序号的标注图作为 `sourceImageSrc`，不提交隐藏的 `referenceImageSrcs`。
diff --git a/docs/【编辑器】画板UI设计图生成入口设计-2026-06-17.md b/docs/【编辑器】画板UI设计图生成入口设计-2026-06-17.md
index 1829eb851..829bf6f72 100644
--- a/docs/【编辑器】画板UI设计图生成入口设计-2026-06-17.md
+++ b/docs/【编辑器】画板UI设计图生成入口设计-2026-06-17.md
@@ -61,8 +61,9 @@
 仅提取被红色框框选的素材并整理成spritesheet，图集背景必须使用后端自动决策出的抠图背景色。纯色背景必须平整无纹理、无渐变、无阴影、无地面、无环境、无道具，方便后续扣除背景；素材自身不要出现与背景色相同或相近的描边、底板、投影或反光。
 ```
 
-- 后端收到 spritesheet 后先把带解析后纯色背景的源图写入 OSS，再调用 BgFilter 按默认 `segModel=birefnet` 透明化，并复用图标素材的连通域拆分能力；未知素材数量时按从上到下、从左到右自动命名为 `素材 1`、`素材 2`。
-- 前端先把 spritesheet 原图作为 `assetKind: "icon-spritesheet"` 图集图层放在 UI 设计图右侧，再把拆分出的独立素材作为 `assetKind: "icon"` 图标图层继续放到画布。
+- 后端收到 spritesheet 后先把带解析后纯色背景的源图写入 OSS、项目资源和账号素材库，再调用 BgFilter 按默认 `segModel=birefnet` 透明化；透明 spritesheet 同样先进入 OSS、项目资源和账号素材库，再复用图标素材的连通域拆分能力。调用方未指定素材文件夹时落默认“项目”文件夹。
+- UI 素材自动拆分与图标图集一致，属于 best-effort 附加动作。未知素材数量时按从上到下、从左到右自动命名为 `素材 1`、`素材 2`；识别或切片持久化失败仍返回整张透明图集和 `sliceWarning`，前端显示非阻断 warning toast，用户可手动重试。
+- 前端先把 spritesheet 原图作为 `assetKind: "icon-spritesheet"` 图集图层放在 UI 设计图右侧，再把拆分出的独立素材作为 `assetKind: "icon"` 图标图层继续放到画布。图集图层同样提供 `拆分图集` 工具栏按钮，可使用相同连通域规则重新拆分。
 
 ## 验收点
 
diff --git a/docs/【编辑器】画板图标素材生成入口设计-2026-06-15.md b/docs/【编辑器】画板图标素材生成入口设计-2026-06-15.md
index 84a19ac5e..35fc3a1c8 100644
--- a/docs/【编辑器】画板图标素材生成入口设计-2026-06-15.md
+++ b/docs/【编辑器】画板图标素材生成入口设计-2026-06-15.md
@@ -4,7 +4,7 @@
 
 ## 背景
 
-图片画布编辑器已有普通图片生成、生成规范、生成角色形象和角色动画入口。本次新增 `生成图标素材`，用于一次输入多条图标素材描述，生成一张绿幕 spritesheet，并在后端扣除绿色背景后作为单个图集铺到画布。
+图片画布编辑器已有普通图片生成、生成规范、生成角色形象和角色动画入口。本次新增 `生成图标素材`，用于一次输入多条图标素材描述，生成一张纯色背景 spritesheet，在后端去背景后自动拆分为可独立编辑的素材。
 
 ## 入口与画布表现
 
@@ -12,7 +12,8 @@
 - 点击后立即在画布中心创建图标素材占位图，不复用普通“单张空白图片”图标；占位图表现为一叠空白素材图标卡片。
 - 图标素材占位图使用 `360x360` 的画布展示尺寸和 `512x512` 的原始图集尺寸；面板中的模型、比例和尺寸仍按生成契约独立提交，不用通用图片生成的 `1K` 画布外框。
 - 图标素材面板锚定在占位图下方，和现有生成输入框同一层级展示。
-- 生成完成后删除占位态，只把后端返回的已扣绿 spritesheet 作为 `assetKind: "icon-spritesheet"` 的图集图层放到画布，不额外拆出 `assetKind: "icon"` 图层。
+- 生成完成后删除占位态，把后端返回的透明 spritesheet 作为 `assetKind: "icon-spritesheet"` 的图集图层放到画布，并把按 alpha 连通域拆出的 `assetKind: "icon"` 素材铺到图集右侧。
+- 选中 `assetKind: "icon-spritesheet"` 图层时，图片浮动工具栏显示 `拆分图集`；手动拆分只追加独立素材，不复制原图集。
 - 图标规范图写入 `assetKind: "icon-spec"`，用于刷新后保留标签和限制点选来源。
 
 ## 面板结构
@@ -59,13 +60,15 @@
 ## 去背与保存
 
 - 后端收到 spritesheet 后先把带解析后纯色背景的源图写入 OSS，再调用 BgFilter 透明化；请求字段包含 `screenColor` 和 `segModel`，前端用户路径固定提交 `screenColor=auto` 与默认 `birefnet`，后端仍识别内部保留的 `anime-seg`，但该选项不对用户可见。
-- 去背后的整张 spritesheet 统一编码为透明 PNG，并作为唯一图标素材产物持久化。
-- 响应保留 `iconImageSrcs` 字段用于兼容旧客户端，但图标素材生成固定返回空数组；UI 设计图提取素材仍可复用该响应结构返回切片素材。
+- 带背景原图和去背后的透明 spritesheet 都先同时写入 OSS、项目资源和账号素材库，再按 alpha 连通域和素材描述顺序执行附加拆分；调用方未指定素材文件夹时统一落默认“项目”文件夹。每个成功切片单独写入 OSS、项目资源和账号素材库，`sourceResourceId` 指向透明图集资源。
+- 自动拆分是生成后的 best-effort 附加动作，不参与图集生成的成功判定。连通域识别或切片持久化失败时，接口仍返回并回填整张透明图集，`iconImageSrcs=[]`，并通过 `sliceWarning.code/reason` 暴露非阻断原因；前端在 inline、worker 队列完成和刷新恢复三条路径统一显示 warning toast，用户可在图集工具栏手动重试。
+- 响应通过 `iconImageSrcs` 返回成功切片素材；自动生成使用用户输入的素材描述命名，UI 设计提取和手动拆分按从上到下、从左到右自动命名为 `素材 N`。
+- 手动拆分调用 `POST /api/editor/icon-spritesheets/slices`，只允许读取当前用户项目中的 `icon-spritesheet` 资源，不调用图片生成 provider，不扣除泥点。输入限制为单边最多 `4096` 像素、总像素最多 `2048×2048`，单次最多持久化 `64` 个切片；超限在任何切片写入前拒绝。
 
 ## 前端铺放规则
 
 - spritesheet 图集放在原占位图位置附近。
-- 不再把图集右侧铺开独立图标，用户需要继续编辑时直接操作图集图层。
+- 自动拆分素材从图集右侧开始换行铺放；手动拆分使用相同布局，但保留原图集不变。
 - 生成成功后关闭图标素材面板，选中 spritesheet 图集，并打开图层面板。
 
 ## 验收
@@ -76,5 +79,6 @@
 - 默认打开图标素材面板时选中 `nanobanana2 / 1:1 / 1K`；模型切换后，角色和图标素材面板之间沿用上次选择的模型。
 - 图标素材生成请求必须带 `model`、`aspectRatio` 和 `imageSize`；`nanobanana2` 请求体必须包含 `generationConfig.imageConfig.aspectRatio/imageSize`，`gpt-image-2` 请求必须包含文档映射后的 `size`。
 - 图标素材生成可以上传普通参考图；提交时图标规范图仍走 `referenceImageSrc`，普通参考图走 `referenceImageSrcs`，上传参考图优先提交 `objectKey`，并写入 `generationInputs.references`。
-- 生成成功后画布只出现一个已扣绿的透明 spritesheet 图集，不出现额外独立图标图层。
+- 生成成功后画布同时出现透明 spritesheet 图集和按描述命名的独立图标图层。
+- 选中图集图层时显示 `拆分图集`，点击后不新增第二张图集，只在原图集右侧追加自动识别的独立素材，并同步写入素材库。
 - 生成图标素材提交体包含按模型和尺寸计算的 `priceMudPoints`；`nanobanana2 1K` 应为 `12`，`gpt-image-2 1K` 应为 `3`，`gpt-image-2 2K` 应为 `5`。若前端传入与后端计费配置不一致的值，后端返回 `priceMudPoints` 校验错误，不继续调用上游生成。
diff --git a/docs/【编辑器】画板角色形象生成入口设计-2026-06-15.md b/docs/【编辑器】画板角色形象生成入口设计-2026-06-15.md
index fe9c1bec7..374c65796 100644
--- a/docs/【编辑器】画板角色形象生成入口设计-2026-06-15.md
+++ b/docs/【编辑器】画板角色形象生成入口设计-2026-06-15.md
@@ -147,7 +147,7 @@
 ### Prompt 与生成契约
 
 - 前端提交到 `POST /api/editor/character-animations/generations`。
-- 请求必须带上角色图片来源、原始尺寸、动画描述、分辨率、画面比例、帧数和时长。角色图片已经持久化到 OSS 时，`sourceImageSrc` 必须优先传 `objectKey`；只有未持久化的本地临时图片才允许传 Data URL。
+- 请求必须带上角色图片来源、原始尺寸、动画描述、分辨率、画面比例、帧数和时长，并可通过 `assetFolderId` 指定中间视频素材落点。角色图片已经持久化到 OSS 时，`sourceImageSrc` 必须优先传 `objectKey`；只有未持久化的本地临时图片才允许传 Data URL。
 - 后端使用角色图片作为首帧和尾帧参考，模型固定映射到 `doubao-seedance-2-0-fast-260128`。
 - 后端路由兼容旧 Data URL 请求并单独放宽 JSON body limit 到 `12MB`，但该限额只作为兼容兜底，不作为新链路默认传大图的方式。
 - 后端 prompt 使用以下固定骨架，并把面板输入追加到 `动作描述：` 后：
@@ -160,7 +160,7 @@
 
 ### 抽帧与 OSS 存储
 
-- 视频生成完成后，后端按面板选择抽取对应帧数：`32`、`40` 或 `48`。
+- 视频生成完成后，后端先把带纯色背景的预览视频登记为 OSS 私有对象、`asset_object`、项目资源和账号素材，再按面板选择抽取对应帧数：`32`、`40` 或 `48`。未传 `assetFolderId` 时进入默认“项目”素材文件夹；后续抽帧或抠图失败不能抹掉这份已经生成成功的可恢复视频。
 - 抽帧采样必须按目标帧数预留视频尾部安全步长，例如 `32帧·4秒` 最后一帧采 `3.875s`，避免 FFmpeg 在尾点附近返回成功但输出 `0` 帧。
 - 每帧必须先把带自动决策纯色背景的源图写入 OSS，再优先调用阿里云通用抠图输出透明背景 PNG；阿里云失败时降级执行本地 `editor_green_screen`，并按同一次生成已选定的 `screenColor` 去背。
 - 抽帧结果写入 OSS，并返回帧路径、帧尺寸、帧数、fps、预览视频路径、模型、价格和实际 prompt。
diff --git a/docs/【编辑器】画板音乐生成入口设计-2026-06-18.md b/docs/【编辑器】画板音乐生成入口设计-2026-06-18.md
index df513b2cc..0572907cc 100644
--- a/docs/【编辑器】画板音乐生成入口设计-2026-06-18.md
+++ b/docs/【编辑器】画板音乐生成入口设计-2026-06-18.md
@@ -43,6 +43,7 @@
   - `assetKind="sound-effect"`
   - `assetKind="background-music"`
 - 音频结果以小型音频卡加入画布，卡片底部使用融入卡片的自定义播放器组件承载进度、时间和音量，播放 / 暂停只收口到卡片中央图标按钮；生成成功后同时保存为 OSS 私有对象、画布资源和账号级素材库素材，响应携带 `objectKey` / `assetObjectId` 供后续换签和复用。
+- 从素材库拖放音效或背景音乐时，卡片中心必须落在鼠标松手对应的画布位置，不叠加点击添加素材时使用的级联错位量；音频卡除中央播放按钮、底部进度 / 音量控件、标签和信息按钮外，其余卡片区域都作为选择与拖拽热区。
 - 普通素材上传入口首版支持图片、MP3 和 MP4；MP3 / MP4 先走 OSS 直传和 asset object confirm，再以素材库素材保存，其他音视频格式暂不开放。
 - 音频结果卡片底部显示播放器辅助控件，不在卡片左下角或悬停左上角展示时长；提示词固定显示在卡片左上角。
 - 音频结果卡片底部播放器辅助控件仅在鼠标悬停音频卡片时从下方滑入显示，移出后向下滑出收起。
@@ -106,7 +107,7 @@ POST /api/editor/audios/background-music/generations
   - Suno 音乐接口路径固定为 `/suno/submit/music`；`VECTOR_ENGINE_BASE_URL` 即使配置为带 `/v1` 的图片接口根，也要在 `platform-audio` 中归一为根路径后再拼接，避免误请求 `/v1/suno/submit/music`。
   - 音效 body 使用 Vidu 文生音频契约：提交 `/ent/v2/text2audio`，请求体包含 `model: "audio1.0"`、`prompt`、`sound: prompt`、`duration` 和可选 `seed`；`model` 和 `prompt` 为文档必填，`sound` 用于兼容线上网关实际校验，`prompt` 最长 1500 字符，`duration` 按 Vidu 文档限制在 `2-10` 秒。
   - 编辑器音效轮询使用 Vidu 路径 `/ent/v2/tasks/{taskId}/creations`，不再使用 Suno `/suno/fetch/{taskId}`；Suno 文生音效 `task: "sound"` 暂不从编辑器入口暴露。
-  - Suno 提交成功后的任务 ID 兼容与 wav clip 轮询逻辑只保留给背景音乐链路，避免误伤 `/api/editor/audios/background-music/generations`。
+  - Suno 提交成功后的任务 ID 兼容与 wav clip 轮询逻辑只保留给背景音乐链路；`/suno/fetch/{taskId}` 返回 `audiopipe.suno.ai/?item_id=...` 时，该地址只作为 clip id 来源，不作为最终下载文件，后端继续调用 `/suno/act/wav/{clipId}` 获取稳定 wav URL，避免 worker 在不完整 chunked body 上卡满超时。
   - VectorEngine 音频响应的 `code` 需要兼容 `"success"`、`"ok"`、`"0"`、`"200"` 以及数字 `0` / `200`；HTTP 非 2xx 时后端错误信息应透出安全的上游状态和短响应摘要，避免前端只显示笼统提交失败。
 - 在 `api-server` 增加编辑器音频 BFF：
   - `/api/editor/audios/sound-effects/generations`
@@ -124,6 +125,7 @@ POST /api/editor/audios/background-music/generations
 - 点击 `生成游戏背景音乐` 后出现背景音乐面板，字段为 `gpt_description_prompt`，右侧固定显示 `Suno` 模型胶囊，不展示 `make_instrumental`。
 - 音效提交到 `/api/editor/audios/sound-effects/generations`，背景音乐提交到 `/api/editor/audios/background-music/generations`。
 - 成功后画布新增音频卡，能通过卡片中央播放按钮播放，底部进度、时间和音量控件可操作。
+- 从素材库拖放音效或背景音乐后，音频卡中心位于鼠标松手位置；拖动卡片任意非播放 / 播放器控件区域都能移动图层，点击中央播放按钮只播放或暂停，不启动拖拽。
 - 成功后音频素材自动出现在账号级素材库；从素材库再次添加到画布时仍恢复为 `mediaType="audio"` 音频图层。
 - 普通素材上传 MP3 / MP4 会写入 OSS 并进入素材库；MP3 添加到画布为音频图层，MP4 添加到画布为视频图层。
 - 成功后的音频卡展示提示词；卡片中央按未悬停图标、悬停播放、播放中暂停切换，不在底部重复显示播放 / 暂停按钮，播放器辅助控件直接融入卡片底部。
diff --git a/package.json b/package.json
index 28f7de087..f50def4fa 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "check:encoding": "node scripts/check-encoding.mjs",
     "check:spacetime-schema": "node scripts/check-spacetime-schema-guard.mjs",
     "check:production-ops": "node scripts/check-production-ops-guardrails.mjs",
+    "check:maintenance-page": "node scripts/check-maintenance-page.mjs",
     "check:database-backup": "node scripts/check-database-backup-to-oss.mjs",
     "check:production-health-patrol": "node scripts/check-production-health-patrol.mjs",
     "check:production-health-patrol-env": "node scripts/check-production-health-patrol-env-check.mjs",
@@ -82,7 +83,7 @@
     "lint:guardrails": "npm run lint:eslint",
     "typecheck": "tsc -p tsconfig.typecheck-guardrails.json --noEmit",
     "typecheck:guardrails": "npm run typecheck",
-    "lint": "npm run check:encoding && npm run check:spacetime-schema && npm run check:production-ops && npm run lint:eslint && npm run typecheck",
+    "lint": "npm run check:encoding && npm run check:spacetime-schema && npm run check:production-ops && npm run check:maintenance-page && npm run lint:eslint && npm run typecheck",
     "lint:fix": "eslint . --ext .ts,.tsx,.js,.mjs,.cjs --fix && prettier --write .",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
diff --git a/packages/shared/src/contracts/externalGeneration.ts b/packages/shared/src/contracts/externalGeneration.ts
index 24919afec..ed496c355 100644
--- a/packages/shared/src/contracts/externalGeneration.ts
+++ b/packages/shared/src/contracts/externalGeneration.ts
@@ -22,6 +22,7 @@ export interface ExternalGenerationJobStatusRecord {
   phaseDetail: string;
   progress: number;
   error?: string | null;
+  warning?: string | null;
   updatedAtMicros: number;
 }
 
@@ -41,6 +42,7 @@ export interface ExternalGenerationTaskRecord {
   phaseDetail: string;
   progress: number;
   error?: string | null;
+  warning?: string | null;
   priceMudPoints: number;
   refundLedgerId?: string | null;
   notificationAcknowledgedAt?: string | null;
diff --git a/packages/shared/src/contracts/runtime.ts b/packages/shared/src/contracts/runtime.ts
index a01f70547..7f731aa9a 100644
--- a/packages/shared/src/contracts/runtime.ts
+++ b/packages/shared/src/contracts/runtime.ts
@@ -457,6 +457,8 @@ export type ProfileRedeemCodeAdminResponse = {
   globalUsedCount: number;
   enabled: boolean;
   allowedUserIds: string[];
+  startsAt?: string | null;
+  expiresAt?: string | null;
   createdBy: string;
   createdAt: string;
   updatedAt: string;
@@ -484,6 +486,8 @@ export type AdminUpsertProfileRedeemCodeRequest = {
   enabled?: boolean;
   allowedUserIds?: string[];
   allowedPublicUserCodes?: string[];
+  startsAt?: string | null;
+  expiresAt?: string | null;
 };
 
 export type AdminDisableProfileRedeemCodeRequest = {
diff --git a/public/404.html b/public/404.html
new file mode 100644
index 000000000..1588d6bb9
--- /dev/null
+++ b/public/404.html
@@ -0,0 +1,213 @@
+<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="robots" content="noindex, nofollow" />
+    <link rel="icon" type="image/png" href="/branding/taonier-product-ip.png" />
+    <title>页面无法连接 - 陶泥儿</title>
+    <style>
+      * {
+        box-sizing: border-box;
+      }
+
+      html,
+      body {
+        width: 100%;
+        min-height: 100%;
+        margin: 0;
+        background: #fff8f4;
+      }
+
+      body {
+        min-height: 100vh;
+        min-height: 100dvh;
+        overflow: hidden;
+      }
+
+      .page-art {
+        position: fixed;
+        inset: 0;
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+        object-position: center;
+      }
+
+      .mobile-page {
+        position: absolute;
+        visibility: hidden;
+        width: 1px;
+        height: 1px;
+        padding: 0;
+        margin: -1px;
+        overflow: hidden;
+        clip: rect(0, 0, 0, 0);
+        white-space: nowrap;
+        border: 0;
+      }
+
+      @media (max-aspect-ratio: 4 / 5) {
+        .page-art {
+          object-fit: contain;
+        }
+      }
+
+      @media (max-width: 680px) {
+        body {
+          overflow: auto;
+        }
+
+        .page-art {
+          display: none;
+        }
+
+        .mobile-page {
+          position: relative;
+          visibility: visible;
+          display: flex;
+          width: 100%;
+          min-height: 100vh;
+          min-height: 100dvh;
+          height: auto;
+          margin: 0;
+          padding: 36px 24px 30px;
+          overflow: visible;
+          clip: auto;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          color: #563018;
+          text-align: center;
+          white-space: normal;
+        }
+
+        .mobile-page h1 {
+          margin: 0;
+          color: #ef762f;
+          font-size: 68px;
+          line-height: 1;
+          letter-spacing: 0;
+        }
+
+        .mobile-page h2 {
+          margin: 12px 0 0;
+          font-size: 28px;
+          line-height: 1.3;
+          letter-spacing: 0;
+        }
+
+        .mobile-page p {
+          max-width: 300px;
+          margin: 12px 0 0;
+          color: #86563d;
+          font-size: 15px;
+          line-height: 1.7;
+          letter-spacing: 0;
+        }
+
+        .mobile-character {
+          width: min(64vw, 250px);
+          height: auto;
+          margin-top: 20px;
+        }
+
+        .mobile-actions {
+          display: flex;
+          gap: 12px;
+          margin-top: 18px;
+        }
+
+        .mobile-actions a,
+        .mobile-actions button {
+          display: inline-flex;
+          height: 42px;
+          align-items: center;
+          justify-content: center;
+          padding: 0 18px;
+          border: 1px solid #e98a54;
+          border-radius: 8px;
+          background: #fff8f4;
+          color: #d86228;
+          font: inherit;
+          font-size: 14px;
+          font-weight: 700;
+          letter-spacing: 0;
+          text-decoration: none;
+          cursor: pointer;
+        }
+
+        .mobile-actions .primary {
+          background: #ef7939;
+          color: #fff;
+          box-shadow: 0 8px 20px rgb(205 100 44 / 16%);
+        }
+
+        .mobile-actions a:focus-visible,
+        .mobile-actions button:focus-visible {
+          outline: 3px solid rgb(239 121 57 / 28%);
+          outline-offset: 3px;
+        }
+      }
+
+      @media (max-width: 680px) and (max-height: 720px) {
+        .mobile-page {
+          padding-top: 24px;
+          padding-bottom: 22px;
+        }
+
+        .mobile-page h1 {
+          font-size: 58px;
+        }
+
+        .mobile-page h2 {
+          margin-top: 8px;
+          font-size: 24px;
+        }
+
+        .mobile-page p {
+          margin-top: 8px;
+        }
+
+        .mobile-character {
+          width: 190px;
+          margin-top: 12px;
+        }
+
+        .mobile-actions {
+          margin-top: 12px;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <img
+      class="page-art"
+      src="/branding/taonier-404-page.png"
+      alt="404 页面无法连接，您访问的页面不存在或已被移除"
+      width="1672"
+      height="941"
+    />
+    <main class="mobile-page">
+      <h1>404</h1>
+      <h2>页面无法连接</h2>
+      <p>抱歉，您访问的页面不存在或已被移除。</p>
+      <img
+        class="mobile-character"
+        src="/branding/taonier-404-character.png"
+        alt="陶泥儿从陶罐中探出头，旁边放着施工路障"
+        width="470"
+        height="590"
+      />
+      <div class="mobile-actions">
+        <button
+          type="button"
+          onclick="window.history.length > 1 ? window.history.back() : (window.location.href = '/')"
+        >
+          返回上一页
+        </button>
+        <a class="primary" href="/">前往首页</a>
+      </div>
+    </main>
+  </body>
+</html>
diff --git a/public/branding/taonier-404-character.png b/public/branding/taonier-404-character.png
new file mode 100644
index 000000000..e12222aa4
Binary files /dev/null and b/public/branding/taonier-404-character.png differ
diff --git a/public/branding/taonier-404-page.png b/public/branding/taonier-404-page.png
new file mode 100644
index 000000000..184b6b939
Binary files /dev/null and b/public/branding/taonier-404-page.png differ
diff --git a/public/branding/taonier-maintenance-page.png b/public/branding/taonier-maintenance-page.png
new file mode 100644
index 000000000..5cbc970b4
Binary files /dev/null and b/public/branding/taonier-maintenance-page.png differ
diff --git a/public/maintenance.html b/public/maintenance.html
index 75799f377..6cca73d0f 100644
--- a/public/maintenance.html
+++ b/public/maintenance.html
@@ -4,44 +4,72 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="robots" content="noindex, nofollow" />
-    <title>陶泥儿停服升级公告</title>
+    <link rel="icon" type="image/png" href="/branding/taonier-product-ip.png" />
+    <title>服务维护中 - 陶泥儿</title>
     <style>
       :root {
-        color-scheme: dark;
+        color-scheme: light;
         font-family:
           Inter,
           system-ui,
           -apple-system,
           BlinkMacSystemFont,
-          'Segoe UI',
+          "Segoe UI",
           sans-serif;
-        background: #101418;
-        color: #f7f9fb;
+        color: #5d2c13;
+        background: #fff9f5;
       }
 
       * {
         box-sizing: border-box;
       }
 
+      html,
       body {
+        width: 100%;
+        min-height: 100%;
         margin: 0;
+      }
+
+      body {
         min-height: 100vh;
-        background: #101418;
+        min-height: 100dvh;
+        overflow: hidden;
+        background: #fff9f5;
+      }
+
+      .page-art {
+        position: fixed;
+        inset: 0;
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+        object-position: center;
       }
 
       main {
-        width: min(100% - 32px, 720px);
-        margin: 0 auto;
-        padding: 56px 0 64px;
+        position: relative;
+        z-index: 1;
+        display: flex;
+        min-height: 100vh;
+        min-height: 100dvh;
+        align-items: center;
+        justify-content: center;
+        padding: 72px 24px 120px;
+        text-align: center;
+      }
+
+      .content {
+        width: min(100%, 680px);
       }
 
       .status {
-        display: flex;
+        display: inline-flex;
         align-items: center;
         gap: 10px;
-        margin-bottom: 22px;
-        color: #ffb36b;
-        font-size: 14px;
+        margin-bottom: 20px;
+        color: #e76d2f;
+        font-size: 15px;
         font-weight: 700;
       }
 
@@ -50,138 +78,121 @@
         height: 10px;
         flex: 0 0 10px;
         border-radius: 50%;
-        background: #ff8a3d;
-        box-shadow: 0 0 0 5px rgb(255 138 61 / 14%);
+        background: #f27a35;
+        box-shadow: 0 0 0 6px rgb(242 122 53 / 13%);
       }
 
       h1 {
         margin: 0;
-        font-size: 32px;
+        color: #6a3216;
+        font-size: 42px;
         line-height: 1.25;
+        letter-spacing: 0;
       }
 
-      .lead {
+      p {
         margin: 18px 0 0;
-        color: #d5dde5;
-        font-size: 17px;
-        line-height: 1.8;
-      }
-
-      .window {
-        display: grid;
-        grid-template-columns: auto 1fr;
-        gap: 8px 18px;
-        margin: 30px 0 0;
-        padding: 18px 20px;
-        border: 1px solid #3c4650;
-        border-left: 4px solid #ff8a3d;
-        border-radius: 6px;
-        background: #171d22;
-      }
-
-      .window-label {
-        color: #9eabb8;
-        font-size: 14px;
-      }
-
-      .window-value {
-        color: #fff2e7;
-        font-size: 16px;
-        font-weight: 750;
-      }
-
-      section {
-        margin-top: 34px;
-        padding-top: 28px;
-        border-top: 1px solid #303942;
-      }
-
-      h2 {
-        margin: 0 0 14px;
+        color: #86563d;
         font-size: 18px;
-        line-height: 1.5;
-      }
-
-      ol {
-        margin: 0;
-        padding-left: 24px;
-        color: #d5dde5;
-      }
-
-      li {
-        margin: 10px 0;
-        padding-left: 4px;
-        line-height: 1.75;
-      }
-
-      .feature {
-        margin: 0;
-        padding-left: 16px;
-        border-left: 3px solid #53c7a3;
-        color: #d5dde5;
         line-height: 1.8;
+        letter-spacing: 0;
       }
 
-      .feature strong {
-        color: #7be0c0;
+      button {
+        min-width: 132px;
+        height: 44px;
+        margin-top: 30px;
+        padding: 0 24px;
+        border: 1px solid #ed8a51;
+        border-radius: 8px;
+        background: #ef7939;
+        color: #fff;
+        font: inherit;
+        font-size: 15px;
+        font-weight: 700;
+        letter-spacing: 0;
+        cursor: pointer;
+        box-shadow: 0 8px 20px rgb(205 100 44 / 16%);
       }
 
-      @media (max-width: 520px) {
+      button:hover {
+        background: #df682d;
+      }
+
+      button:focus-visible {
+        outline: 3px solid rgb(239 121 57 / 28%);
+        outline-offset: 3px;
+      }
+
+      @media (max-width: 680px) {
         main {
-          width: min(100% - 28px, 720px);
-          padding: 38px 0 48px;
+          padding: 52px 38px 108px;
+        }
+
+        .status {
+          margin-bottom: 16px;
+          font-size: 14px;
         }
 
         h1 {
-          font-size: 27px;
+          font-size: 32px;
         }
 
-        .lead {
+        p {
+          margin-top: 14px;
           font-size: 16px;
         }
 
-        .window {
-          grid-template-columns: 1fr;
+        button {
+          margin-top: 24px;
+        }
+      }
+
+      @media (max-height: 620px) {
+        main {
+          padding-top: 44px;
+          padding-bottom: 76px;
+        }
+
+        .status {
+          margin-bottom: 12px;
+        }
+
+        h1 {
+          font-size: 30px;
+        }
+
+        p {
+          margin-top: 10px;
+          font-size: 15px;
+        }
+
+        button {
+          height: 40px;
+          margin-top: 18px;
         }
       }
     </style>
   </head>
   <body>
+    <img
+      class="page-art"
+      src="/branding/taonier-maintenance-page.png"
+      alt=""
+      aria-hidden="true"
+      width="1672"
+      height="941"
+    />
     <main>
-      <div class="status">
-        <span class="status-mark" aria-hidden="true"></span>
-        <span>服务维护中</span>
+      <div class="content">
+        <div class="status">
+          <span class="status-mark" aria-hidden="true"></span>
+          <span>系统维护中</span>
+        </div>
+        <h1>服务维护中</h1>
+        <p>我们正在更新系统，稍后请重新访问。</p>
+        <button type="button" onclick="window.location.reload()">刷新页面</button>
       </div>
-
-      <h1>陶泥儿美术工具停服升级</h1>
-      <p class="lead">
-        各位陶泥儿创作者，美术工具官网将在今天晚上 21:00~22:00 停服升级。<br />
-        注意保存好自己的项目和下载好素材。
-      </p>
-
-      <div class="window" aria-label="维护时间">
-        <span class="window-label">维护时间</span>
-        <span class="window-value">今天晚上 21:00~22:00</span>
-      </div>
-
-      <section>
-        <h2>本次更新修复内容</h2>
-        <ol>
-          <li>修复多个影响画布使用的 BUG。</li>
-          <li>
-            修复了 PC 端不能充值的恶性 BUG（bushi），PC
-            网页端支持微信二维码充值。
-          </li>
-        </ol>
-      </section>
-
-      <section>
-        <h2>新增功能</h2>
-        <p class="feature">
-          <strong>抠图与背景色功能升级：</strong
-          >使用更强、更稳定的抠图技术，解决角色扣残问题，角色动作的逐帧抠图同步升级。
-        </p>
-      </section>
     </main>
   </body>
 </html>
diff --git a/scripts/build-production-release.sh b/scripts/build-production-release.sh
index fb368e3ce..2ced31812 100644
--- a/scripts/build-production-release.sh
+++ b/scripts/build-production-release.sh
@@ -446,6 +446,17 @@ if [[ "${BUILD_WEB}" -eq 1 ]]; then
 MAINTENANCE_HTML
   fi
 
+  if [[ ! -f "${WEB_DIR}/404.html" ]]; then
+    echo "[production-release] Web 发布包缺少品牌 404 页面: ${WEB_DIR}/404.html" >&2
+    exit 1
+  fi
+
+  echo "[production-release] 校验默认维护页不包含临时公告"
+  (
+    cd "${REPO_ROOT}"
+    node scripts/check-maintenance-page.mjs --file "${WEB_DIR}/maintenance.html"
+  )
+
   echo "[production-release] 规范 Web 静态资源权限"
   find "${WEB_DIR}" -type d -exec chmod 755 {} +
   find "${WEB_DIR}" -type f -exec chmod 644 {} +
diff --git a/scripts/check-maintenance-page.mjs b/scripts/check-maintenance-page.mjs
new file mode 100644
index 000000000..1109f99c0
--- /dev/null
+++ b/scripts/check-maintenance-page.mjs
@@ -0,0 +1,203 @@
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process';
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  statSync,
+  writeFileSync,
+} from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const failures = [];
+const requestedFiles = [];
+
+for (let index = 2; index < process.argv.length; index += 1) {
+  if (process.argv[index] !== '--file' || !process.argv[index + 1]) {
+    failures.push(`未知或不完整参数: ${process.argv[index]}`);
+    continue;
+  }
+  requestedFiles.push(path.resolve(process.argv[index + 1]));
+  index += 1;
+}
+
+function fail(message) {
+  failures.push(message);
+}
+
+function validateDefaultPage(filePath) {
+  if (!existsSync(filePath)) {
+    fail(`默认维护页不存在: ${filePath}`);
+    return;
+  }
+
+  const source = readFileSync(filePath, 'utf8');
+  if (!source.includes('服务维护中')) {
+    fail(`${filePath} 必须保留无日期的“服务维护中”默认文案。`);
+  }
+  for (const [pattern, label] of [
+    [/(?:今天|今晚|明天|昨天|昨日)/u, '相对日期'],
+    [/(?:20\d{2}[-/.年]\d{1,2}(?:[-/.月]\d{1,2}日?)?|\d{1,2}月\d{1,2}日)/u, '具体日期'],
+    [/(?:[01]?\d|2[0-3]):[0-5]\d/u, '具体维护时间'],
+  ]) {
+    if (pattern.test(source)) {
+      fail(`${filePath} 不能包含${label}；临时公告必须使用运行态覆盖页。`);
+    }
+  }
+}
+
+function runScript(scriptPath, args, env) {
+  return spawnSync('bash', [scriptPath, ...args], {
+    cwd: repoRoot,
+    env: { ...process.env, ...env },
+    encoding: 'utf8',
+  });
+}
+
+function validateRuntimePageLifecycle() {
+  const tempRoot = mkdtempSync(path.join(os.tmpdir(), 'genarrative-maintenance-'));
+  const markerFile = path.join(tempRoot, 'state', 'enabled');
+  const runtimePageFile = path.join(tempRoot, 'state', 'page.html');
+  const sourcePageFile = path.join(tempRoot, 'announcement.html');
+  const onScript = path.join(repoRoot, 'scripts/deploy/maintenance-on.sh');
+  const offScript = path.join(repoRoot, 'scripts/deploy/maintenance-off.sh');
+  const env = {
+    GENARRATIVE_MAINTENANCE_FILE: markerFile,
+    GENARRATIVE_MAINTENANCE_PAGE_FILE: runtimePageFile,
+  };
+
+  try {
+    const announcement = '<!doctype html><title>planned maintenance</title>\n';
+    writeFileSync(sourcePageFile, announcement);
+
+    const enable = runScript(
+      onScript,
+      ['--page-file', sourcePageFile, 'planned maintenance'],
+      env,
+    );
+    if (enable.status !== 0) {
+      fail(`maintenance-on --page-file 执行失败: ${enable.stderr || enable.stdout}`);
+      return;
+    }
+    if (!existsSync(markerFile)) {
+      fail('maintenance-on --page-file 必须创建维护 marker。');
+    }
+    if (!existsSync(runtimePageFile)) {
+      fail('maintenance-on --page-file 必须原子安装运行态公告页。');
+    } else {
+      if (readFileSync(runtimePageFile, 'utf8') !== announcement) {
+        fail('运行态公告页内容与输入文件不一致。');
+      }
+      if ((statSync(runtimePageFile).mode & 0o777) !== 0o644) {
+        fail('运行态公告页权限必须为 0644。');
+      }
+    }
+
+    const nestedEnable = runScript(onScript, ['api deploy'], env);
+    if (nestedEnable.status !== 0 || !existsSync(runtimePageFile)) {
+      fail('同一维护窗口内的后续 maintenance-on 必须保留已安装公告页。');
+    }
+
+    const disable = runScript(offScript, [], env);
+    if (disable.status !== 0) {
+      fail(`maintenance-off 执行失败: ${disable.stderr || disable.stdout}`);
+    }
+    if (existsSync(markerFile) || existsSync(runtimePageFile)) {
+      fail('maintenance-off 必须同时清理 marker 和运行态公告页。');
+    }
+
+    mkdirSync(path.dirname(runtimePageFile), { recursive: true });
+    writeFileSync(runtimePageFile, announcement);
+    chmodSync(runtimePageFile, 0o644);
+    const genericEnable = runScript(onScript, ['generic maintenance'], env);
+    if (genericEnable.status !== 0) {
+      fail(`通用 maintenance-on 执行失败: ${genericEnable.stderr || genericEnable.stdout}`);
+    }
+    if (existsSync(runtimePageFile)) {
+      fail('新维护窗口未提供 --page-file 时必须清理残留公告页。');
+    }
+    runScript(offScript, [], env);
+
+    const missingPage = runScript(
+      onScript,
+      ['--page-file', path.join(tempRoot, 'missing.html')],
+      env,
+    );
+    if (missingPage.status === 0 || existsSync(markerFile)) {
+      fail('不存在的 --page-file 必须在创建 marker 前失败。');
+    }
+  } finally {
+    rmSync(tempRoot, { recursive: true, force: true });
+  }
+}
+
+function validateGatewayConfiguration() {
+  const nginxSnippet = readFileSync(
+    path.join(repoRoot, 'deploy/nginx/snippets/genarrative-maintenance.conf'),
+    'utf8',
+  );
+  for (const expected of [
+    'root /var/lib/genarrative/maintenance;',
+    'try_files /page.html @genarrative_default_maintenance;',
+    'location @genarrative_default_maintenance',
+    'root /srv/genarrative/web;',
+  ]) {
+    if (!nginxSnippet.includes(expected)) {
+      fail(`Nginx 维护页配置缺少运行态覆盖约束: ${expected}`);
+    }
+  }
+
+  const pingoraSource = readFileSync(
+    path.join(repoRoot, 'server-rs/crates/pingora-gateway/src/main.rs'),
+    'utf8',
+  );
+  for (const expected of [
+    'GENARRATIVE_PINGORA_GATEWAY_MAINTENANCE_PAGE_FILE',
+    'maintenance_page_file',
+  ]) {
+    if (!pingoraSource.includes(expected)) {
+      fail(`Pingora 维护页配置缺少运行态覆盖约束: ${expected}`);
+    }
+  }
+
+  const releaseBuildScript = readFileSync(
+    path.join(repoRoot, 'scripts/build-production-release.sh'),
+    'utf8',
+  );
+  if (
+    !releaseBuildScript.includes(
+      'node scripts/check-maintenance-page.mjs --file "${WEB_DIR}/maintenance.html"',
+    )
+  ) {
+    fail('生产 Web 发布包构建必须校验最终 maintenance.html 不含临时公告。');
+  }
+}
+
+for (const filePath of
+  requestedFiles.length > 0
+    ? requestedFiles
+    : [path.join(repoRoot, 'public/maintenance.html')]) {
+  validateDefaultPage(filePath);
+}
+
+if (requestedFiles.length === 0) {
+  validateRuntimePageLifecycle();
+  validateGatewayConfiguration();
+}
+
+if (failures.length > 0) {
+  console.error('[check:maintenance-page] FAILED');
+  for (const failure of failures) {
+    console.error(`- ${failure}`);
+  }
+  process.exit(1);
+}
+
+console.log('[check:maintenance-page] 通过');
diff --git a/scripts/check-nginx-spa-routes.mjs b/scripts/check-nginx-spa-routes.mjs
index 3ab5682c0..3fc282c5a 100644
--- a/scripts/check-nginx-spa-routes.mjs
+++ b/scripts/check-nginx-spa-routes.mjs
@@ -172,6 +172,17 @@ function validateMaintenanceInternalBypass() {
   if (snippet.includes('$genarrative_admin_maintenance')) {
     fail(`${MAINTENANCE_SNIPPET_PATH} 不应保留仅后台使用的维护变量。`);
   }
+  for (const fragment of [
+    'location = /404.html {',
+    'if ($http_accept !~* "text/html") {',
+    'try_files /404.html =404;',
+    'add_header Cache-Control "no-store";',
+    'internal;',
+  ]) {
+    if (!snippet.includes(fragment)) {
+      fail(`${MAINTENANCE_SNIPPET_PATH} 缺少品牌 404 页面约束: ${fragment}`);
+    }
+  }
 
   for (const nginxPath of MAINTENANCE_NGINX_PATHS) {
     const source = readFileSync(nginxPath, 'utf8');
@@ -193,6 +204,9 @@ function validateMaintenanceInternalBypass() {
     if (source.includes('$genarrative_admin_maintenance')) {
       fail(`${nginxPath} 的维护入口必须统一使用全站维护变量。`);
     }
+    if (!source.includes('error_page 404 /404.html;')) {
+      fail(`${nginxPath} 的 Web 未知路由必须返回品牌 404 页面。`);
+    }
     const maintenanceChecks =
       source.match(/if \(\$genarrative_[a-z_]*maintenance\)/gu) ?? [];
     if (maintenanceChecks.length === 0) {
diff --git a/scripts/check-pingora-gateway-smoke.mjs b/scripts/check-pingora-gateway-smoke.mjs
index 96bf12f53..951b1998b 100644
--- a/scripts/check-pingora-gateway-smoke.mjs
+++ b/scripts/check-pingora-gateway-smoke.mjs
@@ -2,14 +2,14 @@
 
 import { spawn, spawnSync } from 'node:child_process';
 import { createHash, randomBytes } from 'node:crypto';
-import { gunzipSync } from 'node:zlib';
+import { existsSync } from 'node:fs';
+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
 import http from 'node:http';
 import https from 'node:https';
 import net from 'node:net';
-import { mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
-import { existsSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { gunzipSync } from 'node:zlib';
 
 const repoRoot = process.cwd();
 const failures = [];
@@ -51,6 +51,7 @@ async function main() {
   const webRoot = path.join(tempRoot, 'web');
   const acmeRoot = path.join(tempRoot, 'acme');
   const maintenanceFile = path.join(tempRoot, 'maintenance', 'enabled');
+  const maintenancePageFile = path.join(tempRoot, 'maintenance', 'page.html');
   const accessLogFile = path.join(tempRoot, 'logs', 'pingora.access.log');
 
   await prepareStaticRoots(webRoot, acmeRoot);
@@ -158,6 +159,7 @@ async function main() {
       GENARRATIVE_PINGORA_GATEWAY_WEB_ROOT: webRoot,
       GENARRATIVE_PINGORA_GATEWAY_ACME_ROOT: acmeRoot,
       GENARRATIVE_PINGORA_GATEWAY_MAINTENANCE_FILE: maintenanceFile,
+      GENARRATIVE_PINGORA_GATEWAY_MAINTENANCE_PAGE_FILE: maintenancePageFile,
       GENARRATIVE_PINGORA_GATEWAY_ACCESS_LOG_FILE: accessLogFile,
       GENARRATIVE_PINGORA_GATEWAY_PROBE_TOKEN: probeToken,
       GENARRATIVE_PINGORA_GATEWAY_FORWARDED_PROTO: 'https',
@@ -208,6 +210,7 @@ async function main() {
     redirectBaseUrl,
     probeToken,
     maintenanceFile,
+    maintenancePageFile,
     accessLogFile,
     api,
     spacetime,
@@ -348,8 +351,9 @@ async function prepareStaticRoots(webRoot, acmeRoot) {
   );
   await writeFile(
     path.join(webRoot, 'maintenance.html'),
-    '<main>maintenance</main>',
+    '<main>default-maintenance</main>',
   );
+  await writeFile(path.join(webRoot, '404.html'), '<main>not-found-page</main>');
   await writeFile(
     path.join(acmeRoot, '.well-known', 'acme-challenge', 'token'),
     'acme-token',
@@ -550,6 +554,7 @@ async function runSmokeCases(
   redirectBaseUrl,
   probeToken,
   maintenanceFile,
+  maintenancePageFile,
   accessLogFile,
   api,
   spacetime,
@@ -598,6 +603,21 @@ async function runSmokeCases(
       `主站未知路径返回真实 404: ${unknownPath}`,
     );
   }
+  await expectHttp(
+    baseUrl,
+    '/some/browser/navigation',
+    404,
+    'not-found-page',
+    '浏览器导航未知路径返回品牌 404 页面',
+    {
+      headers: {
+        Accept: 'text/html,application/xhtml+xml',
+      },
+      validate: (response) =>
+        response.headers['cache-control'] === 'no-store' &&
+        response.headers['content-type']?.startsWith('text/html'),
+    },
+  );
   await expectHttp(baseUrl, '/admin', 301, '', '/admin 301 到 /admin/', {
     validate: (response) => response.headers.location === '/admin/',
   });
@@ -1124,6 +1144,7 @@ async function runSmokeCases(
   ]);
 
   await mkdir(path.dirname(maintenanceFile), { recursive: true });
+  await writeFile(maintenancePageFile, '<main>runtime-maintenance</main>');
   await writeFile(maintenanceFile, 'enabled');
   const publicClientHeaders = {
     'X-Real-IP': '203.0.113.50',
@@ -1149,11 +1170,11 @@ async function runSmokeCases(
     '维护模式 Gitea Host 请求没有打到 Gitea mock',
   );
   for (const [path, bodyNeedle, label] of [
-    ['/', 'maintenance', '公网主站页面'],
+    ['/', 'runtime-maintenance', '公网主站页面'],
     ['/api/creation-entry/config', 'MAINTENANCE', '公网普通 API'],
-    ['/v1/identity', 'maintenance', '公网 SpacetimeDB 路由'],
-    ['/admin/settings', 'maintenance', '公网后台页面'],
-    ['/admin/assets/admin.js', 'maintenance', '公网后台静态资源'],
+    ['/v1/identity', 'runtime-maintenance', '公网 SpacetimeDB 路由'],
+    ['/admin/settings', 'runtime-maintenance', '公网后台页面'],
+    ['/admin/assets/admin.js', 'runtime-maintenance', '公网后台静态资源'],
     ['/admin/api/users', 'MAINTENANCE', '公网后台 API'],
   ]) {
     await expectHttp(
@@ -1167,6 +1188,15 @@ async function runSmokeCases(
       },
     );
   }
+  await rm(maintenancePageFile, { force: true });
+  await expectHttp(
+    baseUrl,
+    '/',
+    503,
+    'default-maintenance',
+    '运行态公告缺失时回退 Web 制品默认维护页',
+    { headers: publicClientHeaders },
+  );
   await expectHttp(
     baseUrl,
     '/',
diff --git a/scripts/deploy/maintenance-off.sh b/scripts/deploy/maintenance-off.sh
index c47ada80d..7a3648399 100644
--- a/scripts/deploy/maintenance-off.sh
+++ b/scripts/deploy/maintenance-off.sh
@@ -3,10 +3,16 @@
 set -euo pipefail
 
 MAINTENANCE_FILE="${GENARRATIVE_MAINTENANCE_FILE:-/var/lib/genarrative/maintenance/enabled}"
+MAINTENANCE_PAGE_FILE="${GENARRATIVE_MAINTENANCE_PAGE_FILE:-/var/lib/genarrative/maintenance/page.html}"
 
 if [[ -f "${MAINTENANCE_FILE}" ]]; then
-  rm -f "${MAINTENANCE_FILE}"
+  rm -f -- "${MAINTENANCE_FILE}"
   echo "[maintenance] 已退出维护模式: ${MAINTENANCE_FILE}"
 else
   echo "[maintenance] 当前未处于维护模式: ${MAINTENANCE_FILE}"
 fi
+
+if [[ -e "${MAINTENANCE_PAGE_FILE}" || -L "${MAINTENANCE_PAGE_FILE}" ]]; then
+  rm -f -- "${MAINTENANCE_PAGE_FILE}"
+  echo "[maintenance] 已清理本次运行态公告页: ${MAINTENANCE_PAGE_FILE}"
+fi
diff --git a/scripts/deploy/maintenance-on.sh b/scripts/deploy/maintenance-on.sh
index ae9a54e3a..66df9ddb4 100644
--- a/scripts/deploy/maintenance-on.sh
+++ b/scripts/deploy/maintenance-on.sh
@@ -3,13 +3,59 @@
 set -euo pipefail
 
 MAINTENANCE_FILE="${GENARRATIVE_MAINTENANCE_FILE:-/var/lib/genarrative/maintenance/enabled}"
-REASON="${*:-manual}"
+MAINTENANCE_PAGE_FILE="${GENARRATIVE_MAINTENANCE_PAGE_FILE:-/var/lib/genarrative/maintenance/page.html}"
+PAGE_SOURCE=""
+REASON_PARTS=()
 
-mkdir -p "$(dirname "${MAINTENANCE_FILE}")"
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --page-file)
+      PAGE_SOURCE="${2:?缺少 --page-file 的值}"
+      shift 2
+      ;;
+    -h|--help)
+      echo "用法: $0 [--page-file <临时公告 HTML>] [维护原因]"
+      exit 0
+      ;;
+    --*)
+      echo "[maintenance] 未知参数: $1" >&2
+      exit 1
+      ;;
+    *)
+      REASON_PARTS+=("$1")
+      shift
+      ;;
+  esac
+done
+
+REASON="${REASON_PARTS[*]:-manual}"
+
+if [[ -n "${PAGE_SOURCE}" && ( ! -f "${PAGE_SOURCE}" || ! -s "${PAGE_SOURCE}" ) ]]; then
+  echo "[maintenance] 临时公告页不存在或为空: ${PAGE_SOURCE}" >&2
+  exit 1
+fi
+
+mkdir -p "$(dirname "${MAINTENANCE_FILE}")" "$(dirname "${MAINTENANCE_PAGE_FILE}")"
+
+if [[ -n "${PAGE_SOURCE}" ]]; then
+  page_temp="$(mktemp "${MAINTENANCE_PAGE_FILE}.tmp.XXXXXX")"
+  trap 'rm -f "${page_temp:-}" "${marker_temp:-}"' EXIT
+  install -m 0644 -- "${PAGE_SOURCE}" "${page_temp}"
+  mv -fT -- "${page_temp}" "${MAINTENANCE_PAGE_FILE}"
+  page_temp=""
+  echo "[maintenance] 已安装本次运行态公告页: ${MAINTENANCE_PAGE_FILE}"
+elif [[ ! -f "${MAINTENANCE_FILE}" && ( -e "${MAINTENANCE_PAGE_FILE}" || -L "${MAINTENANCE_PAGE_FILE}" ) ]]; then
+  rm -f -- "${MAINTENANCE_PAGE_FILE}"
+fi
+
+marker_temp="$(mktemp "${MAINTENANCE_FILE}.tmp.XXXXXX")"
 {
   printf "enabled_at=%s\n" "$(date -u +%Y-%m-%dT%H:%M:%SZ)"
   printf "reason=%s\n" "${REASON}"
-} >"${MAINTENANCE_FILE}"
+} >"${marker_temp}"
 
-chmod 0644 "${MAINTENANCE_FILE}"
+chmod 0644 "${marker_temp}"
+mv -fT -- "${marker_temp}" "${MAINTENANCE_FILE}"
+marker_temp=""
+trap - EXIT
 echo "[maintenance] 已进入维护模式: ${MAINTENANCE_FILE}"
diff --git a/server-rs/crates/api-server/src/assets.rs b/server-rs/crates/api-server/src/assets.rs
index f8479ab72..dfc6d90f0 100644
--- a/server-rs/crates/api-server/src/assets.rs
+++ b/server-rs/crates/api-server/src/assets.rs
@@ -50,6 +50,7 @@ const SUPPORTED_ASSET_HISTORY_KINDS: [&str; 9] = [
 // 中文注释：同源字节读取同时服务图片转 Data URL 与 Match3D 私有 GLB 预览，Rodin GLB 可能明显超过图片上限。
 const ASSET_READ_BYTES_MAX_SIZE_BYTES: u64 = 120 * 1024 * 1024;
 const ASSET_READ_BYTES_DEFAULT_EXPIRE_SECONDS: u64 = 300;
+const PUBLIC_ASSET_READ_MAX_EXPIRE_SECONDS: u64 = 600;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub(crate) enum AssetReadAuthorization {
@@ -58,6 +59,12 @@ pub(crate) enum AssetReadAuthorization {
     Admin,
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum AssetReadAccessScope {
+    Public,
+    Privileged,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 struct AssetReadTarget {
     object_key: String,
@@ -188,12 +195,17 @@ pub(crate) async fn get_asset_read_url_with_query(
     })?;
 
     let target = resolve_asset_read_target(&query)?;
-    authorize_asset_read_target(state, oss_client.config_bucket(), &target, &authorization).await?;
+    let access_scope =
+        authorize_asset_read_target(state, oss_client.config_bucket(), &target, &authorization)
+            .await?;
 
     let signed = oss_client
         .sign_get_object_url(OssSignedGetObjectUrlRequest {
             object_key: target.object_key,
-            expire_seconds: query.expire_seconds,
+            expire_seconds: clamp_public_asset_read_expire_seconds(
+                query.expire_seconds,
+                access_scope,
+            ),
         })
         .map_err(|error| {
             AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
@@ -298,16 +310,20 @@ pub async fn get_asset_read_bytes(
         "/api/assets/read-bytes",
     )
     .await?;
-    authorize_asset_read_target(&state, oss_client.config_bucket(), &target, &authorization)
-        .await?;
+    let access_scope =
+        authorize_asset_read_target(&state, oss_client.config_bucket(), &target, &authorization)
+            .await?;
 
     let signed = oss_client
         .sign_get_object_url(OssSignedGetObjectUrlRequest {
             object_key: target.object_key,
-            expire_seconds: Some(
-                query
-                    .expire_seconds
-                    .unwrap_or(ASSET_READ_BYTES_DEFAULT_EXPIRE_SECONDS),
+            expire_seconds: clamp_public_asset_read_expire_seconds(
+                Some(
+                    query
+                        .expire_seconds
+                        .unwrap_or(ASSET_READ_BYTES_DEFAULT_EXPIRE_SECONDS),
+                ),
+                access_scope,
             ),
         })
         .map_err(|error| map_oss_error(error, "aliyun-oss"))?;
@@ -657,14 +673,17 @@ async fn authorize_asset_read_target(
     configured_bucket: &str,
     target: &AssetReadTarget,
     authorization: &AssetReadAuthorization,
-) -> Result<(), AppError> {
+) -> Result<AssetReadAccessScope, AppError> {
     if matches!(authorization, AssetReadAuthorization::Admin) {
-        return Ok(());
+        return Ok(AssetReadAccessScope::Privileged);
     }
 
-    let asset_object = state
+    let (asset_object, public_work_granted) = state
         .spacetime_client()
-        .get_asset_object_by_object_key(target.object_key.clone())
+        .get_asset_read_access_by_location(module_assets::AssetObjectLocationInput {
+            bucket: configured_bucket.to_string(),
+            object_key: target.object_key.clone(),
+        })
         .await
         .map_err(map_asset_read_authorization_error)?;
     if let Some(asset_object) = asset_object.as_ref() {
@@ -673,12 +692,13 @@ async fn authorize_asset_read_target(
             configured_bucket,
             target.object_key.as_str(),
             authorization,
+            public_work_granted,
         );
     }
 
     // 已登记对象始终服从 metadata ACL；只有没有 metadata 的历史资源才走公开前缀兼容。
     if target.is_legacy_public_path && is_supported_legacy_public_object_key(&target.object_key) {
-        return Ok(());
+        return Ok(AssetReadAccessScope::Public);
     }
 
     Err(asset_read_not_found())
@@ -689,16 +709,49 @@ fn require_asset_object_read_access(
     configured_bucket: &str,
     object_key: &str,
     authorization: &AssetReadAuthorization,
-) -> Result<(), AppError> {
-    let bucket_matches = asset_object.bucket.trim() == configured_bucket.trim();
-    let key_matches = asset_object.object_key.trim().trim_start_matches('/') == object_key;
-    if !bucket_matches || !key_matches {
+    public_work_granted: bool,
+) -> Result<AssetReadAccessScope, AppError> {
+    if !asset_object_storage_matches(asset_object, configured_bucket, object_key) {
         return Err(asset_read_not_found());
     }
-    if asset_object.access_policy == AssetObjectAccessPolicy::PublicRead {
-        return Ok(());
+    if asset_object_owner_matches(asset_object, authorization) {
+        return Ok(AssetReadAccessScope::Privileged);
     }
-    let owner_matches = match authorization {
+    if asset_object.access_policy == AssetObjectAccessPolicy::PublicRead || public_work_granted {
+        return Ok(AssetReadAccessScope::Public);
+    }
+
+    Err(asset_read_not_found())
+}
+
+fn clamp_public_asset_read_expire_seconds(
+    requested_expire_seconds: Option<u64>,
+    access_scope: AssetReadAccessScope,
+) -> Option<u64> {
+    match access_scope {
+        AssetReadAccessScope::Public => Some(
+            requested_expire_seconds
+                .unwrap_or(PUBLIC_ASSET_READ_MAX_EXPIRE_SECONDS)
+                .min(PUBLIC_ASSET_READ_MAX_EXPIRE_SECONDS),
+        ),
+        AssetReadAccessScope::Privileged => requested_expire_seconds,
+    }
+}
+
+fn asset_object_storage_matches(
+    asset_object: &module_assets::AssetObjectRecord,
+    configured_bucket: &str,
+    object_key: &str,
+) -> bool {
+    asset_object.bucket.trim() == configured_bucket.trim()
+        && asset_object.object_key.trim().trim_start_matches('/') == object_key
+}
+
+fn asset_object_owner_matches(
+    asset_object: &module_assets::AssetObjectRecord,
+    authorization: &AssetReadAuthorization,
+) -> bool {
+    match authorization {
         AssetReadAuthorization::Owner(owner_user_id) => asset_object
             .owner_user_id
             .as_deref()
@@ -706,11 +759,6 @@ fn require_asset_object_read_access(
             .is_some_and(|value| value == owner_user_id.trim()),
         AssetReadAuthorization::Admin => true,
         AssetReadAuthorization::Anonymous => false,
-    };
-    if owner_matches {
-        Ok(())
-    } else {
-        Err(asset_read_not_found())
     }
 }
 
@@ -987,15 +1035,16 @@ mod tests {
             Some("user-owner"),
         );
 
-        assert!(
+        assert!(matches!(
             super::require_asset_object_read_access(
                 &record,
                 "genarrative-assets",
                 record.object_key.as_str(),
                 &super::AssetReadAuthorization::Owner("user-owner".to_string()),
-            )
-            .is_ok()
-        );
+                false,
+            ),
+            Ok(super::AssetReadAccessScope::Privileged)
+        ));
         for authorization in [
             super::AssetReadAuthorization::Anonymous,
             super::AssetReadAuthorization::Owner("user-other".to_string()),
@@ -1005,6 +1054,7 @@ mod tests {
                 "genarrative-assets",
                 record.object_key.as_str(),
                 &authorization,
+                false,
             )
             .expect_err("private asset should reject non-owner");
             assert_eq!(error.status_code(), StatusCode::NOT_FOUND);
@@ -1015,21 +1065,23 @@ mod tests {
     fn public_asset_read_allows_anonymous_but_rejects_storage_mismatch() {
         let record = asset_object_record(module_assets::AssetObjectAccessPolicy::PublicRead, None);
 
-        assert!(
+        assert!(matches!(
             super::require_asset_object_read_access(
                 &record,
                 "genarrative-assets",
                 record.object_key.as_str(),
                 &super::AssetReadAuthorization::Anonymous,
-            )
-            .is_ok()
-        );
+                false,
+            ),
+            Ok(super::AssetReadAccessScope::Public)
+        ));
         assert_eq!(
             super::require_asset_object_read_access(
                 &record,
                 "another-bucket",
                 record.object_key.as_str(),
                 &super::AssetReadAuthorization::Anonymous,
+                false,
             )
             .expect_err("bucket mismatch should be hidden")
             .status_code(),
@@ -1037,6 +1089,62 @@ mod tests {
         );
     }
 
+    #[test]
+    fn published_visible_work_reference_grants_private_asset_read() {
+        let record = asset_object_record(
+            module_assets::AssetObjectAccessPolicy::Private,
+            Some("user-owner"),
+        );
+
+        assert!(matches!(
+            super::require_asset_object_read_access(
+                &record,
+                "genarrative-assets",
+                record.object_key.as_str(),
+                &super::AssetReadAuthorization::Anonymous,
+                true,
+            ),
+            Ok(super::AssetReadAccessScope::Public)
+        ));
+        assert_eq!(
+            super::require_asset_object_read_access(
+                &record,
+                "another-bucket",
+                record.object_key.as_str(),
+                &super::AssetReadAuthorization::Anonymous,
+                true,
+            )
+            .expect_err("public work grant must not bypass storage identity")
+            .status_code(),
+            StatusCode::NOT_FOUND
+        );
+    }
+
+    #[test]
+    fn public_asset_read_url_expiry_is_capped_but_privileged_expiry_is_preserved() {
+        assert_eq!(
+            super::clamp_public_asset_read_expire_seconds(
+                None,
+                super::AssetReadAccessScope::Public,
+            ),
+            Some(super::PUBLIC_ASSET_READ_MAX_EXPIRE_SECONDS)
+        );
+        assert_eq!(
+            super::clamp_public_asset_read_expire_seconds(
+                Some(86_400),
+                super::AssetReadAccessScope::Public,
+            ),
+            Some(super::PUBLIC_ASSET_READ_MAX_EXPIRE_SECONDS)
+        );
+        assert_eq!(
+            super::clamp_public_asset_read_expire_seconds(
+                Some(86_400),
+                super::AssetReadAccessScope::Privileged,
+            ),
+            Some(86_400)
+        );
+    }
+
     #[test]
     fn legacy_public_fallback_only_accepts_curated_prefixes() {
         assert!(super::is_supported_legacy_public_object_key(
@@ -1229,7 +1337,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn read_url_returns_signed_legacy_public_object_url_when_oss_configured() {
+    async fn read_url_fails_closed_when_asset_metadata_authority_is_unavailable() {
         let config = AppConfig {
             oss_bucket: Some("genarrative-assets".to_string()),
             oss_endpoint: Some("oss-cn-shanghai.aliyuncs.com".to_string()),
@@ -1252,7 +1360,7 @@ mod tests {
             .await
             .expect("request should succeed");
 
-        assert_eq!(response.status(), StatusCode::OK);
+        assert_eq!(response.status(), StatusCode::BAD_GATEWAY);
 
         let body = response
             .into_body()
@@ -1263,20 +1371,14 @@ mod tests {
         let payload: Value =
             serde_json::from_slice(&body).expect("response body should be valid json");
 
-        assert_eq!(payload["ok"], Value::Bool(true));
         assert_eq!(
-            payload["data"]["read"]["objectKey"],
-            Value::String("generated-characters/hero_001/visual/asset_01/master.png".to_string())
-        );
-        assert!(
-            payload["data"]["read"]["signedUrl"]
-                .as_str()
-                .is_some_and(|value| value.contains("x-oss-signature-version=OSS4-HMAC-SHA256"))
+            payload["error"]["details"]["provider"],
+            Value::String("spacetimedb".to_string())
         );
     }
 
     #[tokio::test]
-    async fn read_url_accepts_legacy_public_path_for_transition() {
+    async fn legacy_transition_does_not_bypass_asset_metadata_authority() {
         let config = AppConfig {
             oss_bucket: Some("genarrative-assets".to_string()),
             oss_endpoint: Some("oss-cn-shanghai.aliyuncs.com".to_string()),
@@ -1298,7 +1400,7 @@ mod tests {
             .await
             .expect("request should succeed");
 
-        assert_eq!(response.status(), StatusCode::OK);
+        assert_eq!(response.status(), StatusCode::BAD_GATEWAY);
 
         let body = response
             .into_body()
@@ -1310,10 +1412,8 @@ mod tests {
             serde_json::from_slice(&body).expect("response body should be valid json");
 
         assert_eq!(
-            payload["read"]["objectKey"],
-            Value::String(
-                "generated-custom-world-scenes/profile_01/landmark_01/scene.png".to_string()
-            )
+            payload["error"]["details"]["provider"],
+            Value::String("spacetimedb".to_string())
         );
     }
 
diff --git a/server-rs/crates/api-server/src/character_animation_assets.rs b/server-rs/crates/api-server/src/character_animation_assets.rs
index e99ab0e46..391e33d95 100644
--- a/server-rs/crates/api-server/src/character_animation_assets.rs
+++ b/server-rs/crates/api-server/src/character_animation_assets.rs
@@ -41,9 +41,9 @@ use shared_contracts::assets::{
     CharacterRoleAssetWorkflowResolveRequest, CharacterRoleAssetWorkflowResponse,
     CharacterVisualDraftPayload, CharacterWorkflowCacheGetResponse, CharacterWorkflowCachePayload,
     CharacterWorkflowCacheSaveRequest, CharacterWorkflowCacheSaveResponse,
-    EditorCharacterAnimationFramePayload, EditorCharacterAnimationGenerateRequest,
-    EditorCharacterAnimationGenerateResponse, EditorVideoGenerateRequest,
-    EditorVideoGenerateResponse,
+    EDITOR_ASSET_LABEL_MAX_CHARS, EditorCharacterAnimationFramePayload,
+    EditorCharacterAnimationGenerateRequest, EditorCharacterAnimationGenerateResponse,
+    EditorVideoGenerateRequest, EditorVideoGenerateResponse,
 };
 use spacetime_client::SpacetimeClientError;
 
@@ -165,7 +165,13 @@ struct PersistedEditorVideo {
     legacy_public_path: String,
     object_key: String,
     asset_object_id: String,
-    thumbnail_src: String,
+    thumbnail_src: Option<String>,
+}
+
+struct PersistedEditorCharacterAnimationPreview {
+    legacy_public_path: String,
+    object_key: String,
+    asset_object_id: String,
 }
 
 pub async fn list_character_animation_templates(
@@ -627,6 +633,9 @@ pub(crate) async fn generate_editor_character_animation_for_owner(
     let canvas_completion = payload.canvas_completion.clone();
     let generation_inputs = payload.generation_inputs.clone();
     let source_resource_id = payload.source_resource_id.clone();
+    let asset_folder_id = payload.asset_folder_id.clone();
+    let asset_label =
+        resolve_editor_character_animation_asset_label(payload.asset_label.as_deref());
 
     let pricing = state.editor_generation_pricing().await.map_err(|error| {
         character_animation_error_response(
@@ -727,6 +736,33 @@ pub(crate) async fn generate_editor_character_animation_for_owner(
                 source_data_url.as_str(),
             )
             .await?;
+            persist_editor_generated_media_asset(
+                &state,
+                PersistEditorGeneratedAssetRequest {
+                    project_id: project_id.clone(),
+                    owner_user_id: owner_user_id.clone(),
+                    folder_id: asset_folder_id
+                        .clone()
+                        .or_else(|| Some("project".to_string())),
+                    label: editor_character_animation_source_asset_label(asset_label.as_str()),
+                    image_src: generated.preview_video_path.clone(),
+                    object_key: generated.object_key.clone(),
+                    asset_object_id: generated.asset_object_id.clone(),
+                    width: normalized.frame_width,
+                    height: normalized.frame_height,
+                    prompt: normalized.prompt.clone(),
+                    actual_prompt: Some(generated.submitted_prompt.clone()),
+                    model: EDITOR_CHARACTER_ANIMATION_MODEL.to_string(),
+                    provider: "Ark".to_string(),
+                    task_id: task_id.clone(),
+                    source_resource_id: source_resource_id.clone(),
+                    asset_kind: Some(EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND.to_string()),
+                    generation_inputs: generation_inputs.clone(),
+                    thumbnail_src: None,
+                    generation_cost_mud_points: 0,
+                },
+            )
+            .await?;
             let frames = extract_and_persist_editor_character_animation_frames(
                 &state,
                 owner_user_id.as_str(),
@@ -1819,6 +1855,53 @@ async fn put_generated_preview_video(
     Ok(put_result.legacy_public_path)
 }
 
+async fn put_generated_editor_character_animation_preview(
+    state: &AppState,
+    owner_user_id: &str,
+    source_layer_id: &str,
+    task_id: &str,
+    preview_payload: MediaPayload,
+) -> Result<PersistedEditorCharacterAnimationPreview, AppError> {
+    let content_type = preview_payload.mime_type.clone();
+    let put_result = put_character_animation_object(
+        state,
+        LegacyAssetPrefix::CharacterDrafts,
+        vec![
+            sanitize_storage_segment(source_layer_id, "layer"),
+            "animation".to_string(),
+            "editor-character-animation".to_string(),
+            task_id.to_string(),
+        ],
+        format!("preview.{}", preview_payload.extension),
+        preview_payload.mime_type,
+        preview_payload.bytes,
+        build_asset_metadata(
+            EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND,
+            owner_user_id,
+            "editor_layer",
+            source_layer_id,
+            EDITOR_GREEN_SCREEN_SOURCE_SLOT,
+            "editor-character-animation",
+        ),
+    )
+    .await?;
+    let confirmed = confirm_editor_character_animation_source_asset_object(
+        state,
+        owner_user_id,
+        source_layer_id,
+        task_id,
+        put_result.object_key.clone(),
+        content_type,
+    )
+    .await?;
+
+    Ok(PersistedEditorCharacterAnimationPreview {
+        legacy_public_path: put_result.legacy_public_path,
+        object_key: put_result.object_key,
+        asset_object_id: confirmed.record.asset_object_id,
+    })
+}
+
 async fn request_editor_character_animation_preview(
     state: &AppState,
     http_client: &reqwest::Client,
@@ -1841,20 +1924,19 @@ async fn request_editor_character_animation_preview(
         "下载画板角色动画视频失败。",
     )
     .await?;
-    let preview_video_path = put_generated_preview_video(
+    let persisted = put_generated_editor_character_animation_preview(
         state,
         owner_user_id,
         source_layer_id,
-        "editor-character-animation",
         task_id,
         preview_payload,
     )
     .await?;
 
     Ok(GeneratedAnimationPreview {
-        preview_video_path,
-        object_key: None,
-        asset_object_id: None,
+        preview_video_path: persisted.legacy_public_path,
+        object_key: Some(persisted.object_key),
+        asset_object_id: Some(persisted.asset_object_id),
         thumbnail_src: None,
         upstream_task_id,
         submitted_prompt: prompt.to_string(),
@@ -1884,7 +1966,7 @@ async fn request_editor_video_preview(
         preview_video_path: persisted.legacy_public_path,
         object_key: Some(persisted.object_key),
         asset_object_id: Some(persisted.asset_object_id),
-        thumbnail_src: Some(persisted.thumbnail_src),
+        thumbnail_src: persisted.thumbnail_src,
         upstream_task_id,
         submitted_prompt: request.prompt.clone(),
         moderation_fallback_applied: false,
@@ -1942,9 +2024,6 @@ async fn put_generated_editor_video(
     preview_payload: MediaPayload,
 ) -> Result<PersistedEditorVideo, AppError> {
     let content_type = preview_payload.mime_type.clone();
-    let thumbnail_src =
-        put_generated_editor_video_cover(state, owner_user_id, task_id, request, &preview_payload)
-            .await?;
     let put_result = put_character_animation_object(
         state,
         LegacyAssetPrefix::CharacterDrafts,
@@ -1954,8 +2033,8 @@ async fn put_generated_editor_video(
             task_id.to_string(),
         ],
         format!("preview.{}", preview_payload.extension),
-        preview_payload.mime_type,
-        preview_payload.bytes,
+        preview_payload.mime_type.clone(),
+        preview_payload.bytes.clone(),
         build_asset_metadata(
             EDITOR_VIDEO_ASSET_KIND,
             owner_user_id,
@@ -1974,6 +2053,27 @@ async fn put_generated_editor_video(
         content_type,
     )
     .await?;
+    let thumbnail_src = match put_generated_editor_video_cover(
+        state,
+        owner_user_id,
+        task_id,
+        request,
+        &preview_payload,
+    )
+    .await
+    {
+        Ok(thumbnail_src) => Some(thumbnail_src),
+        Err(error) => {
+            tracing::warn!(
+                provider = "editor-video",
+                operation = "persist_cover",
+                task_id = %task_id,
+                error = %error,
+                "画板视频主文件已持久化，但首帧封面生成失败"
+            );
+            None
+        }
+    };
     Ok(PersistedEditorVideo {
         legacy_public_path: put_result.legacy_public_path,
         object_key: put_result.object_key,
@@ -2635,6 +2735,46 @@ async fn confirm_editor_video_asset_object(
     Ok(module_assets::ConfirmAssetObjectResult { record })
 }
 
+async fn confirm_editor_character_animation_source_asset_object(
+    state: &AppState,
+    owner_user_id: &str,
+    source_layer_id: &str,
+    task_id: &str,
+    object_key: String,
+    content_type: String,
+) -> Result<module_assets::ConfirmAssetObjectResult, AppError> {
+    let oss_client = require_oss_client(state)?;
+    let head = oss_client
+        .head_object(&reqwest::Client::new(), OssHeadObjectRequest { object_key })
+        .await
+        .map_err(map_character_animation_oss_error)?;
+    let now_micros = current_utc_micros();
+    let record = state
+        .spacetime_client()
+        .confirm_asset_object(
+            build_asset_object_upsert_input(
+                generate_asset_object_id(now_micros),
+                head.bucket,
+                head.object_key,
+                AssetObjectAccessPolicy::Private,
+                head.content_type.or(Some(content_type)),
+                head.content_length,
+                head.etag,
+                EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND.to_string(),
+                Some(task_id.to_string()),
+                Some(owner_user_id.to_string()),
+                None,
+                Some(source_layer_id.to_string()),
+                now_micros,
+            )
+            .map_err(map_asset_object_prepare_error)?,
+        )
+        .await
+        .map_err(map_character_animation_spacetime_error)?;
+
+    Ok(module_assets::ConfirmAssetObjectResult { record })
+}
+
 async fn bind_character_animation_asset(
     state: &AppState,
     owner_user_id: &str,
@@ -4545,6 +4685,25 @@ fn trim_optional_text(value: Option<&str>) -> Option<String> {
         .map(ToOwned::to_owned)
 }
 
+fn resolve_editor_character_animation_asset_label(value: Option<&str>) -> String {
+    trim_optional_text(value)
+        .unwrap_or_else(|| "角色动作".to_string())
+        .chars()
+        .take(EDITOR_ASSET_LABEL_MAX_CHARS)
+        .collect()
+}
+
+fn editor_character_animation_source_asset_label(asset_label: &str) -> String {
+    let suffix = "（原始视频）";
+    let base_char_limit = EDITOR_ASSET_LABEL_MAX_CHARS.saturating_sub(suffix.chars().count());
+    let base = asset_label
+        .trim()
+        .chars()
+        .take(base_char_limit)
+        .collect::<String>();
+    format!("{base}{suffix}")
+}
+
 fn clamp_prompt_seed_text(value: Option<&str>) -> String {
     trim_optional_text(value)
         .unwrap_or_default()
@@ -5565,6 +5724,8 @@ mod tests {
                 canvas_completion: None,
                 generation_inputs: None,
                 source_resource_id: None,
+                asset_folder_id: None,
+                asset_label: Some(" 勇者待机 ".to_string()),
             })
             .expect("editor request should normalize");
 
@@ -5576,6 +5737,31 @@ mod tests {
         assert_eq!(normalized.frame_width, 540);
         assert_eq!(normalized.frame_height, 720);
         assert_eq!(normalized.ratio, "3:4");
+        assert_eq!(
+            resolve_editor_character_animation_asset_label(Some(" 勇者待机 ")),
+            "勇者待机"
+        );
+        assert_eq!(
+            resolve_editor_character_animation_asset_label(Some("   ")),
+            "角色动作"
+        );
+        assert_eq!(
+            resolve_editor_character_animation_asset_label(Some("动".repeat(81).as_str()))
+                .chars()
+                .count(),
+            EDITOR_ASSET_LABEL_MAX_CHARS
+        );
+        assert_eq!(
+            editor_character_animation_source_asset_label("勇者待机"),
+            "勇者待机（原始视频）"
+        );
+        let long_source_label =
+            editor_character_animation_source_asset_label("动".repeat(80).as_str());
+        assert_eq!(
+            long_source_label.chars().count(),
+            EDITOR_ASSET_LABEL_MAX_CHARS
+        );
+        assert!(long_source_label.ends_with("（原始视频）"));
     }
 
     #[test]
@@ -5604,6 +5790,8 @@ mod tests {
                 canvas_completion: None,
                 generation_inputs: None,
                 source_resource_id: None,
+                asset_folder_id: None,
+                asset_label: None,
             })
             .expect("editor request should normalize");
 
@@ -5632,6 +5820,8 @@ mod tests {
                 canvas_completion: None,
                 generation_inputs: None,
                 source_resource_id: None,
+                asset_folder_id: None,
+                asset_label: None,
             })
             .expect_err("invalid frame/duration pair should fail");
 
@@ -5742,6 +5932,50 @@ mod tests {
         );
     }
 
+    #[test]
+    fn editor_video_intermediate_outputs_are_registered_before_derivatives() {
+        let source = include_str!("character_animation_assets.rs");
+        assert_function_contains_in_order(
+            source,
+            "pub(crate) async fn generate_editor_character_animation_for_owner",
+            "pub async fn generate_editor_video",
+            &[
+                "request_editor_character_animation_preview",
+                "persist_editor_generated_media_asset",
+                "extract_and_persist_editor_character_animation_frames",
+            ],
+        );
+        assert_function_contains(
+            source,
+            "pub(crate) async fn generate_editor_character_animation_for_owner",
+            "pub async fn generate_editor_video",
+            &[
+                "or_else(|| Some(\"project\".to_string()))",
+                "EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND",
+            ],
+        );
+        assert_function_contains_in_order(
+            source,
+            "async fn put_generated_editor_character_animation_preview",
+            "async fn request_editor_character_animation_preview",
+            &[
+                "put_character_animation_object",
+                "confirm_editor_character_animation_source_asset_object",
+            ],
+        );
+        assert_function_contains_in_order(
+            source,
+            "async fn put_generated_editor_video",
+            "async fn put_generated_editor_video_cover",
+            &[
+                "put_character_animation_object",
+                "confirm_editor_video_asset_object",
+                "match put_generated_editor_video_cover",
+                "None",
+            ],
+        );
+    }
+
     #[test]
     fn editor_character_animation_samples_last_frame_before_decode_tail() {
         let last_frame_seconds = compute_sample_time_seconds(4.0, 31, 32, 0.0, 1.0, false);
diff --git a/server-rs/crates/api-server/src/editor_project.rs b/server-rs/crates/api-server/src/editor_project.rs
index 9969b55aa..39ec8a3c4 100644
--- a/server-rs/crates/api-server/src/editor_project.rs
+++ b/server-rs/crates/api-server/src/editor_project.rs
@@ -18,7 +18,11 @@ use module_assets::{
 };
 use platform_image::{
     DownloadedImage,
-    generated_asset_sheets::slice_generated_icon_spritesheet_all_by_connected_components,
+    generated_asset_sheets::{
+        GeneratedAssetSheetConnectedIcon,
+        slice_generated_icon_spritesheet_all_by_connected_components,
+        slice_generated_icon_spritesheet_by_connected_components,
+    },
 };
 use platform_oss::{
     LegacyAssetPrefix, OssHeadObjectRequest, OssObjectAccess, OssSignedGetObjectUrlRequest,
@@ -26,6 +30,7 @@ use platform_oss::{
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use shared_contracts::assets::{
+    EDITOR_ASSET_LABEL_MAX_CHARS,
     EditorCanvasGenerationCompletionPayload as EditorCanvasGenerationCompletionRequest,
     EditorCanvasGenerationPlaceholderPayload,
 };
@@ -99,6 +104,9 @@ const EDITOR_IMAGE_MODEL_NANOBANANA2: &str = "gemini-3.1-flash-image-preview";
 const EDITOR_IMAGE_MODEL_NANOBANANA2_DISPLAY_ALIAS: &str = "nanobanana2";
 const EDITOR_IMAGE_MODEL_NANOBANANA_LEGACY_ALIAS: &str = "nano-banana";
 const EDITOR_ICON_DESCRIPTION_LIMIT: usize = 100;
+const EDITOR_ICON_SPRITESHEET_MANUAL_MAX_DIMENSION: u32 = 4096;
+const EDITOR_ICON_SPRITESHEET_MANUAL_MAX_PIXELS: u64 = 2048 * 2048;
+const EDITOR_ICON_SPRITESHEET_MANUAL_MAX_SLICES: usize = 64;
 const EDITOR_UI_DESIGN_ASSET_EXTRACTION_REFERENCE_LIMIT: usize = 5;
 const EDITOR_CHARACTER_IMAGE_ASSET_KIND: &str = "editor_character_image";
 const EDITOR_CHARACTER_IMAGE_ENTITY_KIND: &str = "editor_project";
@@ -108,7 +116,11 @@ const EDITOR_SPEC_IMAGE_ASSET_KIND: &str = "editor_spec_image";
 const EDITOR_QUICK_EDIT_IMAGE_ASSET_KIND: &str = "editor_quick_edit_image";
 const EDITOR_UI_DESIGN_IMAGE_ASSET_KIND: &str = "editor_ui_design_image";
 const EDITOR_IMAGE_EDIT_ASSET_KIND: &str = "editor_image_edit";
+const EDITOR_IMAGE_EDIT_SOURCE_ASSET_KIND: &str = "editor_image_edit_source";
 const EDITOR_ICON_SPRITESHEET_ASSET_KIND: &str = "editor_icon_spritesheet";
+const EDITOR_ICON_SPRITESHEET_SLICE_ASSET_KIND: &str = "editor_icon_spritesheet_slice";
+const EDITOR_ICON_SPRITESHEET_SLICE_WARNING_COMPONENTS: &str = "insufficient-connected-components";
+const EDITOR_ICON_SPRITESHEET_SLICE_WARNING_PERSISTENCE: &str = "slice-persistence-failed";
 const EDITOR_UI_DESIGN_SPRITESHEET_ASSET_KIND: &str = "editor_ui_design_spritesheet";
 const EDITOR_UI_DESIGN_ASSET_IMAGE_KIND: &str = "editor_ui_design_asset";
 const EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND: &str = "editor_green_screen_source";
@@ -287,9 +299,19 @@ pub struct EditorIconSpritesheetGenerationRequest {
     pub(crate) project_id: Option<String>,
     pub(crate) generation_inputs: Option<Value>,
     pub(crate) asset_folder_id: Option<String>,
+    pub(crate) asset_label: Option<String>,
     pub(crate) canvas_completion: Option<EditorCanvasGenerationCompletionRequest>,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct EditorIconSpritesheetSliceRequest {
+    pub(crate) project_id: String,
+    pub(crate) source_resource_id: String,
+    pub(crate) asset_folder_id: Option<String>,
+    pub(crate) canvas_completion: EditorCanvasGenerationCompletionRequest,
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct EditorUiDesignAssetExtractionRequest {
@@ -550,6 +572,13 @@ pub struct EditorIconSpritesheetIconResponse {
     asset: Option<EditorAssetPayload>,
 }
 
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct EditorIconSpritesheetSliceWarningResponse {
+    code: &'static str,
+    reason: String,
+}
+
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct EditorIconSpritesheetGenerationResponse {
@@ -557,6 +586,8 @@ pub struct EditorIconSpritesheetGenerationResponse {
     spritesheet_width: u32,
     spritesheet_height: u32,
     icon_image_srcs: Vec<EditorIconSpritesheetIconResponse>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    slice_warning: Option<EditorIconSpritesheetSliceWarningResponse>,
     prompt: String,
     actual_prompt: Option<String>,
     model: String,
@@ -568,6 +599,13 @@ pub struct EditorIconSpritesheetGenerationResponse {
     project: Option<EditorProjectPayload>,
 }
 
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct EditorIconSpritesheetSliceResponse {
+    icon_image_srcs: Vec<EditorIconSpritesheetIconResponse>,
+    project: EditorProjectPayload,
+}
+
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct EditorProjectPayload {
@@ -1554,14 +1592,23 @@ pub(crate) async fn generate_editor_image_for_owner(
     let screen_color = screen_background_decision
         .as_ref()
         .map(|decision| decision.color);
+    let generation_inputs = apply_editor_screen_background_decision_to_generation_inputs(
+        payload.generation_inputs.clone(),
+        screen_background_decision.as_ref(),
+    );
+    let asset_label =
+        resolve_editor_generated_asset_label(payload.asset_label.clone(), role_setting.as_str());
     let mut image = generated.images.into_iter().next().ok_or_else(|| {
         AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({
             "provider": "vector-engine",
             "message": "VectorEngine 未返回图片",
         }))
     })?;
-    if is_character_generation {
-        persist_editor_green_screen_source_image(
+    let source_record = if is_character_generation {
+        let (source_width, source_height) = image::load_from_memory(image.bytes.as_slice())
+            .map(|image| (image.width(), image.height()))
+            .unwrap_or((1024, 1024));
+        let source_persisted = persist_editor_green_screen_source_image(
             state,
             caller.owner_user_id.as_str(),
             generated.task_id.as_str(),
@@ -1572,6 +1619,28 @@ pub(crate) async fn generate_editor_image_for_owner(
             "character-image",
         )
         .await?;
+        let source_record = persist_editor_green_screen_source_resource(
+            state,
+            source_persisted,
+            PersistEditorGreenScreenSourceResourceInput {
+                project_id: payload.project_id.clone(),
+                owner_user_id: caller.owner_user_id.clone(),
+                folder_id: payload
+                    .asset_folder_id
+                    .clone()
+                    .or_else(|| Some(EDITOR_ASSET_DEFAULT_FOLDER_ID.to_string())),
+                label: editor_generated_asset_variant_label(asset_label.as_str(), "原图"),
+                width: source_width,
+                height: source_height,
+                prompt: role_setting.clone(),
+                actual_prompt: generated.actual_prompt.clone(),
+                model: generation_options.model.to_string(),
+                task_id: generated.task_id.clone(),
+                source_resource_id: payload.source_resource_id.clone(),
+                generation_inputs: generation_inputs.clone(),
+            },
+        )
+        .await?;
         let matting_audit = crate::external_api_audit::ExternalApiAuditContext {
             user_id: caller.audit_subject_user_id.clone(),
             profile_id: caller
@@ -1588,7 +1657,10 @@ pub(crate) async fn generate_editor_image_for_owner(
             &matting_audit,
         )
         .await?;
-    }
+        Some(source_record)
+    } else {
+        None
+    };
 
     let (width, height) = image::load_from_memory(image.bytes.as_slice())
         .map(|image| (image.width(), image.height()))
@@ -1615,8 +1687,7 @@ pub(crate) async fn generate_editor_image_for_owner(
             project_id: payload.project_id.clone(),
             owner_user_id: caller.owner_user_id.clone(),
             folder_id: payload.asset_folder_id,
-            label: normalize_optional_string(payload.asset_label)
-                .unwrap_or_else(|| role_setting.clone()),
+            label: asset_label,
             image_src: image_src.clone(),
             object_key: Some(persisted.object_key.clone()),
             asset_object_id: Some(persisted.asset_object_id.clone()),
@@ -1629,21 +1700,31 @@ pub(crate) async fn generate_editor_image_for_owner(
             task_id: generated.task_id.clone(),
             source_resource_id: payload.source_resource_id,
             asset_kind: payload.asset_kind,
-            generation_inputs: apply_editor_screen_background_decision_to_generation_inputs(
-                payload.generation_inputs,
-                screen_background_decision.as_ref(),
-            ),
+            generation_inputs,
             thumbnail_src: None,
             generation_cost_mud_points: u64::from(configured_price_mud_points),
         },
     )
     .await?;
-    let completed_project = complete_editor_canvas_generation(
+    let (canvas_items, primary_layer_id) =
+        if let Some(completion) = payload.canvas_completion.as_ref() {
+            build_multi_asset_canvas_layer_items(
+                completion,
+                generated_asset.resource.as_ref(),
+                source_record
+                    .as_ref()
+                    .and_then(|record| record.resource.as_ref()),
+            )
+        } else {
+            (Vec::new(), None)
+        };
+    let completed_project = complete_editor_canvas_generation_with_items(
         state,
         caller.owner_user_id.as_str(),
         payload.project_id.as_deref(),
         payload.canvas_completion.as_ref(),
-        generated_asset.resource.as_ref(),
+        canvas_items,
+        primary_layer_id,
     )
     .await?;
 
@@ -1922,6 +2003,93 @@ fn align_editor_image_edit_dimension(value: u32) -> u32 {
     value.saturating_add(15) / 16 * 16
 }
 
+fn ensure_editor_image_edit_asset_kind_allowed(asset_kind: Option<&str>) -> Result<(), AppError> {
+    let Some(asset_kind) = asset_kind.map(str::trim).filter(|value| !value.is_empty()) else {
+        return Ok(());
+    };
+    if !matches!(asset_kind, "icon" | "icon-spritesheet") {
+        return Ok(());
+    }
+
+    Err(
+        AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
+            "provider": "editor-image-edit",
+            "message": "图标与图标图集不支持快速编辑",
+            "assetKind": asset_kind,
+        })),
+    )
+}
+
+fn resolve_editor_image_edit_target_layer_asset_kind<'a>(
+    layers: &'a Value,
+    resources: &'a [EditorProjectResourcePayload],
+    target_layer_id: &str,
+) -> Result<Option<&'a str>, AppError> {
+    let target_layer = layers
+        .as_array()
+        .and_then(|items| {
+            items
+                .iter()
+                .find(|item| item.get("layerId").and_then(Value::as_str) == Some(target_layer_id))
+        })
+        .ok_or_else(|| {
+            AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
+                "provider": "editor-image-edit",
+                "message": "快速编辑目标图层不存在",
+                "targetLayerId": target_layer_id,
+            }))
+        })?;
+    if let Some(asset_kind) = target_layer.get("assetKind").and_then(Value::as_str) {
+        return Ok(Some(asset_kind));
+    }
+    let resource_id = target_layer.get("resourceId").and_then(Value::as_str);
+    Ok(resource_id.and_then(|resource_id| {
+        resources
+            .iter()
+            .find(|resource| resource.resource_id == resource_id)
+            .and_then(|resource| resource.asset_kind.as_deref())
+    }))
+}
+
+async fn ensure_editor_image_edit_source_allowed(
+    state: &AppState,
+    owner_user_id: &str,
+    payload: &EditorImageEditRequest,
+) -> Result<(), AppError> {
+    let Some(project_id) = payload
+        .project_id
+        .as_deref()
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+    else {
+        return ensure_editor_image_edit_asset_kind_allowed(payload.asset_kind.as_deref());
+    };
+    let Some(target_layer_id) = payload
+        .target_layer_id
+        .as_deref()
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+    else {
+        return ensure_editor_image_edit_asset_kind_allowed(payload.asset_kind.as_deref());
+    };
+    let project = state
+        .spacetime_client()
+        .get_editor_project(EditorProjectGetRecordInput {
+            project_id: project_id.to_string(),
+            owner_user_id: owner_user_id.to_string(),
+        })
+        .await
+        .map_err(map_editor_project_error)?;
+    let project = editor_project_payload_from_record(project);
+    let asset_kind = resolve_editor_image_edit_target_layer_asset_kind(
+        &project.layers,
+        &project.resources,
+        target_layer_id,
+    )?
+    .or(payload.asset_kind.as_deref());
+    ensure_editor_image_edit_asset_kind_allowed(asset_kind)
+}
+
 fn encode_editor_image_edit_png(
     image: image::DynamicImage,
     failure_status: StatusCode,
@@ -2060,6 +2228,8 @@ pub async fn edit_editor_image(
 ) -> Result<Json<Value>, AppError> {
     let caller = EditorGenerationCaller::from_authenticated(&authenticated);
     if !state.config.external_generation_mode.is_inline() {
+        ensure_editor_image_edit_source_allowed(&state, caller.owner_user_id.as_str(), &payload)
+            .await?;
         let generation_options =
             normalize_editor_generation_options(payload.model.as_deref(), None, None);
         let image_size = normalize_editor_image_generation_size(payload.size.as_deref());
@@ -2096,6 +2266,7 @@ pub(crate) async fn edit_editor_image_for_owner(
     caller: EditorGenerationCaller,
     payload: EditorImageEditRequest,
 ) -> Result<Json<Value>, AppError> {
+    ensure_editor_image_edit_source_allowed(state, caller.owner_user_id.as_str(), &payload).await?;
     let prompt = payload.prompt.trim().to_string();
     if prompt.is_empty() {
         return Err(
@@ -2162,13 +2333,66 @@ pub(crate) async fn edit_editor_image_for_owner(
         ),
     )
     .await?;
-    let image = generated.images.into_iter().next().ok_or_else(|| {
+    let provider_image = generated.images.into_iter().next().ok_or_else(|| {
         AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({
             "provider": "vector-engine",
             "message": "VectorEngine 未返回图片",
         }))
     })?;
-    let image = restore_editor_image_edit_output_dimensions(image, &edit_dimensions)?;
+    let (provider_width, provider_height) =
+        image::load_from_memory(provider_image.bytes.as_slice())
+            .map(|image| (image.width(), image.height()))
+            .unwrap_or((
+                edit_dimensions.provider_width,
+                edit_dimensions.provider_height,
+            ));
+    let source_persisted = persist_editor_generated_image(
+        state,
+        caller.owner_user_id.as_str(),
+        generated.task_id.as_str(),
+        &provider_image,
+        prompt.as_str(),
+        generated.actual_prompt.as_deref(),
+        EDITOR_IMAGE_EDIT_SOURCE_ASSET_KIND,
+        "edit-images",
+        "image-provider-source",
+        "provider_source",
+        "vector-engine",
+    )
+    .await?;
+    let asset_label =
+        resolve_editor_generated_asset_label(payload.asset_label.clone(), "图片修改结果");
+    let source_label =
+        editor_generated_asset_variant_label(asset_label.as_str(), "原始输出");
+    let _source_record = persist_editor_generated_asset(
+        state,
+        PersistEditorGeneratedAssetInput {
+            project_id: payload.project_id.clone(),
+            owner_user_id: caller.owner_user_id.clone(),
+            folder_id: payload
+                .asset_folder_id
+                .clone()
+                .or_else(|| Some(EDITOR_ASSET_DEFAULT_FOLDER_ID.to_string())),
+            label: source_label,
+            image_src: editor_media_src_from_object_key(source_persisted.object_key.as_str()),
+            object_key: Some(source_persisted.object_key),
+            asset_object_id: Some(source_persisted.asset_object_id),
+            width: provider_width,
+            height: provider_height,
+            prompt: prompt.clone(),
+            actual_prompt: generated.actual_prompt.clone(),
+            model: generation_options.model.to_string(),
+            provider: "VectorEngine".to_string(),
+            task_id: generated.task_id.clone(),
+            source_resource_id: payload.source_resource_id.clone(),
+            asset_kind: Some(EDITOR_IMAGE_EDIT_SOURCE_ASSET_KIND.to_string()),
+            generation_inputs: payload.generation_inputs.clone(),
+            thumbnail_src: None,
+            generation_cost_mud_points: 0,
+        },
+    )
+    .await?;
+    let image = restore_editor_image_edit_output_dimensions(provider_image, &edit_dimensions)?;
     let (width, height) = image::load_from_memory(image.bytes.as_slice())
         .map(|image| (image.width(), image.height()))
         .unwrap_or((1024, 1024));
@@ -2194,8 +2418,7 @@ pub(crate) async fn edit_editor_image_for_owner(
             project_id: payload.project_id.clone(),
             owner_user_id: owner_user_id.clone(),
             folder_id: payload.asset_folder_id,
-            label: normalize_optional_string(payload.asset_label)
-                .unwrap_or_else(|| "图片修改结果".to_string()),
+            label: asset_label.clone(),
             image_src: image_src.clone(),
             object_key: Some(persisted.object_key.clone()),
             asset_object_id: Some(persisted.asset_object_id.clone()),
@@ -2230,6 +2453,8 @@ pub(crate) async fn edit_editor_image_for_owner(
             payload.project_id.as_deref(),
             payload.target_layer_id.as_deref(),
             generated_asset.resource.as_ref(),
+            Some(asset_label.as_str()),
+            true,
         )
         .await?
     };
@@ -2316,14 +2541,15 @@ pub(crate) async fn remove_editor_image_background_for_owner(
     )
     .await?;
     let image_src = editor_media_src_from_object_key(persisted.object_key.as_str());
+    let asset_label =
+        resolve_editor_generated_asset_label(payload.asset_label.clone(), "去背景结果");
     let generated_asset = persist_editor_generated_asset(
         state,
         PersistEditorGeneratedAssetInput {
             project_id: payload.project_id.clone(),
             owner_user_id: caller.owner_user_id.clone(),
             folder_id: payload.asset_folder_id,
-            label: normalize_optional_string(payload.asset_label)
-                .unwrap_or_else(|| "去背景结果".to_string()),
+            label: asset_label.clone(),
             image_src: image_src.clone(),
             object_key: Some(persisted.object_key.clone()),
             asset_object_id: Some(persisted.asset_object_id.clone()),
@@ -2358,6 +2584,8 @@ pub(crate) async fn remove_editor_image_background_for_owner(
             payload.project_id.as_deref(),
             payload.target_layer_id.as_deref(),
             generated_asset.resource.as_ref(),
+            Some(asset_label.as_str()),
+            false,
         )
         .await?
     };
@@ -3014,6 +3242,96 @@ fn decode_editor_removed_background_image(
     })
 }
 
+struct PersistEditorSpritesheetSlicesInput {
+    owner_user_id: String,
+    project_id: Option<String>,
+    asset_folder_id: Option<String>,
+    source_resource_id: Option<String>,
+    task_id: String,
+    prompt: String,
+    actual_prompt: Option<String>,
+    model: String,
+    provider: String,
+    generation_inputs: Option<Value>,
+    path_kind: &'static str,
+    asset_kind: &'static str,
+    persistence_provider: &'static str,
+}
+
+async fn persist_editor_spritesheet_slices(
+    state: &AppState,
+    slices: Vec<GeneratedAssetSheetConnectedIcon>,
+    input: PersistEditorSpritesheetSlicesInput,
+) -> Result<Vec<EditorIconSpritesheetIconResponse>, AppError> {
+    if slices.is_empty() {
+        return Err(
+            AppError::from_status(StatusCode::UNPROCESSABLE_ENTITY).with_details(json!({
+                "provider": "editor-icon-spritesheet-slicing",
+                "message": "图集中未识别到可拆分的独立素材。",
+            })),
+        );
+    }
+
+    let mut results = Vec::with_capacity(slices.len());
+    for (index, slice) in slices.into_iter().enumerate() {
+        let image = DownloadedOpenAiImage {
+            bytes: slice.bytes,
+            mime_type: "image/png".to_string(),
+            extension: "png".to_string(),
+        };
+        let file_stem = format!("asset-{:03}", index + 1);
+        let persisted = persist_editor_generated_image(
+            state,
+            input.owner_user_id.as_str(),
+            input.task_id.as_str(),
+            &image,
+            input.prompt.as_str(),
+            input.actual_prompt.as_deref(),
+            input.asset_kind,
+            input.path_kind,
+            file_stem.as_str(),
+            "asset",
+            input.persistence_provider,
+        )
+        .await?;
+        let image_src = editor_media_src_from_object_key(persisted.object_key.as_str());
+        let record = persist_editor_generated_asset(
+            state,
+            PersistEditorGeneratedAssetInput {
+                project_id: input.project_id.clone(),
+                owner_user_id: input.owner_user_id.clone(),
+                folder_id: input.asset_folder_id.clone(),
+                label: slice.name.clone(),
+                image_src: image_src.clone(),
+                object_key: Some(persisted.object_key),
+                asset_object_id: Some(persisted.asset_object_id),
+                width: slice.width,
+                height: slice.height,
+                prompt: input.prompt.clone(),
+                actual_prompt: input.actual_prompt.clone(),
+                model: input.model.clone(),
+                provider: input.provider.clone(),
+                task_id: input.task_id.clone(),
+                source_resource_id: input.source_resource_id.clone(),
+                asset_kind: Some("icon".to_string()),
+                generation_inputs: input.generation_inputs.clone(),
+                thumbnail_src: None,
+                generation_cost_mud_points: 0,
+            },
+        )
+        .await?;
+        results.push(EditorIconSpritesheetIconResponse {
+            name: slice.name,
+            image_src,
+            width: slice.width,
+            height: slice.height,
+            resource: record.resource,
+            asset: record.asset,
+        });
+    }
+    Ok(results)
+}
+
 pub async fn generate_editor_icon_spritesheet(
     State(state): State<AppState>,
     Extension(request_context): Extension<RequestContext>,
@@ -3199,7 +3517,20 @@ pub(crate) async fn generate_editor_icon_spritesheet_for_owner(
             "message": "VectorEngine 未返回图标 spritesheet",
         }))
     })?;
-    persist_editor_green_screen_source_image(
+    let (source_width, source_height) = image::load_from_memory(image.bytes.as_slice())
+        .map(|image| (image.width(), image.height()))
+        .unwrap_or((512, 512));
+    let generation_inputs = apply_editor_screen_background_decision_to_generation_inputs(
+        payload.generation_inputs.clone(),
+        Some(&screen_background_decision),
+    );
+    let spritesheet_label =
+        resolve_editor_generated_asset_label(payload.asset_label.clone(), "图标素材图集");
+    let asset_folder_id = payload
+        .asset_folder_id
+        .clone()
+        .or_else(|| Some(EDITOR_ASSET_DEFAULT_FOLDER_ID.to_string()));
+    let source_persisted = persist_editor_green_screen_source_image(
         state,
         caller.owner_user_id.as_str(),
         generated.task_id.as_str(),
@@ -3210,6 +3541,25 @@ pub(crate) async fn generate_editor_icon_spritesheet_for_owner(
         "spritesheet",
     )
     .await?;
+    let source_record = persist_editor_green_screen_source_resource(
+        state,
+        source_persisted,
+        PersistEditorGreenScreenSourceResourceInput {
+            project_id: payload.project_id.clone(),
+            owner_user_id: caller.owner_user_id.clone(),
+            folder_id: asset_folder_id.clone(),
+            label: editor_generated_asset_variant_label(spritesheet_label.as_str(), "原图"),
+            width: source_width,
+            height: source_height,
+            prompt: prompt.clone(),
+            actual_prompt: generated.actual_prompt.clone(),
+            model: generation_options.model.to_string(),
+            task_id: generated.task_id.clone(),
+            source_resource_id: None,
+            generation_inputs: generation_inputs.clone(),
+        },
+    )
+    .await?;
     let matting_audit = crate::external_api_audit::ExternalApiAuditContext {
         user_id: caller.audit_subject_user_id.clone(),
         profile_id: caller
@@ -3229,10 +3579,6 @@ pub(crate) async fn generate_editor_icon_spritesheet_for_owner(
     let (spritesheet_width, spritesheet_height) = image::load_from_memory(image.bytes.as_slice())
         .map(|image| (image.width(), image.height()))
         .unwrap_or((512, 512));
-    let generation_inputs = apply_editor_screen_background_decision_to_generation_inputs(
-        payload.generation_inputs.clone(),
-        Some(&screen_background_decision),
-    );
     let owner_user_id = caller.owner_user_id;
     let spritesheet_persisted = persist_editor_generated_image(
         state,
@@ -3255,8 +3601,8 @@ pub(crate) async fn generate_editor_icon_spritesheet_for_owner(
         PersistEditorGeneratedAssetInput {
             project_id: payload.project_id.clone(),
             owner_user_id: owner_user_id.clone(),
-            folder_id: payload.asset_folder_id.clone(),
-            label: "图标素材图集".to_string(),
+            folder_id: asset_folder_id.clone(),
+            label: spritesheet_label,
             image_src: spritesheet_image_src.clone(),
             object_key: Some(spritesheet_persisted.object_key.clone()),
             asset_object_id: Some(spritesheet_persisted.asset_object_id.clone()),
@@ -3275,12 +3621,85 @@ pub(crate) async fn generate_editor_icon_spritesheet_for_owner(
         },
     )
     .await?;
-    let icon_image_srcs = Vec::new();
+    let slice_source = DownloadedImage {
+        bytes: image.bytes.clone(),
+        mime_type: image.mime_type.clone(),
+        extension: image.extension.clone(),
+    };
+    let (icon_image_srcs, slice_warning) =
+        match slice_generated_icon_spritesheet_by_connected_components(
+            &slice_source,
+            &icon_descriptions,
+        ) {
+            Ok(icon_slices) => {
+                match persist_editor_spritesheet_slices(
+                    state,
+                    icon_slices,
+                    PersistEditorSpritesheetSlicesInput {
+                        owner_user_id: owner_user_id.clone(),
+                        project_id: payload.project_id.clone(),
+                        asset_folder_id: asset_folder_id.clone(),
+                        source_resource_id: spritesheet_record
+                            .resource
+                            .as_ref()
+                            .map(|resource| resource.resource_id.clone()),
+                        task_id: generated.task_id.clone(),
+                        prompt: prompt.clone(),
+                        actual_prompt: generated.actual_prompt.clone(),
+                        model: generation_options.model.to_string(),
+                        provider: "VectorEngine".to_string(),
+                        generation_inputs: generation_inputs.clone(),
+                        path_kind: "icon-spritesheet-assets",
+                        asset_kind: EDITOR_ICON_SPRITESHEET_SLICE_ASSET_KIND,
+                        persistence_provider: "vector-engine",
+                    },
+                )
+                .await
+                {
+                    Ok(icon_image_srcs) => (icon_image_srcs, None),
+                    Err(error) => {
+                        let reason = error.body_text();
+                        tracing::warn!(
+                            provider = "editor-icon-spritesheet",
+                            operation = "persist_automatic_slices",
+                            task_id = %generated.task_id,
+                            reason = %reason,
+                            "图标图集已持久化，但自动拆分素材持久化失败"
+                        );
+                        (
+                            Vec::new(),
+                            Some(EditorIconSpritesheetSliceWarningResponse {
+                                code: EDITOR_ICON_SPRITESHEET_SLICE_WARNING_PERSISTENCE,
+                                reason,
+                            }),
+                        )
+                    }
+                }
+            }
+            Err(error) => {
+                let reason = error.to_string();
+                tracing::warn!(
+                    provider = "editor-icon-spritesheet",
+                    operation = "detect_automatic_slices",
+                    task_id = %generated.task_id,
+                    reason = %reason,
+                    "图标图集已持久化，但自动拆分未识别到全部素材"
+                );
+                (
+                    Vec::new(),
+                    Some(EditorIconSpritesheetSliceWarningResponse {
+                        code: EDITOR_ICON_SPRITESHEET_SLICE_WARNING_COMPONENTS,
+                        reason,
+                    }),
+                )
+            }
+        };
     let (canvas_items, primary_layer_id) =
         if let Some(completion) = payload.canvas_completion.as_ref() {
             build_icon_spritesheet_canvas_layer_items(
                 completion,
                 spritesheet_record.resource.as_ref(),
+                source_record.resource.as_ref(),
                 icon_image_srcs.as_slice(),
             )
         } else {
@@ -3303,6 +3722,7 @@ pub(crate) async fn generate_editor_icon_spritesheet_for_owner(
             spritesheet_width,
             spritesheet_height,
             icon_image_srcs,
+            slice_warning,
             prompt,
             actual_prompt: generated.actual_prompt,
             model: generation_options.model.to_string(),
@@ -3316,6 +3736,196 @@ pub(crate) async fn generate_editor_icon_spritesheet_for_owner(
     ))
 }
 
+pub async fn split_editor_icon_spritesheet(
+    State(state): State<AppState>,
+    Extension(request_context): Extension<RequestContext>,
+    Extension(authenticated): Extension<AuthenticatedAccessToken>,
+    Json(payload): Json<EditorIconSpritesheetSliceRequest>,
+) -> Result<Json<Value>, AppError> {
+    let owner_user_id = authenticated.claims().user_id().to_string();
+    let project_id = payload.project_id.trim().to_string();
+    let source_resource_id = payload.source_resource_id.trim().to_string();
+    if project_id.is_empty() || source_resource_id.is_empty() {
+        return Err(
+            AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({
+                "provider": "editor-icon-spritesheet-slicing",
+                "message": "projectId 和 sourceResourceId 不能为空。",
+            })),
+        );
+    }
+
+    let project = state
+        .spacetime_client()
+        .get_editor_project(EditorProjectGetRecordInput {
+            project_id: project_id.clone(),
+            owner_user_id: owner_user_id.clone(),
+        })
+        .await
+        .map_err(map_editor_project_error)?;
+    let source_resource = project
+        .resources
+        .iter()
+        .find(|resource| resource.resource_id == source_resource_id)
+        .ok_or_else(|| {
+            AppError::from_status(StatusCode::NOT_FOUND).with_details(json!({
+                "provider": "editor-icon-spritesheet-slicing",
+                "message": "未找到要拆分的图集资源。",
+            }))
+        })?;
+    if source_resource.asset_kind.as_deref() != Some("icon-spritesheet") {
+        return Err(
+            AppError::from_status(StatusCode::UNPROCESSABLE_ENTITY).with_details(json!({
+                "provider": "editor-icon-spritesheet-slicing",
+                "message": "只有图集素材可以使用拆分功能。",
+            })),
+        );
+    }
+
+    let reference =
+        parse_editor_reference_image(&state, owner_user_id.as_str(), source_resource_id.as_str())
+            .await?;
+    let source = DownloadedImage {
+        bytes: reference.bytes,
+        mime_type: reference.mime_type,
+        extension: "png".to_string(),
+    };
+    validate_editor_icon_spritesheet_manual_source(&source)?;
+    let slices =
+        slice_generated_icon_spritesheet_all_by_connected_components(&source).map_err(|error| {
+            AppError::from_status(StatusCode::UNPROCESSABLE_ENTITY).with_details(json!({
+                "provider": "editor-icon-spritesheet-slicing",
+                "message": error.to_string(),
+            }))
+        })?;
+    validate_editor_icon_spritesheet_manual_slice_count(slices.len())?;
+    let task_id = build_prefixed_uuid_id("editor-atlas-split-");
+    let prompt = source_resource
+        .prompt
+        .clone()
+        .unwrap_or_else(|| "拆分图集素材".to_string());
+    let actual_prompt = source_resource.actual_prompt.clone();
+    let model = source_resource
+        .model
+        .clone()
+        .unwrap_or_else(|| "connected-components".to_string());
+    let provider = source_resource
+        .provider
+        .clone()
+        .unwrap_or_else(|| "Genarrative".to_string());
+    let generation_inputs = source_resource.generation_inputs.clone();
+    let icon_image_srcs = persist_editor_spritesheet_slices(
+        &state,
+        slices,
+        PersistEditorSpritesheetSlicesInput {
+            owner_user_id: owner_user_id.clone(),
+            project_id: Some(project_id.clone()),
+            asset_folder_id: payload
+                .asset_folder_id
+                .or_else(|| Some(EDITOR_ASSET_DEFAULT_FOLDER_ID.to_string())),
+            source_resource_id: Some(source_resource_id),
+            task_id,
+            prompt,
+            actual_prompt,
+            model,
+            provider,
+            generation_inputs,
+            path_kind: "icon-spritesheet-slices",
+            asset_kind: EDITOR_ICON_SPRITESHEET_SLICE_ASSET_KIND,
+            persistence_provider: "genarrative",
+        },
+    )
+    .await?;
+    let canvas_items = build_icon_spritesheet_slice_canvas_layer_items(
+        &payload.canvas_completion,
+        icon_image_srcs.as_slice(),
+    );
+    let project = complete_editor_canvas_generation_with_items(
+        &state,
+        owner_user_id.as_str(),
+        Some(project_id.as_str()),
+        Some(&payload.canvas_completion),
+        canvas_items,
+        icon_image_srcs
+            .first()
+            .and_then(|icon| icon.resource.as_ref())
+            .map(|resource| generated_canvas_layer_id(resource.resource_id.as_str())),
+    )
+    .await?
+    .ok_or_else(|| {
+        AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR).with_details(json!({
+            "provider": "editor-icon-spritesheet-slicing",
+            "message": "图集拆分结果未能写入画布。",
+        }))
+    })?;
+
+    Ok(json_success_body(
+        Some(&request_context),
+        EditorIconSpritesheetSliceResponse {
+            icon_image_srcs,
+            project,
+        },
+    ))
+}
+
+fn validate_editor_icon_spritesheet_manual_source(
+    source: &DownloadedImage,
+) -> Result<(), AppError> {
+    let reader = image::ImageReader::new(Cursor::new(source.bytes.as_slice()))
+        .with_guessed_format()
+        .map_err(|error| {
+            AppError::from_status(StatusCode::UNPROCESSABLE_ENTITY).with_details(json!({
+                "provider": "editor-icon-spritesheet-slicing",
+                "message": format!("无法识别图集图片格式：{error}"),
+            }))
+        })?;
+    let (width, height) = reader.into_dimensions().map_err(|error| {
+        AppError::from_status(StatusCode::UNPROCESSABLE_ENTITY).with_details(json!({
+            "provider": "editor-icon-spritesheet-slicing",
+            "message": format!("无法读取图集图片尺寸：{error}"),
+        }))
+    })?;
+    validate_editor_icon_spritesheet_manual_dimensions(width, height)
+}
+
+fn validate_editor_icon_spritesheet_manual_dimensions(
+    width: u32,
+    height: u32,
+) -> Result<(), AppError> {
+    let pixel_count = u64::from(width).saturating_mul(u64::from(height));
+    if width == 0
+        || height == 0
+        || width > EDITOR_ICON_SPRITESHEET_MANUAL_MAX_DIMENSION
+        || height > EDITOR_ICON_SPRITESHEET_MANUAL_MAX_DIMENSION
+        || pixel_count > EDITOR_ICON_SPRITESHEET_MANUAL_MAX_PIXELS
+    {
+        return Err(
+            AppError::from_status(StatusCode::UNPROCESSABLE_ENTITY).with_details(json!({
+                "provider": "editor-icon-spritesheet-slicing",
+                "message": "图集尺寸超过手动拆分限制。",
+                "width": width,
+                "height": height,
+                "maxDimension": EDITOR_ICON_SPRITESHEET_MANUAL_MAX_DIMENSION,
+                "maxPixels": EDITOR_ICON_SPRITESHEET_MANUAL_MAX_PIXELS,
+            })),
+        );
+    }
+    Ok(())
+}
+
+fn validate_editor_icon_spritesheet_manual_slice_count(slice_count: usize) -> Result<(), AppError> {
+    if slice_count > EDITOR_ICON_SPRITESHEET_MANUAL_MAX_SLICES {
+        return Err(
+            AppError::from_status(StatusCode::UNPROCESSABLE_ENTITY).with_details(json!({
+                "provider": "editor-icon-spritesheet-slicing",
+                "message": "图集识别出的素材数量超过手动拆分限制。",
+                "sliceCount": slice_count,
+                "maxSliceCount": EDITOR_ICON_SPRITESHEET_MANUAL_MAX_SLICES,
+            })),
+        );
+    }
+    Ok(())
+}
+
 pub async fn extract_editor_ui_design_assets(
     State(state): State<AppState>,
     Extension(request_context): Extension<RequestContext>,
@@ -3500,7 +4110,20 @@ pub(crate) async fn extract_editor_ui_design_assets_for_owner(
             "message": "VectorEngine 未返回 UI 设计图素材 spritesheet",
         }))
     })?;
-    persist_editor_green_screen_source_image(
+    let (source_width, source_height) = image::load_from_memory(image.bytes.as_slice())
+        .map(|image| (image.width(), image.height()))
+        .unwrap_or((512, 512));
+    let generation_inputs = apply_editor_screen_background_decision_to_generation_inputs(
+        payload.generation_inputs.clone(),
+        Some(&screen_background_decision),
+    );
+    let source_label =
+        resolve_editor_generated_asset_label(payload.spritesheet_label.clone(), "UI设计图素材图集");
+    let asset_folder_id = payload
+        .asset_folder_id
+        .clone()
+        .or_else(|| Some(EDITOR_ASSET_DEFAULT_FOLDER_ID.to_string()));
+    let source_persisted = persist_editor_green_screen_source_image(
         state,
         caller.owner_user_id.as_str(),
         generated.task_id.as_str(),
@@ -3511,6 +4134,25 @@ pub(crate) async fn extract_editor_ui_design_assets_for_owner(
         "spritesheet",
     )
     .await?;
+    let source_record = persist_editor_green_screen_source_resource(
+        state,
+        source_persisted,
+        PersistEditorGreenScreenSourceResourceInput {
+            project_id: payload.project_id.clone(),
+            owner_user_id: caller.owner_user_id.clone(),
+            folder_id: asset_folder_id.clone(),
+            label: editor_generated_asset_variant_label(source_label.as_str(), "原图"),
+            width: source_width,
+            height: source_height,
+            prompt: prompt.clone(),
+            actual_prompt: generated.actual_prompt.clone(),
+            model: generation_options.model.to_string(),
+            task_id: generated.task_id.clone(),
+            source_resource_id: None,
+            generation_inputs: generation_inputs.clone(),
+        },
+    )
+    .await?;
     let matting_audit = crate::external_api_audit::ExternalApiAuditContext {
         user_id: caller.audit_subject_user_id.clone(),
         profile_id: caller
@@ -3530,22 +4172,6 @@ pub(crate) async fn extract_editor_ui_design_assets_for_owner(
     let (spritesheet_width, spritesheet_height) = image::load_from_memory(image.bytes.as_slice())
         .map(|image| (image.width(), image.height()))
         .unwrap_or((512, 512));
-    let source = DownloadedImage {
-        bytes: image.bytes.clone(),
-        mime_type: image.mime_type.clone(),
-        extension: image.extension.clone(),
-    };
-    let icon_slices = slice_generated_icon_spritesheet_all_by_connected_components(&source)
-        .map_err(|error| {
-            AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({
-                "provider": "editor-ui-design-asset-extraction",
-                "message": error.to_string(),
-            }))
-        })?;
-    let generation_inputs = apply_editor_screen_background_decision_to_generation_inputs(
-        payload.generation_inputs.clone(),
-        Some(&screen_background_decision),
-    );
     let owner_user_id = caller.owner_user_id;
     let spritesheet_persisted = persist_editor_generated_image(
         state,
@@ -3568,9 +4194,8 @@ pub(crate) async fn extract_editor_ui_design_assets_for_owner(
         PersistEditorGeneratedAssetInput {
             project_id: payload.project_id.clone(),
             owner_user_id: owner_user_id.clone(),
-            folder_id: payload.asset_folder_id.clone(),
-            label: normalize_optional_string(payload.spritesheet_label)
-                .unwrap_or_else(|| "UI设计图素材图集".to_string()),
+            folder_id: asset_folder_id.clone(),
+            label: source_label,
             image_src: spritesheet_image_src.clone(),
             object_key: Some(spritesheet_persisted.object_key.clone()),
             asset_object_id: Some(spritesheet_persisted.asset_object_id.clone()),
@@ -3589,72 +4214,82 @@ pub(crate) async fn extract_editor_ui_design_assets_for_owner(
         },
     )
     .await?;
-    let mut icon_image_srcs = Vec::new();
-    for icon in icon_slices {
-        let icon_index = icon_image_srcs.len() + 1;
-        let icon_name = icon.name.clone();
-        let icon_width = icon.width;
-        let icon_height = icon.height;
-        let icon_image = DownloadedOpenAiImage {
-            bytes: icon.bytes,
-            mime_type: "image/png".to_string(),
-            extension: "png".to_string(),
+    let slice_source = DownloadedImage {
+        bytes: image.bytes.clone(),
+        mime_type: image.mime_type.clone(),
+        extension: image.extension.clone(),
+    };
+    let (icon_image_srcs, slice_warning) =
+        match slice_generated_icon_spritesheet_all_by_connected_components(&slice_source) {
+            Ok(icon_slices) => {
+                match persist_editor_spritesheet_slices(
+                    state,
+                    icon_slices,
+                    PersistEditorSpritesheetSlicesInput {
+                        owner_user_id: owner_user_id.clone(),
+                        project_id: payload.project_id.clone(),
+                        asset_folder_id: asset_folder_id.clone(),
+                        source_resource_id: spritesheet_record
+                            .resource
+                            .as_ref()
+                            .map(|resource| resource.resource_id.clone()),
+                        task_id: generated.task_id.clone(),
+                        prompt: prompt.clone(),
+                        actual_prompt: generated.actual_prompt.clone(),
+                        model: generation_options.model.to_string(),
+                        provider: "VectorEngine".to_string(),
+                        generation_inputs: generation_inputs.clone(),
+                        path_kind: "ui-design-assets",
+                        asset_kind: EDITOR_UI_DESIGN_ASSET_IMAGE_KIND,
+                        persistence_provider: "vector-engine",
+                    },
+                )
+                .await
+                {
+                    Ok(icon_image_srcs) => (icon_image_srcs, None),
+                    Err(error) => {
+                        let reason = error.body_text();
+                        tracing::warn!(
+                            provider = "editor-ui-design-asset-extraction",
+                            operation = "persist_slices",
+                            task_id = %generated.task_id,
+                            reason = %reason,
+                            "UI 设计图透明图集已持久化，但独立素材持久化失败"
+                        );
+                        (
+                            Vec::new(),
+                            Some(EditorIconSpritesheetSliceWarningResponse {
+                                code: EDITOR_ICON_SPRITESHEET_SLICE_WARNING_PERSISTENCE,
+                                reason,
+                            }),
+                        )
+                    }
+                }
+            }
+            Err(error) => {
+                let reason = error.to_string();
+                tracing::warn!(
+                    provider = "editor-ui-design-asset-extraction",
+                    operation = "detect_slices",
+                    task_id = %generated.task_id,
+                    reason = %reason,
+                    "UI 设计图透明图集已持久化，但未识别到可拆分素材"
+                );
+                (
+                    Vec::new(),
+                    Some(EditorIconSpritesheetSliceWarningResponse {
+                        code: EDITOR_ICON_SPRITESHEET_SLICE_WARNING_COMPONENTS,
+                        reason,
+                    }),
+                )
+            }
         };
-        let icon_file_stem = format!("asset-{icon_index:03}");
-        let icon_persisted = persist_editor_generated_image(
-            state,
-            owner_user_id.as_str(),
-            generated.task_id.as_str(),
-            &icon_image,
-            prompt.as_str(),
-            generated.actual_prompt.as_deref(),
-            EDITOR_UI_DESIGN_ASSET_IMAGE_KIND,
-            "ui-design-assets",
-            icon_file_stem.as_str(),
-            "asset",
-            "vector-engine",
-        )
-        .await?;
-        let icon_image_src = editor_media_src_from_object_key(icon_persisted.object_key.as_str());
-        let icon_record = persist_editor_generated_asset(
-            state,
-            PersistEditorGeneratedAssetInput {
-                project_id: payload.project_id.clone(),
-                owner_user_id: owner_user_id.clone(),
-                folder_id: payload.asset_folder_id.clone(),
-                label: icon_name.clone(),
-                image_src: icon_image_src.clone(),
-                object_key: Some(icon_persisted.object_key.clone()),
-                asset_object_id: Some(icon_persisted.asset_object_id.clone()),
-                width: icon_width,
-                height: icon_height,
-                prompt: prompt.clone(),
-                actual_prompt: generated.actual_prompt.clone(),
-                model: generation_options.model.to_string(),
-                provider: "VectorEngine".to_string(),
-                task_id: generated.task_id.clone(),
-                source_resource_id: None,
-                asset_kind: Some("icon".to_string()),
-                generation_inputs: generation_inputs.clone(),
-                thumbnail_src: None,
-                generation_cost_mud_points: 0,
-            },
-        )
-        .await?;
-        icon_image_srcs.push(EditorIconSpritesheetIconResponse {
-            name: icon_name,
-            image_src: icon_image_src,
-            width: icon_width,
-            height: icon_height,
-            resource: icon_record.resource,
-            asset: icon_record.asset,
-        });
-    }
     let (canvas_items, primary_layer_id) =
         if let Some(completion) = payload.canvas_completion.as_ref() {
             build_icon_spritesheet_canvas_layer_items(
                 completion,
                 spritesheet_record.resource.as_ref(),
+                source_record.resource.as_ref(),
                 icon_image_srcs.as_slice(),
             )
         } else {
@@ -3677,6 +4312,7 @@ pub(crate) async fn extract_editor_ui_design_assets_for_owner(
             spritesheet_width,
             spritesheet_height,
             icon_image_srcs,
+            slice_warning,
             prompt,
             actual_prompt: generated.actual_prompt,
             model: generation_options.model.to_string(),
@@ -4512,6 +5148,8 @@ pub(crate) async fn complete_editor_canvas_background_removal(
     project_id: Option<&str>,
     target_layer_id: Option<&str>,
     resource: Option<&EditorProjectResourcePayload>,
+    replacement_title: Option<&str>,
+    recenter_replacement: bool,
 ) -> Result<Option<EditorProjectPayload>, AppError> {
     let (Some(project_id), Some(target_layer_id), Some(resource)) =
         (project_id, target_layer_id, resource)
@@ -4539,6 +5177,8 @@ pub(crate) async fn complete_editor_canvas_background_removal(
         project_payload.layers,
         target_layer_id,
         resource,
+        replacement_title,
+        recenter_replacement,
     ) else {
         return Ok(None);
     };
@@ -4562,6 +5202,8 @@ fn replace_editor_canvas_layer_with_resource(
     layers: Value,
     target_layer_id: &str,
     resource: &EditorProjectResourcePayload,
+    replacement_title: Option<&str>,
+    recenter_replacement: bool,
 ) -> Option<Value> {
     let mut items = match layers {
         Value::Array(items) => items,
@@ -4580,11 +5222,40 @@ fn replace_editor_canvas_layer_with_resource(
             continue;
         }
 
+        let replacement_width = f64::from(resource.width.max(1));
+        let replacement_height = f64::from(resource.height.max(1));
+        let centered_position = recenter_replacement
+            .then(|| {
+                object
+                    .get("x")
+                    .and_then(Value::as_f64)
+                    .zip(object.get("y").and_then(Value::as_f64))
+                    .zip(object.get("width").and_then(Value::as_f64))
+                    .zip(object.get("height").and_then(Value::as_f64))
+                    .map(|(((x, y), width), height)| {
+                        (
+                            x + width / 2.0 - replacement_width / 2.0,
+                            y + height / 2.0 - replacement_height / 2.0,
+                        )
+                    })
+            })
+            .flatten();
+
         object.insert(
             "resourceId".to_string(),
             Value::String(resource.resource_id.clone()),
         );
+        if let Some(title) = replacement_title
+            .map(str::trim)
+            .filter(|title| !title.is_empty())
+        {
+            object.insert("title".to_string(), Value::String(title.to_string()));
+        }
         object.insert("src".to_string(), Value::String(resource.image_src.clone()));
+        if let Some((x, y)) = centered_position {
+            object.insert("x".to_string(), json!(x));
+            object.insert("y".to_string(), json!(y));
+        }
         object.insert("width".to_string(), json!(resource.width.max(1)));
         object.insert("height".to_string(), json!(resource.height.max(1)));
         object.insert("originalWidth".to_string(), json!(resource.width.max(1)));
@@ -4919,38 +5590,113 @@ fn generated_canvas_media_type(asset_kind: Option<&str>) -> &'static str {
     }
 }
 
+fn build_multi_asset_canvas_layer_items(
+    completion: &EditorCanvasGenerationCompletionRequest,
+    primary_resource: Option<&EditorProjectResourcePayload>,
+    source_resource: Option<&EditorProjectResourcePayload>,
+) -> (Vec<Value>, Option<String>) {
+    let Some(primary_resource) = primary_resource else {
+        return (Vec::new(), None);
+    };
+    let placeholder = completion.placeholder.clone();
+    let primary_layer_id = generated_canvas_layer_id(primary_resource.resource_id.as_str());
+    let primary_item = build_generated_canvas_layer_item(
+        completion,
+        &placeholder,
+        primary_resource,
+        primary_layer_id.as_str(),
+        0,
+    );
+    let primary_right = primary_item
+        .get("x")
+        .and_then(Value::as_f64)
+        .unwrap_or(placeholder.x)
+        + primary_item
+            .get("width")
+            .and_then(Value::as_f64)
+            .unwrap_or(placeholder.width.max(1.0));
+    let primary_y = primary_item
+        .get("y")
+        .and_then(Value::as_f64)
+        .unwrap_or(placeholder.y);
+    let mut items = vec![primary_item];
+
+    if let Some(source_resource) = source_resource {
+        let source_layer_id = generated_canvas_layer_id(source_resource.resource_id.as_str());
+        let mut source_item = build_generated_canvas_layer_item(
+            completion,
+            &placeholder,
+            source_resource,
+            source_layer_id.as_str(),
+            0,
+        );
+        if let Some(object) = source_item.as_object_mut() {
+            object.insert("x".to_string(), json!(primary_right + 32.0));
+            object.insert("y".to_string(), json!(primary_y));
+            object.insert(
+                "title".to_string(),
+                json!(format!("{}（原图）", completion.title.trim())),
+            );
+        }
+        items.push(source_item);
+    }
+
+    (items, Some(primary_layer_id))
+}
+
 fn build_icon_spritesheet_canvas_layer_items(
     completion: &EditorCanvasGenerationCompletionRequest,
     spritesheet_resource: Option<&EditorProjectResourcePayload>,
+    source_resource: Option<&EditorProjectResourcePayload>,
     icons: &[EditorIconSpritesheetIconResponse],
 ) -> (Vec<Value>, Option<String>) {
-    let mut items = Vec::new();
-    let mut primary_layer_id = None;
     let placeholder = completion.placeholder.clone();
-    let Some(spritesheet_resource) = spritesheet_resource else {
+    let (mut items, primary_layer_id) =
+        build_multi_asset_canvas_layer_items(completion, spritesheet_resource, source_resource);
+    if items.is_empty() {
         return (items, primary_layer_id);
-    };
+    }
 
-    let spritesheet_layer_id = generated_canvas_layer_id(spritesheet_resource.resource_id.as_str());
-    primary_layer_id = Some(spritesheet_layer_id.clone());
-    let spritesheet_item = build_generated_canvas_layer_item(
+    let start_x = items
+        .iter()
+        .filter_map(|item| Some(item.get("x")?.as_f64()? + item.get("width")?.as_f64()?))
+        .fold(placeholder.x, f64::max)
+        + 32.0;
+    items.extend(build_icon_slice_canvas_layer_items_from_origin(
         completion,
-        &placeholder,
-        spritesheet_resource,
-        spritesheet_layer_id.as_str(),
-        0,
-    );
-    let sheet_width = spritesheet_item
-        .get("width")
-        .and_then(Value::as_f64)
-        .unwrap_or(placeholder.width.max(1.0));
-    items.push(spritesheet_item);
+        icons,
+        start_x,
+        placeholder.y,
+    ));
 
-    let mut cursor_x = placeholder.x + sheet_width + 32.0;
-    let mut cursor_y = placeholder.y;
+    (items, primary_layer_id)
+}
+
+fn build_icon_spritesheet_slice_canvas_layer_items(
+    completion: &EditorCanvasGenerationCompletionRequest,
+    icons: &[EditorIconSpritesheetIconResponse],
+) -> Vec<Value> {
+    let placeholder = &completion.placeholder;
+    build_icon_slice_canvas_layer_items_from_origin(
+        completion,
+        icons,
+        placeholder.x + placeholder.width.max(1.0) + 32.0,
+        placeholder.y,
+    )
+}
+
+fn build_icon_slice_canvas_layer_items_from_origin(
+    completion: &EditorCanvasGenerationCompletionRequest,
+    icons: &[EditorIconSpritesheetIconResponse],
+    start_x: f64,
+    start_y: f64,
+) -> Vec<Value> {
+    let placeholder = &completion.placeholder;
+    let mut items = Vec::new();
+    let mut cursor_x = start_x;
+    let mut cursor_y = start_y;
     let mut row_height = 0.0_f64;
     let max_row_width = 560.0_f64;
-    let start_x = cursor_x;
     let spacing = 24.0_f64;
 
     for icon in icons {
@@ -4973,6 +5719,7 @@ fn build_icon_spritesheet_canvas_layer_items(
             0,
         );
         if let Some(object) = item.as_object_mut() {
+            object.insert("title".to_string(), json!(icon.name));
             object.insert("x".to_string(), json!(cursor_x));
             object.insert("y".to_string(), json!(cursor_y));
             object.insert("width".to_string(), json!(width));
@@ -4984,8 +5731,7 @@ fn build_icon_spritesheet_canvas_layer_items(
         row_height = row_height.max(height);
         items.push(item);
     }
-
-    (items, primary_layer_id)
+    items
 }
 
 fn next_canvas_layer_z_index(items: &[Value]) -> i64 {
@@ -5185,6 +5931,25 @@ pub(crate) fn normalize_optional_string(value: Option<String>) -> Option<String>
         .filter(|item| !item.is_empty())
 }
 
+fn resolve_editor_generated_asset_label(value: Option<String>, fallback: &str) -> String {
+    normalize_optional_string(value)
+        .unwrap_or_else(|| fallback.to_string())
+        .chars()
+        .take(EDITOR_ASSET_LABEL_MAX_CHARS)
+        .collect()
+}
+
+fn editor_generated_asset_variant_label(label: &str, variant: &str) -> String {
+    let suffix = format!("（{variant}）");
+    let base_char_limit = EDITOR_ASSET_LABEL_MAX_CHARS.saturating_sub(suffix.chars().count());
+    let base = label
+        .trim()
+        .chars()
+        .take(base_char_limit)
+        .collect::<String>();
+    format!("{base}{suffix}")
+}
+
 pub(crate) fn sanitize_editor_storage_segment(value: &str, fallback: &str) -> String {
     let normalized = value
         .trim()
@@ -5345,6 +6110,21 @@ pub(crate) struct PersistedEditorGeneratedImage {
     pub(crate) asset_object_id: String,
 }
 
+struct PersistEditorGreenScreenSourceResourceInput {
+    project_id: Option<String>,
+    owner_user_id: String,
+    folder_id: Option<String>,
+    label: String,
+    width: u32,
+    height: u32,
+    prompt: String,
+    actual_prompt: Option<String>,
+    model: String,
+    task_id: String,
+    source_resource_id: Option<String>,
+    generation_inputs: Option<Value>,
+}
+
 pub(crate) async fn persist_editor_generated_image(
     state: &AppState,
     owner_user_id: &str,
@@ -5474,6 +6254,38 @@ async fn persist_editor_green_screen_source_image(
     .await
 }
 
+async fn persist_editor_green_screen_source_resource(
+    state: &AppState,
+    persisted: PersistedEditorGeneratedImage,
+    input: PersistEditorGreenScreenSourceResourceInput,
+) -> Result<EditorGeneratedAssetRecord, AppError> {
+    persist_editor_generated_asset(
+        state,
+        PersistEditorGeneratedAssetInput {
+            project_id: input.project_id,
+            owner_user_id: input.owner_user_id,
+            folder_id: input.folder_id,
+            label: input.label,
+            image_src: editor_media_src_from_object_key(persisted.object_key.as_str()),
+            object_key: Some(persisted.object_key),
+            asset_object_id: Some(persisted.asset_object_id),
+            width: input.width,
+            height: input.height,
+            prompt: input.prompt,
+            actual_prompt: input.actual_prompt,
+            model: input.model,
+            provider: "VectorEngine".to_string(),
+            task_id: input.task_id,
+            source_resource_id: input.source_resource_id,
+            asset_kind: Some(EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND.to_string()),
+            generation_inputs: input.generation_inputs,
+            thumbnail_src: None,
+            generation_cost_mud_points: 0,
+        },
+    )
+    .await
+}
+
 const EDITOR_REFERENCE_IMAGE_READ_EXPIRE_SECONDS: u64 = 300;
 const EDITOR_REFERENCE_IMAGE_MAX_SIZE_BYTES: u64 = 32 * 1024 * 1024;
 const EDITOR_BACKGROUND_REMOVAL_MAX_RESPONSE_BYTES: usize = 32 * 1024 * 1024;
@@ -5637,9 +6449,15 @@ async fn ensure_editor_reference_object_key_owned(
     }) {
         return Ok(());
     }
+    let Some(oss_client) = state.oss_client() else {
+        return Err(editor_reference_image_forbidden(object_key));
+    };
     if let Some(asset_object) = state
         .spacetime_client()
-        .get_asset_object_by_object_key(object_key.to_string())
+        .get_asset_object_by_location(module_assets::AssetObjectLocationInput {
+            bucket: oss_client.config_bucket().to_string(),
+            object_key: object_key.to_string(),
+        })
         .await
         .map_err(map_editor_project_error)?
     {
@@ -5922,6 +6740,49 @@ mod tests {
     use super::*;
     use crate::{config::AppConfig, editor_green_screen::parse_editor_screen_background_color};
 
+    fn editor_project_resource_for_canvas_test(
+        resource_id: &str,
+        asset_kind: &str,
+        width: u32,
+        height: u32,
+    ) -> EditorProjectResourcePayload {
+        EditorProjectResourcePayload {
+            resource_id: resource_id.to_string(),
+            showcase_id: None,
+            asset_id: None,
+            label: None,
+            project_id: "editor-project-1".to_string(),
+            owner_user_id: "user-1".to_string(),
+            author_display_name: None,
+            author_public_user_code: None,
+            image_src: format!("/generated-character-drafts/editor/{resource_id}.png"),
+            object_key: Some(format!(
+                "generated-character-drafts/editor/{resource_id}.png"
+            )),
+            asset_object_id: Some(format!("asset-object-{resource_id}")),
+            width,
+            height,
+            source_type: "generated".to_string(),
+            prompt: Some("银发游侠".to_string()),
+            actual_prompt: Some("实际提示词".to_string()),
+            model: Some("gpt-image-2".to_string()),
+            provider: Some("VectorEngine".to_string()),
+            task_id: Some("task-character".to_string()),
+            source_resource_id: None,
+            asset_kind: Some(asset_kind.to_string()),
+            showcase_category: None,
+            generation_inputs: None,
+            public_showcase_enabled: true,
+            review_status: None,
+            display_enabled: None,
+            like_count: None,
+            generation_cost_mud_points: 0,
+            refund_mud_points: None,
+            created_at: "2026-07-13T00:00:00.000Z".to_string(),
+            updated_at: "2026-07-13T00:00:00.000Z".to_string(),
+        }
+    }
+
     #[test]
     fn editor_project_procedure_errors_preserve_business_reason_as_bad_request() {
         let error = map_editor_project_error(SpacetimeClientError::Procedure(
@@ -6963,8 +7824,14 @@ mod tests {
             updated_at: "2026-06-29T00:00:00.000Z".to_string(),
         };
 
-        let replaced = replace_editor_canvas_layer_with_resource(layers, "layer-source", &resource)
-            .expect("target layer should be replaced");
+        let replaced = replace_editor_canvas_layer_with_resource(
+            layers.clone(),
+            "layer-source",
+            &resource,
+            None,
+            false,
+        )
+        .expect("target layer should be replaced");
         let items = replaced.as_array().expect("layers should stay array");
         let layer = items
             .iter()
@@ -6986,8 +7853,27 @@ mod tests {
         assert_eq!(layer["taskId"], json!("extgen-cutout"));
         assert_eq!(layer["sourceResourceId"], json!("resource-source"));
         assert_eq!(layer["assetKind"], json!("character"));
+        assert_eq!(layer["title"], json!("源图"));
         assert!(layer.get("sourceAssetId").is_none());
         assert!(layer.get("thumbnailSrc").is_none());
+
+        let recentered = replace_editor_canvas_layer_with_resource(
+            layers,
+            "layer-source",
+            &resource,
+            Some("勇者快速编辑"),
+            true,
+        )
+        .expect("quick edit replacement should recenter the layer");
+        let recentered_layer = recentered
+            .as_array()
+            .and_then(|items| items.iter().find(|item| item["layerId"] == "layer-source"))
+            .expect("quick edit source layer should remain");
+        assert_eq!(recentered_layer["x"], json!(24.0));
+        assert_eq!(recentered_layer["y"], json!(-124.0));
+        assert_eq!(recentered_layer["title"], json!("勇者快速编辑"));
+        assert_eq!(recentered_layer["x"].as_f64().unwrap() + 512.0 / 2.0, 280.0);
+        assert_eq!(recentered_layer["y"].as_f64().unwrap() + 768.0 / 2.0, 260.0);
     }
 
     #[test]
@@ -7229,6 +8115,200 @@ mod tests {
         assert_eq!(result_layer["y"], json!(290.0));
     }
 
+    #[test]
+    fn editor_canvas_multi_asset_items_keep_source_and_anchor_processed_result() {
+        let completion = EditorCanvasGenerationCompletionRequest {
+            dialog_id: Some("dialog-character".to_string()),
+            title: "角色形象 1".to_string(),
+            placeholder: EditorCanvasGenerationPlaceholderPayload {
+                x: 100.0,
+                y: 80.0,
+                width: 200.0,
+                height: 300.0,
+                original_width: 400.0,
+                original_height: 600.0,
+            },
+        };
+        let processed = editor_project_resource_for_canvas_test(
+            "resource-character-cutout",
+            "character",
+            400,
+            600,
+        );
+        let source = editor_project_resource_for_canvas_test(
+            "resource-character-source",
+            EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND,
+            400,
+            600,
+        );
+
+        let (items, primary_layer_id) =
+            build_multi_asset_canvas_layer_items(&completion, Some(&processed), Some(&source));
+
+        assert_eq!(items.len(), 2);
+        assert_eq!(
+            primary_layer_id.as_deref(),
+            Some("layer-editor-resource-resource-character-cutout")
+        );
+        assert_eq!(items[0]["resourceId"], json!("resource-character-cutout"));
+        assert_eq!(items[0]["x"], json!(0.0));
+        assert_eq!(items[0]["y"], json!(-70.0));
+        assert_eq!(items[1]["resourceId"], json!("resource-character-source"));
+        assert_eq!(items[1]["title"], json!("角色形象 1（原图）"));
+        assert_eq!(items[1]["x"], json!(432.0));
+        assert_eq!(items[1]["y"], json!(-70.0));
+
+        let layers = json!([{
+            "itemType": "generation-dialog",
+            "layerId": "generation-dialog:dialog-character",
+            "resourceId": "generation-dialog:dialog-character",
+            "dialog": {
+                "id": "dialog-character",
+                "status": "generating",
+                "placeholder": completion.placeholder.clone()
+            }
+        }]);
+        let completed = apply_editor_canvas_generation_multi_items(
+            layers,
+            &completion,
+            items,
+            primary_layer_id,
+        )
+        .expect("multi-asset completion should apply");
+        let completed_items = completed
+            .layers
+            .as_array()
+            .expect("layers should stay array");
+        assert_eq!(
+            completed_items
+                .iter()
+                .filter(|item| item
+                    .get("resourceId")
+                    .and_then(Value::as_str)
+                    .is_some_and(|id| id.starts_with("resource-character-")))
+                .count(),
+            2
+        );
+        let dialog = completed_items
+            .iter()
+            .find(|item| item["itemType"] == "generation-dialog")
+            .and_then(|item| item.get("dialog"))
+            .expect("generation dialog should remain");
+        assert_eq!(
+            dialog["generatedLayerId"],
+            json!("layer-editor-resource-resource-character-cutout")
+        );
+    }
+
+    #[test]
+    fn editor_canvas_spritesheet_items_include_source_sheet_and_slices() {
+        let completion = EditorCanvasGenerationCompletionRequest {
+            dialog_id: Some("dialog-ui-assets".to_string()),
+            title: "UI素材图集".to_string(),
+            placeholder: EditorCanvasGenerationPlaceholderPayload {
+                x: 100.0,
+                y: 80.0,
+                width: 256.0,
+                height: 256.0,
+                original_width: 512.0,
+                original_height: 512.0,
+            },
+        };
+        let processed = editor_project_resource_for_canvas_test(
+            "resource-ui-sheet",
+            "icon-spritesheet",
+            512,
+            512,
+        );
+        let source = editor_project_resource_for_canvas_test(
+            "resource-ui-source",
+            EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND,
+            512,
+            512,
+        );
+        let slice = editor_project_resource_for_canvas_test("resource-ui-slice", "icon", 128, 128);
+        let icons = vec![EditorIconSpritesheetIconResponse {
+            name: "开始按钮".to_string(),
+            image_src: slice.image_src.clone(),
+            width: 128,
+            height: 128,
+            resource: Some(slice),
+            asset: None,
+        }];
+
+        let (items, primary_layer_id) = build_icon_spritesheet_canvas_layer_items(
+            &completion,
+            Some(&processed),
+            Some(&source),
+            icons.as_slice(),
+        );
+
+        assert_eq!(items.len(), 3);
+        assert_eq!(
+            primary_layer_id.as_deref(),
+            Some("layer-editor-resource-resource-ui-sheet")
+        );
+        assert_eq!(items[0]["resourceId"], json!("resource-ui-sheet"));
+        assert_eq!(items[1]["resourceId"], json!("resource-ui-source"));
+        assert_eq!(items[2]["resourceId"], json!("resource-ui-slice"));
+        let source_right =
+            items[1]["x"].as_f64().unwrap() + items[1]["width"].as_f64().unwrap();
+        assert!(items[2]["x"].as_f64().unwrap() > source_right);
+    }
+
+    #[test]
+    fn editor_canvas_spritesheet_items_keep_sheet_and_source_when_slices_are_empty() {
+        let completion = EditorCanvasGenerationCompletionRequest {
+            dialog_id: Some("dialog-icon-sheet".to_string()),
+            title: "图标素材图集".to_string(),
+            placeholder: EditorCanvasGenerationPlaceholderPayload {
+                x: 100.0,
+                y: 80.0,
+                width: 256.0,
+                height: 256.0,
+                original_width: 512.0,
+                original_height: 512.0,
+            },
+        };
+        let processed = editor_project_resource_for_canvas_test(
+            "resource-icon-sheet",
+            "icon-spritesheet",
+            512,
+            512,
+        );
+        let source = editor_project_resource_for_canvas_test(
+            "resource-icon-source",
+            EDITOR_GREEN_SCREEN_SOURCE_ASSET_KIND,
+            512,
+            512,
+        );
+
+        let (items, primary_layer_id) = build_icon_spritesheet_canvas_layer_items(
+            &completion,
+            Some(&processed),
+            Some(&source),
+            &[],
+        );
+
+        assert_eq!(items.len(), 2);
+        assert_eq!(items[0]["resourceId"], json!("resource-icon-sheet"));
+        assert_eq!(items[1]["resourceId"], json!("resource-icon-source"));
+        assert_eq!(
+            primary_layer_id.as_deref(),
+            Some("layer-editor-resource-resource-icon-sheet")
+        );
+    }
+
+    #[test]
+    fn manual_icon_spritesheet_limits_reject_large_images_and_excessive_slices() {
+        assert!(validate_editor_icon_spritesheet_manual_dimensions(2048, 2048).is_ok());
+        assert!(validate_editor_icon_spritesheet_manual_dimensions(4096, 1024).is_ok());
+        assert!(validate_editor_icon_spritesheet_manual_dimensions(2049, 2048).is_err());
+        assert!(validate_editor_icon_spritesheet_manual_dimensions(4097, 1).is_err());
+        assert!(validate_editor_icon_spritesheet_manual_slice_count(64).is_ok());
+        assert!(validate_editor_icon_spritesheet_manual_slice_count(65).is_err());
+    }
+
     #[test]
     fn editor_canvas_generation_completion_skips_when_dialog_was_removed() {
         let layers = json!([
@@ -7574,6 +8654,10 @@ mod tests {
             spritesheet_width: 512,
             spritesheet_height: 512,
             icon_image_srcs: Vec::new(),
+            slice_warning: Some(EditorIconSpritesheetSliceWarningResponse {
+                code: EDITOR_ICON_SPRITESHEET_SLICE_WARNING_COMPONENTS,
+                reason: "图标 spritesheet 连通域数量不足：需要 2 个，实际 1 个。".to_string(),
+            }),
             prompt: "图标 prompt".to_string(),
             actual_prompt: Some("图标 prompt".to_string()),
             model: "gemini-3.1-flash-image-preview".to_string(),
@@ -7592,6 +8676,15 @@ mod tests {
 
         assert_eq!(payload["priceMudPoints"], json!(12));
         assert_eq!(payload["iconImageSrcs"], json!([]));
+        assert_eq!(
+            payload["sliceWarning"]["code"],
+            json!("insufficient-connected-components")
+        );
+        assert!(
+            payload["sliceWarning"]["reason"]
+                .as_str()
+                .is_some_and(|reason| reason.contains("连通域数量不足"))
+        );
     }
 
     #[tokio::test]
@@ -7698,6 +8791,66 @@ mod tests {
         assert_eq!(request.target_layer_id.as_deref(), Some("layer-source"));
     }
 
+    #[test]
+    fn editor_image_edit_rejects_icons_but_allows_icon_specs() {
+        for asset_kind in ["icon", "icon-spritesheet"] {
+            let error = ensure_editor_image_edit_asset_kind_allowed(Some(asset_kind))
+                .expect_err("icon assets should not support quick edit");
+            assert_eq!(error.status_code(), StatusCode::BAD_REQUEST);
+            assert_eq!(
+                error.details().and_then(|details| details.get("message")),
+                Some(&json!("图标与图标图集不支持快速编辑")),
+            );
+            assert_eq!(
+                error.details().and_then(|details| details.get("assetKind")),
+                Some(&json!(asset_kind)),
+            );
+        }
+
+        assert!(ensure_editor_image_edit_asset_kind_allowed(Some("icon-spec")).is_ok());
+        assert!(ensure_editor_image_edit_asset_kind_allowed(Some("image")).is_ok());
+        assert!(ensure_editor_image_edit_asset_kind_allowed(None).is_ok());
+
+        let layers = json!([
+            { "layerId": "layer-icon", "assetKind": "icon" },
+            { "layerId": "layer-icon-spec", "assetKind": "icon-spec" }
+        ]);
+        let icon_kind =
+            resolve_editor_image_edit_target_layer_asset_kind(&layers, &[], "layer-icon")
+                .expect("icon layer should exist");
+        assert!(ensure_editor_image_edit_asset_kind_allowed(icon_kind).is_err());
+        let icon_spec_kind =
+            resolve_editor_image_edit_target_layer_asset_kind(&layers, &[], "layer-icon-spec")
+                .expect("icon spec layer should exist");
+        assert!(ensure_editor_image_edit_asset_kind_allowed(icon_spec_kind).is_ok());
+        assert!(
+            resolve_editor_image_edit_target_layer_asset_kind(&layers, &[], "missing").is_err()
+        );
+    }
+
+    #[test]
+    fn editor_image_edit_guards_before_queue_and_owner_execution() {
+        let source = include_str!("editor_project.rs");
+        assert_function_contains_in_order(
+            source,
+            "pub async fn edit_editor_image(",
+            "pub(crate) async fn edit_editor_image_for_owner",
+            &[
+                "ensure_editor_image_edit_source_allowed(",
+                "enqueue_editor_generation_job",
+            ],
+        );
+        assert_function_contains_in_order(
+            source,
+            "pub(crate) async fn edit_editor_image_for_owner",
+            "pub async fn remove_editor_image_background",
+            &[
+                "ensure_editor_image_edit_source_allowed(",
+                "parse_editor_reference_image",
+            ],
+        );
+    }
+
     #[test]
     fn editor_image_edit_can_complete_by_replacing_target_layer() {
         let source = include_str!("editor_project.rs");
@@ -7720,7 +8873,8 @@ mod tests {
             "referenceImageSrcs": ["data:image/png;base64,style"],
             "iconDescriptions": ["返回按钮"],
             "screenColor": "#7FB3FF",
-            "segModel": "anime-seg"
+            "segModel": "anime-seg",
+            "assetLabel": " 冒险界面图标 "
         }))
         .expect("icon spritesheet request should deserialize references");
 
@@ -7730,6 +8884,62 @@ mod tests {
         );
         assert_eq!(request.screen_color.as_deref(), Some("#7FB3FF"));
         assert_eq!(request.seg_model.as_deref(), Some("anime-seg"));
+        assert_eq!(request.asset_label.as_deref(), Some(" 冒险界面图标 "));
+    }
+
+    #[test]
+    fn editor_generated_asset_label_trims_custom_name_and_falls_back_for_blank_input() {
+        assert_eq!(
+            resolve_editor_generated_asset_label(
+                Some(" 冒险界面图标 ".to_string()),
+                "图标素材图集"
+            ),
+            "冒险界面图标"
+        );
+        assert_eq!(
+            resolve_editor_generated_asset_label(Some("   ".to_string()), "图标素材图集"),
+            "图标素材图集"
+        );
+        assert_eq!(
+            resolve_editor_generated_asset_label(Some("图".repeat(81)), "图标素材图集")
+                .chars()
+                .count(),
+            EDITOR_ASSET_LABEL_MAX_CHARS
+        );
+        assert_eq!(
+            editor_generated_asset_variant_label("冒险界面图标", "原图"),
+            "冒险界面图标（原图）"
+        );
+        let long_variant = editor_generated_asset_variant_label("图".repeat(80).as_str(), "原图");
+        assert_eq!(long_variant.chars().count(), EDITOR_ASSET_LABEL_MAX_CHARS);
+        assert!(long_variant.ends_with("（原图）"));
+    }
+
+    #[test]
+    fn editor_icon_spritesheet_slice_request_requires_project_source_and_layout() {
+        let request: EditorIconSpritesheetSliceRequest = serde_json::from_value(json!({
+            "projectId": "project-1",
+            "sourceResourceId": "resource-atlas-1",
+            "assetFolderId": "project",
+            "canvasCompletion": {
+                "title": "拆分图集",
+                "placeholder": {
+                    "x": 120.0,
+                    "y": 80.0,
+                    "width": 360.0,
+                    "height": 360.0,
+                    "originalWidth": 1024.0,
+                    "originalHeight": 1024.0
+                }
+            }
+        }))
+        .expect("spritesheet slice request should deserialize");
+
+        assert_eq!(request.project_id, "project-1");
+        assert_eq!(request.source_resource_id, "resource-atlas-1");
+        assert_eq!(request.asset_folder_id.as_deref(), Some("project"));
+        assert_eq!(request.canvas_completion.title, "拆分图集");
+        assert_eq!(request.canvas_completion.placeholder.width, 360.0);
     }
 
     #[test]
@@ -7819,6 +9029,7 @@ mod tests {
             &[
                 "persist_editor_green_screen_source_image",
                 "remove_editor_generated_screen_background_with_bgfilter",
+                "persist_editor_green_screen_source_resource",
                 "if is_character_generation",
             ],
         );
@@ -7828,6 +9039,7 @@ mod tests {
             "fn normalize_editor_image_generation_size",
             &[
                 "persist_editor_green_screen_source_image",
+                "persist_editor_green_screen_source_resource",
                 "remove_editor_generated_screen_background_with_bgfilter",
             ],
         );
@@ -7838,6 +9050,9 @@ mod tests {
             &[
                 "persist_editor_green_screen_source_image",
                 "remove_editor_generated_screen_background_with_bgfilter",
+                "persist_editor_green_screen_source_resource",
+                "slice_generated_icon_spritesheet_by_connected_components",
+                "persist_editor_spritesheet_slices",
             ],
         );
         assert_function_contains_in_order(
@@ -7846,6 +9061,7 @@ mod tests {
             "pub async fn extract_editor_ui_design_assets",
             &[
                 "persist_editor_green_screen_source_image",
+                "persist_editor_green_screen_source_resource",
                 "remove_editor_generated_screen_background_with_bgfilter",
             ],
         );
@@ -7856,6 +9072,7 @@ mod tests {
             &[
                 "persist_editor_green_screen_source_image",
                 "remove_editor_generated_screen_background_with_bgfilter",
+                "persist_editor_green_screen_source_resource",
                 "slice_generated_icon_spritesheet_all_by_connected_components",
             ],
         );
@@ -7865,6 +9082,7 @@ mod tests {
             "pub(crate) fn editor_project_payload_from_record",
             &[
                 "persist_editor_green_screen_source_image",
+                "persist_editor_green_screen_source_resource",
                 "remove_editor_generated_screen_background_with_bgfilter",
             ],
         );
@@ -7973,6 +9191,51 @@ mod tests {
         );
     }
 
+    #[test]
+    fn editor_paid_image_postprocess_keeps_provider_outputs_recoverable() {
+        let source = include_str!("editor_project.rs");
+        assert_function_contains(
+            source,
+            "pub(crate) async fn generate_editor_image_for_owner",
+            "fn normalize_editor_image_generation_size",
+            &["EDITOR_ASSET_DEFAULT_FOLDER_ID"],
+        );
+        assert_function_contains_in_order(
+            source,
+            "pub(crate) async fn edit_editor_image_for_owner",
+            "pub async fn generate_editor_icon_spritesheet",
+            &[
+                "let provider_image",
+                "EDITOR_IMAGE_EDIT_SOURCE_ASSET_KIND",
+                "persist_editor_generated_asset",
+                "restore_editor_image_edit_output_dimensions",
+            ],
+        );
+        assert_function_contains_in_order(
+            source,
+            "pub(crate) async fn extract_editor_ui_design_assets_for_owner",
+            "pub(crate) fn editor_project_payload_from_record",
+            &[
+                "persist_editor_green_screen_source_resource",
+                "remove_editor_generated_screen_background_with_bgfilter",
+                "EDITOR_UI_DESIGN_SPRITESHEET_ASSET_KIND",
+                "persist_editor_generated_asset",
+                "slice_generated_icon_spritesheet_all_by_connected_components",
+                "persist_editor_spritesheet_slices",
+            ],
+        );
+        assert_function_contains(
+            source,
+            "pub(crate) async fn extract_editor_ui_design_assets_for_owner",
+            "pub(crate) fn editor_project_payload_from_record",
+            &[
+                "EDITOR_ASSET_DEFAULT_FOLDER_ID",
+                "EDITOR_ICON_SPRITESHEET_SLICE_WARNING_COMPONENTS",
+                "EDITOR_ICON_SPRITESHEET_SLICE_WARNING_PERSISTENCE",
+            ],
+        );
+    }
+
     #[test]
     fn generated_asset_folder_id_normalizes_project_and_legacy_local_folder() {
         assert_eq!(
diff --git a/server-rs/crates/api-server/src/external_editor_api.rs b/server-rs/crates/api-server/src/external_editor_api.rs
index eb5ac1a69..ee6628de6 100644
--- a/server-rs/crates/api-server/src/external_editor_api.rs
+++ b/server-rs/crates/api-server/src/external_editor_api.rs
@@ -875,6 +875,11 @@ mod tests {
                 .get("/api/external/v1/editor/icon-spritesheets/generations")
                 .is_some()
         );
+        assert_eq!(
+            parsed["components"]["schemas"]["EditorIconSpritesheetGenerationResponse"]["properties"]
+                ["sliceWarning"]["anyOf"][0]["$ref"],
+            "#/components/schemas/EditorIconSpritesheetSliceWarning"
+        );
         assert!(
             parsed["paths"]
                 .get("/api/external/v1/editor/ui-designs/assets/extractions")
diff --git a/server-rs/crates/api-server/src/external_generation.rs b/server-rs/crates/api-server/src/external_generation.rs
index 5d3bacc4b..def534cf9 100644
--- a/server-rs/crates/api-server/src/external_generation.rs
+++ b/server-rs/crates/api-server/src/external_generation.rs
@@ -7,11 +7,11 @@ use axum::{
 use serde::Deserialize;
 use serde_json::json;
 use shared_contracts::external_generation::{
-    ExternalGenerationJobStatus, ExternalGenerationJobStatusRecord,
-    ExternalGenerationJobStatusResponse, ExternalGenerationQueueOverview,
-    ExternalGenerationQueueOverviewResponse, ExternalGenerationTaskAcknowledgeRequest,
-    ExternalGenerationTaskAcknowledgeResponse, ExternalGenerationTaskListResponse,
-    ExternalGenerationTaskRecord,
+    ExternalGenerationJobStatus, ExternalGenerationJobStatusDetailRecord,
+    ExternalGenerationJobStatusRecord, ExternalGenerationJobStatusResponse,
+    ExternalGenerationQueueOverview, ExternalGenerationQueueOverviewResponse,
+    ExternalGenerationTaskAcknowledgeRequest, ExternalGenerationTaskAcknowledgeResponse,
+    ExternalGenerationTaskListResponse, ExternalGenerationTaskRecord,
 };
 use spacetime_client::{
     ExternalGenerationJobAcknowledgeRecordInput, ExternalGenerationJobGetRecordInput,
@@ -146,7 +146,7 @@ pub async fn get_external_generation_job_status(
     Ok(json_success_body(
         Some(&request_context),
         ExternalGenerationJobStatusResponse {
-            job: map_external_generation_job_status(job),
+            job: map_external_generation_job_status_detail(job),
         },
     ))
 }
@@ -165,11 +165,31 @@ fn map_external_generation_queue_overview(
 fn map_external_generation_job_status(
     job: ExternalGenerationJobSummaryRecord,
 ) -> ExternalGenerationJobStatusRecord {
-    let (status, phase_detail, progress) = match job.status.as_str() {
-        "completed" => (ExternalGenerationJobStatus::Completed, "生成已完成。", 100),
-        "running" => (ExternalGenerationJobStatus::Running, "正在生成。", 35),
-        "failed" => (ExternalGenerationJobStatus::Failed, "生成失败。", 0),
-        _ => (ExternalGenerationJobStatus::Queued, "排队中。", 8),
+    let (status, phase_detail, progress, error) = match job.status.as_str() {
+        "completed" => (
+            ExternalGenerationJobStatus::Completed,
+            "生成已完成。",
+            100,
+            None,
+        ),
+        "running" => (
+            ExternalGenerationJobStatus::Running,
+            "正在生成。",
+            35,
+            None,
+        ),
+        "failed" => (
+            ExternalGenerationJobStatus::Failed,
+            "生成失败。",
+            0,
+            job.last_error_message.clone(),
+        ),
+        _ => (
+            ExternalGenerationJobStatus::Queued,
+            "排队中。",
+            8,
+            None,
+        ),
     };
 
     ExternalGenerationJobStatusRecord {
@@ -178,11 +198,21 @@ fn map_external_generation_job_status(
         phase_label: job.request_label.clone(),
         phase_detail: phase_detail.to_string(),
         progress,
-        error: job.last_error_message.clone(),
+        error,
         updated_at_micros: job.updated_at_micros,
     }
 }
 
+fn map_external_generation_job_status_detail(
+    job: ExternalGenerationJobSummaryRecord,
+) -> ExternalGenerationJobStatusDetailRecord {
+    let warning = job.warning_message.clone();
+    ExternalGenerationJobStatusDetailRecord {
+        status: map_external_generation_job_status(job),
+        warning,
+    }
+}
+
 fn map_external_generation_task_record(
     job: ExternalGenerationJobSummaryRecord,
 ) -> ExternalGenerationTaskRecord {
@@ -199,6 +229,7 @@ fn map_external_generation_task_record(
         phase_detail: status_record.phase_detail,
         progress: status_record.progress,
         error: status_record.error,
+        warning: job.warning_message,
         price_mud_points: job.price_mud_points,
         refund_ledger_id: job.refund_ledger_id,
         notification_acknowledged_at: job.notification_acknowledged_at,
@@ -274,7 +305,7 @@ mod tests {
 
     #[test]
     fn maps_task_from_payload_free_summary_projection() {
-        let task = map_external_generation_task_record(ExternalGenerationJobSummaryRecord {
+        let summary = ExternalGenerationJobSummaryRecord {
             job_id: "task-1".to_string(),
             job_kind: "editor_image_generation".to_string(),
             owner_user_id: "user-1".to_string(),
@@ -283,7 +314,7 @@ mod tests {
             request_label: "图片生成".to_string(),
             request_prompt: Some("发光主视觉".to_string()),
             status: "completed".to_string(),
-            last_error_message: None,
+            last_error_message: Some("上一次尝试失败".to_string()),
             created_at: "2026-07-10T08:00:00Z".to_string(),
             started_at: Some("2026-07-10T08:00:01Z".to_string()),
             completed_at: Some("2026-07-10T08:00:10Z".to_string()),
@@ -293,9 +324,16 @@ mod tests {
             refund_ledger_id: None,
             notification_acknowledged_at: None,
             notification_acknowledged_at_micros: None,
-        });
+            warning_message: Some("连通域数量不足".to_string()),
+        };
+        let status = map_external_generation_job_status_detail(summary.clone());
+        let task = map_external_generation_task_record(summary);
 
+        assert_eq!(status.warning.as_deref(), Some("连通域数量不足"));
+        assert!(status.status.error.is_none());
         assert_eq!(task.request_prompt.as_deref(), Some("发光主视觉"));
         assert_eq!(task.status, ExternalGenerationJobStatus::Completed);
+        assert_eq!(task.warning.as_deref(), Some("连通域数量不足"));
+        assert!(task.error.is_none());
     }
 }
diff --git a/server-rs/crates/api-server/src/external_generation_worker.rs b/server-rs/crates/api-server/src/external_generation_worker.rs
index e8187f5c8..f7e4f8f21 100644
--- a/server-rs/crates/api-server/src/external_generation_worker.rs
+++ b/server-rs/crates/api-server/src/external_generation_worker.rs
@@ -1,7 +1,7 @@
 use std::{future::Future, io, pin::Pin, time::Duration};
 
 use axum::{Json, extract::FromRef};
-use serde_json::json;
+use serde_json::{Value, json};
 use shared_kernel::offset_datetime_to_unix_micros;
 use spacetime_client::{
     ExternalGenerationJobClaimRecordInput, ExternalGenerationJobCompleteRecordInput,
@@ -14,6 +14,10 @@ use tokio::{
 };
 use tracing::{error, info, warn};
 
+const MAX_EDITOR_GENERATION_WARNING_CHARS: usize = 2_048;
+const EDITOR_GENERATION_WARNING_REDACTED_MESSAGE: &str =
+    "自动拆分未完成（告警详情含内联媒体引用，已省略）";
+
 use crate::{
     asset_billing::with_external_generation_billing_attempt_context,
     character_animation_assets::{
@@ -762,8 +766,14 @@ async fn process_external_generation_job_once(
             )
             .await
             {
-                Ok(result) => {
-                    complete_editor_generation_job(&state, &worker_id, &job, result.0).await
+                Ok(response) => {
+                    complete_editor_generation_job_with_response(
+                        &state,
+                        &worker_id,
+                        &job,
+                        &response.0,
+                    )
+                    .await
                 }
                 Err(error) => {
                     let message = error.body_text();
@@ -792,8 +802,14 @@ async fn process_external_generation_job_once(
             )
             .await
             {
-                Ok(result) => {
-                    complete_editor_generation_job(&state, &worker_id, &job, result.0).await
+                Ok(response) => {
+                    complete_editor_generation_job_with_response(
+                        &state,
+                        &worker_id,
+                        &job,
+                        &response.0,
+                    )
+                    .await
                 }
                 Err(error) => {
                     let message = error.body_text();
@@ -1062,6 +1078,68 @@ fn compact_editor_generation_result(mut result: serde_json::Value) -> serde_json
     result
 }
 
+async fn complete_editor_generation_job_with_response(
+    state: &AppState,
+    worker_id: &str,
+    job: &ExternalGenerationJobRecord,
+    response: &Value,
+) -> Result<(), String> {
+    complete_job(
+        state,
+        worker_id,
+        job,
+        Some(editor_generation_result_payload_json(job, response)),
+    )
+    .await
+}
+
+fn editor_generation_result_payload_json(
+    job: &ExternalGenerationJobRecord,
+    response: &Value,
+) -> String {
+    let mut payload = json!({
+        "sourceModule": job.source_module.clone(),
+        "sourceEntityId": job.source_entity_id.clone(),
+    });
+    if let Some(warning) = extract_editor_generation_slice_warning(response)
+        && let Some(object) = payload.as_object_mut()
+    {
+        object.insert("warning".to_string(), warning);
+    }
+    payload.to_string()
+}
+
+fn extract_editor_generation_slice_warning(response: &Value) -> Option<Value> {
+    let data = response.get("data").unwrap_or(response);
+    let warning = data.get("sliceWarning")?;
+    let code = warning.get("code")?.as_str()?.trim();
+    let reason = warning.get("reason")?.as_str()?.trim();
+    if code.is_empty() || reason.is_empty() {
+        return None;
+    }
+    let reason = normalize_editor_generation_warning_reason(reason);
+    Some(json!({
+        "code": code,
+        "reason": reason,
+    }))
+}
+
+fn normalize_editor_generation_warning_reason(reason: &str) -> String {
+    let normalized = reason.to_ascii_lowercase();
+    if normalized.contains("data:") || normalized.contains("blob:") {
+        return EDITOR_GENERATION_WARNING_REDACTED_MESSAGE.to_string();
+    }
+    let mut chars = reason.chars();
+    let mut bounded = chars
+        .by_ref()
+        .take(MAX_EDITOR_GENERATION_WARNING_CHARS)
+        .collect::<String>();
+    if chars.next().is_some() {
+        bounded.push('…');
+    }
+    bounded
+}
+
 async fn complete_job(
     state: &AppState,
     worker_id: &str,
@@ -1289,6 +1367,58 @@ mod tests {
         assert_eq!(message, "VECTOR_ENGINE_API_KEY 未配置");
     }
 
+    #[test]
+    fn editor_generation_result_payload_keeps_only_lightweight_slice_warning() {
+        let job = external_generation_job_record_fixture(Some("lease-1"));
+        let response = json!({
+            "spritesheetImageSrc": "data:image/png;base64,SHOULD_NOT_PERSIST",
+            "iconImageSrcs": [{"imageSrc": "data:image/png;base64,SHOULD_NOT_PERSIST"}],
+            "sliceWarning": {
+                "code": "insufficient-connected-components",
+                "reason": "连通域数量不足"
+            }
+        });
+
+        let payload: Value =
+            serde_json::from_str(&editor_generation_result_payload_json(&job, &response))
+                .expect("worker 结果应是合法 JSON");
+
+        assert_eq!(payload["sourceModule"], json!("puzzle"));
+        assert_eq!(payload["sourceEntityId"], json!("session-1:puzzle-level-1"));
+        assert_eq!(
+            payload["warning"],
+            json!({
+                "code": "insufficient-connected-components",
+                "reason": "连通域数量不足"
+            })
+        );
+        assert!(payload.get("spritesheetImageSrc").is_none());
+        assert!(payload.get("iconImageSrcs").is_none());
+    }
+
+    #[test]
+    fn editor_generation_result_payload_accepts_envelope_and_redacts_inline_media() {
+        let job = external_generation_job_record_fixture(Some("lease-1"));
+        let response = json!({
+            "data": {
+                "sliceWarning": {
+                    "code": "slice-persistence-failed",
+                    "reason": "provider returned data:image/png;base64,AAAA"
+                }
+            }
+        });
+
+        let payload: Value =
+            serde_json::from_str(&editor_generation_result_payload_json(&job, &response))
+                .expect("worker 结果应是合法 JSON");
+
+        assert_eq!(
+            payload["warning"]["reason"],
+            json!(EDITOR_GENERATION_WARNING_REDACTED_MESSAGE)
+        );
+        assert!(!payload.to_string().contains("data:image"));
+    }
+
     #[test]
     fn worker_job_timeout_uses_long_budget_for_video_jobs() {
         let config = AppConfig {
diff --git a/server-rs/crates/api-server/src/modules/editor_project.rs b/server-rs/crates/api-server/src/modules/editor_project.rs
index 801fe0eb7..441fa999b 100644
--- a/server-rs/crates/api-server/src/modules/editor_project.rs
+++ b/server-rs/crates/api-server/src/modules/editor_project.rs
@@ -21,8 +21,9 @@ use crate::{
         get_editor_generation_pricing, get_editor_project, list_editor_projects,
         list_public_editor_project_resources, load_recent_editor_project,
         remove_editor_image_background, rename_editor_project, save_editor_project_layout,
-        submit_editor_asset_showcase, toggle_editor_showcase_asset_like, update_editor_asset,
-        update_editor_asset_folder, update_editor_project_resource_showcase,
+        split_editor_icon_spritesheet, submit_editor_asset_showcase,
+        toggle_editor_showcase_asset_like, update_editor_asset, update_editor_asset_folder,
+        update_editor_project_resource_showcase,
     },
     state::AppState,
 };
@@ -226,6 +227,13 @@ pub fn router(state: AppState) -> Router<AppState> {
                     require_bearer_auth,
                 )),
         )
+        .route(
+            "/api/editor/icon-spritesheets/slices",
+            post(split_editor_icon_spritesheet).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
         .route(
             "/api/editor/ui-designs/assets/extractions",
             post(extract_editor_ui_design_assets)
diff --git a/server-rs/crates/api-server/src/runtime_profile.rs b/server-rs/crates/api-server/src/runtime_profile.rs
index 726d0f533..0d936e15e 100644
--- a/server-rs/crates/api-server/src/runtime_profile.rs
+++ b/server-rs/crates/api-server/src/runtime_profile.rs
@@ -1127,6 +1127,12 @@ pub async fn admin_upsert_profile_redeem_code(
             AppError::from_status(StatusCode::BAD_REQUEST).with_message(error),
         )
     })?;
+    let starts_at_micros =
+        parse_admin_profile_code_time_field("兑换码", "startsAt", payload.starts_at)
+            .map_err(|error| runtime_profile_error_response(&request_context, error))?;
+    let expires_at_micros =
+        parse_admin_profile_code_time_field("兑换码", "expiresAt", payload.expires_at)
+            .map_err(|error| runtime_profile_error_response(&request_context, error))?;
     let record = state
         .spacetime_client()
         .admin_upsert_profile_redeem_code(
@@ -1138,6 +1144,8 @@ pub async fn admin_upsert_profile_redeem_code(
             payload.enabled,
             payload.allowed_user_ids,
             payload.allowed_public_user_codes,
+            starts_at_micros,
+            expires_at_micros,
             updated_at_micros as i64,
         )
         .await
@@ -1223,10 +1231,12 @@ pub async fn admin_upsert_profile_invite_code(
 ) -> Result<Json<Value>, Response> {
     let metadata_json = normalize_admin_invite_code_metadata(payload.metadata)
         .map_err(|error| runtime_profile_error_response(&request_context, error))?;
-    let starts_at_micros = parse_admin_invite_code_time_field("startsAt", payload.starts_at)
-        .map_err(|error| runtime_profile_error_response(&request_context, error))?;
-    let expires_at_micros = parse_admin_invite_code_time_field("expiresAt", payload.expires_at)
-        .map_err(|error| runtime_profile_error_response(&request_context, error))?;
+    let starts_at_micros =
+        parse_admin_profile_code_time_field("邀请码", "startsAt", payload.starts_at)
+            .map_err(|error| runtime_profile_error_response(&request_context, error))?;
+    let expires_at_micros =
+        parse_admin_profile_code_time_field("邀请码", "expiresAt", payload.expires_at)
+            .map_err(|error| runtime_profile_error_response(&request_context, error))?;
     let updated_at_micros = OffsetDateTime::now_utc().unix_timestamp_nanos() / 1_000;
     let record = state
         .spacetime_client()
@@ -1294,15 +1304,40 @@ pub async fn get_profile_play_stats(
 }
 
 fn map_runtime_profile_client_error(error: SpacetimeClientError) -> AppError {
-    let (status, provider) = match error {
+    let is_redeem_code_domain_error = matches!(
+        &error,
+        SpacetimeClientError::Procedure(message)
+            if is_runtime_profile_redeem_code_domain_error(message)
+    );
+    let (status, provider) = match &error {
         SpacetimeClientError::Runtime(_) => (StatusCode::BAD_REQUEST, "runtime-profile"),
+        SpacetimeClientError::Procedure(_) if is_redeem_code_domain_error => {
+            (StatusCode::BAD_REQUEST, "runtime-profile")
+        }
         _ => (StatusCode::BAD_GATEWAY, "spacetimedb"),
     };
 
-    AppError::from_status(status).with_details(json!({
+    let app_error = AppError::from_status(status).with_details(json!({
         "provider": provider,
         "message": error.to_string(),
-    }))
+    }));
+    if is_redeem_code_domain_error {
+        return app_error.with_message(error.to_string());
+    }
+    app_error
+}
+
+fn is_runtime_profile_redeem_code_domain_error(message: &str) -> bool {
+    matches!(
+        message,
+        "兑换码不存在"
+            | "兑换码已停用"
+            | "兑换码未生效"
+            | "兑换码已过期"
+            | "兑换次数已用完"
+            | "该兑换码不适用于当前账号"
+            | "兑换码奖励无效"
+    )
 }
 
 fn runtime_profile_error_response(request_context: &RequestContext, error: AppError) -> Response {
@@ -2112,7 +2147,8 @@ fn normalize_admin_invite_code_metadata(metadata: Option<Value>) -> Result<Strin
     Ok(metadata_json)
 }
 
-fn parse_admin_invite_code_time_field(
+fn parse_admin_profile_code_time_field(
+    code_label: &'static str,
     field: &'static str,
     value: Option<String>,
 ) -> Result<Option<i64>, AppError> {
@@ -2126,7 +2162,7 @@ fn parse_admin_invite_code_time_field(
 
     let parsed = parse_rfc3339(value).map_err(|error| {
         AppError::from_status(StatusCode::BAD_REQUEST)
-            .with_message(format!("邀请码 {field} 必须是 RFC3339 时间字符串"))
+            .with_message(format!("{code_label} {field} 必须是 RFC3339 时间字符串"))
             .with_details(json!({ "field": field, "message": error }))
     })?;
 
@@ -2271,6 +2307,8 @@ fn build_profile_redeem_code_admin_response(
         created_by: record.created_by,
         created_at: record.created_at,
         updated_at: record.updated_at,
+        starts_at: record.starts_at,
+        expires_at: record.expires_at,
     }
 }
 
@@ -2305,9 +2343,67 @@ mod tests {
         calc_wechat_virtual_payment_user_signature_with_key,
         format_profile_wallet_ledger_source_type,
         is_wechat_profile_recharge_order_terminal_for_confirmation,
-        normalize_admin_invite_code_metadata, should_notify_virtual_payment_goods_delivery,
+        map_runtime_profile_client_error, normalize_admin_invite_code_metadata,
+        parse_admin_profile_code_time_field, should_notify_virtual_payment_goods_delivery,
     };
 
+    #[test]
+    fn redeem_code_domain_errors_map_to_client_errors_without_hiding_infrastructure_failures() {
+        for message in ["兑换码未生效", "兑换码已过期"] {
+            let error = map_runtime_profile_client_error(SpacetimeClientError::Procedure(
+                message.to_string(),
+            ));
+
+            assert_eq!(error.status_code(), StatusCode::BAD_REQUEST);
+            assert_eq!(error.code(), "BAD_REQUEST");
+            assert_eq!(error.message(), message);
+            assert_eq!(
+                error
+                    .details()
+                    .and_then(|details| details.get("provider"))
+                    .and_then(Value::as_str),
+                Some("runtime-profile")
+            );
+        }
+
+        let infrastructure_error = map_runtime_profile_client_error(
+            SpacetimeClientError::Procedure("No such procedure: redeem_profile_reward_code".into()),
+        );
+        assert_eq!(infrastructure_error.status_code(), StatusCode::BAD_GATEWAY);
+        assert_eq!(
+            infrastructure_error
+                .details()
+                .and_then(|details| details.get("provider"))
+                .and_then(Value::as_str),
+            Some("spacetimedb")
+        );
+    }
+
+    #[test]
+    fn admin_profile_code_time_parser_accepts_optional_rfc3339_values() {
+        assert_eq!(
+            parse_admin_profile_code_time_field("兑换码", "startsAt", None)
+                .expect("missing boundary should pass"),
+            None
+        );
+        assert_eq!(
+            parse_admin_profile_code_time_field(
+                "兑换码",
+                "startsAt",
+                Some("1970-01-01T00:00:01Z".to_string()),
+            )
+            .expect("RFC3339 boundary should pass"),
+            Some(1_000_000)
+        );
+        let error = parse_admin_profile_code_time_field(
+            "兑换码",
+            "startsAt",
+            Some("2026-07-13 00:00:00".to_string()),
+        )
+        .expect_err("non-RFC3339 boundary should fail");
+        assert!(error.message().contains("兑换码 startsAt"));
+    }
+
     use axum::{
         body::Body,
         http::{Request, StatusCode},
@@ -2317,6 +2413,7 @@ mod tests {
         AccessTokenClaims, AccessTokenClaimsInput, AuthProvider, BindingStatus, sign_access_token,
     };
     use serde_json::Value;
+    use spacetime_client::SpacetimeClientError;
     use std::time::Duration;
     use time::OffsetDateTime;
     use tower::ServiceExt;
diff --git a/server-rs/crates/module-assets/src/application.rs b/server-rs/crates/module-assets/src/application.rs
index bad6ddbea..7b3f8fdb7 100644
--- a/server-rs/crates/module-assets/src/application.rs
+++ b/server-rs/crates/module-assets/src/application.rs
@@ -19,6 +19,15 @@ pub struct AssetObjectProcedureResult {
     pub error_message: Option<String>,
 }
 
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetObjectReadAccessProcedureResult {
+    pub ok: bool,
+    pub record: Option<AssetObjectUpsertSnapshot>,
+    pub public_work_granted: bool,
+    pub error_message: Option<String>,
+}
+
 #[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct AssetHistoryListResult {
diff --git a/server-rs/crates/module-assets/src/commands.rs b/server-rs/crates/module-assets/src/commands.rs
index 0c3443f3b..5f58f676c 100644
--- a/server-rs/crates/module-assets/src/commands.rs
+++ b/server-rs/crates/module-assets/src/commands.rs
@@ -32,6 +32,13 @@ pub struct AssetHistoryListInput {
     pub limit: u32,
 }
 
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetObjectLocationInput {
+    pub bucket: String,
+    pub object_key: String,
+}
+
 #[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct AssetObjectUpsertInput {
diff --git a/server-rs/crates/module-assets/src/domain.rs b/server-rs/crates/module-assets/src/domain.rs
index fba91cc0f..209943f20 100644
--- a/server-rs/crates/module-assets/src/domain.rs
+++ b/server-rs/crates/module-assets/src/domain.rs
@@ -99,6 +99,73 @@ pub struct AssetObjectRecord {
     pub updated_at: String,
 }
 
+/// 已发布且可见作品派生出的精确资产读取授权。
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PublicAssetReadGrant {
+    pub owner_user_id: String,
+    pub asset_object_id: Option<String>,
+    pub object_key: Option<String>,
+}
+
+/// 为公开资产授权生成可由订阅缓存点查的 owner-scoped 主键。
+pub fn public_asset_read_grant_id(grant: &PublicAssetReadGrant) -> Option<String> {
+    let owner_user_id = grant.owner_user_id.trim();
+    if owner_user_id.is_empty() {
+        return None;
+    }
+    let owner_prefix = format!("owner:{}:{owner_user_id}", owner_user_id.len());
+
+    if let Some(asset_object_id) = grant
+        .asset_object_id
+        .as_deref()
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+    {
+        return Some(format!("{owner_prefix}|asset-object-id:{asset_object_id}"));
+    }
+
+    grant
+        .object_key
+        .as_deref()
+        .map(str::trim)
+        .map(|value| value.trim_start_matches('/'))
+        .filter(|value| !value.is_empty())
+        .map(|object_key| format!("{owner_prefix}|object-key:{object_key}"))
+}
+
+/// 判断资产对象是否命中同 owner 公开作品派生出的精确授权。
+pub fn asset_object_matches_public_read_grant(
+    asset_object: &AssetObjectRecord,
+    grant: &PublicAssetReadGrant,
+) -> bool {
+    let Some(asset_owner_user_id) = asset_object
+        .owner_user_id
+        .as_deref()
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+    else {
+        return false;
+    };
+    let grant_owner_user_id = grant.owner_user_id.trim();
+    if grant_owner_user_id.is_empty() || asset_owner_user_id != grant_owner_user_id {
+        return false;
+    }
+
+    grant
+        .asset_object_id
+        .as_deref()
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+        .is_some_and(|value| value == asset_object.asset_object_id.trim())
+        || grant
+            .object_key
+            .as_deref()
+            .map(str::trim)
+            .map(|value| value.trim_start_matches('/'))
+            .filter(|value| !value.is_empty())
+            .is_some_and(|value| value == asset_object.object_key.trim().trim_start_matches('/'))
+}
+
 /// 面向 API 与前端展示的资产历史记录。
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct AssetHistoryEntryRecord {
@@ -126,3 +193,117 @@ pub struct AssetEntityBindingRecord {
     pub created_at: String,
     pub updated_at: String,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn asset_object(owner_user_id: Option<&str>) -> AssetObjectRecord {
+        AssetObjectRecord {
+            asset_object_id: "assetobj_public_reference".to_string(),
+            bucket: "genarrative-assets".to_string(),
+            object_key: "generated-puzzle-assets/public-reference.png".to_string(),
+            access_policy: AssetObjectAccessPolicy::Private,
+            content_type: Some("image/png".to_string()),
+            content_length: 1,
+            content_hash: None,
+            version: 1,
+            source_job_id: None,
+            owner_user_id: owner_user_id.map(ToOwned::to_owned),
+            profile_id: None,
+            entity_id: Some("puzzle-session-001".to_string()),
+            asset_kind: "puzzle_cover_image".to_string(),
+            created_at: "2026-07-13T00:00:00Z".to_string(),
+            updated_at: "2026-07-13T00:00:00Z".to_string(),
+        }
+    }
+
+    fn grant(
+        owner_user_id: &str,
+        asset_object_id: Option<&str>,
+        object_key: Option<&str>,
+    ) -> PublicAssetReadGrant {
+        PublicAssetReadGrant {
+            owner_user_id: owner_user_id.to_string(),
+            asset_object_id: asset_object_id.map(ToOwned::to_owned),
+            object_key: object_key.map(ToOwned::to_owned),
+        }
+    }
+
+    #[test]
+    fn public_work_grant_authorizes_exact_historical_object_key() {
+        let asset = asset_object(Some("user-owner"));
+
+        assert!(asset_object_matches_public_read_grant(
+            &asset,
+            &grant(
+                "user-owner",
+                None,
+                Some("generated-puzzle-assets/public-reference.png")
+            )
+        ));
+    }
+
+    #[test]
+    fn public_work_grant_authorizes_exact_asset_object_id() {
+        let asset = asset_object(Some("user-owner"));
+
+        assert!(asset_object_matches_public_read_grant(
+            &asset,
+            &grant("user-owner", Some("assetobj_public_reference"), None)
+        ));
+    }
+
+    #[test]
+    fn public_work_grant_rejects_cross_owner_and_unrelated_assets() {
+        let asset = asset_object(Some("user-owner"));
+
+        assert!(!asset_object_matches_public_read_grant(
+            &asset,
+            &grant("user-other", Some("assetobj_public_reference"), None)
+        ));
+        assert!(!asset_object_matches_public_read_grant(
+            &asset,
+            &grant("user-owner", Some("assetobj_other"), None)
+        ));
+        assert!(!asset_object_matches_public_read_grant(
+            &asset_object(None),
+            &grant("user-owner", Some("assetobj_public_reference"), None)
+        ));
+    }
+
+    #[test]
+    fn public_work_grant_id_is_owner_scoped_and_normalizes_object_key() {
+        assert_eq!(
+            public_asset_read_grant_id(&grant(
+                "user-owner",
+                Some("assetobj_public_reference"),
+                None
+            )),
+            Some("owner:10:user-owner|asset-object-id:assetobj_public_reference".to_string())
+        );
+        assert_eq!(
+            public_asset_read_grant_id(&grant(
+                "user-owner",
+                None,
+                Some("/generated-puzzle-assets/public-reference.png")
+            )),
+            Some(
+                "owner:10:user-owner|object-key:generated-puzzle-assets/public-reference.png"
+                    .to_string()
+            )
+        );
+        assert_ne!(
+            public_asset_read_grant_id(&grant(
+                "user-owner",
+                Some("assetobj_public_reference"),
+                None
+            )),
+            public_asset_read_grant_id(&grant(
+                "user-other",
+                Some("assetobj_public_reference"),
+                None
+            ))
+        );
+    }
+}
diff --git a/server-rs/crates/module-assets/src/lib.rs b/server-rs/crates/module-assets/src/lib.rs
index 3c2e1ac27..410967b8f 100644
--- a/server-rs/crates/module-assets/src/lib.rs
+++ b/server-rs/crates/module-assets/src/lib.rs
@@ -10,20 +10,23 @@ mod asset_object_service;
 
 pub use application::{
     AssetEntityBindingProcedureResult, AssetHistoryListResult, AssetObjectProcedureResult,
-    ConfirmAssetObjectResult, build_asset_entity_binding_input, build_asset_object_upsert_input,
+    AssetObjectReadAccessProcedureResult, ConfirmAssetObjectResult,
+    build_asset_entity_binding_input, build_asset_object_upsert_input,
 };
 #[cfg(feature = "server-service")]
 pub use asset_object_service::{
     AssetObjectService, ConfirmAssetObjectError, InMemoryAssetObjectStore,
 };
 pub use commands::{
-    AssetEntityBindingInput, AssetHistoryListInput, AssetObjectUpsertInput, ConfirmAssetObjectInput,
+    AssetEntityBindingInput, AssetHistoryListInput, AssetObjectLocationInput,
+    AssetObjectUpsertInput, ConfirmAssetObjectInput,
 };
 pub use domain::{
     ASSET_BINDING_ID_PREFIX, ASSET_OBJECT_ID_PREFIX, AssetEntityBindingRecord,
     AssetEntityBindingSnapshot, AssetHistoryEntryRecord, AssetHistoryEntrySnapshot,
     AssetObjectAccessPolicy, AssetObjectRecord, AssetObjectUpsertSnapshot,
-    INITIAL_ASSET_OBJECT_VERSION,
+    INITIAL_ASSET_OBJECT_VERSION, PublicAssetReadGrant, asset_object_matches_public_read_grant,
+    public_asset_read_grant_id,
 };
 pub use errors::AssetObjectFieldError;
 pub use events::{AssetDomainEvent, AssetEntityBindingChangedEvent, AssetObjectConfirmedEvent};
diff --git a/server-rs/crates/module-runtime/src/application.rs b/server-rs/crates/module-runtime/src/application.rs
index a123970e4..fc804bc82 100644
--- a/server-rs/crates/module-runtime/src/application.rs
+++ b/server-rs/crates/module-runtime/src/application.rs
@@ -1723,6 +1723,10 @@ pub fn build_runtime_profile_redeem_code_record(
         created_at_micros: snapshot.created_at_micros,
         updated_at: format_utc_micros(snapshot.updated_at_micros),
         updated_at_micros: snapshot.updated_at_micros,
+        starts_at: snapshot.starts_at_micros.map(format_utc_micros),
+        starts_at_micros: snapshot.starts_at_micros,
+        expires_at: snapshot.expires_at_micros.map(format_utc_micros),
+        expires_at_micros: snapshot.expires_at_micros,
     }
 }
 
@@ -2040,6 +2044,7 @@ pub fn validate_runtime_profile_redeem_code_usage(
     code: &RuntimeProfileRedeemCodeSnapshot,
     user_id: &str,
     user_used_count: u32,
+    redeemed_at_micros: i64,
 ) -> Result<(), RuntimeProfileFieldError> {
     if !code.enabled {
         return Err(RuntimeProfileFieldError::RedeemCodeDisabled);
@@ -2047,6 +2052,11 @@ pub fn validate_runtime_profile_redeem_code_usage(
     if code.reward_points == 0 {
         return Err(RuntimeProfileFieldError::InvalidRedeemCodeReward);
     }
+    crate::commands::validate_runtime_profile_redeem_code_redeem_time(
+        code.starts_at_micros,
+        code.expires_at_micros,
+        redeemed_at_micros,
+    )?;
 
     match code.mode {
         RuntimeProfileRedeemCodeMode::Public if user_used_count >= code.max_uses => {
diff --git a/server-rs/crates/module-runtime/src/commands.rs b/server-rs/crates/module-runtime/src/commands.rs
index d5d866d88..6de8a1c63 100644
--- a/server-rs/crates/module-runtime/src/commands.rs
+++ b/server-rs/crates/module-runtime/src/commands.rs
@@ -593,6 +593,8 @@ pub fn build_runtime_profile_redeem_code_admin_upsert_input(
     enabled: bool,
     allowed_user_ids: Vec<String>,
     allowed_public_user_codes: Vec<String>,
+    starts_at_micros: Option<i64>,
+    expires_at_micros: Option<i64>,
     updated_at_micros: i64,
 ) -> Result<RuntimeProfileRedeemCodeAdminUpsertInput, RuntimeProfileFieldError> {
     let admin_user_id = normalize_runtime_profile_user_id(admin_user_id)?;
@@ -603,6 +605,7 @@ pub fn build_runtime_profile_redeem_code_admin_upsert_input(
     if max_uses == 0 {
         return Err(RuntimeProfileFieldError::InvalidRedeemCodeMaxUses);
     }
+    validate_runtime_profile_redeem_code_validity_window(starts_at_micros, expires_at_micros)?;
 
     Ok(RuntimeProfileRedeemCodeAdminUpsertInput {
         admin_user_id,
@@ -619,6 +622,8 @@ pub fn build_runtime_profile_redeem_code_admin_upsert_input(
             .into_iter()
             .filter_map(|value| normalize_optional_string(Some(value)))
             .collect(),
+        starts_at_micros,
+        expires_at_micros,
         updated_at_micros,
     })
 }
@@ -1047,14 +1052,53 @@ pub fn validate_runtime_profile_invite_code_validity_window(
     starts_at_micros: Option<i64>,
     expires_at_micros: Option<i64>,
 ) -> Result<(), RuntimeProfileFieldError> {
-    if matches!((starts_at_micros, expires_at_micros), (Some(starts_at), Some(expires_at)) if starts_at >= expires_at)
-    {
+    if is_invalid_runtime_profile_code_validity_window(starts_at_micros, expires_at_micros) {
         return Err(RuntimeProfileFieldError::InvalidInviteCodeValidityWindow);
     }
 
     Ok(())
 }
 
+pub fn validate_runtime_profile_redeem_code_validity_window(
+    starts_at_micros: Option<i64>,
+    expires_at_micros: Option<i64>,
+) -> Result<(), RuntimeProfileFieldError> {
+    if is_invalid_runtime_profile_code_validity_window(starts_at_micros, expires_at_micros) {
+        return Err(RuntimeProfileFieldError::InvalidRedeemCodeValidityWindow);
+    }
+
+    Ok(())
+}
+
+pub fn validate_runtime_profile_redeem_code_redeem_time(
+    starts_at_micros: Option<i64>,
+    expires_at_micros: Option<i64>,
+    now_micros: i64,
+) -> Result<(), RuntimeProfileFieldError> {
+    if starts_at_micros
+        .map(|starts_at| now_micros < starts_at)
+        .unwrap_or(false)
+    {
+        return Err(RuntimeProfileFieldError::RedeemCodeNotStarted);
+    }
+
+    if expires_at_micros
+        .map(|expires_at| now_micros >= expires_at)
+        .unwrap_or(false)
+    {
+        return Err(RuntimeProfileFieldError::RedeemCodeExpired);
+    }
+
+    Ok(())
+}
+
+fn is_invalid_runtime_profile_code_validity_window(
+    starts_at_micros: Option<i64>,
+    expires_at_micros: Option<i64>,
+) -> bool {
+    matches!((starts_at_micros, expires_at_micros), (Some(starts_at), Some(expires_at)) if starts_at >= expires_at)
+}
+
 pub fn resolve_runtime_profile_invite_code_status(
     starts_at_micros: Option<i64>,
     expires_at_micros: Option<i64>,
diff --git a/server-rs/crates/module-runtime/src/domain.rs b/server-rs/crates/module-runtime/src/domain.rs
index 215b80ea1..5be01a58a 100644
--- a/server-rs/crates/module-runtime/src/domain.rs
+++ b/server-rs/crates/module-runtime/src/domain.rs
@@ -1575,6 +1575,8 @@ pub struct RuntimeProfileRedeemCodeAdminUpsertInput {
     pub enabled: bool,
     pub allowed_user_ids: Vec<String>,
     pub allowed_public_user_codes: Vec<String>,
+    pub starts_at_micros: Option<i64>,
+    pub expires_at_micros: Option<i64>,
     pub updated_at_micros: i64,
 }
 
@@ -1605,6 +1607,8 @@ pub struct RuntimeProfileRedeemCodeSnapshot {
     pub created_by: String,
     pub created_at_micros: i64,
     pub updated_at_micros: i64,
+    pub starts_at_micros: Option<i64>,
+    pub expires_at_micros: Option<i64>,
 }
 
 #[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
@@ -2098,6 +2102,10 @@ pub struct RuntimeProfileRedeemCodeRecord {
     pub created_at_micros: i64,
     pub updated_at: String,
     pub updated_at_micros: i64,
+    pub starts_at: Option<String>,
+    pub starts_at_micros: Option<i64>,
+    pub expires_at: Option<String>,
+    pub expires_at_micros: Option<i64>,
 }
 
 #[derive(Clone, Debug, PartialEq)]
diff --git a/server-rs/crates/module-runtime/src/errors.rs b/server-rs/crates/module-runtime/src/errors.rs
index c98e43eb5..695f7f304 100644
--- a/server-rs/crates/module-runtime/src/errors.rs
+++ b/server-rs/crates/module-runtime/src/errors.rs
@@ -58,6 +58,9 @@ pub enum RuntimeProfileFieldError {
     RedeemCodeNotAllowedForUser,
     InvalidRedeemCodeReward,
     InvalidRedeemCodeMaxUses,
+    InvalidRedeemCodeValidityWindow,
+    RedeemCodeNotStarted,
+    RedeemCodeExpired,
     InvalidInviteCodeMetadata,
     InvalidUserTag,
     InvalidInviteCodeValidityWindow,
@@ -130,6 +133,9 @@ impl std::fmt::Display for RuntimeProfileFieldError {
             Self::RedeemCodeNotAllowedForUser => f.write_str("该兑换码不适用于当前账号"),
             Self::InvalidRedeemCodeReward => f.write_str("兑换码奖励无效"),
             Self::InvalidRedeemCodeMaxUses => f.write_str("兑换次数必须大于 0"),
+            Self::InvalidRedeemCodeValidityWindow => f.write_str("兑换码开始时间不能晚于截止时间"),
+            Self::RedeemCodeNotStarted => f.write_str("兑换码未生效"),
+            Self::RedeemCodeExpired => f.write_str("兑换码已过期"),
             Self::InvalidInviteCodeMetadata => {
                 f.write_str("邀请码 metadata 必须是合法 JSON object")
             }
diff --git a/server-rs/crates/module-runtime/src/lib.rs b/server-rs/crates/module-runtime/src/lib.rs
index 409bf2356..2def15c25 100644
--- a/server-rs/crates/module-runtime/src/lib.rs
+++ b/server-rs/crates/module-runtime/src/lib.rs
@@ -1265,12 +1265,14 @@ mod tests {
             created_by: "admin".to_string(),
             created_at_micros: 1,
             updated_at_micros: 1,
+            starts_at_micros: None,
+            expires_at_micros: None,
         };
 
-        validate_runtime_profile_redeem_code_usage(&base, "user-1", 1)
+        validate_runtime_profile_redeem_code_usage(&base, "user-1", 1, 1)
             .expect("public code under per-user limit should pass");
         assert_eq!(
-            validate_runtime_profile_redeem_code_usage(&base, "user-1", 2)
+            validate_runtime_profile_redeem_code_usage(&base, "user-1", 2, 1)
                 .expect_err("public code over per-user limit should fail"),
             RuntimeProfileFieldError::RedeemCodeUsesExhausted
         );
@@ -1280,10 +1282,10 @@ mod tests {
             global_used_count: 9,
             ..base.clone()
         };
-        validate_runtime_profile_redeem_code_usage(&unique, "user-1", 0)
+        validate_runtime_profile_redeem_code_usage(&unique, "user-1", 0, 1)
             .expect("unique code should allow a user that has not redeemed it");
         assert_eq!(
-            validate_runtime_profile_redeem_code_usage(&unique, "user-1", 1)
+            validate_runtime_profile_redeem_code_usage(&unique, "user-1", 1, 1)
                 .expect_err("unique code should reject the same user twice"),
             RuntimeProfileFieldError::RedeemCodeUsesExhausted
         );
@@ -1295,14 +1297,14 @@ mod tests {
             ..base.clone()
         };
         assert_eq!(
-            validate_runtime_profile_redeem_code_usage(&private, "user-1", 0)
+            validate_runtime_profile_redeem_code_usage(&private, "user-1", 0, 1)
                 .expect_err("private code should check allow list"),
             RuntimeProfileFieldError::RedeemCodeNotAllowedForUser
         );
-        validate_runtime_profile_redeem_code_usage(&private, "user-2", 0)
+        validate_runtime_profile_redeem_code_usage(&private, "user-2", 0, 1)
             .expect("private code should allow an allowed user that has not redeemed it");
         assert_eq!(
-            validate_runtime_profile_redeem_code_usage(&private, "user-2", 1)
+            validate_runtime_profile_redeem_code_usage(&private, "user-2", 1, 1)
                 .expect_err("private code should reject the same allowed user twice"),
             RuntimeProfileFieldError::RedeemCodeUsesExhausted
         );
@@ -1312,7 +1314,7 @@ mod tests {
             ..base
         };
         assert_eq!(
-            validate_runtime_profile_redeem_code_usage(&disabled, "user-1", 0)
+            validate_runtime_profile_redeem_code_usage(&disabled, "user-1", 0, 1)
                 .expect_err("disabled code should fail"),
             RuntimeProfileFieldError::RedeemCodeDisabled
         );
diff --git a/server-rs/crates/module-runtime/tests/redeem_code_validity.rs b/server-rs/crates/module-runtime/tests/redeem_code_validity.rs
new file mode 100644
index 000000000..a430e90ce
--- /dev/null
+++ b/server-rs/crates/module-runtime/tests/redeem_code_validity.rs
@@ -0,0 +1,89 @@
+use module_runtime::{
+    RuntimeProfileFieldError, RuntimeProfileRedeemCodeMode, RuntimeProfileRedeemCodeSnapshot,
+    build_runtime_profile_redeem_code_admin_upsert_input, build_runtime_profile_redeem_code_record,
+    validate_runtime_profile_redeem_code_usage,
+    validate_runtime_profile_redeem_code_validity_window,
+};
+
+#[test]
+fn redeem_code_validity_window_allows_open_ended_and_requires_strict_order() {
+    assert!(validate_runtime_profile_redeem_code_validity_window(None, None).is_ok());
+    assert!(validate_runtime_profile_redeem_code_validity_window(Some(10), None).is_ok());
+    assert!(validate_runtime_profile_redeem_code_validity_window(None, Some(10)).is_ok());
+    assert_eq!(
+        validate_runtime_profile_redeem_code_validity_window(Some(10), Some(10)),
+        Err(RuntimeProfileFieldError::InvalidRedeemCodeValidityWindow)
+    );
+    assert_eq!(
+        validate_runtime_profile_redeem_code_validity_window(Some(20), Some(10)),
+        Err(RuntimeProfileFieldError::InvalidRedeemCodeValidityWindow)
+    );
+}
+
+#[test]
+fn redeem_code_admin_upsert_carries_optional_validity_window() {
+    let input = build_runtime_profile_redeem_code_admin_upsert_input(
+        "admin-1".to_string(),
+        "GIFT".to_string(),
+        RuntimeProfileRedeemCodeMode::Public,
+        30,
+        1,
+        true,
+        Vec::new(),
+        Vec::new(),
+        Some(10),
+        Some(20),
+        5,
+    )
+    .expect("valid window should pass");
+
+    assert_eq!(input.starts_at_micros, Some(10));
+    assert_eq!(input.expires_at_micros, Some(20));
+}
+
+#[test]
+fn redeem_code_usage_uses_inclusive_start_and_exclusive_expire_boundary() {
+    let code = redeem_code_snapshot(Some(20), Some(30));
+
+    assert_eq!(
+        validate_runtime_profile_redeem_code_usage(&code, "user-1", 0, 19),
+        Err(RuntimeProfileFieldError::RedeemCodeNotStarted)
+    );
+    validate_runtime_profile_redeem_code_usage(&code, "user-1", 0, 20)
+        .expect("start boundary should be valid");
+    validate_runtime_profile_redeem_code_usage(&code, "user-1", 0, 29)
+        .expect("time before expire boundary should be valid");
+    assert_eq!(
+        validate_runtime_profile_redeem_code_usage(&code, "user-1", 0, 30),
+        Err(RuntimeProfileFieldError::RedeemCodeExpired)
+    );
+}
+
+#[test]
+fn redeem_code_record_formats_optional_validity_window() {
+    let record =
+        build_runtime_profile_redeem_code_record(redeem_code_snapshot(Some(0), Some(1_000_000)));
+
+    assert_eq!(record.starts_at.as_deref(), Some("1970-01-01T00:00:00Z"));
+    assert_eq!(record.expires_at.as_deref(), Some("1970-01-01T00:00:01Z"));
+}
+
+fn redeem_code_snapshot(
+    starts_at_micros: Option<i64>,
+    expires_at_micros: Option<i64>,
+) -> RuntimeProfileRedeemCodeSnapshot {
+    RuntimeProfileRedeemCodeSnapshot {
+        code: "GIFT".to_string(),
+        mode: RuntimeProfileRedeemCodeMode::Public,
+        reward_points: 30,
+        max_uses: 1,
+        global_used_count: 0,
+        enabled: true,
+        allowed_user_ids: Vec::new(),
+        created_by: "admin".to_string(),
+        created_at_micros: 1,
+        updated_at_micros: 1,
+        starts_at_micros,
+        expires_at_micros,
+    }
+}
diff --git a/server-rs/crates/pingora-gateway/src/main.rs b/server-rs/crates/pingora-gateway/src/main.rs
index 8c080f789..a38896340 100644
--- a/server-rs/crates/pingora-gateway/src/main.rs
+++ b/server-rs/crates/pingora-gateway/src/main.rs
@@ -36,6 +36,7 @@ const DEFAULT_SPACETIME_UPSTREAM: &str = "127.0.0.1:3101";
 const DEFAULT_WEB_ROOT: &str = "/srv/genarrative/web";
 const DEFAULT_ACME_ROOT: &str = "/var/www/html";
 const DEFAULT_MAINTENANCE_FILE: &str = "/var/lib/genarrative/maintenance/enabled";
+const DEFAULT_MAINTENANCE_PAGE_FILE: &str = "/var/lib/genarrative/maintenance/page.html";
 const DEFAULT_MAX_API_BODY_BYTES: u64 = 64 * 1024 * 1024;
 const DEFAULT_GZIP_LEVEL: u32 = 5;
 const DEFAULT_GZIP_MIN_LENGTH_BYTES: u64 = 1024;
@@ -134,6 +135,7 @@ struct GatewayConfig {
     web_root: PathBuf,
     acme_root: PathBuf,
     maintenance_file: PathBuf,
+    maintenance_page_file: PathBuf,
     forwarded_proto: String,
     max_api_body_bytes: u64,
     gzip_enabled: bool,
@@ -195,6 +197,10 @@ impl GatewayConfig {
                 "GENARRATIVE_PINGORA_GATEWAY_MAINTENANCE_FILE",
                 DEFAULT_MAINTENANCE_FILE,
             )),
+            maintenance_page_file: PathBuf::from(read_env_or_default(
+                "GENARRATIVE_PINGORA_GATEWAY_MAINTENANCE_PAGE_FILE",
+                DEFAULT_MAINTENANCE_PAGE_FILE,
+            )),
             forwarded_proto: read_env_or_default(
                 "GENARRATIVE_PINGORA_GATEWAY_FORWARDED_PROTO",
                 "http",
@@ -1198,8 +1204,13 @@ impl ProxyHttp for GenarrativeGateway {
             let should_apply_maintenance = !internal_bypass
                 && (is_admin_request_path(path) || ctx.route.applies_maintenance_gate());
             if should_apply_maintenance {
-                respond_maintenance(session, ctx.route.is_api_like(), &self.config.web_root)
-                    .await?;
+                respond_maintenance(
+                    session,
+                    ctx.route.is_api_like(),
+                    &self.config.maintenance_page_file,
+                    &self.config.web_root,
+                )
+                .await?;
                 return Ok(true);
             }
         }
@@ -2083,7 +2094,10 @@ async fn serve_static(
 ) -> PingoraResult<()> {
     let path = session.req_header().uri.path();
     let Some(candidate) = resolve_static_candidate(root, root_kind, path, mode).await else {
-        respond_not_found(session).await?;
+        match root_kind {
+            StaticRoot::Web => respond_page_not_found(session, root).await?,
+            StaticRoot::Acme => respond_not_found(session).await?,
+        }
         return Ok(());
     };
     if !is_static_read_method(&session.req_header().method) {
@@ -2537,6 +2551,7 @@ async fn is_directory(path: &Path) -> bool {
 async fn respond_maintenance(
     session: &mut Session,
     api_like: bool,
+    maintenance_page_file: &Path,
     web_root: &Path,
 ) -> PingoraResult<()> {
     if api_like {
@@ -2548,9 +2563,17 @@ async fn respond_maintenance(
         .await;
     }
 
-    let maintenance_page = web_root.join("maintenance.html");
-    if is_regular_file(&maintenance_page).await {
-        let body = Bytes::from(tokio::fs::read(&maintenance_page).await.unwrap_or_default());
+    let default_maintenance_page = web_root.join("maintenance.html");
+    let maintenance_page = if is_regular_file(maintenance_page_file).await {
+        Some(maintenance_page_file)
+    } else if is_regular_file(&default_maintenance_page).await {
+        Some(default_maintenance_page.as_path())
+    } else {
+        None
+    };
+
+    if let Some(maintenance_page) = maintenance_page {
+        let body = Bytes::from(tokio::fs::read(maintenance_page).await.unwrap_or_default());
         respond_bytes(session, 503, Some("text/html; charset=utf-8"), body).await
     } else {
         respond_bytes(
@@ -2613,6 +2636,33 @@ async fn respond_not_found(session: &mut Session) -> PingoraResult<()> {
     respond_bytes(session, 404, None, Bytes::new()).await
 }
 
+async fn respond_page_not_found(session: &mut Session, web_root: &Path) -> PingoraResult<()> {
+    let accepts_html = session
+        .req_header()
+        .headers
+        .get("accept")
+        .and_then(|value| value.to_str().ok())
+        .is_some_and(|value| {
+            value
+                .split(',')
+                .any(|entry| entry.trim().starts_with("text/html"))
+        });
+    let not_found_page = web_root.join("404.html");
+    if accepts_html && is_regular_file(&not_found_page).await {
+        let body = Bytes::from(tokio::fs::read(&not_found_page).await.unwrap_or_default());
+        return respond_bytes_with_headers(
+            session,
+            404,
+            Some("text/html; charset=utf-8"),
+            &[("Cache-Control".to_string(), "no-store".to_string())],
+            body,
+        )
+        .await;
+    }
+
+    respond_not_found(session).await
+}
+
 async fn respond_static_method_not_allowed(session: &mut Session) -> PingoraResult<()> {
     respond_head_with_headers(
         session,
@@ -3225,6 +3275,7 @@ mod tests {
             web_root: PathBuf::from("/srv/genarrative/web"),
             acme_root: PathBuf::from("/var/www/html"),
             maintenance_file: PathBuf::from("/var/lib/genarrative/maintenance/enabled"),
+            maintenance_page_file: PathBuf::from("/var/lib/genarrative/maintenance/page.html"),
             forwarded_proto: "http".to_string(),
             max_api_body_bytes: DEFAULT_MAX_API_BODY_BYTES,
             gzip_enabled: true,
diff --git a/server-rs/crates/platform-audio/src/client.rs b/server-rs/crates/platform-audio/src/client.rs
index d993d1005..df8205746 100644
--- a/server-rs/crates/platform-audio/src/client.rs
+++ b/server-rs/crates/platform-audio/src/client.rs
@@ -171,40 +171,49 @@ pub async fn resolve_audio_task_download_urls(
     if matches!(
         kind,
         AudioTaskKind::BackgroundMusic | AudioTaskKind::SunoSoundEffect
-    ) && audio_urls.is_empty()
-    {
-        let clip_ids = extract_suno_clip_ids(&task_payload);
+    ) {
+        let (downloadable_audio_urls, clip_ids, has_audiopipe_url) =
+            resolve_suno_audio_candidates(&task_payload, audio_urls);
+        // Suno 查询结果还会混入 image_url 等非音频 URL。一旦存在 audiopipe，
+        // 不保留同一 payload 的其它直连候选，强制用 item_id 获取稳定 wav。
+        audio_urls = if has_audiopipe_url {
+            Vec::new()
+        } else {
+            downloadable_audio_urls
+        };
         let has_clip_ids = !clip_ids.is_empty();
         let mut latest_wav_error = None;
-        for clip_id in clip_ids {
-            let wav_payload = match get_vector_engine_json(
-                http_client,
-                settings,
-                &format!("/suno/act/wav/{}", urlencoding::encode(clip_id.as_str())),
-                match kind {
-                    AudioTaskKind::SunoSoundEffect => "获取 Suno 音效 wav 失败",
-                    _ => "获取 Suno wav 音频失败",
-                },
-            )
-            .await
-            {
-                Ok(payload) => {
-                    latest_wav_error = None;
-                    payload
+        if should_wait_for_suno_wav_audio(&status, has_clip_ids, &audio_urls) {
+            for clip_id in clip_ids {
+                let wav_payload = match get_vector_engine_json(
+                    http_client,
+                    settings,
+                    &format!("/suno/act/wav/{}", urlencoding::encode(clip_id.as_str())),
+                    match kind {
+                        AudioTaskKind::SunoSoundEffect => "获取 Suno 音效 wav 失败",
+                        _ => "获取 Suno wav 音频失败",
+                    },
+                )
+                .await
+                {
+                    Ok(payload) => {
+                        latest_wav_error = None;
+                        payload
+                    }
+                    Err(error) => {
+                        latest_wav_error = Some(error);
+                        continue;
+                    }
+                };
+                audio_urls = extract_audio_urls(&wav_payload);
+                if !audio_urls.is_empty() {
+                    break;
                 }
-                Err(error) => {
-                    latest_wav_error = Some(error);
-                    continue;
-                }
-            };
-            audio_urls = extract_audio_urls(&wav_payload);
-            if !audio_urls.is_empty() {
-                break;
             }
         }
-        // 中文注释：Suno 任务完成后可能先返回 clip id，/suno/act/wav/{clip_id}
-        // 可能返回 404/业务错误或 wav_file_url 仍为 null。此时不能把任务判成失败，
-        // 让上层轮询继续等待；真正失败仍交给 fetch 任务状态判断。
+        // 中文注释：Suno 的 audiopipe 地址只是携带 item_id 的流式中转地址，线上可能
+        // 返回 200 后不结束 chunked body。统一把 item_id 当 clip id 转走稳定 wav 地址；
+        // wav 地址尚未就绪或子请求暂时失败时保持 processing，让上层继续轮询。
         if let Some(status) = resolve_suno_status_after_wav_probe(
             &status,
             has_clip_ids,
@@ -217,6 +226,42 @@ pub async fn resolve_audio_task_download_urls(
     Ok((status, audio_urls))
 }
 
+fn resolve_suno_audio_candidates(
+    task_payload: &Value,
+    audio_urls: Vec<String>,
+) -> (Vec<String>, Vec<String>, bool) {
+    let mut clip_ids = extract_suno_clip_ids(task_payload);
+    let mut downloadable_audio_urls = Vec::new();
+    let mut has_audiopipe_url = false;
+    for audio_url in audio_urls {
+        let Ok(parsed_url) = reqwest::Url::parse(audio_url.as_str()) else {
+            downloadable_audio_urls.push(audio_url);
+            continue;
+        };
+        if !parsed_url
+            .host_str()
+            .is_some_and(|host| host.eq_ignore_ascii_case("audiopipe.suno.ai"))
+        {
+            downloadable_audio_urls.push(audio_url);
+            continue;
+        }
+        has_audiopipe_url = true;
+
+        if let Some(clip_id) = parsed_url
+            .query_pairs()
+            .find(|(key, _)| key.eq_ignore_ascii_case("item_id"))
+            .map(|(_, value)| value.trim().to_string())
+            .filter(|value| {
+                !value.is_empty() && value.len() <= 180 && !value.chars().any(char::is_whitespace)
+            })
+            && !clip_ids.contains(&clip_id)
+        {
+            clip_ids.push(clip_id);
+        }
+    }
+    (downloadable_audio_urls, clip_ids, has_audiopipe_url)
+}
+
 fn should_wait_for_suno_wav_audio(status: &str, has_clip_ids: bool, audio_urls: &[String]) -> bool {
     audio_urls.is_empty() && has_clip_ids && !is_failed_task_status(status)
 }
@@ -419,6 +464,13 @@ fn extract_upstream_payload_message(payload: &Value) -> Option<String> {
 
 #[cfg(test)]
 mod tests {
+    use std::{
+        io::{Read, Write},
+        net::TcpListener,
+        thread,
+        time::Duration,
+    };
+
     use super::*;
 
     fn settings(base_url: &str) -> VectorEngineAudioSettings {
@@ -527,4 +579,67 @@ mod tests {
 
         assert_eq!(status.as_deref(), Some("processing"));
     }
+
+    #[test]
+    fn suno_audiopipe_url_uses_item_id_to_resolve_stable_wav_url() {
+        let listener = TcpListener::bind("127.0.0.1:0").expect("mock server should bind");
+        let address = listener
+            .local_addr()
+            .expect("mock server address should be readable");
+        let server = thread::spawn(move || {
+            let responses = [
+                (
+                    "/suno/fetch/task-1",
+                    r#"{"code":200,"data":{"status":"complete","audio_url":"https://audiopipe.suno.ai/?item_id=clip-1","image_url":"https://cdn.example.test/cover.jpg"}}"#,
+                ),
+                (
+                    "/suno/act/wav/clip-1",
+                    r#"{"code":200,"data":{"url":"https://cdn.example.test/audio.wav"}}"#,
+                ),
+            ];
+            for (expected_path, body) in responses {
+                let (mut stream, _) = listener.accept().expect("request should connect");
+                let mut request = [0_u8; 2048];
+                let size = stream
+                    .read(&mut request)
+                    .expect("request should be readable");
+                let request = String::from_utf8_lossy(&request[..size]);
+                assert!(
+                    request.starts_with(format!("GET {expected_path} HTTP/1.1").as_str()),
+                    "unexpected request: {request}"
+                );
+                let response = format!(
+                    "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}",
+                    body.len()
+                );
+                stream
+                    .write_all(response.as_bytes())
+                    .expect("response should be writable");
+            }
+        });
+        let runtime = tokio::runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .expect("tokio runtime should build");
+        let http_client = reqwest::Client::builder()
+            .timeout(Duration::from_secs(2))
+            .build()
+            .expect("http client should build");
+
+        let (status, audio_urls) = runtime
+            .block_on(resolve_audio_task_download_urls(
+                &http_client,
+                &settings(format!("http://{address}").as_str()),
+                AudioTaskKind::BackgroundMusic,
+                "task-1",
+            ))
+            .expect("audiopipe item id should resolve through the wav endpoint");
+
+        assert_eq!(status, "completed");
+        assert_eq!(
+            audio_urls,
+            vec!["https://cdn.example.test/audio.wav".to_string()]
+        );
+        server.join().expect("mock server should finish");
+    }
 }
diff --git a/server-rs/crates/platform-image/src/generated_asset_sheets/sheet.rs b/server-rs/crates/platform-image/src/generated_asset_sheets/sheet.rs
index 1115dba86..4d4b46119 100644
--- a/server-rs/crates/platform-image/src/generated_asset_sheets/sheet.rs
+++ b/server-rs/crates/platform-image/src/generated_asset_sheets/sheet.rs
@@ -212,7 +212,7 @@ fn slice_generated_icon_spritesheet_rgba_by_connected_components(
         icon_names.len(),
         auto_name_all_components,
     );
-    components.sort_by_key(|bounds| (bounds.y0, bounds.x0));
+    sort_generated_icon_components_in_visual_rows(&mut components);
     let icon_names = if auto_name_all_components {
         (1..=components.len())
             .map(|index| format!("素材 {index}"))
@@ -314,6 +314,76 @@ fn normalize_generated_icon_components(
         .collect()
 }
 
+fn sort_generated_icon_components_in_visual_rows(components: &mut [GeneratedAssetSheetCellBounds]) {
+    if components.len() < 2 {
+        return;
+    }
+
+    let mut component_heights = components
+        .iter()
+        .map(|bounds| bounds.height())
+        .collect::<Vec<_>>();
+    component_heights.sort_unstable();
+    let typical_height = component_heights[component_heights.len() / 2].max(1);
+    // 双倍中心坐标避免浮点；3/4 中位高度可容纳顶边不齐，同时保留正常行距。
+    let row_center_tolerance_twice = typical_height.saturating_mul(3).div_ceil(2).max(8);
+
+    components.sort_by_key(|bounds| (bounds.center_y_twice(), bounds.x0));
+    let mut rows = Vec::<GeneratedIconVisualRow>::new();
+    for bounds in components.iter().copied() {
+        let center_y_twice = bounds.center_y_twice();
+        let closest_row = rows
+            .iter()
+            .enumerate()
+            .filter_map(|(index, row)| {
+                let distance = row.center_y_twice().abs_diff(center_y_twice);
+                (distance <= row_center_tolerance_twice).then_some((index, distance))
+            })
+            .min_by_key(|(_, distance)| *distance)
+            .map(|(index, _)| index);
+        if let Some(row_index) = closest_row {
+            rows[row_index].push(bounds);
+        } else {
+            rows.push(GeneratedIconVisualRow::new(bounds));
+        }
+    }
+
+    rows.sort_by_key(GeneratedIconVisualRow::center_y_twice);
+    let mut ordered = Vec::with_capacity(components.len());
+    for mut row in rows {
+        row.components
+            .sort_by_key(|bounds| (bounds.x0, bounds.center_y_twice()));
+        ordered.extend(row.components);
+    }
+    components.copy_from_slice(&ordered);
+}
+
+struct GeneratedIconVisualRow {
+    center_y_twice_sum: u64,
+    components: Vec<GeneratedAssetSheetCellBounds>,
+}
+
+impl GeneratedIconVisualRow {
+    fn new(bounds: GeneratedAssetSheetCellBounds) -> Self {
+        Self {
+            center_y_twice_sum: u64::from(bounds.center_y_twice()),
+            components: vec![bounds],
+        }
+    }
+
+    fn center_y_twice(&self) -> u32 {
+        let component_count = self.components.len().max(1) as u64;
+        u32::try_from(self.center_y_twice_sum / component_count).unwrap_or(u32::MAX)
+    }
+
+    fn push(&mut self, bounds: GeneratedAssetSheetCellBounds) {
+        self.center_y_twice_sum = self
+            .center_y_twice_sum
+            .saturating_add(u64::from(bounds.center_y_twice()));
+        self.components.push(bounds);
+    }
+}
+
 fn merge_generated_icon_related_components(
     mut components: Vec<GeneratedAssetSheetIconComponent>,
     width: u32,
@@ -621,6 +691,17 @@ mod tests {
         cursor.into_inner()
     }
 
+    fn assert_icon_contains_color(icon: &GeneratedAssetSheetConnectedIcon, color: [u8; 4]) {
+        let image = image::load_from_memory(icon.bytes.as_slice())
+            .expect("icon should decode")
+            .to_rgba8();
+        assert!(
+            image.pixels().any(|pixel| pixel.0 == color),
+            "{} should contain {color:?}",
+            icon.name
+        );
+    }
+
     #[test]
     fn slices_icon_spritesheet_by_connected_components_in_reading_order() {
         let mut sheet: image::RgbaImage = ImageBuffer::from_pixel(96, 64, Rgba([0, 255, 0, 255]));
@@ -654,6 +735,88 @@ mod tests {
         assert!(image::load_from_memory(icons[0].bytes.as_slice()).is_ok());
     }
 
+    #[test]
+    fn keeps_left_to_right_order_when_same_row_top_edges_differ() {
+        let mut sheet: image::RgbaImage = ImageBuffer::from_pixel(112, 56, Rgba([0, 255, 0, 255]));
+        let left_color = [240, 80, 80, 255];
+        let right_color = [80, 120, 240, 255];
+        for y in 18..38 {
+            for x in 10..30 {
+                sheet.put_pixel(x, y, Rgba(left_color));
+            }
+        }
+        for y in 8..38 {
+            for x in 70..92 {
+                sheet.put_pixel(x, y, Rgba(right_color));
+            }
+        }
+
+        let source = crate::DownloadedImage {
+            bytes: encode_png(sheet),
+            mime_type: "image/png".to_string(),
+            extension: "png".to_string(),
+        };
+        let icons = slice_generated_icon_spritesheet_by_connected_components(
+            &source,
+            &["左侧素材".to_string(), "右侧素材".to_string()],
+        )
+        .expect("same-row icons should slice from left to right");
+
+        assert_icon_contains_color(&icons[0], left_color);
+        assert_icon_contains_color(&icons[1], right_color);
+    }
+
+    #[test]
+    fn orders_multiple_visual_rows_top_to_bottom_and_left_to_right() {
+        let mut sheet: image::RgbaImage = ImageBuffer::from_pixel(128, 112, Rgba([0, 255, 0, 255]));
+        let colors = [
+            [240, 80, 80, 255],
+            [80, 120, 240, 255],
+            [180, 80, 220, 255],
+            [250, 190, 40, 255],
+        ];
+        for y in 18..38 {
+            for x in 10..30 {
+                sheet.put_pixel(x, y, Rgba(colors[0]));
+            }
+        }
+        for y in 8..38 {
+            for x in 78..100 {
+                sheet.put_pixel(x, y, Rgba(colors[1]));
+            }
+        }
+        for y in 72..94 {
+            for x in 12..34 {
+                sheet.put_pixel(x, y, Rgba(colors[2]));
+            }
+        }
+        for y in 62..94 {
+            for x in 80..104 {
+                sheet.put_pixel(x, y, Rgba(colors[3]));
+            }
+        }
+
+        let source = crate::DownloadedImage {
+            bytes: encode_png(sheet),
+            mime_type: "image/png".to_string(),
+            extension: "png".to_string(),
+        };
+        let icons = slice_generated_icon_spritesheet_by_connected_components(
+            &source,
+            &[
+                "第一行左侧".to_string(),
+                "第一行右侧".to_string(),
+                "第二行左侧".to_string(),
+                "第二行右侧".to_string(),
+            ],
+        )
+        .expect("visual rows should slice in reading order");
+
+        for (icon, color) in icons.iter().zip(colors) {
+            assert_icon_contains_color(icon, color);
+        }
+    }
+
     #[test]
     fn rejects_when_connected_components_are_fewer_than_icon_names() {
         let mut sheet: image::RgbaImage = ImageBuffer::from_pixel(48, 48, Rgba([0, 255, 0, 255]));
@@ -837,6 +1000,10 @@ impl GeneratedAssetSheetCellBounds {
         self.y1.saturating_sub(self.y0).max(1)
     }
 
+    fn center_y_twice(self) -> u32 {
+        self.y0.saturating_add(self.y1)
+    }
+
     fn area(self) -> u32 {
         self.width().saturating_mul(self.height())
     }
diff --git a/server-rs/crates/shared-contracts/src/assets.rs b/server-rs/crates/shared-contracts/src/assets.rs
index c30598dc1..58e0b3958 100644
--- a/server-rs/crates/shared-contracts/src/assets.rs
+++ b/server-rs/crates/shared-contracts/src/assets.rs
@@ -5,6 +5,8 @@ use serde_json::Value;
 
 use crate::external_generation::ExternalGenerationJobStatusRecord;
 
+pub const EDITOR_ASSET_LABEL_MAX_CHARS: usize = 80;
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct CreateDirectUploadTicketRequest {
@@ -330,6 +332,10 @@ pub struct EditorCharacterAnimationGenerateRequest {
     pub generation_inputs: Option<Value>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub source_resource_id: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub asset_folder_id: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub asset_label: Option<String>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
@@ -477,6 +483,13 @@ pub struct EditorIconSpritesheetIconPayload {
     pub height: u32,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct EditorIconSpritesheetSliceWarningPayload {
+    pub code: String,
+    pub reason: String,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct EditorIconSpritesheetGenerateResponse {
@@ -484,6 +497,8 @@ pub struct EditorIconSpritesheetGenerateResponse {
     pub spritesheet_width: u32,
     pub spritesheet_height: u32,
     pub icon_image_srcs: Vec<EditorIconSpritesheetIconPayload>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub slice_warning: Option<EditorIconSpritesheetSliceWarningPayload>,
     pub prompt: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub actual_prompt: Option<String>,
@@ -1099,6 +1114,8 @@ mod tests {
             }),
             generation_inputs: None,
             source_resource_id: Some("resource-source".to_string()),
+            asset_folder_id: Some("project".to_string()),
+            asset_label: Some("勇者奔跑".to_string()),
         })
         .expect("request should serialize");
 
@@ -1112,6 +1129,8 @@ mod tests {
         assert_eq!(payload["projectId"], json!("editor-project-1"));
         assert_eq!(payload["canvasCompletion"]["dialogId"], json!("dialog-1"));
         assert_eq!(payload["sourceResourceId"], json!("resource-source"));
+        assert_eq!(payload["assetFolderId"], json!("project"));
+        assert_eq!(payload["assetLabel"], json!("勇者奔跑"));
     }
 
     #[test]
@@ -1293,6 +1312,10 @@ mod tests {
             spritesheet_width: 512,
             spritesheet_height: 512,
             icon_image_srcs: Vec::new(),
+            slice_warning: Some(EditorIconSpritesheetSliceWarningPayload {
+                code: "insufficient-connected-components".to_string(),
+                reason: "连通域数量不足".to_string(),
+            }),
             prompt: "图标 prompt".to_string(),
             actual_prompt: Some("图标 prompt".to_string()),
             model: "gemini-3.1-flash-image-preview".to_string(),
@@ -1304,6 +1327,13 @@ mod tests {
 
         assert_eq!(response_payload["priceMudPoints"], json!(12));
         assert_eq!(response_payload["iconImageSrcs"], json!([]));
+        assert_eq!(
+            response_payload["sliceWarning"],
+            json!({
+                "code": "insufficient-connected-components",
+                "reason": "连通域数量不足",
+            })
+        );
     }
 
     #[test]
diff --git a/server-rs/crates/shared-contracts/src/external_generation.rs b/server-rs/crates/shared-contracts/src/external_generation.rs
index 004574c81..a93705986 100644
--- a/server-rs/crates/shared-contracts/src/external_generation.rs
+++ b/server-rs/crates/shared-contracts/src/external_generation.rs
@@ -36,10 +36,19 @@ pub struct ExternalGenerationJobStatusRecord {
     pub updated_at_micros: i64,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ExternalGenerationJobStatusDetailRecord {
+    #[serde(flatten)]
+    pub status: ExternalGenerationJobStatusRecord,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ExternalGenerationJobStatusResponse {
-    pub job: ExternalGenerationJobStatusRecord,
+    pub job: ExternalGenerationJobStatusDetailRecord,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -56,6 +65,8 @@ pub struct ExternalGenerationTaskRecord {
     pub phase_detail: String,
     pub progress: u8,
     pub error: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
     pub price_mud_points: u64,
     pub refund_ledger_id: Option<String>,
     pub notification_acknowledged_at: Option<String>,
@@ -84,3 +95,33 @@ pub struct ExternalGenerationTaskAcknowledgeRequest {
 pub struct ExternalGenerationTaskAcknowledgeResponse {
     pub acknowledged_tasks: Vec<ExternalGenerationTaskRecord>,
 }
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+
+    use super::*;
+
+    #[test]
+    fn status_detail_serializes_warning_without_reusing_error() {
+        let payload = serde_json::to_value(ExternalGenerationJobStatusResponse {
+            job: ExternalGenerationJobStatusDetailRecord {
+                status: ExternalGenerationJobStatusRecord {
+                    operation_id: "job-1".to_string(),
+                    status: ExternalGenerationJobStatus::Completed,
+                    phase_label: "图标素材生成".to_string(),
+                    phase_detail: "生成已完成。".to_string(),
+                    progress: 100,
+                    error: None,
+                    updated_at_micros: 1,
+                },
+                warning: Some("连通域数量不足".to_string()),
+            },
+        })
+        .expect("状态响应应可序列化");
+
+        assert_eq!(payload["job"]["warning"], json!("连通域数量不足"));
+        assert_eq!(payload["job"]["error"], json!(null));
+        assert_eq!(payload["job"]["status"], json!("completed"));
+    }
+}
diff --git a/server-rs/crates/shared-contracts/src/runtime.rs b/server-rs/crates/shared-contracts/src/runtime.rs
index 98674d92b..67afc5fa0 100644
--- a/server-rs/crates/shared-contracts/src/runtime.rs
+++ b/server-rs/crates/shared-contracts/src/runtime.rs
@@ -680,6 +680,10 @@ pub struct AdminUpsertProfileRedeemCodeRequest {
     pub allowed_user_ids: Vec<String>,
     #[serde(default)]
     pub allowed_public_user_codes: Vec<String>,
+    #[serde(default)]
+    pub starts_at: Option<String>,
+    #[serde(default)]
+    pub expires_at: Option<String>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
@@ -713,6 +717,8 @@ pub struct ProfileRedeemCodeAdminResponse {
     pub created_by: String,
     pub created_at: String,
     pub updated_at: String,
+    pub starts_at: Option<String>,
+    pub expires_at: Option<String>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
@@ -1219,6 +1225,39 @@ mod tests {
     use super::*;
     use serde_json::json;
 
+    #[test]
+    fn redeem_code_admin_contract_uses_optional_camel_case_validity_window() {
+        let request: AdminUpsertProfileRedeemCodeRequest = serde_json::from_value(json!({
+            "code": "GIFT",
+            "mode": "public",
+            "rewardPoints": 30,
+            "maxUses": 1,
+            "startsAt": "2026-07-13T00:00:00Z",
+            "expiresAt": null
+        }))
+        .expect("redeem code request should accept validity window");
+        assert_eq!(request.starts_at.as_deref(), Some("2026-07-13T00:00:00Z"));
+        assert_eq!(request.expires_at, None);
+
+        let response = ProfileRedeemCodeAdminResponse {
+            code: "GIFT".to_string(),
+            mode: "public".to_string(),
+            reward_points: 30,
+            max_uses: 1,
+            global_used_count: 0,
+            enabled: true,
+            allowed_user_ids: Vec::new(),
+            created_by: "admin".to_string(),
+            created_at: "2026-07-13T00:00:00Z".to_string(),
+            updated_at: "2026-07-13T00:00:00Z".to_string(),
+            starts_at: Some("2026-07-13T00:00:00Z".to_string()),
+            expires_at: None,
+        };
+        let payload = serde_json::to_value(response).expect("response should serialize");
+        assert_eq!(payload["startsAt"], json!("2026-07-13T00:00:00Z"));
+        assert_eq!(payload["expiresAt"], json!(null));
+    }
+
     fn empty_mud_point_balance() -> ProfileMudPointBalanceResponse {
         ProfileMudPointBalanceResponse {
             total_points: 0,
diff --git a/server-rs/crates/spacetime-client/src/assets.rs b/server-rs/crates/spacetime-client/src/assets.rs
index 004197d93..c33e050c3 100644
--- a/server-rs/crates/spacetime-client/src/assets.rs
+++ b/server-rs/crates/spacetime-client/src/assets.rs
@@ -50,29 +50,67 @@ impl SpacetimeClient {
         &self,
         asset_object_id: String,
     ) -> Result<Option<AssetObjectRecord>, SpacetimeClientError> {
-        self.read_after_connect("get_asset_object", move |connection| {
-            Ok(connection
-                .db()
-                .asset_object()
-                .asset_object_id()
-                .find(&asset_object_id)
-                .map(map_asset_object_row))
-        })
+        self.call_after_connect(
+            "get_asset_object_by_id_and_return",
+            move |connection, sender| {
+                connection
+                    .procedures()
+                    .get_asset_object_by_id_and_return_then(asset_object_id, move |_, result| {
+                        let mapped = result
+                            .map_err(SpacetimeClientError::from_sdk_error)
+                            .and_then(map_optional_asset_object_procedure_result);
+                        send_once(&sender, mapped);
+                    });
+            },
+        )
         .await
     }
 
-    pub async fn get_asset_object_by_object_key(
+    pub async fn get_asset_object_by_location(
         &self,
-        object_key: String,
+        input: module_assets::AssetObjectLocationInput,
     ) -> Result<Option<AssetObjectRecord>, SpacetimeClientError> {
-        self.read_after_connect("get_asset_object_by_object_key", move |connection| {
-            Ok(connection
-                .db()
-                .asset_object()
-                .iter()
-                .find(|row| row.object_key == object_key)
-                .map(map_asset_object_row))
-        })
+        let procedure_input = input.into();
+        self.call_after_connect(
+            "get_asset_object_by_location_and_return",
+            move |connection, sender| {
+                connection
+                    .procedures()
+                    .get_asset_object_by_location_and_return_then(
+                        procedure_input,
+                        move |_, result| {
+                            let mapped = result
+                                .map_err(SpacetimeClientError::from_sdk_error)
+                                .and_then(map_optional_asset_object_procedure_result);
+                            send_once(&sender, mapped);
+                        },
+                    );
+            },
+        )
+        .await
+    }
+
+    pub async fn get_asset_read_access_by_location(
+        &self,
+        input: module_assets::AssetObjectLocationInput,
+    ) -> Result<(Option<AssetObjectRecord>, bool), SpacetimeClientError> {
+        let procedure_input = input.into();
+        self.call_after_connect(
+            "get_asset_read_access_by_location_and_return",
+            move |connection, sender| {
+                connection
+                    .procedures()
+                    .get_asset_read_access_by_location_and_return_then(
+                        procedure_input,
+                        move |_, result| {
+                            let mapped = result
+                                .map_err(SpacetimeClientError::from_sdk_error)
+                                .and_then(map_asset_read_access_procedure_result);
+                            send_once(&sender, mapped);
+                        },
+                    );
+            },
+        )
         .await
     }
 
diff --git a/server-rs/crates/spacetime-client/src/lib.rs b/server-rs/crates/spacetime-client/src/lib.rs
index 2ae6f57ca..304be0eb9 100644
--- a/server-rs/crates/spacetime-client/src/lib.rs
+++ b/server-rs/crates/spacetime-client/src/lib.rs
@@ -383,6 +383,35 @@ pub enum SpacetimeClientError {
 const DEFAULT_PROCEDURE_TIMEOUT: Duration = Duration::from_secs(30);
 const PUBLIC_WORK_PLAY_DAY_MICROS: i64 = 86_400_000_000;
 const PUBLIC_WORK_RECENT_PLAY_WINDOW_DAYS: i64 = 7;
+const REQUIRED_CACHED_READ_MODEL_QUERIES: [&str; 12] = [
+    "SELECT * FROM public_work_gallery_entry",
+    "SELECT * FROM public_work_detail_entry",
+    "SELECT * FROM bark_battle_gallery_view",
+    "SELECT * FROM puzzle_gallery_card_view",
+    "SELECT * FROM puzzle_clear_gallery_card_view",
+    "SELECT * FROM jump_hop_gallery_card_view",
+    "SELECT * FROM wooden_fish_gallery_card_view",
+    "SELECT * FROM custom_world_gallery_entry",
+    "SELECT * FROM match_3_d_gallery_view",
+    "SELECT * FROM square_hole_gallery_view",
+    "SELECT * FROM visual_novel_gallery_view",
+    "SELECT * FROM big_fish_gallery_view",
+];
+const OPTIONAL_CACHED_READ_MODEL_QUERIES: [&str; 13] = [
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'puzzle'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'puzzle-clear'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'jump-hop'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'wooden-fish'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'custom-world'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'match3d'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'square-hole'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'visual-novel'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'big-fish'",
+    "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'bark-battle'",
+    "SELECT * FROM creation_entry_config",
+    "SELECT * FROM creation_entry_type_config",
+    "SELECT * FROM user_account",
+];
 
 type ProcedureResultSender<T> =
     Arc<Mutex<Option<oneshot::Sender<Result<T, SpacetimeClientError>>>>>;
@@ -882,20 +911,7 @@ impl SpacetimeClient {
         operation_timeout: Duration,
     ) -> Result<Vec<SubscriptionHandle>, SpacetimeStageError> {
         let mut subscriptions = Vec::new();
-        for query in [
-            "SELECT * FROM public_work_gallery_entry",
-            "SELECT * FROM public_work_detail_entry",
-            "SELECT * FROM bark_battle_gallery_view",
-            "SELECT * FROM puzzle_gallery_card_view",
-            "SELECT * FROM puzzle_clear_gallery_card_view",
-            "SELECT * FROM jump_hop_gallery_card_view",
-            "SELECT * FROM wooden_fish_gallery_card_view",
-            "SELECT * FROM custom_world_gallery_entry",
-            "SELECT * FROM match_3_d_gallery_view",
-            "SELECT * FROM square_hole_gallery_view",
-            "SELECT * FROM visual_novel_gallery_view",
-            "SELECT * FROM big_fish_gallery_view",
-        ] {
+        for query in REQUIRED_CACHED_READ_MODEL_QUERIES {
             let subscription = self
                 .subscribe_cached_read_model_query(
                     connection,
@@ -908,22 +924,7 @@ impl SpacetimeClient {
             subscriptions.push(subscription);
         }
 
-        for query in [
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'puzzle'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'puzzle-clear'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'jump-hop'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'wooden-fish'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'custom-world'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'match3d'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'square-hole'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'visual-novel'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'big-fish'",
-            "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'bark-battle'",
-            "SELECT * FROM creation_entry_config",
-            "SELECT * FROM creation_entry_type_config",
-            "SELECT * FROM user_account",
-            "SELECT * FROM asset_object",
-        ] {
+        for query in OPTIONAL_CACHED_READ_MODEL_QUERIES {
             if let Ok(subscription) = self
                 .subscribe_cached_read_model_query(
                     connection,
@@ -1202,6 +1203,16 @@ mod tests {
         ));
     }
 
+    #[test]
+    fn asset_acl_truth_is_not_read_from_cached_subscriptions() {
+        assert!(
+            !REQUIRED_CACHED_READ_MODEL_QUERIES
+                .contains(&"SELECT * FROM public_work_asset_read_grant")
+        );
+        assert!(!REQUIRED_CACHED_READ_MODEL_QUERIES.contains(&"SELECT * FROM asset_object"));
+        assert!(!OPTIONAL_CACHED_READ_MODEL_QUERIES.contains(&"SELECT * FROM asset_object"));
+    }
+
     fn test_client(pool_size: u32, procedure_timeout: Duration) -> SpacetimeClient {
         SpacetimeClient::new(SpacetimeClientConfig {
             // 指向本机不可达端口：测试只验证连接池行为，不需要真实 SpacetimeDB。
diff --git a/server-rs/crates/spacetime-client/src/mapper.rs b/server-rs/crates/spacetime-client/src/mapper.rs
index c29d71cde..43c2d4b2a 100644
--- a/server-rs/crates/spacetime-client/src/mapper.rs
+++ b/server-rs/crates/spacetime-client/src/mapper.rs
@@ -191,7 +191,8 @@ pub use self::wooden_fish::{
 
 pub(crate) use self::ai::map_ai_task_procedure_result;
 pub(crate) use self::assets::{
-    map_asset_object_row, map_entity_binding_procedure_result, map_procedure_result,
+    map_asset_read_access_procedure_result, map_entity_binding_procedure_result,
+    map_optional_asset_object_procedure_result, map_procedure_result,
 };
 pub(crate) use self::auth::{
     map_auth_store_projection_procedure_result, map_auth_store_projection_sync_procedure_result,
diff --git a/server-rs/crates/spacetime-client/src/mapper/assets.rs b/server-rs/crates/spacetime-client/src/mapper/assets.rs
index 8c46ab82c..f9edd4900 100644
--- a/server-rs/crates/spacetime-client/src/mapper/assets.rs
+++ b/server-rs/crates/spacetime-client/src/mapper/assets.rs
@@ -46,6 +46,15 @@ impl From<module_assets::AssetHistoryListInput> for AssetHistoryListInput {
     }
 }
 
+impl From<module_assets::AssetObjectLocationInput> for AssetObjectLocationInput {
+    fn from(input: module_assets::AssetObjectLocationInput) -> Self {
+        Self {
+            bucket: input.bucket,
+            object_key: input.object_key,
+        }
+    }
+}
+
 pub(crate) fn map_procedure_result(
     result: AssetObjectProcedureResult,
 ) -> Result<AssetObjectRecord, SpacetimeClientError> {
@@ -60,6 +69,71 @@ pub(crate) fn map_procedure_result(
     Ok(build_asset_object_record(map_snapshot(snapshot)))
 }
 
+pub(crate) fn map_optional_asset_object_procedure_result(
+    result: AssetObjectProcedureResult,
+) -> Result<Option<AssetObjectRecord>, SpacetimeClientError> {
+    if !result.ok {
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
+    }
+
+    Ok(result
+        .record
+        .map(map_snapshot)
+        .map(build_asset_object_record))
+}
+
+pub(crate) fn map_asset_read_access_procedure_result(
+    result: AssetObjectReadAccessProcedureResult,
+) -> Result<(Option<AssetObjectRecord>, bool), SpacetimeClientError> {
+    if !result.ok {
+        return Err(SpacetimeClientError::procedure_failed(result.error_message));
+    }
+
+    Ok((
+        result
+            .record
+            .map(map_snapshot)
+            .map(build_asset_object_record),
+        result.public_work_granted,
+    ))
+}
+
+#[cfg(test)]
+mod asset_object_procedure_result_tests {
+    use super::*;
+
+    #[test]
+    fn optional_asset_lookup_distinguishes_missing_record_from_failure() {
+        let missing = map_optional_asset_object_procedure_result(AssetObjectProcedureResult {
+            ok: true,
+            record: None,
+            error_message: None,
+        })
+        .expect("authoritative missing record should be a successful lookup");
+        assert!(missing.is_none());
+
+        let failed = map_optional_asset_object_procedure_result(AssetObjectProcedureResult {
+            ok: false,
+            record: None,
+            error_message: Some("runtime identity 不匹配".to_string()),
+        });
+        assert!(failed.is_err());
+    }
+
+    #[test]
+    fn read_access_lookup_preserves_authoritative_public_grant() {
+        let result = map_asset_read_access_procedure_result(AssetObjectReadAccessProcedureResult {
+            ok: true,
+            record: None,
+            public_work_granted: true,
+            error_message: None,
+        })
+        .expect("authoritative read access lookup should succeed");
+
+        assert_eq!(result, (None, true));
+    }
+}
+
 pub(crate) fn map_entity_binding_procedure_result(
     result: AssetEntityBindingProcedureResult,
 ) -> Result<AssetEntityBindingRecord, SpacetimeClientError> {
@@ -115,26 +189,6 @@ pub(crate) fn map_snapshot(
     }
 }
 
-pub(crate) fn map_asset_object_row(row: AssetObject) -> AssetObjectRecord {
-    build_asset_object_record(module_assets::AssetObjectUpsertSnapshot {
-        asset_object_id: row.asset_object_id,
-        bucket: row.bucket,
-        object_key: row.object_key,
-        access_policy: map_access_policy_back(row.access_policy),
-        content_type: row.content_type,
-        content_length: row.content_length,
-        content_hash: row.content_hash,
-        version: row.version,
-        source_job_id: row.source_job_id,
-        owner_user_id: row.owner_user_id,
-        profile_id: row.profile_id,
-        entity_id: row.entity_id,
-        asset_kind: row.asset_kind,
-        created_at_micros: row.created_at.to_micros_since_unix_epoch(),
-        updated_at_micros: row.updated_at.to_micros_since_unix_epoch(),
-    })
-}
-
 pub(crate) fn map_access_policy(
     value: AssetObjectAccessPolicy,
 ) -> crate::module_bindings::AssetObjectAccessPolicy {
diff --git a/server-rs/crates/spacetime-client/src/mapper/external_generation.rs b/server-rs/crates/spacetime-client/src/mapper/external_generation.rs
index fa1901aac..e032f20c5 100644
--- a/server-rs/crates/spacetime-client/src/mapper/external_generation.rs
+++ b/server-rs/crates/spacetime-client/src/mapper/external_generation.rs
@@ -264,6 +264,7 @@ fn map_external_generation_job_summary_snapshot(
             .notification_acknowledged_at_micros
             .map(format_timestamp_micros),
         notification_acknowledged_at_micros: snapshot.notification_acknowledged_at_micros,
+        warning_message: snapshot.warning_message,
     }
 }
 
@@ -400,6 +401,7 @@ pub struct ExternalGenerationJobSummaryRecord {
     pub refund_ledger_id: Option<String>,
     pub notification_acknowledged_at: Option<String>,
     pub notification_acknowledged_at_micros: Option<i64>,
+    pub warning_message: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/server-rs/crates/spacetime-client/src/mapper/runtime_profile.rs b/server-rs/crates/spacetime-client/src/mapper/runtime_profile.rs
index 74f898096..1294e945f 100644
--- a/server-rs/crates/spacetime-client/src/mapper/runtime_profile.rs
+++ b/server-rs/crates/spacetime-client/src/mapper/runtime_profile.rs
@@ -315,6 +315,8 @@ impl From<module_runtime::RuntimeProfileRedeemCodeAdminUpsertInput>
             enabled: input.enabled,
             allowed_user_ids: input.allowed_user_ids,
             allowed_public_user_codes: input.allowed_public_user_codes,
+            starts_at_micros: input.starts_at_micros,
+            expires_at_micros: input.expires_at_micros,
             updated_at_micros: input.updated_at_micros,
         }
     }
@@ -1286,6 +1288,8 @@ pub(crate) fn map_runtime_profile_redeem_code_snapshot(
         created_by: snapshot.created_by,
         created_at_micros: snapshot.created_at_micros,
         updated_at_micros: snapshot.updated_at_micros,
+        starts_at_micros: snapshot.starts_at_micros,
+        expires_at_micros: snapshot.expires_at_micros,
     }
 }
 
diff --git a/server-rs/crates/spacetime-client/src/module_bindings.rs b/server-rs/crates/spacetime-client/src/module_bindings.rs
index c0db8c832..01e478d4f 100644
--- a/server-rs/crates/spacetime-client/src/module_bindings.rs
+++ b/server-rs/crates/spacetime-client/src/module_bindings.rs
@@ -94,7 +94,9 @@ pub mod asset_history_entry_snapshot_type;
 pub mod asset_history_list_input_type;
 pub mod asset_history_list_result_type;
 pub mod asset_object_access_policy_type;
+pub mod asset_object_location_input_type;
 pub mod asset_object_procedure_result_type;
+pub mod asset_object_read_access_procedure_result_type;
 pub mod asset_object_table;
 pub mod asset_object_type;
 pub mod asset_object_upsert_input_type;
@@ -516,6 +518,9 @@ pub mod finish_match_3_d_time_up_procedure;
 pub mod finish_square_hole_time_up_procedure;
 pub mod finish_wooden_fish_run_procedure;
 pub mod generate_big_fish_asset_procedure;
+pub mod get_asset_object_by_id_and_return_procedure;
+pub mod get_asset_object_by_location_and_return_procedure;
+pub mod get_asset_read_access_by_location_and_return_procedure;
 pub mod get_bark_battle_run_procedure;
 pub mod get_bark_battle_runtime_config_procedure;
 pub mod get_battle_state_procedure;
@@ -775,6 +780,8 @@ pub mod profile_wallet_config_table;
 pub mod profile_wallet_config_type;
 pub mod profile_wallet_ledger_table;
 pub mod profile_wallet_ledger_type;
+pub mod public_work_asset_read_grant_table;
+pub mod public_work_asset_read_grant_type;
 pub mod public_work_detail_entry_table;
 pub mod public_work_detail_entry_type;
 pub mod public_work_gallery_entry_table;
@@ -1432,7 +1439,9 @@ pub use asset_history_entry_snapshot_type::AssetHistoryEntrySnapshot;
 pub use asset_history_list_input_type::AssetHistoryListInput;
 pub use asset_history_list_result_type::AssetHistoryListResult;
 pub use asset_object_access_policy_type::AssetObjectAccessPolicy;
+pub use asset_object_location_input_type::AssetObjectLocationInput;
 pub use asset_object_procedure_result_type::AssetObjectProcedureResult;
+pub use asset_object_read_access_procedure_result_type::AssetObjectReadAccessProcedureResult;
 pub use asset_object_table::*;
 pub use asset_object_type::AssetObject;
 pub use asset_object_upsert_input_type::AssetObjectUpsertInput;
@@ -1854,6 +1863,9 @@ pub use finish_match_3_d_time_up_procedure::finish_match_3_d_time_up;
 pub use finish_square_hole_time_up_procedure::finish_square_hole_time_up;
 pub use finish_wooden_fish_run_procedure::finish_wooden_fish_run;
 pub use generate_big_fish_asset_procedure::generate_big_fish_asset;
+pub use get_asset_object_by_id_and_return_procedure::get_asset_object_by_id_and_return;
+pub use get_asset_object_by_location_and_return_procedure::get_asset_object_by_location_and_return;
+pub use get_asset_read_access_by_location_and_return_procedure::get_asset_read_access_by_location_and_return;
 pub use get_bark_battle_run_procedure::get_bark_battle_run;
 pub use get_bark_battle_runtime_config_procedure::get_bark_battle_runtime_config;
 pub use get_battle_state_procedure::get_battle_state;
@@ -2113,6 +2125,8 @@ pub use profile_wallet_config_table::*;
 pub use profile_wallet_config_type::ProfileWalletConfig;
 pub use profile_wallet_ledger_table::*;
 pub use profile_wallet_ledger_type::ProfileWalletLedger;
+pub use public_work_asset_read_grant_table::*;
+pub use public_work_asset_read_grant_type::PublicWorkAssetReadGrant;
 pub use public_work_detail_entry_table::*;
 pub use public_work_detail_entry_type::PublicWorkDetailEntry;
 pub use public_work_gallery_entry_table::*;
@@ -3058,6 +3072,7 @@ pub struct DbUpdate {
     profile_task_reward_claim: __sdk::TableUpdate<ProfileTaskRewardClaim>,
     profile_wallet_config: __sdk::TableUpdate<ProfileWalletConfig>,
     profile_wallet_ledger: __sdk::TableUpdate<ProfileWalletLedger>,
+    public_work_asset_read_grant: __sdk::TableUpdate<PublicWorkAssetReadGrant>,
     public_work_detail_entry: __sdk::TableUpdate<PublicWorkDetailEntry>,
     public_work_gallery_entry: __sdk::TableUpdate<PublicWorkGalleryEntry>,
     public_work_like: __sdk::TableUpdate<PublicWorkLike>,
@@ -3415,6 +3430,9 @@ impl TryFrom<__ws::v2::TransactionUpdate> for DbUpdate {
                 "profile_wallet_ledger" => db_update.profile_wallet_ledger.append(
                     profile_wallet_ledger_table::parse_table_update(table_update)?,
                 ),
+                "public_work_asset_read_grant" => db_update.public_work_asset_read_grant.append(
+                    public_work_asset_read_grant_table::parse_table_update(table_update)?,
+                ),
                 "public_work_detail_entry" => db_update.public_work_detail_entry.append(
                     public_work_detail_entry_table::parse_table_update(table_update)?,
                 ),
@@ -4258,6 +4276,12 @@ impl __sdk::DbUpdate for DbUpdate {
             "match_3_d_gallery_view",
             &self.match_3_d_gallery_view,
         );
+        diff.public_work_asset_read_grant = cache
+            .apply_diff_to_table::<PublicWorkAssetReadGrant>(
+                "public_work_asset_read_grant",
+                &self.public_work_asset_read_grant,
+            )
+            .with_updates_by_pk(|row| &row.grant_id);
         diff.public_work_detail_entry = cache.apply_diff_to_table::<PublicWorkDetailEntry>(
             "public_work_detail_entry",
             &self.public_work_detail_entry,
@@ -4577,6 +4601,9 @@ impl __sdk::DbUpdate for DbUpdate {
                 "profile_wallet_ledger" => db_update
                     .profile_wallet_ledger
                     .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
+                "public_work_asset_read_grant" => db_update
+                    .public_work_asset_read_grant
+                    .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
                 "public_work_detail_entry" => db_update
                     .public_work_detail_entry
                     .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
@@ -5007,6 +5034,9 @@ impl __sdk::DbUpdate for DbUpdate {
                 "profile_wallet_ledger" => db_update
                     .profile_wallet_ledger
                     .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
+                "public_work_asset_read_grant" => db_update
+                    .public_work_asset_read_grant
+                    .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
                 "public_work_detail_entry" => db_update
                     .public_work_detail_entry
                     .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
@@ -5264,6 +5294,7 @@ pub struct AppliedDiff<'r> {
     profile_task_reward_claim: __sdk::TableAppliedDiff<'r, ProfileTaskRewardClaim>,
     profile_wallet_config: __sdk::TableAppliedDiff<'r, ProfileWalletConfig>,
     profile_wallet_ledger: __sdk::TableAppliedDiff<'r, ProfileWalletLedger>,
+    public_work_asset_read_grant: __sdk::TableAppliedDiff<'r, PublicWorkAssetReadGrant>,
     public_work_detail_entry: __sdk::TableAppliedDiff<'r, PublicWorkDetailEntry>,
     public_work_gallery_entry: __sdk::TableAppliedDiff<'r, PublicWorkGalleryEntry>,
     public_work_like: __sdk::TableAppliedDiff<'r, PublicWorkLike>,
@@ -5765,6 +5796,11 @@ impl<'r> __sdk::AppliedDiff<'r> for AppliedDiff<'r> {
             &self.profile_wallet_ledger,
             event,
         );
+        callbacks.invoke_table_row_callbacks::<PublicWorkAssetReadGrant>(
+            "public_work_asset_read_grant",
+            &self.public_work_asset_read_grant,
+            event,
+        );
         callbacks.invoke_table_row_callbacks::<PublicWorkDetailEntry>(
             "public_work_detail_entry",
             &self.public_work_detail_entry,
@@ -6752,6 +6788,7 @@ impl __sdk::SpacetimeModule for RemoteModule {
         profile_task_reward_claim_table::register_table(client_cache);
         profile_wallet_config_table::register_table(client_cache);
         profile_wallet_ledger_table::register_table(client_cache);
+        public_work_asset_read_grant_table::register_table(client_cache);
         public_work_detail_entry_table::register_table(client_cache);
         public_work_gallery_entry_table::register_table(client_cache);
         public_work_like_table::register_table(client_cache);
@@ -6893,6 +6930,7 @@ impl __sdk::SpacetimeModule for RemoteModule {
         "profile_task_reward_claim",
         "profile_wallet_config",
         "profile_wallet_ledger",
+        "public_work_asset_read_grant",
         "public_work_detail_entry",
         "public_work_gallery_entry",
         "public_work_like",
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/asset_object_location_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/asset_object_location_input_type.rs
new file mode 100644
index 000000000..54319aea6
--- /dev/null
+++ b/server-rs/crates/spacetime-client/src/module_bindings/asset_object_location_input_type.rs
@@ -0,0 +1,16 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+#![allow(unused, clippy::all)]
+use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
+
+#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
+#[sats(crate = __lib)]
+pub struct AssetObjectLocationInput {
+    pub bucket: String,
+    pub object_key: String,
+}
+
+impl __sdk::InModule for AssetObjectLocationInput {
+    type Module = super::RemoteModule;
+}
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/asset_object_read_access_procedure_result_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/asset_object_read_access_procedure_result_type.rs
new file mode 100644
index 000000000..a5c63e445
--- /dev/null
+++ b/server-rs/crates/spacetime-client/src/module_bindings/asset_object_read_access_procedure_result_type.rs
@@ -0,0 +1,20 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+#![allow(unused, clippy::all)]
+use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
+
+use super::asset_object_upsert_snapshot_type::AssetObjectUpsertSnapshot;
+
+#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
+#[sats(crate = __lib)]
+pub struct AssetObjectReadAccessProcedureResult {
+    pub ok: bool,
+    pub record: Option<AssetObjectUpsertSnapshot>,
+    pub public_work_granted: bool,
+    pub error_message: Option<String>,
+}
+
+impl __sdk::InModule for AssetObjectReadAccessProcedureResult {
+    type Module = super::RemoteModule;
+}
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/external_generation_job_summary_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/external_generation_job_summary_snapshot_type.rs
index 492102908..c802d64ae 100644
--- a/server-rs/crates/spacetime-client/src/module_bindings/external_generation_job_summary_snapshot_type.rs
+++ b/server-rs/crates/spacetime-client/src/module_bindings/external_generation_job_summary_snapshot_type.rs
@@ -23,6 +23,7 @@ pub struct ExternalGenerationJobSummarySnapshot {
     pub price_mud_points: u64,
     pub refund_ledger_id: Option<String>,
     pub notification_acknowledged_at_micros: Option<i64>,
+    pub warning_message: Option<String>,
 }
 
 impl __sdk::InModule for ExternalGenerationJobSummarySnapshot {
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/external_generation_job_summary_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/external_generation_job_summary_type.rs
index 685be2b15..38c59d165 100644
--- a/server-rs/crates/spacetime-client/src/module_bindings/external_generation_job_summary_type.rs
+++ b/server-rs/crates/spacetime-client/src/module_bindings/external_generation_job_summary_type.rs
@@ -23,6 +23,7 @@ pub struct ExternalGenerationJobSummary {
     pub price_mud_points: u64,
     pub refund_ledger_id: Option<String>,
     pub notification_acknowledged_at: Option<__sdk::Timestamp>,
+    pub warning_message: Option<String>,
 }
 
 impl __sdk::InModule for ExternalGenerationJobSummary {
@@ -53,6 +54,7 @@ pub struct ExternalGenerationJobSummaryCols {
     pub refund_ledger_id: __sdk::__query_builder::Col<ExternalGenerationJobSummary, Option<String>>,
     pub notification_acknowledged_at:
         __sdk::__query_builder::Col<ExternalGenerationJobSummary, Option<__sdk::Timestamp>>,
+    pub warning_message: __sdk::__query_builder::Col<ExternalGenerationJobSummary, Option<String>>,
 }
 
 impl __sdk::__query_builder::HasCols for ExternalGenerationJobSummary {
@@ -78,6 +80,7 @@ impl __sdk::__query_builder::HasCols for ExternalGenerationJobSummary {
                 table_name,
                 "notification_acknowledged_at",
             ),
+            warning_message: __sdk::__query_builder::Col::new(table_name, "warning_message"),
         }
     }
 }
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/get_asset_object_by_id_and_return_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/get_asset_object_by_id_and_return_procedure.rs
new file mode 100644
index 000000000..b1d165b00
--- /dev/null
+++ b/server-rs/crates/spacetime-client/src/module_bindings/get_asset_object_by_id_and_return_procedure.rs
@@ -0,0 +1,58 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+#![allow(unused, clippy::all)]
+use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
+
+use super::asset_object_procedure_result_type::AssetObjectProcedureResult;
+
+#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
+#[sats(crate = __lib)]
+struct GetAssetObjectByIdAndReturnArgs {
+    pub asset_object_id: String,
+}
+
+impl __sdk::InModule for GetAssetObjectByIdAndReturnArgs {
+    type Module = super::RemoteModule;
+}
+
+#[allow(non_camel_case_types)]
+/// Extension trait for access to the procedure `get_asset_object_by_id_and_return`.
+///
+/// Implemented for [`super::RemoteProcedures`].
+pub trait get_asset_object_by_id_and_return {
+    fn get_asset_object_by_id_and_return(&self, asset_object_id: String) {
+        self.get_asset_object_by_id_and_return_then(asset_object_id, |_, _| {});
+    }
+
+    fn get_asset_object_by_id_and_return_then(
+        &self,
+        asset_object_id: String,
+
+        __callback: impl FnOnce(
+                &super::ProcedureEventContext,
+                Result<AssetObjectProcedureResult, __sdk::InternalError>,
+            ) + Send
+            + 'static,
+    );
+}
+
+impl get_asset_object_by_id_and_return for super::RemoteProcedures {
+    fn get_asset_object_by_id_and_return_then(
+        &self,
+        asset_object_id: String,
+
+        __callback: impl FnOnce(
+                &super::ProcedureEventContext,
+                Result<AssetObjectProcedureResult, __sdk::InternalError>,
+            ) + Send
+            + 'static,
+    ) {
+        self.imp
+            .invoke_procedure_with_callback::<_, AssetObjectProcedureResult>(
+                "get_asset_object_by_id_and_return",
+                GetAssetObjectByIdAndReturnArgs { asset_object_id },
+                __callback,
+            );
+    }
+}
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/get_asset_object_by_location_and_return_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/get_asset_object_by_location_and_return_procedure.rs
new file mode 100644
index 000000000..9254cc5c9
--- /dev/null
+++ b/server-rs/crates/spacetime-client/src/module_bindings/get_asset_object_by_location_and_return_procedure.rs
@@ -0,0 +1,59 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+#![allow(unused, clippy::all)]
+use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
+
+use super::asset_object_location_input_type::AssetObjectLocationInput;
+use super::asset_object_procedure_result_type::AssetObjectProcedureResult;
+
+#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
+#[sats(crate = __lib)]
+struct GetAssetObjectByLocationAndReturnArgs {
+    pub input: AssetObjectLocationInput,
+}
+
+impl __sdk::InModule for GetAssetObjectByLocationAndReturnArgs {
+    type Module = super::RemoteModule;
+}
+
+#[allow(non_camel_case_types)]
+/// Extension trait for access to the procedure `get_asset_object_by_location_and_return`.
+///
+/// Implemented for [`super::RemoteProcedures`].
+pub trait get_asset_object_by_location_and_return {
+    fn get_asset_object_by_location_and_return(&self, input: AssetObjectLocationInput) {
+        self.get_asset_object_by_location_and_return_then(input, |_, _| {});
+    }
+
+    fn get_asset_object_by_location_and_return_then(
+        &self,
+        input: AssetObjectLocationInput,
+
+        __callback: impl FnOnce(
+                &super::ProcedureEventContext,
+                Result<AssetObjectProcedureResult, __sdk::InternalError>,
+            ) + Send
+            + 'static,
+    );
+}
+
+impl get_asset_object_by_location_and_return for super::RemoteProcedures {
+    fn get_asset_object_by_location_and_return_then(
+        &self,
+        input: AssetObjectLocationInput,
+
+        __callback: impl FnOnce(
+                &super::ProcedureEventContext,
+                Result<AssetObjectProcedureResult, __sdk::InternalError>,
+            ) + Send
+            + 'static,
+    ) {
+        self.imp
+            .invoke_procedure_with_callback::<_, AssetObjectProcedureResult>(
+                "get_asset_object_by_location_and_return",
+                GetAssetObjectByLocationAndReturnArgs { input },
+                __callback,
+            );
+    }
+}
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/get_asset_read_access_by_location_and_return_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/get_asset_read_access_by_location_and_return_procedure.rs
new file mode 100644
index 000000000..bb8314cfa
--- /dev/null
+++ b/server-rs/crates/spacetime-client/src/module_bindings/get_asset_read_access_by_location_and_return_procedure.rs
@@ -0,0 +1,59 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+#![allow(unused, clippy::all)]
+use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
+
+use super::asset_object_location_input_type::AssetObjectLocationInput;
+use super::asset_object_read_access_procedure_result_type::AssetObjectReadAccessProcedureResult;
+
+#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
+#[sats(crate = __lib)]
+struct GetAssetReadAccessByLocationAndReturnArgs {
+    pub input: AssetObjectLocationInput,
+}
+
+impl __sdk::InModule for GetAssetReadAccessByLocationAndReturnArgs {
+    type Module = super::RemoteModule;
+}
+
+#[allow(non_camel_case_types)]
+/// Extension trait for access to the procedure `get_asset_read_access_by_location_and_return`.
+///
+/// Implemented for [`super::RemoteProcedures`].
+pub trait get_asset_read_access_by_location_and_return {
+    fn get_asset_read_access_by_location_and_return(&self, input: AssetObjectLocationInput) {
+        self.get_asset_read_access_by_location_and_return_then(input, |_, _| {});
+    }
+
+    fn get_asset_read_access_by_location_and_return_then(
+        &self,
+        input: AssetObjectLocationInput,
+
+        __callback: impl FnOnce(
+                &super::ProcedureEventContext,
+                Result<AssetObjectReadAccessProcedureResult, __sdk::InternalError>,
+            ) + Send
+            + 'static,
+    );
+}
+
+impl get_asset_read_access_by_location_and_return for super::RemoteProcedures {
+    fn get_asset_read_access_by_location_and_return_then(
+        &self,
+        input: AssetObjectLocationInput,
+
+        __callback: impl FnOnce(
+                &super::ProcedureEventContext,
+                Result<AssetObjectReadAccessProcedureResult, __sdk::InternalError>,
+            ) + Send
+            + 'static,
+    ) {
+        self.imp
+            .invoke_procedure_with_callback::<_, AssetObjectReadAccessProcedureResult>(
+                "get_asset_read_access_by_location_and_return",
+                GetAssetReadAccessByLocationAndReturnArgs { input },
+                __callback,
+            );
+    }
+}
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/profile_redeem_code_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/profile_redeem_code_type.rs
index 9be48e6d9..a880d3ceb 100644
--- a/server-rs/crates/spacetime-client/src/module_bindings/profile_redeem_code_type.rs
+++ b/server-rs/crates/spacetime-client/src/module_bindings/profile_redeem_code_type.rs
@@ -19,6 +19,8 @@ pub struct ProfileRedeemCode {
     pub created_by: String,
     pub created_at: __sdk::Timestamp,
     pub updated_at: __sdk::Timestamp,
+    pub starts_at: Option<__sdk::Timestamp>,
+    pub expires_at: Option<__sdk::Timestamp>,
 }
 
 impl __sdk::InModule for ProfileRedeemCode {
@@ -39,6 +41,8 @@ pub struct ProfileRedeemCodeCols {
     pub created_by: __sdk::__query_builder::Col<ProfileRedeemCode, String>,
     pub created_at: __sdk::__query_builder::Col<ProfileRedeemCode, __sdk::Timestamp>,
     pub updated_at: __sdk::__query_builder::Col<ProfileRedeemCode, __sdk::Timestamp>,
+    pub starts_at: __sdk::__query_builder::Col<ProfileRedeemCode, Option<__sdk::Timestamp>>,
+    pub expires_at: __sdk::__query_builder::Col<ProfileRedeemCode, Option<__sdk::Timestamp>>,
 }
 
 impl __sdk::__query_builder::HasCols for ProfileRedeemCode {
@@ -55,6 +59,8 @@ impl __sdk::__query_builder::HasCols for ProfileRedeemCode {
             created_by: __sdk::__query_builder::Col::new(table_name, "created_by"),
             created_at: __sdk::__query_builder::Col::new(table_name, "created_at"),
             updated_at: __sdk::__query_builder::Col::new(table_name, "updated_at"),
+            starts_at: __sdk::__query_builder::Col::new(table_name, "starts_at"),
+            expires_at: __sdk::__query_builder::Col::new(table_name, "expires_at"),
         }
     }
 }
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/public_work_asset_read_grant_table.rs b/server-rs/crates/spacetime-client/src/module_bindings/public_work_asset_read_grant_table.rs
new file mode 100644
index 000000000..d35245795
--- /dev/null
+++ b/server-rs/crates/spacetime-client/src/module_bindings/public_work_asset_read_grant_table.rs
@@ -0,0 +1,166 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+#![allow(unused, clippy::all)]
+use super::public_work_asset_read_grant_type::PublicWorkAssetReadGrant;
+use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
+
+/// Table handle for the table `public_work_asset_read_grant`.
+///
+/// Obtain a handle from the [`PublicWorkAssetReadGrantTableAccess::public_work_asset_read_grant`] method on [`super::RemoteTables`],
+/// like `ctx.db.public_work_asset_read_grant()`.
+///
+/// Users are encouraged not to explicitly reference this type,
+/// but to directly chain method calls,
+/// like `ctx.db.public_work_asset_read_grant().on_insert(...)`.
+pub struct PublicWorkAssetReadGrantTableHandle<'ctx> {
+    imp: __sdk::TableHandle<PublicWorkAssetReadGrant>,
+    ctx: std::marker::PhantomData<&'ctx super::RemoteTables>,
+}
+
+#[allow(non_camel_case_types)]
+/// Extension trait for access to the table `public_work_asset_read_grant`.
+///
+/// Implemented for [`super::RemoteTables`].
+pub trait PublicWorkAssetReadGrantTableAccess {
+    #[allow(non_snake_case)]
+    /// Obtain a [`PublicWorkAssetReadGrantTableHandle`], which mediates access to the table `public_work_asset_read_grant`.
+    fn public_work_asset_read_grant(&self) -> PublicWorkAssetReadGrantTableHandle<'_>;
+}
+
+impl PublicWorkAssetReadGrantTableAccess for super::RemoteTables {
+    fn public_work_asset_read_grant(&self) -> PublicWorkAssetReadGrantTableHandle<'_> {
+        PublicWorkAssetReadGrantTableHandle {
+            imp: self
+                .imp
+                .get_table::<PublicWorkAssetReadGrant>("public_work_asset_read_grant"),
+            ctx: std::marker::PhantomData,
+        }
+    }
+}
+
+pub struct PublicWorkAssetReadGrantInsertCallbackId(__sdk::CallbackId);
+pub struct PublicWorkAssetReadGrantDeleteCallbackId(__sdk::CallbackId);
+
+impl<'ctx> __sdk::Table for PublicWorkAssetReadGrantTableHandle<'ctx> {
+    type Row = PublicWorkAssetReadGrant;
+    type EventContext = super::EventContext;
+
+    fn count(&self) -> u64 {
+        self.imp.count()
+    }
+    fn iter(&self) -> impl Iterator<Item = PublicWorkAssetReadGrant> + '_ {
+        self.imp.iter()
+    }
+
+    type InsertCallbackId = PublicWorkAssetReadGrantInsertCallbackId;
+
+    fn on_insert(
+        &self,
+        callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static,
+    ) -> PublicWorkAssetReadGrantInsertCallbackId {
+        PublicWorkAssetReadGrantInsertCallbackId(self.imp.on_insert(Box::new(callback)))
+    }
+
+    fn remove_on_insert(&self, callback: PublicWorkAssetReadGrantInsertCallbackId) {
+        self.imp.remove_on_insert(callback.0)
+    }
+
+    type DeleteCallbackId = PublicWorkAssetReadGrantDeleteCallbackId;
+
+    fn on_delete(
+        &self,
+        callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static,
+    ) -> PublicWorkAssetReadGrantDeleteCallbackId {
+        PublicWorkAssetReadGrantDeleteCallbackId(self.imp.on_delete(Box::new(callback)))
+    }
+
+    fn remove_on_delete(&self, callback: PublicWorkAssetReadGrantDeleteCallbackId) {
+        self.imp.remove_on_delete(callback.0)
+    }
+}
+
+pub struct PublicWorkAssetReadGrantUpdateCallbackId(__sdk::CallbackId);
+
+impl<'ctx> __sdk::TableWithPrimaryKey for PublicWorkAssetReadGrantTableHandle<'ctx> {
+    type UpdateCallbackId = PublicWorkAssetReadGrantUpdateCallbackId;
+
+    fn on_update(
+        &self,
+        callback: impl FnMut(&Self::EventContext, &Self::Row, &Self::Row) + Send + 'static,
+    ) -> PublicWorkAssetReadGrantUpdateCallbackId {
+        PublicWorkAssetReadGrantUpdateCallbackId(self.imp.on_update(Box::new(callback)))
+    }
+
+    fn remove_on_update(&self, callback: PublicWorkAssetReadGrantUpdateCallbackId) {
+        self.imp.remove_on_update(callback.0)
+    }
+}
+
+/// Access to the `grant_id` unique index on the table `public_work_asset_read_grant`,
+/// which allows point queries on the field of the same name
+/// via the [`PublicWorkAssetReadGrantGrantIdUnique::find`] method.
+///
+/// Users are encouraged not to explicitly reference this type,
+/// but to directly chain method calls,
+/// like `ctx.db.public_work_asset_read_grant().grant_id().find(...)`.
+pub struct PublicWorkAssetReadGrantGrantIdUnique<'ctx> {
+    imp: __sdk::UniqueConstraintHandle<PublicWorkAssetReadGrant, String>,
+    phantom: std::marker::PhantomData<&'ctx super::RemoteTables>,
+}
+
+impl<'ctx> PublicWorkAssetReadGrantTableHandle<'ctx> {
+    /// Get a handle on the `grant_id` unique index on the table `public_work_asset_read_grant`.
+    pub fn grant_id(&self) -> PublicWorkAssetReadGrantGrantIdUnique<'ctx> {
+        PublicWorkAssetReadGrantGrantIdUnique {
+            imp: self.imp.get_unique_constraint::<String>("grant_id"),
+            phantom: std::marker::PhantomData,
+        }
+    }
+}
+
+impl<'ctx> PublicWorkAssetReadGrantGrantIdUnique<'ctx> {
+    /// Find the subscribed row whose `grant_id` column value is equal to `col_val`,
+    /// if such a row is present in the client cache.
+    pub fn find(&self, col_val: &String) -> Option<PublicWorkAssetReadGrant> {
+        self.imp.find(col_val)
+    }
+}
+
+#[doc(hidden)]
+pub(super) fn register_table(client_cache: &mut __sdk::ClientCache<super::RemoteModule>) {
+    let _table =
+        client_cache.get_or_make_table::<PublicWorkAssetReadGrant>("public_work_asset_read_grant");
+    _table.add_unique_constraint::<String>("grant_id", |row| &row.grant_id);
+}
+
+#[doc(hidden)]
+pub(super) fn parse_table_update(
+    raw_updates: __ws::v2::TableUpdate,
+) -> __sdk::Result<__sdk::TableUpdate<PublicWorkAssetReadGrant>> {
+    __sdk::TableUpdate::parse_table_update(raw_updates).map_err(|e| {
+        __sdk::InternalError::failed_parse("TableUpdate<PublicWorkAssetReadGrant>", "TableUpdate")
+            .with_cause(e)
+            .into()
+    })
+}
+
+#[allow(non_camel_case_types)]
+/// Extension trait for query builder access to the table `PublicWorkAssetReadGrant`.
+///
+/// Implemented for [`__sdk::QueryTableAccessor`].
+pub trait public_work_asset_read_grantQueryTableAccess {
+    #[allow(non_snake_case)]
+    /// Get a query builder for the table `PublicWorkAssetReadGrant`.
+    fn public_work_asset_read_grant(
+        &self,
+    ) -> __sdk::__query_builder::Table<PublicWorkAssetReadGrant>;
+}
+
+impl public_work_asset_read_grantQueryTableAccess for __sdk::QueryTableAccessor {
+    fn public_work_asset_read_grant(
+        &self,
+    ) -> __sdk::__query_builder::Table<PublicWorkAssetReadGrant> {
+        __sdk::__query_builder::Table::new("public_work_asset_read_grant")
+    }
+}
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/public_work_asset_read_grant_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/public_work_asset_read_grant_type.rs
new file mode 100644
index 000000000..73710250f
--- /dev/null
+++ b/server-rs/crates/spacetime-client/src/module_bindings/public_work_asset_read_grant_type.rs
@@ -0,0 +1,46 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+#![allow(unused, clippy::all)]
+use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
+
+#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
+#[sats(crate = __lib)]
+pub struct PublicWorkAssetReadGrant {
+    pub grant_id: String,
+    pub source_type: String,
+    pub profile_id: String,
+    pub owner_user_id: String,
+    pub asset_object_id: Option<String>,
+    pub object_key: Option<String>,
+}
+
+impl __sdk::InModule for PublicWorkAssetReadGrant {
+    type Module = super::RemoteModule;
+}
+
+/// Column accessor struct for the table `PublicWorkAssetReadGrant`.
+///
+/// Provides typed access to columns for query building.
+pub struct PublicWorkAssetReadGrantCols {
+    pub grant_id: __sdk::__query_builder::Col<PublicWorkAssetReadGrant, String>,
+    pub source_type: __sdk::__query_builder::Col<PublicWorkAssetReadGrant, String>,
+    pub profile_id: __sdk::__query_builder::Col<PublicWorkAssetReadGrant, String>,
+    pub owner_user_id: __sdk::__query_builder::Col<PublicWorkAssetReadGrant, String>,
+    pub asset_object_id: __sdk::__query_builder::Col<PublicWorkAssetReadGrant, Option<String>>,
+    pub object_key: __sdk::__query_builder::Col<PublicWorkAssetReadGrant, Option<String>>,
+}
+
+impl __sdk::__query_builder::HasCols for PublicWorkAssetReadGrant {
+    type Cols = PublicWorkAssetReadGrantCols;
+    fn cols(table_name: &'static str) -> Self::Cols {
+        PublicWorkAssetReadGrantCols {
+            grant_id: __sdk::__query_builder::Col::new(table_name, "grant_id"),
+            source_type: __sdk::__query_builder::Col::new(table_name, "source_type"),
+            profile_id: __sdk::__query_builder::Col::new(table_name, "profile_id"),
+            owner_user_id: __sdk::__query_builder::Col::new(table_name, "owner_user_id"),
+            asset_object_id: __sdk::__query_builder::Col::new(table_name, "asset_object_id"),
+            object_key: __sdk::__query_builder::Col::new(table_name, "object_key"),
+        }
+    }
+}
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/runtime_profile_redeem_code_admin_upsert_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/runtime_profile_redeem_code_admin_upsert_input_type.rs
index 5f18a8751..1baeb5cbe 100644
--- a/server-rs/crates/spacetime-client/src/module_bindings/runtime_profile_redeem_code_admin_upsert_input_type.rs
+++ b/server-rs/crates/spacetime-client/src/module_bindings/runtime_profile_redeem_code_admin_upsert_input_type.rs
@@ -17,6 +17,8 @@ pub struct RuntimeProfileRedeemCodeAdminUpsertInput {
     pub enabled: bool,
     pub allowed_user_ids: Vec<String>,
     pub allowed_public_user_codes: Vec<String>,
+    pub starts_at_micros: Option<i64>,
+    pub expires_at_micros: Option<i64>,
     pub updated_at_micros: i64,
 }
 
diff --git a/server-rs/crates/spacetime-client/src/module_bindings/runtime_profile_redeem_code_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/runtime_profile_redeem_code_snapshot_type.rs
index aea09f25b..3580d911a 100644
--- a/server-rs/crates/spacetime-client/src/module_bindings/runtime_profile_redeem_code_snapshot_type.rs
+++ b/server-rs/crates/spacetime-client/src/module_bindings/runtime_profile_redeem_code_snapshot_type.rs
@@ -19,6 +19,8 @@ pub struct RuntimeProfileRedeemCodeSnapshot {
     pub created_by: String,
     pub created_at_micros: i64,
     pub updated_at_micros: i64,
+    pub starts_at_micros: Option<i64>,
+    pub expires_at_micros: Option<i64>,
 }
 
 impl __sdk::InModule for RuntimeProfileRedeemCodeSnapshot {
diff --git a/server-rs/crates/spacetime-client/src/runtime.rs b/server-rs/crates/spacetime-client/src/runtime.rs
index 2b158c0f9..561bc8f31 100644
--- a/server-rs/crates/spacetime-client/src/runtime.rs
+++ b/server-rs/crates/spacetime-client/src/runtime.rs
@@ -1351,6 +1351,8 @@ impl SpacetimeClient {
         enabled: bool,
         allowed_user_ids: Vec<String>,
         allowed_public_user_codes: Vec<String>,
+        starts_at_micros: Option<i64>,
+        expires_at_micros: Option<i64>,
         updated_at_micros: i64,
     ) -> Result<RuntimeProfileRedeemCodeRecord, SpacetimeClientError> {
         let procedure_input = build_runtime_profile_redeem_code_admin_upsert_input(
@@ -1362,6 +1364,8 @@ impl SpacetimeClient {
             enabled,
             allowed_user_ids,
             allowed_public_user_codes,
+            starts_at_micros,
+            expires_at_micros,
             updated_at_micros,
         )
         .map_err(SpacetimeClientError::validation_failed)?
diff --git a/server-rs/crates/spacetime-module/src/asset_metadata/objects.rs b/server-rs/crates/spacetime-module/src/asset_metadata/objects.rs
index 825e4059a..f5c14f6e2 100644
--- a/server-rs/crates/spacetime-module/src/asset_metadata/objects.rs
+++ b/server-rs/crates/spacetime-module/src/asset_metadata/objects.rs
@@ -96,6 +96,98 @@ pub fn confirm_asset_object_and_return(
     }
 }
 
+// ACL 等安全判断必须读取事务内真相，不能把订阅 cache miss 当成对象不存在。
+#[spacetimedb::procedure]
+pub fn get_asset_object_by_location_and_return(
+    ctx: &mut ProcedureContext,
+    input: AssetObjectLocationInput,
+) -> AssetObjectProcedureResult {
+    let caller = ctx.sender();
+    match ctx.try_with_tx(|tx| {
+        crate::editor_project_storage::require_editor_generation_runtime_service_identity(
+            tx, caller,
+        )?;
+        find_asset_object_by_location(tx, &input)
+    }) {
+        Ok(record) => AssetObjectProcedureResult {
+            ok: true,
+            record,
+            error_message: None,
+        },
+        Err(message) => AssetObjectProcedureResult {
+            ok: false,
+            record: None,
+            error_message: Some(message),
+        },
+    }
+}
+
+// 公开授权与资产 metadata 必须在同一事务快照中判断，不能依赖 API 连接池的订阅水位。
+#[spacetimedb::procedure]
+pub fn get_asset_read_access_by_location_and_return(
+    ctx: &mut ProcedureContext,
+    input: AssetObjectLocationInput,
+) -> AssetObjectReadAccessProcedureResult {
+    let caller = ctx.sender();
+    match ctx.try_with_tx(|tx| {
+        crate::editor_project_storage::require_editor_generation_runtime_service_identity(
+            tx, caller,
+        )?;
+        let record = find_asset_object_by_location(tx, &input)?;
+        let public_work_granted = record.as_ref().is_some_and(|asset_object| {
+            crate::public_asset_access::asset_object_has_public_work_read_grant(tx, asset_object)
+        });
+        Ok((record, public_work_granted))
+    }) {
+        Ok((record, public_work_granted)) => AssetObjectReadAccessProcedureResult {
+            ok: true,
+            record,
+            public_work_granted,
+            error_message: None,
+        },
+        Err(message) => AssetObjectReadAccessProcedureResult {
+            ok: false,
+            record: None,
+            public_work_granted: false,
+            error_message: Some(message),
+        },
+    }
+}
+
+#[spacetimedb::procedure]
+pub fn get_asset_object_by_id_and_return(
+    ctx: &mut ProcedureContext,
+    asset_object_id: String,
+) -> AssetObjectProcedureResult {
+    let caller = ctx.sender();
+    match ctx.try_with_tx(|tx| {
+        crate::editor_project_storage::require_editor_generation_runtime_service_identity(
+            tx, caller,
+        )?;
+        let asset_object_id = asset_object_id.trim();
+        if asset_object_id.is_empty() {
+            return Err("asset_object_id 不能为空".to_string());
+        }
+        Ok(tx
+            .db
+            .asset_object()
+            .asset_object_id()
+            .find(&asset_object_id.to_string())
+            .map(asset_object_snapshot))
+    }) {
+        Ok(record) => AssetObjectProcedureResult {
+            ok: true,
+            record,
+            error_message: None,
+        },
+        Err(message) => AssetObjectProcedureResult {
+            ok: false,
+            record: None,
+            error_message: Some(message),
+        },
+    }
+}
+
 // 历史素材只返回编辑器复用所需的脱敏字段，asset_object 本表继续保持 private。
 #[spacetimedb::procedure]
 pub fn list_asset_history_and_return(
@@ -197,6 +289,54 @@ pub(crate) fn upsert_asset_object(
     Ok(snapshot)
 }
 
+fn find_asset_object_by_location(
+    ctx: &ReducerContext,
+    input: &AssetObjectLocationInput,
+) -> Result<Option<AssetObjectUpsertSnapshot>, String> {
+    let bucket = input.bucket.trim();
+    let object_key = input.object_key.trim().trim_start_matches('/');
+    if bucket.is_empty() || object_key.is_empty() {
+        return Err("bucket 与 object_key 不能为空".to_string());
+    }
+
+    let mut matches = ctx
+        .db
+        .asset_object()
+        .by_bucket_object_key()
+        .filter((bucket, object_key));
+    resolve_unique_asset_object_location(&mut matches)
+}
+
+fn resolve_unique_asset_object_location(
+    matches: &mut impl Iterator<Item = AssetObject>,
+) -> Result<Option<AssetObjectUpsertSnapshot>, String> {
+    let record = matches.next();
+    if matches.next().is_some() {
+        return Err("asset_object 的 bucket + object_key 存在重复记录".to_string());
+    }
+    Ok(record.map(asset_object_snapshot))
+}
+
+fn asset_object_snapshot(row: AssetObject) -> AssetObjectUpsertSnapshot {
+    AssetObjectUpsertSnapshot {
+        asset_object_id: row.asset_object_id,
+        bucket: row.bucket,
+        object_key: row.object_key,
+        access_policy: row.access_policy,
+        content_type: row.content_type,
+        content_length: row.content_length,
+        content_hash: row.content_hash,
+        version: row.version,
+        source_job_id: row.source_job_id,
+        owner_user_id: row.owner_user_id,
+        profile_id: row.profile_id,
+        entity_id: row.entity_id,
+        asset_kind: row.asset_kind,
+        created_at_micros: row.created_at.to_micros_since_unix_epoch(),
+        updated_at_micros: row.updated_at.to_micros_since_unix_epoch(),
+    }
+}
+
 fn require_matching_asset_object_owner(
     existing_owner_user_id: Option<&str>,
     next_owner_user_id: Option<&str>,
@@ -333,6 +473,46 @@ pub(crate) fn emit_asset_object_confirmed_event(
 mod tests {
     use super::*;
 
+    fn asset_object(asset_object_id: &str) -> AssetObject {
+        AssetObject {
+            asset_object_id: asset_object_id.to_string(),
+            bucket: "genarrative-assets".to_string(),
+            object_key: "generated-puzzle-assets/published.png".to_string(),
+            access_policy: AssetObjectAccessPolicy::Private,
+            content_type: Some("image/png".to_string()),
+            content_length: 1,
+            content_hash: None,
+            version: 1,
+            source_job_id: None,
+            owner_user_id: Some("owner-a".to_string()),
+            profile_id: Some("profile-a".to_string()),
+            entity_id: None,
+            asset_kind: "puzzle_cover_image".to_string(),
+            created_at: Timestamp::from_micros_since_unix_epoch(1),
+            updated_at: Timestamp::from_micros_since_unix_epoch(1),
+        }
+    }
+
+    #[test]
+    fn authoritative_location_lookup_fails_closed_on_duplicate_rows() {
+        let record = asset_object("assetobj-first");
+        let mut one = vec![record].into_iter();
+        assert_eq!(
+            resolve_unique_asset_object_location(&mut one)
+                .expect("one exact row should resolve")
+                .expect("one exact row should exist")
+                .asset_object_id,
+            "assetobj-first"
+        );
+
+        let mut duplicates = vec![
+            asset_object("assetobj-first"),
+            asset_object("assetobj-second"),
+        ]
+        .into_iter();
+        assert!(resolve_unique_asset_object_location(&mut duplicates).is_err());
+    }
+
     #[test]
     fn registered_asset_object_owner_is_immutable() {
         assert!(require_matching_asset_object_owner(Some("owner-a"), Some("owner-a")).is_ok());
diff --git a/server-rs/crates/spacetime-module/src/external_generation.rs b/server-rs/crates/spacetime-module/src/external_generation.rs
index c4bf6c665..105db0900 100644
--- a/server-rs/crates/spacetime-module/src/external_generation.rs
+++ b/server-rs/crates/spacetime-module/src/external_generation.rs
@@ -19,9 +19,12 @@ const EXTERNAL_GENERATION_FINAL_ATTEMPT_LEASE_EXPIRED_MESSAGE: &str =
 const MAX_EXTERNAL_GENERATION_PAYLOAD_BYTES: usize = 512 * 1024;
 const MAX_EXTERNAL_GENERATION_REQUEST_PROMPT_CHARS: usize = 2_048;
 const MAX_EXTERNAL_GENERATION_ERROR_MESSAGE_CHARS: usize = 2_048;
+const MAX_EXTERNAL_GENERATION_WARNING_MESSAGE_CHARS: usize = 2_048;
 const MAX_EXTERNAL_GENERATION_MAINTENANCE_BATCH_SIZE: u32 = 25;
 const INLINE_MEDIA_REMOVED_PLACEHOLDER: &str = "[inline-media-removed]";
 const INLINE_MEDIA_ERROR_REDACTED_MESSAGE: &str = "外部生成失败（错误详情含内联媒体引用，已省略）";
+const INLINE_MEDIA_WARNING_REDACTED_MESSAGE: &str =
+    "外部生成已完成（告警详情含内联媒体引用，已省略）";
 
 #[spacetimedb::table(
     accessor = external_generation_job,
@@ -134,6 +137,8 @@ pub struct ExternalGenerationJobSummary {
     pub(crate) price_mud_points: u64,
     pub(crate) refund_ledger_id: Option<String>,
     pub(crate) notification_acknowledged_at: Option<Timestamp>,
+    #[default(None::<String>)]
+    pub(crate) warning_message: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)]
@@ -284,6 +289,7 @@ pub struct ExternalGenerationJobSummarySnapshot {
     pub price_mud_points: u64,
     pub refund_ledger_id: Option<String>,
     pub notification_acknowledged_at_micros: Option<i64>,
+    pub warning_message: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)]
@@ -842,6 +848,7 @@ fn complete_external_generation_job_tx(
     };
     let completed_at = ctx.timestamp;
     row.status = EXTERNAL_GENERATION_STATUS_COMPLETED.to_string();
+    row.last_error_message = None;
     row.result_payload_json = result_payload_json;
     row.lease_expires_at = None;
     row.completed_at = Some(completed_at);
@@ -1760,9 +1767,23 @@ fn build_external_generation_job_summary_row(
         price_mud_points: row.price_mud_points,
         refund_ledger_id: row.refund_ledger_id.clone(),
         notification_acknowledged_at: row.notification_acknowledged_at,
+        warning_message: extract_external_generation_warning_message(
+            row.result_payload_json.as_deref(),
+        ),
     }
 }
 
+fn extract_external_generation_warning_message(
+    result_payload_json: Option<&str>,
+) -> Option<String> {
+    let payload: serde_json::Value = serde_json::from_str(result_payload_json?.trim()).ok()?;
+    let warning = payload
+        .get("warning")
+        .or_else(|| payload.get("sliceWarning"))?;
+    let reason = warning.get("reason").and_then(serde_json::Value::as_str)?;
+    normalize_external_generation_warning_message(reason)
+}
+
 fn extract_external_generation_request_prompt(request_payload_json: &str) -> Option<String> {
     let payload: serde_json::Value = serde_json::from_str(request_payload_json).ok()?;
     for key in ["prompt", "promptText", "spritesheetLabel"] {
@@ -1845,6 +1866,25 @@ fn normalize_external_generation_error_message(value: &str) -> Option<String> {
     Some(normalized)
 }
 
+fn normalize_external_generation_warning_message(value: &str) -> Option<String> {
+    let trimmed = value.trim();
+    if trimmed.is_empty() {
+        return None;
+    }
+    if contains_external_generation_inline_media_reference_text(trimmed) {
+        return Some(INLINE_MEDIA_WARNING_REDACTED_MESSAGE.to_string());
+    }
+    let mut chars = trimmed.chars();
+    let mut normalized = chars
+        .by_ref()
+        .take(MAX_EXTERNAL_GENERATION_WARNING_MESSAGE_CHARS)
+        .collect::<String>();
+    if chars.next().is_some() {
+        normalized.push('…');
+    }
+    Some(normalized)
+}
+
 fn contains_external_generation_inline_media_reference_text(value: &str) -> bool {
     let normalized = value.to_ascii_lowercase();
     ["data:", "blob:"].iter().any(|scheme| {
@@ -2005,6 +2045,7 @@ fn map_external_generation_job_summary_row(
         notification_acknowledged_at_micros: row
             .notification_acknowledged_at
             .map(|value| value.to_micros_since_unix_epoch()),
+        warning_message: row.warning_message,
     }
 }
 
@@ -2732,6 +2773,64 @@ mod tests {
         );
     }
 
+    #[test]
+    fn job_summary_extracts_lightweight_completion_warning() {
+        let mut row = external_generation_job_fixture(EXTERNAL_GENERATION_STATUS_COMPLETED);
+        row.result_payload_json = Some(
+            r#"{"sourceModule":"editor-canvas","warning":{"code":"insufficient-connected-components","reason":"连通域数量不足"}}"#
+                .to_string(),
+        );
+
+        let summary = build_external_generation_job_summary_row(&row, None);
+
+        assert_eq!(summary.warning_message.as_deref(), Some("连通域数量不足"));
+        assert!(summary.last_error_message.is_none());
+    }
+
+    #[test]
+    fn job_summary_bounds_and_redacts_completion_warnings() {
+        let mut row = external_generation_job_fixture(EXTERNAL_GENERATION_STATUS_COMPLETED);
+        row.result_payload_json = Some(
+            serde_json::json!({
+                "warning": {
+                    "code": "slice-persistence-failed",
+                    "reason": "provider returned data:image/png;base64,AAAA"
+                }
+            })
+            .to_string(),
+        );
+        let redacted = build_external_generation_job_summary_row(&row, None);
+        assert_eq!(
+            redacted.warning_message.as_deref(),
+            Some(INLINE_MEDIA_WARNING_REDACTED_MESSAGE)
+        );
+
+        row.result_payload_json = Some(
+            serde_json::json!({
+                "warning": {
+                    "code": "slice-persistence-failed",
+                    "reason": "x".repeat(MAX_EXTERNAL_GENERATION_WARNING_MESSAGE_CHARS + 10)
+                }
+            })
+            .to_string(),
+        );
+        let bounded = build_external_generation_job_summary_row(&row, None)
+            .warning_message
+            .expect("非空告警应保留有界摘要");
+        assert_eq!(
+            bounded.chars().count(),
+            MAX_EXTERNAL_GENERATION_WARNING_MESSAGE_CHARS + 1
+        );
+        assert!(bounded.ends_with('…'));
+
+        row.result_payload_json = Some(r#"{"warning":{"code":"missing-reason"}}"#.to_string());
+        assert!(
+            build_external_generation_job_summary_row(&row, None)
+                .warning_message
+                .is_none()
+        );
+    }
+
     #[test]
     fn job_summary_top_n_keeps_memory_bounded_and_ordered() {
         let mut rows = Vec::new();
diff --git a/server-rs/crates/spacetime-module/src/lib.rs b/server-rs/crates/spacetime-module/src/lib.rs
index a5f26d6fd..9f596ffcc 100644
--- a/server-rs/crates/spacetime-module/src/lib.rs
+++ b/server-rs/crates/spacetime-module/src/lib.rs
@@ -39,6 +39,7 @@ mod gameplay;
 mod jump_hop;
 mod match3d;
 mod migration;
+mod public_asset_access;
 mod public_work;
 mod puzzle;
 mod puzzle_clear;
@@ -63,6 +64,7 @@ pub use gameplay::*;
 pub use jump_hop::*;
 pub use match3d::*;
 pub use migration::*;
+pub use public_asset_access::*;
 pub use public_work::*;
 pub use puzzle_clear::*;
 pub use runtime::*;
diff --git a/server-rs/crates/spacetime-module/src/migration.rs b/server-rs/crates/spacetime-module/src/migration.rs
index 0dc48da85..9ecee3e12 100644
--- a/server-rs/crates/spacetime-module/src/migration.rs
+++ b/server-rs/crates/spacetime-module/src/migration.rs
@@ -1308,6 +1308,17 @@ fn normalize_migration_row(table_name: &str, value: &serde_json::Value) -> serde
                 .or_insert_with(|| serde_json::Value::String("{}".to_string()));
         }
     }
+    if table_name == "profile_redeem_code" {
+        if let Some(object) = next_value.as_object_mut() {
+            // 中文注释：兑换码生效时间晚于兑换码表加入，旧迁移包按无时间边界兼容。
+            object
+                .entry("starts_at".to_string())
+                .or_insert(serde_json::Value::Null);
+            object
+                .entry("expires_at".to_string())
+                .or_insert(serde_json::Value::Null);
+        }
+    }
     if table_name == "profile_recharge_order" {
         if let Some(object) = next_value.as_object_mut() {
             // 中文注释：真实微信支付接入后才有平台交易号，旧迁移包按未回填处理。
@@ -1328,6 +1339,14 @@ fn normalize_migration_row(table_name: &str, value: &serde_json::Value) -> serde
                 .or_insert(serde_json::Value::Null);
         }
     }
+    if table_name == "external_generation_job_summary" {
+        if let Some(object) = next_value.as_object_mut() {
+            // 中文注释：非阻断完成告警晚于轻量任务摘要表加入，旧迁移包按无告警兼容。
+            object
+                .entry("warning_message".to_string())
+                .or_insert(serde_json::Value::Null);
+        }
+    }
     if table_name == "editor_showcase_asset" {
         if let Some(object) = next_value.as_object_mut() {
             // 中文注释：精选分类字段晚于审核表加入，旧迁移包按未设置分类兼容。
@@ -1616,6 +1635,27 @@ fn is_supported_migration_table(table_name: &str) -> bool {
 mod migration_bootstrap_secret_tests {
     use super::*;
 
+    #[test]
+    fn old_profile_redeem_code_rows_default_to_open_validity_window() {
+        let normalized = normalize_migration_row(
+            "profile_redeem_code",
+            &serde_json::json!({ "code": "GIFT" }),
+        );
+
+        assert_eq!(normalized["starts_at"], serde_json::Value::Null);
+        assert_eq!(normalized["expires_at"], serde_json::Value::Null);
+    }
+
+    #[test]
+    fn old_external_generation_summary_rows_default_to_no_warning() {
+        let normalized = normalize_migration_row(
+            "external_generation_job_summary",
+            &serde_json::json!({ "job_id": "task-1" }),
+        );
+
+        assert_eq!(normalized["warning_message"], serde_json::Value::Null);
+    }
+
     #[test]
     fn bootstrap_secret_sha256_is_stable_and_does_not_contain_plaintext() {
         let secret = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
diff --git a/server-rs/crates/spacetime-module/src/public_asset_access.rs b/server-rs/crates/spacetime-module/src/public_asset_access.rs
new file mode 100644
index 000000000..ccdbd9d53
--- /dev/null
+++ b/server-rs/crates/spacetime-module/src/public_asset_access.rs
@@ -0,0 +1,627 @@
+use crate::puzzle::puzzle_work_profile__view;
+use crate::*;
+use module_puzzle::PuzzlePublicationStatus;
+use spacetimedb::AnonymousViewContext;
+use std::collections::BTreeMap;
+
+const SOURCE_TYPE_PUZZLE: &str = "puzzle";
+const SOURCE_TYPE_PUZZLE_CLEAR: &str = "puzzle-clear";
+const SOURCE_TYPE_CUSTOM_WORLD: &str = "custom-world";
+const SOURCE_TYPE_JUMP_HOP: &str = "jump-hop";
+const SOURCE_TYPE_WOODEN_FISH: &str = "wooden-fish";
+const SOURCE_TYPE_MATCH3D: &str = "match3d";
+const SOURCE_TYPE_SQUARE_HOLE: &str = "square-hole";
+const SOURCE_TYPE_VISUAL_NOVEL: &str = "visual-novel";
+const SOURCE_TYPE_BIG_FISH: &str = "big-fish";
+const SOURCE_TYPE_BARK_BATTLE: &str = "bark-battle";
+
+/// 已发布且可见作品派生出的精确资产读取授权。
+///
+/// 资产对象本身继续保持 private；view 只列出公开快照实际使用的对象 ID / key。
+#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)]
+pub struct PublicWorkAssetReadGrant {
+    pub grant_id: String,
+    pub source_type: String,
+    pub profile_id: String,
+    pub owner_user_id: String,
+    pub asset_object_id: Option<String>,
+    pub object_key: Option<String>,
+}
+
+struct PublicWorkAssetGrantScope<'a> {
+    source_type: &'a str,
+    profile_id: &'a str,
+    owner_user_id: &'a str,
+}
+
+/// 跨玩法公开资产授权投影。
+///
+/// 历史作品随 view 首次计算自动补齐；隐藏、删除或取消发布后对应授权自动消失。
+#[spacetimedb::view(accessor = public_work_asset_read_grant, public, primary_key = grant_id)]
+pub fn public_work_asset_read_grant(ctx: &AnonymousViewContext) -> Vec<PublicWorkAssetReadGrant> {
+    let mut grants = BTreeMap::new();
+
+    for row in ctx
+        .db
+        .puzzle_work_profile()
+        .by_puzzle_work_publication_status()
+        .filter(PuzzlePublicationStatus::Published)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_PUZZLE,
+            profile_id: &row.profile_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        insert_src_grant(&mut grants, &scope, row.cover_image_src.as_deref());
+        collect_json_grants(&mut grants, &scope, &row.levels_json);
+    }
+
+    for row in ctx
+        .db
+        .puzzle_clear_work_profile()
+        .by_puzzle_clear_work_publication_status()
+        .filter(PUZZLE_CLEAR_PUBLICATION_PUBLISHED)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_PUZZLE_CLEAR,
+            profile_id: &row.profile_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        insert_src_grant(&mut grants, &scope, Some(&row.cover_image_src));
+        insert_src_grant(&mut grants, &scope, Some(&row.card_back_image_src));
+        for raw in [
+            &row.board_background_asset_json,
+            &row.atlas_asset_json,
+            &row.card_assets_json,
+        ] {
+            collect_json_grants(&mut grants, &scope, raw);
+        }
+    }
+
+    for row in ctx
+        .db
+        .custom_world_profile()
+        .by_custom_world_profile_publication_status()
+        .filter(CustomWorldPublicationStatus::Published)
+        .filter(|row| row.visible && row.deleted_at.is_none())
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_CUSTOM_WORLD,
+            profile_id: &row.profile_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        insert_src_grant(&mut grants, &scope, row.cover_image_src.as_deref());
+        collect_custom_world_json_grants(&mut grants, &scope, &row.profile_payload_json);
+    }
+
+    for row in ctx
+        .db
+        .jump_hop_work_profile()
+        .by_jump_hop_work_publication_status()
+        .filter(JUMP_HOP_PUBLICATION_PUBLISHED)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_JUMP_HOP,
+            profile_id: &row.profile_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        insert_src_grant(&mut grants, &scope, Some(&row.cover_image_src));
+        insert_src_grant(&mut grants, &scope, Some(&row.cover_composite));
+        for raw in [
+            Some(row.character_asset_json.as_str()),
+            Some(row.tile_atlas_asset_json.as_str()),
+            Some(row.tile_assets_json.as_str()),
+            row.back_button_asset_json.as_deref(),
+        ]
+        .into_iter()
+        .flatten()
+        {
+            collect_json_grants(&mut grants, &scope, raw);
+        }
+    }
+
+    for row in ctx
+        .db
+        .wooden_fish_work_profile()
+        .by_wooden_fish_work_publication_status()
+        .filter(WOODEN_FISH_PUBLICATION_PUBLISHED)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_WOODEN_FISH,
+            profile_id: &row.profile_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        insert_src_grant(&mut grants, &scope, Some(&row.cover_image_src));
+        for raw in [
+            Some(row.hit_object_asset_json.as_str()),
+            Some(row.hit_sound_asset_json.as_str()),
+            row.background_asset_json.as_deref(),
+            row.back_button_asset_json.as_deref(),
+        ]
+        .into_iter()
+        .flatten()
+        {
+            collect_json_grants(&mut grants, &scope, raw);
+        }
+    }
+
+    for row in ctx
+        .db
+        .match_3_d_work_profile()
+        .by_match3d_work_publication_status()
+        .filter(MATCH3D_PUBLICATION_PUBLISHED)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_MATCH3D,
+            profile_id: &row.profile_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        insert_src_grant(&mut grants, &scope, Some(&row.cover_image_src));
+        collect_json_grants(&mut grants, &scope, &row.config_json);
+        if let Some(raw) = row.generated_item_assets_json.as_deref() {
+            collect_json_grants(&mut grants, &scope, raw);
+        }
+    }
+
+    for row in ctx
+        .db
+        .square_hole_work_profile()
+        .by_square_hole_work_publication_status()
+        .filter(SQUARE_HOLE_PUBLICATION_PUBLISHED)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_SQUARE_HOLE,
+            profile_id: &row.profile_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        insert_src_grant(&mut grants, &scope, Some(&row.cover_image_src));
+        collect_json_grants(&mut grants, &scope, &row.config_json);
+    }
+
+    for row in ctx
+        .db
+        .visual_novel_work_profile()
+        .by_visual_novel_work_publication_status()
+        .filter(VISUAL_NOVEL_PUBLICATION_PUBLISHED)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_VISUAL_NOVEL,
+            profile_id: &row.profile_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        insert_src_grant(&mut grants, &scope, Some(&row.cover_image_src));
+        collect_json_grants(&mut grants, &scope, &row.draft_json);
+    }
+
+    for row in ctx
+        .db
+        .big_fish_creation_session()
+        .by_big_fish_session_stage()
+        .filter(BigFishCreationStage::Published)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_BIG_FISH,
+            profile_id: &row.session_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        for slot in ctx
+            .db
+            .big_fish_asset_slot()
+            .by_big_fish_asset_session_id()
+            .filter(&row.session_id)
+        {
+            insert_src_grant(&mut grants, &scope, slot.asset_url.as_deref());
+        }
+    }
+
+    for row in ctx
+        .db
+        .bark_battle_published_config()
+        .by_bark_battle_published_owner_user_id()
+        .filter(""..)
+        .filter(|row| row.visible)
+    {
+        let scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_BARK_BATTLE,
+            profile_id: &row.work_id,
+            owner_user_id: &row.owner_user_id,
+        };
+        collect_json_grants(&mut grants, &scope, &row.published_snapshot_json);
+    }
+
+    grants.into_values().collect()
+}
+
+pub(crate) fn asset_object_has_public_work_read_grant(
+    ctx: &ReducerContext,
+    asset_object: &AssetObjectUpsertSnapshot,
+) -> bool {
+    let asset_object = module_assets::build_asset_object_record(asset_object.clone());
+    let view_context = ctx.as_anonymous_read_only();
+
+    public_work_asset_read_grant(&view_context)
+        .into_iter()
+        .any(|grant| {
+            module_assets::asset_object_matches_public_read_grant(
+                &asset_object,
+                &module_assets::PublicAssetReadGrant {
+                    owner_user_id: grant.owner_user_id,
+                    asset_object_id: grant.asset_object_id,
+                    object_key: grant.object_key,
+                },
+            )
+        })
+}
+
+fn collect_json_grants(
+    grants: &mut BTreeMap<String, PublicWorkAssetReadGrant>,
+    scope: &PublicWorkAssetGrantScope<'_>,
+    raw: &str,
+) {
+    let Ok(value) = serde_json::from_str::<JsonValue>(raw) else {
+        return;
+    };
+    collect_json_value_grants(grants, scope, &value);
+}
+
+fn collect_custom_world_json_grants(
+    grants: &mut BTreeMap<String, PublicWorkAssetReadGrant>,
+    scope: &PublicWorkAssetGrantScope<'_>,
+    raw: &str,
+) {
+    let Ok(JsonValue::Object(profile)) = serde_json::from_str::<JsonValue>(raw) else {
+        return;
+    };
+
+    insert_src_grant(
+        grants,
+        scope,
+        profile.get("coverImageSrc").and_then(JsonValue::as_str),
+    );
+    for key in [
+        "cover",
+        "camp",
+        "playableNpcs",
+        "storyNpcs",
+        "landmarks",
+        "chapters",
+        "sceneChapters",
+        "sceneChapterBlueprints",
+        "openingCg",
+    ] {
+        if let Some(value) = profile.get(key) {
+            collect_json_value_grants(grants, scope, value);
+        }
+    }
+}
+
+fn collect_json_value_grants(
+    grants: &mut BTreeMap<String, PublicWorkAssetReadGrant>,
+    scope: &PublicWorkAssetGrantScope<'_>,
+    value: &JsonValue,
+) {
+    match value {
+        JsonValue::Array(items) => {
+            for item in items {
+                collect_json_value_grants(grants, scope, item);
+            }
+        }
+        JsonValue::Object(fields) => {
+            for (key, value) in fields {
+                let normalized_key = normalize_json_key(key);
+                if should_skip_public_asset_field(&normalized_key) {
+                    continue;
+                }
+                if normalized_key.ends_with("assetobjectid") {
+                    if let Some(value) = value.as_str() {
+                        insert_asset_object_id_grant(grants, scope, Some(value));
+                    }
+                    continue;
+                }
+                if normalized_key.ends_with("objectkey") {
+                    if let Some(value) = value.as_str() {
+                        insert_object_key_grant(grants, scope, Some(value));
+                    }
+                    continue;
+                }
+                if is_public_asset_src_field(&normalized_key) {
+                    if let Some(value) = value.as_str() {
+                        insert_src_grant(grants, scope, Some(value));
+                    }
+                    continue;
+                }
+                collect_json_value_grants(grants, scope, value);
+            }
+        }
+        _ => {}
+    }
+}
+
+fn normalize_json_key(key: &str) -> String {
+    key.chars()
+        .filter(|character| character.is_ascii_alphanumeric())
+        .flat_map(char::to_lowercase)
+        .collect()
+}
+
+fn should_skip_public_asset_field(normalized_key: &str) -> bool {
+    normalized_key.contains("reference")
+        || normalized_key == "candidates"
+        || normalized_key == "generationinputs"
+        || normalized_key == "sourceassetids"
+        || normalized_key.starts_with("sourceimage")
+}
+
+fn is_public_asset_src_field(normalized_key: &str) -> bool {
+    normalized_key.ends_with("imagesrc")
+        || normalized_key.ends_with("audiosrc")
+        || normalized_key.ends_with("videosrc")
+        || normalized_key == "musicsrc"
+        || normalized_key == "ambientsoundsrc"
+        || normalized_key == "modelsrc"
+        || normalized_key.ends_with("asseturl")
+}
+
+fn insert_asset_object_id_grant(
+    grants: &mut BTreeMap<String, PublicWorkAssetReadGrant>,
+    scope: &PublicWorkAssetGrantScope<'_>,
+    value: Option<&str>,
+) {
+    let Some(asset_object_id) = normalize_non_empty(value) else {
+        return;
+    };
+    insert_grant(grants, scope, Some(asset_object_id), None);
+}
+
+fn insert_object_key_grant(
+    grants: &mut BTreeMap<String, PublicWorkAssetReadGrant>,
+    scope: &PublicWorkAssetGrantScope<'_>,
+    value: Option<&str>,
+) {
+    let Some(object_key) = normalize_explicit_object_key(value) else {
+        return;
+    };
+    insert_grant(grants, scope, None, Some(object_key));
+}
+
+fn insert_src_grant(
+    grants: &mut BTreeMap<String, PublicWorkAssetReadGrant>,
+    scope: &PublicWorkAssetGrantScope<'_>,
+    value: Option<&str>,
+) {
+    let Some(object_key) = normalize_generated_asset_src(value) else {
+        return;
+    };
+    insert_grant(grants, scope, None, Some(object_key));
+}
+
+fn insert_grant(
+    grants: &mut BTreeMap<String, PublicWorkAssetReadGrant>,
+    scope: &PublicWorkAssetGrantScope<'_>,
+    asset_object_id: Option<String>,
+    object_key: Option<String>,
+) {
+    let domain_grant = module_assets::PublicAssetReadGrant {
+        owner_user_id: scope.owner_user_id.to_string(),
+        asset_object_id: asset_object_id.clone(),
+        object_key: object_key.clone(),
+    };
+    let Some(grant_id) = module_assets::public_asset_read_grant_id(&domain_grant) else {
+        return;
+    };
+    grants
+        .entry(grant_id.clone())
+        .or_insert_with(|| PublicWorkAssetReadGrant {
+            grant_id,
+            source_type: scope.source_type.to_string(),
+            profile_id: scope.profile_id.to_string(),
+            owner_user_id: scope.owner_user_id.to_string(),
+            asset_object_id,
+            object_key,
+        });
+}
+
+fn normalize_non_empty(value: Option<&str>) -> Option<String> {
+    value
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+        .map(ToString::to_string)
+}
+
+fn normalize_explicit_object_key(value: Option<&str>) -> Option<String> {
+    let value = value?.trim().trim_start_matches('/');
+    if value.is_empty()
+        || value.starts_with("data:")
+        || value.starts_with("blob:")
+        || value.starts_with("builtin:")
+        || value.starts_with("http://")
+        || value.starts_with("https://")
+    {
+        return None;
+    }
+    Some(value.to_string())
+}
+
+fn normalize_generated_asset_src(value: Option<&str>) -> Option<String> {
+    let value = value?.trim();
+    let object_key = if value.starts_with("http://") || value.starts_with("https://") {
+        let generated_path_index = value.find("/generated-")?;
+        &value[generated_path_index + 1..]
+    } else {
+        value.trim_start_matches('/')
+    };
+    object_key
+        .starts_with("generated-")
+        .then(|| object_key.to_string())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn collect(raw: &str) -> Vec<PublicWorkAssetReadGrant> {
+        let mut grants = BTreeMap::new();
+        collect_json_grants(
+            &mut grants,
+            &PublicWorkAssetGrantScope {
+                source_type: SOURCE_TYPE_PUZZLE,
+                profile_id: "puzzle-profile-001",
+                owner_user_id: "user-owner",
+            },
+            raw,
+        );
+        grants.into_values().collect()
+    }
+
+    fn collect_custom_world(raw: &str) -> Vec<PublicWorkAssetReadGrant> {
+        let mut grants = BTreeMap::new();
+        collect_custom_world_json_grants(
+            &mut grants,
+            &PublicWorkAssetGrantScope {
+                source_type: SOURCE_TYPE_CUSTOM_WORLD,
+                profile_id: "custom-world-profile-001",
+                owner_user_id: "user-owner",
+            },
+            raw,
+        );
+        grants.into_values().collect()
+    }
+
+    #[test]
+    fn published_asset_collector_excludes_references_candidates_and_generation_inputs() {
+        let grants = collect(
+            r#"{
+                "cover": {
+                    "assetObjectId": "assetobj_cover",
+                    "imageObjectKey": "generated-puzzle-assets/formal-cover.png"
+                },
+                "backgroundMusic": {
+                    "audioSrc": "/generated-audio/formal.mp3"
+                },
+                "sceneAudio": {
+                    "musicSrc": "/generated-audio/scene-music.mp3",
+                    "ambientSoundSrc": "/generated-audio/scene-ambient.mp3"
+                },
+                "modelSrc": "/generated-match3d-assets/formal-model.glb",
+                "pictureReference": {
+                    "imageObjectKey": "generated-puzzle-assets/private-reference.png",
+                    "musicSrc": "/generated-audio/private-reference.mp3"
+                },
+                "candidates": [
+                    { "imageSrc": "/generated-puzzle-assets/unselected.png" }
+                ],
+                "generationInputs": {
+                    "imageSrc": "/generated-puzzle-assets/private-input.png"
+                }
+            }"#,
+        );
+
+        assert!(
+            grants
+                .iter()
+                .any(|grant| { grant.asset_object_id.as_deref() == Some("assetobj_cover") })
+        );
+        assert!(grants.iter().any(|grant| {
+            grant.object_key.as_deref() == Some("generated-puzzle-assets/formal-cover.png")
+        }));
+        assert!(
+            grants
+                .iter()
+                .any(|grant| { grant.object_key.as_deref() == Some("generated-audio/formal.mp3") })
+        );
+        assert!(grants.iter().any(|grant| {
+            grant.object_key.as_deref() == Some("generated-audio/scene-music.mp3")
+        }));
+        assert!(grants.iter().any(|grant| {
+            grant.object_key.as_deref() == Some("generated-audio/scene-ambient.mp3")
+        }));
+        assert!(grants.iter().any(|grant| {
+            grant.object_key.as_deref() == Some("generated-match3d-assets/formal-model.glb")
+        }));
+        assert!(!grants.iter().any(|grant| {
+            grant
+                .object_key
+                .as_deref()
+                .is_some_and(|value| value.contains("private") || value.contains("unselected"))
+        }));
+    }
+
+    #[test]
+    fn published_asset_collector_normalizes_generated_oss_urls() {
+        let grants = collect(
+            r#"{
+                "imageSrc": "https://bucket.oss-cn.test.aliyuncs.com/generated-puzzle-assets/formal.png"
+            }"#,
+        );
+
+        assert_eq!(
+            grants[0].object_key.as_deref(),
+            Some("generated-puzzle-assets/formal.png")
+        );
+    }
+
+    #[test]
+    fn custom_world_collector_only_reads_known_published_structures() {
+        let grants = collect_custom_world(
+            r#"{
+                "cover": { "imageSrc": "/generated-custom-world/formal-cover.png" },
+                "playableNpcs": [
+                    { "imageSrc": "/generated-custom-world/formal-role.png" }
+                ],
+                "sceneChapterBlueprints": [
+                    { "acts": [{ "backgroundImageSrc": "/generated-custom-world/formal-scene.png" }] }
+                ],
+                "preview": {
+                    "imageSrc": "/generated-custom-world/private-preview.png",
+                    "objectKey": "generated-custom-world/private-preview-object.png"
+                },
+                "editorState": {
+                    "assetObjectId": "assetobj_private_editor_state"
+                }
+            }"#,
+        );
+
+        assert_eq!(grants.len(), 3);
+        assert!(grants.iter().all(|grant| {
+            grant
+                .object_key
+                .as_deref()
+                .is_some_and(|value| value.contains("formal"))
+        }));
+    }
+
+    #[test]
+    fn published_asset_collector_deduplicates_reused_asset_per_owner() {
+        let mut grants = BTreeMap::new();
+        let first_scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_PUZZLE,
+            profile_id: "puzzle-profile-001",
+            owner_user_id: "user-owner",
+        };
+        let second_scope = PublicWorkAssetGrantScope {
+            source_type: SOURCE_TYPE_PUZZLE,
+            profile_id: "puzzle-profile-002",
+            owner_user_id: "user-owner",
+        };
+        insert_src_grant(
+            &mut grants,
+            &first_scope,
+            Some("/generated-puzzle-assets/reused.png"),
+        );
+        insert_src_grant(
+            &mut grants,
+            &second_scope,
+            Some("/generated-puzzle-assets/reused.png"),
+        );
+
+        assert_eq!(grants.len(), 1);
+    }
+}
diff --git a/server-rs/crates/spacetime-module/src/runtime/profile.rs b/server-rs/crates/spacetime-module/src/runtime/profile.rs
index 7dd00c720..4146a9c44 100644
--- a/server-rs/crates/spacetime-module/src/runtime/profile.rs
+++ b/server-rs/crates/spacetime-module/src/runtime/profile.rs
@@ -202,6 +202,10 @@ pub struct ProfileRedeemCode {
     pub(crate) created_by: String,
     pub(crate) created_at: Timestamp,
     pub(crate) updated_at: Timestamp,
+    #[default(None::<Timestamp>)]
+    pub(crate) starts_at: Option<Timestamp>,
+    #[default(None::<Timestamp>)]
+    pub(crate) expires_at: Option<Timestamp>,
 }
 
 #[spacetimedb::table(
@@ -3753,6 +3757,7 @@ fn redeem_profile_reward_code_record(
         &build_profile_redeem_code_snapshot_from_row(&redeem_code),
         &user_id,
         user_used_count,
+        validated_input.redeemed_at_micros,
     )
     .map_err(|error| error.to_string())?;
 
@@ -3817,6 +3822,8 @@ fn admin_upsert_profile_redeem_code_record(
         input.enabled,
         input.allowed_user_ids,
         input.allowed_public_user_codes,
+        input.starts_at_micros,
+        input.expires_at_micros,
         input.updated_at_micros,
     )
     .map_err(|error| error.to_string())?;
@@ -3858,6 +3865,12 @@ fn admin_upsert_profile_redeem_code_record(
         created_by: validated_input.admin_user_id,
         created_at,
         updated_at,
+        starts_at: validated_input
+            .starts_at_micros
+            .map(Timestamp::from_micros_since_unix_epoch),
+        expires_at: validated_input
+            .expires_at_micros
+            .map(Timestamp::from_micros_since_unix_epoch),
     };
     let inserted = ctx.db.profile_redeem_code().insert(row);
     insert_profile_code_operation(
@@ -7193,6 +7206,12 @@ fn build_profile_redeem_code_snapshot_from_row(
         created_by: row.created_by.clone(),
         created_at_micros: row.created_at.to_micros_since_unix_epoch(),
         updated_at_micros: row.updated_at.to_micros_since_unix_epoch(),
+        starts_at_micros: row
+            .starts_at
+            .map(|value| value.to_micros_since_unix_epoch()),
+        expires_at_micros: row
+            .expires_at
+            .map(|value| value.to_micros_since_unix_epoch()),
     }
 }
 
diff --git a/src/components/image-editor/ImageCanvasBasicGenerationComposerView.test.tsx b/src/components/image-editor/ImageCanvasBasicGenerationComposerView.test.tsx
index 90335a5c6..596ea1135 100644
--- a/src/components/image-editor/ImageCanvasBasicGenerationComposerView.test.tsx
+++ b/src/components/image-editor/ImageCanvasBasicGenerationComposerView.test.tsx
@@ -58,6 +58,7 @@ function BasicGenerationHarness({
         onSubmit={onSubmit}
       />
       <output aria-label="当前提示词">{dialog.prompt}</output>
+      <output aria-label="当前资源名称">{dialog.assetLabel ?? '-'}</output>
       <output aria-label="当前比例">{dialog.aspectRatio}</output>
       <output aria-label="当前尺寸">{dialog.imageSize}</output>
       <output aria-label="当前模型">{dialog.imageModel}</output>
@@ -86,17 +87,27 @@ describe('ImageCanvasBasicGenerationComposerView', () => {
     fireEvent.change(screen.getByLabelText('生成提示词'), {
       target: { value: '新的提示' },
     });
+    fireEvent.change(screen.getByLabelText('资源名称'), {
+      target: { value: '自定义主视觉' },
+    });
     const panel = screen.getByRole('dialog', { name: '生成图片' });
     fireEvent.click(within(panel).getByRole('button', { name: '添加参考图' }));
     fireEvent.click(screen.getByRole('menuitem', { name: '上传图片' }));
     fireEvent.click(screen.getByRole('button', { name: '生成' }));
 
     expect(screen.getByLabelText('当前提示词').textContent).toBe('新的提示');
+    expect(screen.getByLabelText('当前资源名称').textContent).toBe(
+      '自定义主视觉',
+    );
     expect(screen.getByLabelText('当前状态').textContent).toBe('idle');
     expect(screen.getByLabelText('当前错误').textContent).toBe('-');
     expect(requestUpload).toHaveBeenCalledWith('generation-reference');
     expect(submitGeneration).toHaveBeenCalledWith(
-      expect.objectContaining({ prompt: '新的提示', status: 'idle' }),
+      expect.objectContaining({
+        prompt: '新的提示',
+        assetLabel: '自定义主视觉',
+        status: 'idle',
+      }),
     );
   });
 
@@ -183,7 +194,7 @@ describe('ImageCanvasBasicGenerationComposerView', () => {
     expect(submitButton.textContent).toBe('生成5泥点');
   });
 
-  it('keeps quick edit to one prompt box and model selection', () => {
+  it('keeps quick edit to one prompt box with image parameters', () => {
     render(
       <BasicGenerationHarness
         initialDialog={createDialog({
@@ -213,10 +224,10 @@ describe('ImageCanvasBasicGenerationComposerView', () => {
     ).toBeNull();
     expect(within(panel).queryByText('旧参考图')).toBeNull();
     expect(
-      within(panel).queryByRole('button', {
-        name: /快速编辑图片尺寸/u,
+      within(panel).getByRole('button', {
+        name: '快速编辑图片尺寸 1:1·1K',
       }),
-    ).toBeNull();
+    ).toBeTruthy();
     expect(
       within(panel).getByRole('button', {
         name: '快速编辑图片模型 gpt-image-2',
@@ -234,22 +245,16 @@ describe('ImageCanvasBasicGenerationComposerView', () => {
         name: '生成图片尺寸 16:9·1K',
       }),
     );
-    expect(
-      screen.getByRole('menu', { name: '生成图片尺寸选项' }),
-    ).toBeTruthy();
+    expect(screen.getByRole('menu', { name: '生成图片尺寸选项' })).toBeTruthy();
 
     fireEvent.click(screen.getByRole('textbox', { name: '生成提示词' }));
 
-    expect(
-      screen.queryByRole('menu', { name: '生成图片尺寸选项' }),
-    ).toBeNull();
+    expect(screen.queryByRole('menu', { name: '生成图片尺寸选项' })).toBeNull();
   });
 
   it('does not render a standalone close button', () => {
     render(<BasicGenerationHarness />);
 
-    expect(
-      screen.queryByRole('button', { name: '关闭生成图片' }),
-    ).toBeNull();
+    expect(screen.queryByRole('button', { name: '关闭生成图片' })).toBeNull();
   });
 });
diff --git a/src/components/image-editor/ImageCanvasBasicGenerationComposerView.tsx b/src/components/image-editor/ImageCanvasBasicGenerationComposerView.tsx
index 4a6a11b6f..e21d649cc 100644
--- a/src/components/image-editor/ImageCanvasBasicGenerationComposerView.tsx
+++ b/src/components/image-editor/ImageCanvasBasicGenerationComposerView.tsx
@@ -18,6 +18,7 @@ import type {
   GenerateDialogState,
   UploadTarget,
 } from './ImageCanvasEditorTypes';
+import { ImageCanvasGenerationAssetNameField } from './ImageCanvasGenerationAssetNameField';
 import { ImageCanvasGenerationImageOptionsView } from './ImageCanvasGenerationImageOptionsView';
 import { ImageCanvasReferenceSlot } from './ImageCanvasReferenceSlot';
 import { calculateEditorImageGenerationPrice } from './ImageCanvasGenerationModel';
@@ -140,19 +141,21 @@ export function ImageCanvasBasicGenerationComposerView({
   const references = dialog.generationReferences ?? [];
   const isQuickEdit = dialog.mode === 'quick-edit';
   const resolvedDialogLabel =
-    dialogLabel ?? optionLabelPrefix ?? (isQuickEdit ? '快速编辑图片' : '生成图片');
+    dialogLabel ??
+    optionLabelPrefix ??
+    (isQuickEdit ? '快速编辑图片' : '生成图片');
   const resolvedPromptLabel =
     promptLabel ?? (isQuickEdit ? '快速编辑提示词' : '生成提示词');
   const resolvedPromptPlaceholder =
     promptPlaceholder ??
-    (isQuickEdit ? '写下每个编号要怎么改' : '今天想生成什么画面？');
+    (isQuickEdit ? '你希望素材如何修改？' : '今天想生成什么画面？');
   const resolvedOptionLabelPrefix =
     optionLabelPrefix ?? (isQuickEdit ? '快速编辑图片' : '生成图片');
   const resolvedReferenceButtonLabel = referenceButtonLabel;
   const resolvedReferenceButtonAriaLabel =
     referenceButtonAriaLabel ?? `添加${resolvedReferenceButtonLabel}`;
   const shouldIncludeReferences = isQuickEdit ? false : includeReferences;
-  const shouldIncludeDimensions = isQuickEdit ? false : includeDimensions;
+  const shouldIncludeDimensions = includeDimensions;
   const resolvedSubmitLabel =
     isQuickEdit && submitLabel === '生成' ? '修改' : submitLabel;
   const resolvedSubmitAriaLabel =
@@ -265,6 +268,20 @@ export function ImageCanvasBasicGenerationComposerView({
             )
           }
         />
+        <ImageCanvasGenerationAssetNameField
+          value={dialog.assetLabel}
+          disabled={dialog.status === 'generating'}
+          onChange={(assetLabel) =>
+            setGenerateDialog((currentDialog) =>
+              currentDialog
+                ? {
+                    ...resetFailedDialogStatus(currentDialog),
+                    assetLabel,
+                  }
+                : currentDialog,
+            )
+          }
+        />
         <div className={finalFooterClassName}>
           <ImageCanvasGenerationImageOptionsView
             dialog={dialog}
diff --git a/src/components/image-editor/ImageCanvasCharacterAnimationPanelView.tsx b/src/components/image-editor/ImageCanvasCharacterAnimationPanelView.tsx
index 8131d2c16..09704e136 100644
--- a/src/components/image-editor/ImageCanvasCharacterAnimationPanelView.tsx
+++ b/src/components/image-editor/ImageCanvasCharacterAnimationPanelView.tsx
@@ -24,6 +24,7 @@ import type {
   CanvasLayer,
   CharacterAnimationPanelState,
 } from './ImageCanvasEditorTypes';
+import { ImageCanvasGenerationAssetNameField } from './ImageCanvasGenerationAssetNameField';
 import {
   CHARACTER_ANIMATION_ACTION_PROMPTS,
   CHARACTER_ANIMATION_DURATION_OPTIONS,
@@ -211,6 +212,11 @@ export function ImageCanvasCharacterAnimationPanelView({
             updatePanel({ promptText: event.target.value.slice(0, 4000) })
           }
         />
+        <ImageCanvasGenerationAssetNameField
+          value={panel.assetLabel}
+          disabled={isGenerating}
+          onChange={(assetLabel) => updatePanel({ assetLabel })}
+        />
         <div className="image-canvas-editor__character-animation-presets">
           {CHARACTER_ANIMATION_ACTION_PROMPTS.map((preset) => (
             <button
diff --git a/src/components/image-editor/ImageCanvasCharacterGenerationComposerView.tsx b/src/components/image-editor/ImageCanvasCharacterGenerationComposerView.tsx
index 350a40773..bfad99f04 100644
--- a/src/components/image-editor/ImageCanvasCharacterGenerationComposerView.tsx
+++ b/src/components/image-editor/ImageCanvasCharacterGenerationComposerView.tsx
@@ -20,6 +20,7 @@ import type {
   SpecGenerationType,
   UploadTarget,
 } from './ImageCanvasEditorTypes';
+import { ImageCanvasGenerationAssetNameField } from './ImageCanvasGenerationAssetNameField';
 import { ImageCanvasGenerationImageOptionsView } from './ImageCanvasGenerationImageOptionsView';
 import { calculateEditorImageGenerationPrice } from './ImageCanvasGenerationModel';
 import { useImageCanvasFloatingOptionDismiss } from './useImageCanvasFloatingOptionDismiss';
@@ -275,6 +276,20 @@ export function ImageCanvasCharacterGenerationComposerView({
           }
         />
       </label>
+      <ImageCanvasGenerationAssetNameField
+        value={dialog.assetLabel}
+        disabled={dialog.status === 'generating'}
+        onChange={(assetLabel) =>
+          setGenerateDialog((currentDialog) =>
+            currentDialog?.mode === 'character'
+              ? {
+                  ...resetFailedDialogStatus(currentDialog),
+                  assetLabel,
+                }
+              : currentDialog,
+          )
+        }
+      />
       {dialog.status === 'failed' ? (
         <PlatformStatusMessage
           tone="error"
diff --git a/src/components/image-editor/ImageCanvasContextMenusView.test.tsx b/src/components/image-editor/ImageCanvasContextMenusView.test.tsx
index d56551386..824bb0301 100644
--- a/src/components/image-editor/ImageCanvasContextMenusView.test.tsx
+++ b/src/components/image-editor/ImageCanvasContextMenusView.test.tsx
@@ -265,4 +265,30 @@ describe('ImageCanvasContextMenusView', () => {
     expect(props.onCloseImageContextMenu).toHaveBeenCalledTimes(2);
     expect(props.onDeleteLayerById).toHaveBeenCalledWith(layer.id);
   });
+
+  it.each(['icon', 'icon-spritesheet'] as const)(
+    'hides quick edit from the standalone menu for %s assets',
+    (assetKind) => {
+      const layer = createLayer({ assetKind });
+      renderContextMenus({
+        imageContextMenu: { layerId: layer.id, x: 20, y: 22 },
+        imageContextMenuLayer: layer,
+      });
+
+      expect(screen.queryByRole('menuitem', { name: '快速编辑' })).toBeNull();
+      expect(
+        screen.getByRole('menuitem', { name: '查看图片信息' }),
+      ).toBeTruthy();
+    },
+  );
+
+  it('keeps quick edit in the standalone menu for icon specs', () => {
+    const layer = createLayer({ assetKind: 'icon-spec' });
+    renderContextMenus({
+      imageContextMenu: { layerId: layer.id, x: 20, y: 22 },
+      imageContextMenuLayer: layer,
+    });
+
+    expect(screen.getByRole('menuitem', { name: '快速编辑' })).toBeTruthy();
+  });
 });
diff --git a/src/components/image-editor/ImageCanvasContextMenusView.tsx b/src/components/image-editor/ImageCanvasContextMenusView.tsx
index 98d170d32..91c143bf6 100644
--- a/src/components/image-editor/ImageCanvasContextMenusView.tsx
+++ b/src/components/image-editor/ImageCanvasContextMenusView.tsx
@@ -18,6 +18,7 @@ import type {
   CanvasViewport,
   ImageContextMenuState,
 } from './ImageCanvasEditorTypes';
+import { isQuickEditUnsupportedAssetKind } from './ImageCanvasGenerationModel';
 
 type ImageCanvasContextMenusViewProps = {
   viewport: CanvasViewport;
@@ -477,17 +478,19 @@ export function ImageCanvasContextMenusView({
               <hr />
               {imageContextMenuLayer ? (
                 <>
-                  <button
-                    type="button"
-                    role="menuitem"
-                    onClick={() => {
-                      onOpenQuickEditPanel(imageContextMenuLayer);
-                      onCloseContextMenu();
-                      onCloseImageContextMenu();
-                    }}
-                  >
-                    快速编辑
-                  </button>
+                  {!isQuickEditUnsupportedAssetKind(imageContextMenuLayer) ? (
+                    <button
+                      type="button"
+                      role="menuitem"
+                      onClick={() => {
+                        onOpenQuickEditPanel(imageContextMenuLayer);
+                        onCloseContextMenu();
+                        onCloseImageContextMenu();
+                      }}
+                    >
+                      快速编辑
+                    </button>
+                  ) : null}
                   <button
                     type="button"
                     role="menuitem"
@@ -539,15 +542,17 @@ export function ImageCanvasContextMenusView({
           onPointerDown={(event) => event.stopPropagation()}
         >
           <PlatformFloatingMenu label="图片功能面板" placement="bottom-start">
-            <PlatformFloatingMenuItem
-              className="image-canvas-editor__context-menu-item"
-              onClick={() => {
-                onOpenQuickEditPanel(imageContextMenuLayer);
-                onCloseImageContextMenu();
-              }}
-            >
-              快速编辑
-            </PlatformFloatingMenuItem>
+            {!isQuickEditUnsupportedAssetKind(imageContextMenuLayer) ? (
+              <PlatformFloatingMenuItem
+                className="image-canvas-editor__context-menu-item"
+                onClick={() => {
+                  onOpenQuickEditPanel(imageContextMenuLayer);
+                  onCloseImageContextMenu();
+                }}
+              >
+                快速编辑
+              </PlatformFloatingMenuItem>
+            ) : null}
             <PlatformFloatingMenuItem
               className="image-canvas-editor__context-menu-item"
               onClick={() => {
diff --git a/src/components/image-editor/ImageCanvasEditorGenerationIntegration.test.tsx b/src/components/image-editor/ImageCanvasEditorGenerationIntegration.test.tsx
index b26be96aa..00f4a0229 100644
--- a/src/components/image-editor/ImageCanvasEditorGenerationIntegration.test.tsx
+++ b/src/components/image-editor/ImageCanvasEditorGenerationIntegration.test.tsx
@@ -262,6 +262,7 @@ describe('ImageCanvasEditorView generation integration', () => {
       phaseDetail: overrides.phaseDetail ?? '正在生成角色形象。',
       progress: overrides.progress ?? 40,
       error: overrides.error ?? null,
+      warning: overrides.warning ?? null,
       priceMudPoints: overrides.priceMudPoints ?? 3,
       refundLedgerId: overrides.refundLedgerId ?? null,
       notificationAcknowledgedAt: overrides.notificationAcknowledgedAt ?? null,
@@ -2446,7 +2447,7 @@ describe('ImageCanvasEditorView generation integration', () => {
     expect(screen.getByAltText('画布图片：拼图素材')).toBeTruthy();
   });
 
-  it('opens icon asset generation panel, only picks icon specs, and lays only the generated spritesheet on canvas', async () => {
+  it('opens icon asset generation panel, only picks icon specs, and lays out the generated spritesheet slices', async () => {
     loadOrCreateRecentEditorProjectMock.mockResolvedValueOnce({
       projectId: 'editor-project-icons',
       title: '图标素材画布',
@@ -2489,7 +2490,20 @@ describe('ImageCanvasEditorView generation integration', () => {
       spritesheetImageSrc: 'data:image/png;base64,sheet',
       spritesheetWidth: 512,
       spritesheetHeight: 512,
-      iconImageSrcs: [],
+      iconImageSrcs: [
+        {
+          name: '返回按钮',
+          imageSrc: 'data:image/png;base64,back',
+          width: 128,
+          height: 128,
+        },
+        {
+          name: '设置按钮',
+          imageSrc: 'data:image/png;base64,settings',
+          width: 128,
+          height: 128,
+        },
+      ],
       prompt: '图标 prompt',
       actualPrompt: '图标 prompt',
       model: 'gemini-3.1-flash-image-preview',
@@ -2566,7 +2580,7 @@ describe('ImageCanvasEditorView generation integration', () => {
     await waitFor(() => {
       expect(generateEditorIconSpritesheetMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          referenceImageSrc: 'data:image/png;base64,icon-spec',
+          referenceImageSrc: 'resource-icon-spec',
           iconDescriptions: ['返回按钮', '设置按钮'],
           model: 'gemini-3.1-flash-image-preview',
           aspectRatio: '1:1',
@@ -2588,8 +2602,8 @@ describe('ImageCanvasEditorView generation integration', () => {
     await waitFor(() => {
       expect(screen.getByAltText(/图层缩略图：图标素材图集/u)).toBeTruthy();
     });
-    expect(screen.queryByAltText('画布图片：返回按钮')).toBeNull();
-    expect(screen.queryByAltText('画布图片：设置按钮')).toBeNull();
+    expect(screen.getByAltText('画布图片：返回按钮')).toBeTruthy();
+    expect(screen.getByAltText('画布图片：设置按钮')).toBeTruthy();
     expect(screen.queryByLabelText('图标素材生成占位图')).toBeNull();
     expect(screen.getByText('图集')).toBeTruthy();
     fireEvent.click(
@@ -2882,6 +2896,7 @@ describe('ImageCanvasEditorView generation integration', () => {
       status: 'completed',
       progress: 100,
       phaseDetail: '生成已完成。',
+      warning: '连通域数量不足',
       completedAt: '2026-06-21T00:01:00.000Z',
       updatedAt: '2026-06-21T00:01:00.000Z',
       updatedAtMicros: 2,
@@ -2921,6 +2936,9 @@ describe('ImageCanvasEditorView generation integration', () => {
       expect(loadEditorProjectMock).toHaveBeenCalledWith(projectId);
     });
     expect(await screen.findByAltText('画布图片：刷新后生成结果')).toBeTruthy();
+    expect((await screen.findByRole('alert')).textContent).toBe(
+      '图集已生成，但自动拆分未完成：连通域数量不足',
+    );
     await waitFor(() => {
       expect(loadEditorAssetLibraryMock).toHaveBeenCalledTimes(2);
     });
diff --git a/src/components/image-editor/ImageCanvasEditorModel.test.ts b/src/components/image-editor/ImageCanvasEditorModel.test.ts
index e5af5a158..d5dce4279 100644
--- a/src/components/image-editor/ImageCanvasEditorModel.test.ts
+++ b/src/components/image-editor/ImageCanvasEditorModel.test.ts
@@ -169,7 +169,7 @@ describe('ImageCanvasEditorModel', () => {
     });
   });
 
-  it('creates a layer from an account asset at the requested screen point', () => {
+  it('creates a cascaded layer from an account asset near the requested screen point', () => {
     const asset: EditorAsset = {
       id: 'asset-1',
       label: '角色草图',
@@ -210,6 +210,31 @@ describe('ImageCanvasEditorModel', () => {
     expect(layer.y).toBe(12);
   });
 
+  it('centers a dropped asset exactly at the requested screen point', () => {
+    const asset: EditorAsset = {
+      id: 'asset-drop',
+      label: '投放素材',
+      src: 'data:image/png;base64,drop',
+      width: 640,
+      height: 480,
+      folderId: 'project',
+      sourceKind: 'uploaded',
+      sourceType: 'uploaded',
+      persisted: true,
+    };
+
+    const layer = createLayerFromAsset(
+      asset,
+      3,
+      { x: 20, y: 40, scale: 2 },
+      { x: 420, y: 340 },
+      { applyCascadeOffset: false },
+    );
+
+    expect(layer.x + layer.width / 2).toBe(200);
+    expect(layer.y + layer.height / 2).toBe(150);
+  });
+
   it('preserves source resource ids from the persisted asset library', () => {
     const library = normalizeAssetLibrary({
       folders: [
diff --git a/src/components/image-editor/ImageCanvasEditorModel.ts b/src/components/image-editor/ImageCanvasEditorModel.ts
index eb756a7b6..83b30e4c5 100644
--- a/src/components/image-editor/ImageCanvasEditorModel.ts
+++ b/src/components/image-editor/ImageCanvasEditorModel.ts
@@ -138,6 +138,7 @@ export function createLayerFromAsset(
   index: number,
   viewport: CanvasViewport,
   screenCenter: { x: number; y: number },
+  options: { applyCascadeOffset?: boolean } = {},
 ): CanvasLayer {
   const { width, height } = resolveLayerResolutionSize(
     asset.width,
@@ -151,7 +152,7 @@ export function createLayerFromAsset(
   };
   const worldCenterX = (safeScreenCenter.x - viewport.x) / safeScale;
   const worldCenterY = (safeScreenCenter.y - viewport.y) / safeScale;
-  const offset = index * 34;
+  const offset = options.applyCascadeOffset === false ? 0 : index * 34;
   const assetKind: CanvasAssetKind | undefined =
     asset.mediaType === 'video'
       ? 'video'
@@ -1145,6 +1146,7 @@ export function canvasAssetKindOrNull(value: unknown): CanvasAssetKind | null {
     value === 'icon' ||
     value === 'icon-spritesheet' ||
     value === 'icon-spec' ||
+    value === 'editor_green_screen_source' ||
     value === 'publication-material' ||
     value === 'ui-design' ||
     value === 'video' ||
diff --git a/src/components/image-editor/ImageCanvasEditorShellView.test.tsx b/src/components/image-editor/ImageCanvasEditorShellView.test.tsx
index 48feebceb..88c14ae62 100644
--- a/src/components/image-editor/ImageCanvasEditorShellView.test.tsx
+++ b/src/components/image-editor/ImageCanvasEditorShellView.test.tsx
@@ -194,6 +194,7 @@ function createStageProps(): ImageCanvasStageViewProps {
     onOpenRedrawPanel: vi.fn(),
     onOpenCropExpandPanel: vi.fn(),
     onRemoveBackground: vi.fn(),
+    onSplitIconSpritesheet: vi.fn(),
     onExtractUiDesignAssets: vi.fn(),
     onUiAssetExtractionToolChange: vi.fn(),
     onUiAssetExtractionModelChange: vi.fn(),
diff --git a/src/components/image-editor/ImageCanvasEditorTypes.ts b/src/components/image-editor/ImageCanvasEditorTypes.ts
index efc896315..683810a2e 100644
--- a/src/components/image-editor/ImageCanvasEditorTypes.ts
+++ b/src/components/image-editor/ImageCanvasEditorTypes.ts
@@ -20,6 +20,7 @@ export type CanvasAssetKind =
   | 'icon'
   | 'icon-spritesheet'
   | 'icon-spec'
+  | 'editor_green_screen_source'
   | 'publication-material'
   | 'ui-design'
   | 'video'
@@ -197,6 +198,7 @@ export type GenerateDialogState = {
     | 'audio-sound-effect'
     | 'audio-background-music';
   prompt: string;
+  assetLabel?: string;
   status: 'idle' | 'generating' | 'failed';
   composerOpen?: boolean;
   sourceLayerId?: string;
@@ -304,6 +306,7 @@ export type QuickEditPanelState = {
   mode?: 'quick-edit' | 'redraw';
   sourceLayerId: string;
   prompt: string;
+  assetLabel?: string;
   size: string;
   aspectRatio?: string;
   imageSize?: string;
@@ -347,6 +350,7 @@ export type CropExpandResizeHandle =
 export type CharacterAnimationPanelState = {
   sourceLayerId: string;
   promptText: string;
+  assetLabel?: string;
   resolution: EditorCharacterAnimationResolution;
   ratio: EditorCharacterAnimationRatio;
   frameCount: EditorCharacterAnimationFrameCount;
diff --git a/src/components/image-editor/ImageCanvasEditorView.test.tsx b/src/components/image-editor/ImageCanvasEditorView.test.tsx
index 43ddec8fc..b79a04a9b 100644
--- a/src/components/image-editor/ImageCanvasEditorView.test.tsx
+++ b/src/components/image-editor/ImageCanvasEditorView.test.tsx
@@ -1758,6 +1758,23 @@ describe('ImageCanvasEditorView', () => {
     expect(screen.queryByLabelText('发送给画布 Agent')).toBeNull();
   });
 
+  it('closes the Agent conversation before opening quick edit', async () => {
+    enableEditorAgentSidebarForTest();
+    render(<ImageCanvasEditorView />);
+
+    expect(await screen.findByLabelText('发送给画布 Agent')).toBeTruthy();
+    const sourceLayer = (
+      await screen.findByAltText('画布图片：拼图素材')
+    ).closest('button')!;
+    fireEvent.click(sourceLayer);
+    fireEvent.click(screen.getByRole('button', { name: '快速编辑' }));
+
+    expect(
+      await screen.findByRole('dialog', { name: '快速编辑图片' }),
+    ).toBeTruthy();
+    expect(screen.queryByLabelText('发送给画布 Agent')).toBeNull();
+  });
+
   it('closes the Agent conversation panel when runtime config disables it after focus', async () => {
     loadFrontendRuntimeConfigMock
       .mockResolvedValueOnce({
diff --git a/src/components/image-editor/ImageCanvasEditorView.tsx b/src/components/image-editor/ImageCanvasEditorView.tsx
index 078b2f381..5c685e6ab 100644
--- a/src/components/image-editor/ImageCanvasEditorView.tsx
+++ b/src/components/image-editor/ImageCanvasEditorView.tsx
@@ -9,7 +9,6 @@ import {
   useState,
 } from 'react';
 
-import type { EditorAgentGenerationResultEvent } from '../../../packages/shared/src/contracts/editorAgent';
 import type { ExternalGenerationTaskRecord } from '../../../packages/shared/src/contracts/externalGeneration';
 import { loadFrontendRuntimeConfig } from '../../services/frontendRuntimeConfigService';
 import {
@@ -1098,18 +1097,6 @@ export function ImageCanvasEditorView({
     },
     [applyProjectSnapshot, refreshAssetLibrary],
   );
-  const handleExternalGenerationTasksCompleted = useCallback(
-    (tasks: ExternalGenerationTaskRecord[]) => {
-      if (!projectId || tasks.length === 0) {
-        return;
-      }
-      refreshEditorWalletBalance();
-      void loadEditorProject(projectId)
-        .then(applyGeneratedProjectSnapshot)
-        .catch(() => undefined);
-    },
-    [applyGeneratedProjectSnapshot, projectId, refreshEditorWalletBalance],
-  );
   const handleEditorAgentCanvasRefreshRequested = useCallback(() => {
     if (!projectId) {
       return;
@@ -1256,6 +1243,30 @@ export function ImageCanvasEditorView({
     generationSurface.refreshTaskList();
     handleEditorAgentCanvasRefreshRequested();
   }, [generationSurface, handleEditorAgentCanvasRefreshRequested]);
+  const showGenerationWarning = generationSurface.showGenerationWarning;
+  const handleExternalGenerationTasksCompleted = useCallback(
+    (tasks: ExternalGenerationTaskRecord[]) => {
+      if (!projectId || tasks.length === 0) {
+        return;
+      }
+      const warning = tasks.find((task) => task.warning?.trim())?.warning?.trim();
+      if (warning) {
+        showGenerationWarning(
+          `图集已生成，但自动拆分未完成：${warning}`,
+        );
+      }
+      refreshEditorWalletBalance();
+      void loadEditorProject(projectId)
+        .then(applyGeneratedProjectSnapshot)
+        .catch(() => undefined);
+    },
+    [
+      applyGeneratedProjectSnapshot,
+      projectId,
+      refreshEditorWalletBalance,
+      showGenerationWarning,
+    ],
+  );
   const effectiveIsAgentConversationOpen =
     isAgentConversationEnabled && isAgentConversationOpen;
   const toggleAgentConversation = useCallback(() => {
@@ -1277,6 +1288,16 @@ export function ImageCanvasEditorView({
     }
     generationSurface.toggleTaskSidebar();
   }, [effectiveIsAgentConversationOpen, generationSurface]);
+  const openQuickEditPanelWithAvailableCanvas = useCallback(
+    (layer: CanvasLayer) => {
+      if (generationSurface.isTaskSidebarOpen) {
+        generationSurface.toggleTaskSidebar();
+      }
+      setIsAgentConversationOpen(false);
+      generationSurface.openQuickEditPanel(layer);
+    },
+    [generationSurface],
+  );
   const toggleCanvasSidebarPanel = useCallback(
     (panel: SidebarPanel) => {
       toggleSidebarPanel(panel);
@@ -1328,9 +1349,9 @@ export function ImageCanvasEditorView({
     setIsPickingUiDesignSpecFromCanvas,
     openCharacterAnimationPanel,
     openRedrawPanel,
-    openQuickEditPanel,
     openCropExpandPanel,
     removeSelectedLayerBackground,
+    splitSelectedIconSpritesheet,
     extractUiDesignAssets,
     pickCharacterSpecFromLayer,
     pickGenerationReferenceFromLayer,
@@ -2138,10 +2159,11 @@ export function ImageCanvasEditorView({
     onToggleTaskSidebar: toggleTaskSidebar,
     onToggleAgentConversation: toggleAgentConversation,
     onCropExpandHandlePointerDown: generationSurface.startCropExpandFrameResize,
-    onOpenQuickEditPanel: openQuickEditPanel,
+    onOpenQuickEditPanel: openQuickEditPanelWithAvailableCanvas,
     onOpenRedrawPanel: openRedrawPanel,
     onOpenCropExpandPanel: openCropExpandPanel,
     onRemoveBackground: removeSelectedLayerBackground,
+    onSplitIconSpritesheet: splitSelectedIconSpritesheet,
     onExtractUiDesignAssets: extractUiDesignAssets,
     onUiAssetExtractionToolChange: changeUiAssetExtractionTool,
     onUiAssetExtractionModelChange: changeUiAssetExtractionModel,
diff --git a/src/components/image-editor/ImageCanvasGenerationAssetNameField.test.tsx b/src/components/image-editor/ImageCanvasGenerationAssetNameField.test.tsx
new file mode 100644
index 000000000..cc64caeca
--- /dev/null
+++ b/src/components/image-editor/ImageCanvasGenerationAssetNameField.test.tsx
@@ -0,0 +1,63 @@
+// @vitest-environment jsdom
+
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
+import {
+  IMAGE_CANVAS_GENERATION_ASSET_NAME_MAX_LENGTH,
+  ImageCanvasGenerationAssetNameField,
+} from './ImageCanvasGenerationAssetNameField';
+
+describe('ImageCanvasGenerationAssetNameField', () => {
+  it('renders as a controlled optional name input', () => {
+    const onChange = vi.fn();
+    const { rerender } = render(
+      <ImageCanvasGenerationAssetNameField
+        value="角色立绘"
+        onChange={onChange}
+      />,
+    );
+
+    const input = screen.getByRole('textbox', {
+      name: '资源名称',
+    }) as HTMLInputElement;
+    expect(input.value).toBe('角色立绘');
+    expect(input.getAttribute('maxlength')).toBe(
+      String(IMAGE_CANVAS_GENERATION_ASSET_NAME_MAX_LENGTH),
+    );
+
+    fireEvent.change(input, { target: { value: '新名称' } });
+    expect(onChange).toHaveBeenCalledWith('新名称');
+    expect(input.value).toBe('角色立绘');
+
+    rerender(
+      <ImageCanvasGenerationAssetNameField
+        value="新名称"
+        onChange={onChange}
+      />,
+    );
+    expect(input.value).toBe('新名称');
+  });
+
+  it('limits callback values to 80 characters and supports disabled state', () => {
+    const onChange = vi.fn();
+    render(
+      <ImageCanvasGenerationAssetNameField
+        value=""
+        disabled
+        onChange={onChange}
+      />,
+    );
+
+    const input = screen.getByRole('textbox', {
+      name: '资源名称',
+    }) as HTMLInputElement;
+    expect(input.disabled).toBe(true);
+
+    fireEvent.change(input, { target: { value: '名'.repeat(90) } });
+    expect(onChange).toHaveBeenCalledWith('名'.repeat(80));
+
+    fireEvent.change(input, { target: { value: '🎨'.repeat(90) } });
+    expect(onChange).toHaveBeenLastCalledWith('🎨'.repeat(80));
+  });
+});
diff --git a/src/components/image-editor/ImageCanvasGenerationAssetNameField.tsx b/src/components/image-editor/ImageCanvasGenerationAssetNameField.tsx
new file mode 100644
index 000000000..dedaaf43a
--- /dev/null
+++ b/src/components/image-editor/ImageCanvasGenerationAssetNameField.tsx
@@ -0,0 +1,46 @@
+import { PlatformFieldLabel } from '../common/PlatformFieldLabel';
+import { PlatformTextField } from '../common/PlatformTextField';
+import { EDITOR_GENERATED_ASSET_LABEL_MAX_CHARS } from './ImageCanvasGenerationSubmissionModel';
+
+export const IMAGE_CANVAS_GENERATION_ASSET_NAME_MAX_LENGTH =
+  EDITOR_GENERATED_ASSET_LABEL_MAX_CHARS;
+
+type ImageCanvasGenerationAssetNameFieldProps = {
+  value?: string | null;
+  disabled?: boolean;
+  onChange: (value: string) => void;
+};
+
+export function ImageCanvasGenerationAssetNameField({
+  value,
+  disabled = false,
+  onChange,
+}: ImageCanvasGenerationAssetNameFieldProps) {
+  return (
+    <label className="image-canvas-editor__generation-asset-name-field">
+      <PlatformFieldLabel
+        variant="form"
+        className="image-canvas-editor__field-title"
+      >
+        资源名称
+      </PlatformFieldLabel>
+      <PlatformTextField
+        aria-label="资源名称"
+        value={value ?? ''}
+        maxLength={IMAGE_CANVAS_GENERATION_ASSET_NAME_MAX_LENGTH}
+        disabled={disabled}
+        placeholder="例如：勇者立绘"
+        size="sm"
+        density="compact"
+        className="image-canvas-editor__generation-asset-name-input"
+        onChange={(event) =>
+          onChange(
+            Array.from(event.target.value)
+              .slice(0, IMAGE_CANVAS_GENERATION_ASSET_NAME_MAX_LENGTH)
+              .join(''),
+          )
+        }
+      />
+    </label>
+  );
+}
diff --git a/src/components/image-editor/ImageCanvasGenerationComposerView.test.tsx b/src/components/image-editor/ImageCanvasGenerationComposerView.test.tsx
index 6778ff9be..6a17e51c5 100644
--- a/src/components/image-editor/ImageCanvasGenerationComposerView.test.tsx
+++ b/src/components/image-editor/ImageCanvasGenerationComposerView.test.tsx
@@ -117,7 +117,7 @@ function renderComposer(
 }
 
 describe('ImageCanvasGenerationComposerView', () => {
-  it('让快速编辑只保留提示词和模型选择', () => {
+  it('让快速编辑显示提示词、尺寸和模型选择', () => {
     renderComposer({
       mode: 'quick-edit',
       prompt: '',
@@ -146,10 +146,10 @@ describe('ImageCanvasGenerationComposerView', () => {
       within(panel).queryByRole('button', { name: '添加参考图' }),
     ).toBeNull();
     expect(
-      within(panel).queryByRole('button', {
-        name: /快速编辑图片尺寸/u,
+      within(panel).getByRole('button', {
+        name: '快速编辑图片尺寸 1:1·1K',
       }),
-    ).toBeNull();
+    ).toBeTruthy();
     expect(
       within(panel).getByRole('button', {
         name: '快速编辑图片模型 gpt-image-2',
diff --git a/src/components/image-editor/ImageCanvasGenerationComposerView.tsx b/src/components/image-editor/ImageCanvasGenerationComposerView.tsx
index 3049a31e5..1c8652c3c 100644
--- a/src/components/image-editor/ImageCanvasGenerationComposerView.tsx
+++ b/src/components/image-editor/ImageCanvasGenerationComposerView.tsx
@@ -53,6 +53,7 @@ import {
   resizeGenerationPlaceholderToVideoSelection,
   SPEC_TYPE_LABEL,
 } from './ImageCanvasGenerationModel';
+import { ImageCanvasGenerationAssetNameField } from './ImageCanvasGenerationAssetNameField';
 import { ImageCanvasIconSpritesheetComposerView } from './ImageCanvasIconSpritesheetComposerView';
 import { ImageCanvasPublicationMaterialsDemoPanelView } from './ImageCanvasPublicationMaterialsDemoPanelView';
 import { getPublicationMaterialsWorkflow } from './ImageCanvasPublicationMaterialsModel';
@@ -401,6 +402,11 @@ function ImageCanvasVideoGenerationComposerView({
             updateVideoDialog({ prompt: event.target.value })
           }
         />
+        <ImageCanvasGenerationAssetNameField
+          value={dialog.assetLabel}
+          disabled={isGenerating}
+          onChange={(assetLabel) => updateVideoDialog({ assetLabel })}
+        />
         <div className="image-canvas-editor__generation-composer-footer">
           <div className="image-canvas-editor__option-popover-anchor image-canvas-editor__option-popover-anchor--dimensions">
             <PlatformInlineOptionButton
@@ -787,6 +793,11 @@ function ImageCanvasAudioGenerationComposerView({
         className="image-canvas-editor__generation-prompt"
         onChange={(event) => updateAudioDialog({ prompt: event.target.value })}
       />
+      <ImageCanvasGenerationAssetNameField
+        value={dialog.assetLabel}
+        disabled={isGenerating}
+        onChange={(assetLabel) => updateAudioDialog({ assetLabel })}
+      />
       {dialog.status === 'failed' ? (
         <PlatformStatusMessage
           tone="error"
diff --git a/src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts b/src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts
index 11dfff51d..b2300817f 100644
--- a/src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts
+++ b/src/components/image-editor/ImageCanvasGenerationDialogModel.test.ts
@@ -22,6 +22,7 @@ import {
   createIconGenerationDialogDraft,
   createLayerGenerationDialogDraft,
   createPublicationGenerationDialogDraft,
+  createQuickEditGenerationDialogDraft,
   createQuickEditPanelDraft,
   createRedrawPanelDraft,
   createSameSourceGenerationDialogDraft,
@@ -38,6 +39,7 @@ import {
 } from './ImageCanvasGenerationDialogModel';
 import {
   IMAGE_MODEL_GPT_IMAGE_2,
+  IMAGE_MODEL_NANOBANANA2,
 } from './ImageCanvasGenerationModel';
 
 function createLayer(overrides: Partial<CanvasLayer> = {}): CanvasLayer {
@@ -195,28 +197,29 @@ describe('ImageCanvasGenerationDialogModel', () => {
     const canvasSize = { width: 960, height: 720 };
     const viewport = { x: 0, y: 0, scale: 1 };
 
-    expect(createVideoGenerationDialogDraft({ canvasSize, viewport }))
-      .toMatchObject({
-        mode: 'video',
-        status: 'idle',
-        composerOpen: true,
-        generationReferences: [],
-        videoModel: 'seedance2.0-fast',
-        videoAspectRatio: '16:9',
-        videoResolution: '480p',
-        videoDurationSeconds: 4,
-        videoMode: 'std',
-        videoSound: 'on',
-        videoWebSearchEnabled: true,
-        placeholder: {
-          x: 53,
-          y: 120,
-          width: 854,
-          height: 480,
-          originalWidth: 854,
-          originalHeight: 480,
-        },
-      });
+    expect(
+      createVideoGenerationDialogDraft({ canvasSize, viewport }),
+    ).toMatchObject({
+      mode: 'video',
+      status: 'idle',
+      composerOpen: true,
+      generationReferences: [],
+      videoModel: 'seedance2.0-fast',
+      videoAspectRatio: '16:9',
+      videoResolution: '480p',
+      videoDurationSeconds: 4,
+      videoMode: 'std',
+      videoSound: 'on',
+      videoWebSearchEnabled: true,
+      placeholder: {
+        x: 53,
+        y: 120,
+        width: 854,
+        height: 480,
+        originalWidth: 854,
+        originalHeight: 480,
+      },
+    });
     expect(
       createUiDesignGenerationDialogDraft({
         canvasSize,
@@ -242,37 +245,39 @@ describe('ImageCanvasGenerationDialogModel', () => {
     const canvasSize = { width: 960, height: 720 };
     const viewport = { x: 0, y: 0, scale: 1 };
 
-    expect(createSoundEffectGenerationDialogDraft({ canvasSize, viewport }))
-      .toMatchObject({
-        mode: 'audio-sound-effect',
-        prompt: '',
-        status: 'idle',
-        composerOpen: true,
-        soundModel: 'audio1.0',
-        soundDurationSeconds: 5,
-        placeholder: {
-          x: 270,
-          y: 300,
-          width: 420,
-          height: 120,
-          originalWidth: 420,
-          originalHeight: 120,
-        },
-      });
-    expect(createBackgroundMusicGenerationDialogDraft({ canvasSize, viewport }))
-      .toMatchObject({
-        mode: 'audio-background-music',
-        prompt: '',
-        status: 'idle',
-        composerOpen: true,
-        makeInstrumental: true,
-        placeholder: {
-          x: 270,
-          y: 300,
-          width: 420,
-          height: 120,
-        },
-      });
+    expect(
+      createSoundEffectGenerationDialogDraft({ canvasSize, viewport }),
+    ).toMatchObject({
+      mode: 'audio-sound-effect',
+      prompt: '',
+      status: 'idle',
+      composerOpen: true,
+      soundModel: 'audio1.0',
+      soundDurationSeconds: 5,
+      placeholder: {
+        x: 270,
+        y: 300,
+        width: 420,
+        height: 120,
+        originalWidth: 420,
+        originalHeight: 120,
+      },
+    });
+    expect(
+      createBackgroundMusicGenerationDialogDraft({ canvasSize, viewport }),
+    ).toMatchObject({
+      mode: 'audio-background-music',
+      prompt: '',
+      status: 'idle',
+      composerOpen: true,
+      makeInstrumental: true,
+      placeholder: {
+        x: 270,
+        y: 300,
+        width: 420,
+        height: 120,
+      },
+    });
   });
 
   it('creates audio remodel drafts from generated audio layers without references', () => {
@@ -411,6 +416,20 @@ describe('ImageCanvasGenerationDialogModel', () => {
     expect(createCharacterAnimationPanelDraft(createLayer())).toBeNull();
   });
 
+  it('preserves the resolved asset label in quick-edit dialog snapshots', () => {
+    expect(
+      createQuickEditGenerationDialogDraft({
+        sourceLayer: createLayer(),
+        prompt: '让视频下雨',
+        assetLabel: '雨天版本',
+      }),
+    ).toMatchObject({
+      mode: 'quick-edit',
+      prompt: '让视频下雨',
+      assetLabel: '雨天版本',
+    });
+  });
+
   it('restores remodel prompts from user-visible generation input snapshots only', () => {
     const cases: Array<{
       fields: NonNullable<CanvasLayer['generationInputs']>['fields'];
@@ -496,17 +515,17 @@ describe('ImageCanvasGenerationDialogModel', () => {
     const canvasSize = { width: 960, height: 720 };
     const viewport = { x: 0, y: 0, scale: 1 };
     const characterDraft = createSameSourceGenerationDialogDraft({
-        sourceLayer: createLayer({
-          assetKind: 'character',
-          generationInputs: {
-            fields: [
-              { title: '角色设定', value: '红发骑士' },
-              { title: '抠图背景色', value: '暖浅桃色 #FFD6C2' },
-              { title: '抠图模型', value: '动漫风格 anime-seg' },
-            ],
-            references: [],
-          },
-        }),
+      sourceLayer: createLayer({
+        assetKind: 'character',
+        generationInputs: {
+          fields: [
+            { title: '角色设定', value: '红发骑士' },
+            { title: '抠图背景色', value: '暖浅桃色 #FFD6C2' },
+            { title: '抠图模型', value: '动漫风格 anime-seg' },
+          ],
+          references: [],
+        },
+      }),
       canvasSize,
       viewport,
       mode: 'redraw',
@@ -653,21 +672,38 @@ describe('ImageCanvasGenerationDialogModel', () => {
     });
   });
 
-  it('locks quick edit drafts to gpt-image-2 despite legacy source models', () => {
+  it('inherits and normalizes quick edit model parameters from the source', () => {
     expect(
       createQuickEditPanelDraft(
         createLayer({
           model: 'nano-banana',
         }),
-      ).model,
-    ).toBe(IMAGE_MODEL_GPT_IMAGE_2);
+      ),
+    ).toMatchObject({
+      model: IMAGE_MODEL_NANOBANANA2,
+      aspectRatio: '4:3',
+      imageSize: '1K',
+    });
+    expect(
+      createQuickEditPanelDraft(createLayer({ model: 'nanobanana2' }), {
+        imageModel: IMAGE_MODEL_GPT_IMAGE_2,
+        aspectRatio: '16:9',
+        imageSize: '2K',
+      }),
+    ).toMatchObject({
+      model: IMAGE_MODEL_GPT_IMAGE_2,
+      aspectRatio: '16:9',
+      imageSize: '2K',
+    });
     expect(
       createQuickEditPanelDraft(
-        createLayer({
-          model: 'nanobanana2',
-        }),
-      ).model,
-    ).toBe(IMAGE_MODEL_GPT_IMAGE_2);
+        createLayer({ originalWidth: 512, originalHeight: 512 }),
+        { imageModel: IMAGE_MODEL_GPT_IMAGE_2, imageSize: '0.5K' },
+      ).imageSize,
+    ).toBe('1K');
+    expect(
+      createQuickEditPanelDraft(createLayer({ model: 'legacy-image-model' })),
+    ).toMatchObject({ model: IMAGE_MODEL_NANOBANANA2 });
   });
 
   it('creates character animation generation dialog drafts for character layers', () => {
@@ -805,7 +841,8 @@ describe('ImageCanvasGenerationDialogModel', () => {
       title: '动作参考',
       src: 'https://signed.example.com/reference.mp4',
       mediaType: 'video',
-      objectKey: 'generated-character-drafts/editor/seedance-references/video/reference.mp4',
+      objectKey:
+        'generated-character-drafts/editor/seedance-references/video/reference.mp4',
       assetObjectId: 'asset-object-video',
     });
     expect(
@@ -864,7 +901,9 @@ describe('ImageCanvasGenerationDialogModel', () => {
       status: 'idle',
       generationReferences: [],
     };
-    expect(appendGenerationReference(imageDialog, videoLayer)).toBe(imageDialog);
+    expect(appendGenerationReference(imageDialog, videoLayer)).toBe(
+      imageDialog,
+    );
     const specDialog: GenerateDialogState = {
       mode: 'spec',
       prompt: '',
@@ -978,7 +1017,9 @@ describe('ImageCanvasGenerationDialogModel', () => {
       errorMessage: '描述错误',
       iconDescriptions: ['旧描述'],
     };
-    expect(updateIconDescriptionsTextInDialog(iconDialog, '剑\n盾、药水')).toEqual(
+    expect(
+      updateIconDescriptionsTextInDialog(iconDialog, '剑\n盾、药水'),
+    ).toEqual(
       expect.objectContaining({
         status: 'idle',
         errorMessage: undefined,
diff --git a/src/components/image-editor/ImageCanvasGenerationDialogModel.ts b/src/components/image-editor/ImageCanvasGenerationDialogModel.ts
index d18898685..d238044fe 100644
--- a/src/components/image-editor/ImageCanvasGenerationDialogModel.ts
+++ b/src/components/image-editor/ImageCanvasGenerationDialogModel.ts
@@ -29,6 +29,7 @@ import {
   DEFAULT_VIDEO_SOUND,
   DEFAULT_VIDEO_WEB_SEARCH_ENABLED,
   EDITOR_IMAGE_DIMENSION_OPTIONS,
+  EDITOR_IMAGE_MODEL_OPTIONS,
   ICON_DESCRIPTION_LIMIT,
   ICON_FRAME_DISPLAY_SIZE,
   ICON_FRAME_ORIGINAL_SIZE,
@@ -690,7 +691,8 @@ export function createLayerGenerationDialogDraft({
   return {
     ...draft,
     prompt: draft.prompt || sourceLayer.prompt?.trim() || '',
-    imageModel: sourceDialog?.imageModel ?? sourceLayer.model ?? draft.imageModel,
+    imageModel:
+      sourceDialog?.imageModel ?? sourceLayer.model ?? draft.imageModel,
     status: 'idle',
     composerOpen: true,
     generatedLayerId: sourceLayer.id,
@@ -1176,19 +1178,41 @@ export function createQuickEditPanelDraft(
     imageSize?: string;
   } = {},
 ): QuickEditPanelState {
-  const aspectRatio =
-    options.aspectRatio ??
-    inferEditorImageAspectRatio(
-      sourceLayer.originalWidth,
-      sourceLayer.originalHeight,
-    );
-  const imageSize =
-    options.imageSize ??
-    inferEditorImageSizeLabel(
-      sourceLayer.originalWidth,
-      sourceLayer.originalHeight,
-    );
-  const model = IMAGE_MODEL_GPT_IMAGE_2;
+  const normalizedModel = normalizeEditorImageModel(
+    options.imageModel ?? sourceLayer.model,
+  );
+  const model = EDITOR_IMAGE_MODEL_OPTIONS.some(
+    (option) => option.value === normalizedModel,
+  )
+    ? normalizedModel
+    : DEFAULT_IMAGE_MODEL;
+  const dimensionOptions =
+    EDITOR_IMAGE_DIMENSION_OPTIONS[
+      model as keyof typeof EDITOR_IMAGE_DIMENSION_OPTIONS
+    ] ?? EDITOR_IMAGE_DIMENSION_OPTIONS[DEFAULT_IMAGE_MODEL];
+  const supportedAspectRatios =
+    dimensionOptions.aspectRatios as readonly string[];
+  const supportedImageSizes = dimensionOptions.imageSizes as readonly string[];
+  const inferredAspectRatio = inferEditorImageAspectRatio(
+    sourceLayer.originalWidth,
+    sourceLayer.originalHeight,
+  );
+  const inferredImageSize = inferEditorImageSizeLabel(
+    sourceLayer.originalWidth,
+    sourceLayer.originalHeight,
+  );
+  const aspectRatio = supportedAspectRatios.includes(options.aspectRatio ?? '')
+    ? options.aspectRatio
+    : supportedAspectRatios.includes(inferredAspectRatio)
+      ? inferredAspectRatio
+      : (dimensionOptions.aspectRatios[0] ?? '1:1');
+  const imageSize = supportedImageSizes.includes(options.imageSize ?? '')
+    ? options.imageSize
+    : supportedImageSizes.includes(inferredImageSize)
+      ? inferredImageSize
+      : (dimensionOptions.imageSizes.find((size) => size === '1K') ??
+        dimensionOptions.imageSizes[0] ??
+        '1K');
   return {
     mode: 'quick-edit',
     sourceLayerId: sourceLayer.id,
@@ -1208,6 +1232,7 @@ export function createQuickEditPanelDraft(
 export function createQuickEditGenerationDialogDraft({
   sourceLayer,
   prompt,
+  assetLabel,
   status = 'idle',
   references = [],
   aspectRatio,
@@ -1216,6 +1241,7 @@ export function createQuickEditGenerationDialogDraft({
 }: {
   sourceLayer: CanvasLayer;
   prompt: string;
+  assetLabel?: string;
   status?: CanvasGenerationDialogState['status'];
   references?: NonNullable<QuickEditPanelState['quickEditReferences']>;
   model?: string;
@@ -1228,6 +1254,7 @@ export function createQuickEditGenerationDialogDraft({
   return {
     mode: 'quick-edit',
     prompt,
+    assetLabel,
     status,
     composerOpen: false,
     sourceLayerId: sourceLayer.id,
diff --git a/src/components/image-editor/ImageCanvasGenerationLayerModel.test.ts b/src/components/image-editor/ImageCanvasGenerationLayerModel.test.ts
index 88f006286..248cbd2c9 100644
--- a/src/components/image-editor/ImageCanvasGenerationLayerModel.test.ts
+++ b/src/components/image-editor/ImageCanvasGenerationLayerModel.test.ts
@@ -313,14 +313,22 @@ describe('ImageCanvasGenerationLayerModel', () => {
       id: 'layer-source',
       title: '源图',
       src: 'data:image/png;base64,edited',
-      width: 320,
-      height: 240,
-      originalWidth: 1537,
-      originalHeight: 1025,
+      x: -488,
+      y: -252,
+      width: 1536,
+      height: 1024,
+      originalWidth: 1536,
+      originalHeight: 1024,
       resourceId: 'resource-edited',
       sourceResourceId: 'resource-source',
       objectKey: 'generated/edited.png',
     });
+    expect(layer.x + layer.width / 2).toBe(
+      sourceLayer.x + sourceLayer.width / 2,
+    );
+    expect(layer.y + layer.height / 2).toBe(
+      sourceLayer.y + sourceLayer.height / 2,
+    );
   });
 
   it('creates wrapped icon layers with icon metadata', () => {
diff --git a/src/components/image-editor/ImageCanvasGenerationLayerModel.ts b/src/components/image-editor/ImageCanvasGenerationLayerModel.ts
index b88025f29..612678189 100644
--- a/src/components/image-editor/ImageCanvasGenerationLayerModel.ts
+++ b/src/components/image-editor/ImageCanvasGenerationLayerModel.ts
@@ -39,6 +39,7 @@ type QuickEditResultLayerOptions = {
   generationInputs: CanvasGenerationInputs;
   mode?: 'quick-edit' | 'redraw';
   frame?: GenerateDialogState['placeholder'];
+  title?: string;
 };
 
 type IconSpritesheetResultLayerOptions = {
@@ -190,9 +191,13 @@ export function createQuickEditResultLayer({
   generationInputs,
   mode = 'quick-edit',
   frame,
+  title,
 }: QuickEditResultLayerOptions): CanvasLayer {
   const originalWidth =
-    frame?.originalWidth || generated.width || sourceLayer.originalWidth || 1024;
+    frame?.originalWidth ||
+    generated.width ||
+    sourceLayer.originalWidth ||
+    1024;
   const originalHeight =
     frame?.originalHeight ||
     generated.height ||
@@ -219,7 +224,9 @@ export function createQuickEditResultLayer({
     {
       id: `layer-quick-edit-${generatedIndex}`,
       resourceId: `local-resource-quick-edit-${generatedIndex}`,
-      title: `${sourceLayer.title} ${mode === 'redraw' ? '重绘' : '快速编辑'}`,
+      title:
+        title ??
+        `${sourceLayer.title} ${mode === 'redraw' ? '重绘' : '快速编辑'}`,
       src: generated.imageSrc,
       x: frameX ?? sourceLayer.x + sourceLayer.width + 32,
       y: frameY ?? sourceLayer.y,
@@ -247,14 +254,29 @@ export function applyImageEditResultToSourceLayer({
   sourceLayer: CanvasLayer;
   generationInputs: CanvasGenerationInputs;
 }): CanvasLayer {
-  const originalWidth = sourceLayer.originalWidth || sourceLayer.width;
-  const originalHeight = sourceLayer.originalHeight || sourceLayer.height;
-  const width = sourceLayer.width;
-  const height = sourceLayer.height;
+  const originalWidth =
+    generated.resource?.width ||
+    generated.width ||
+    sourceLayer.originalWidth ||
+    1;
+  const originalHeight =
+    generated.resource?.height ||
+    generated.height ||
+    sourceLayer.originalHeight ||
+    1;
+  const { width, height } = resolveLayerResolutionSize(
+    originalWidth,
+    originalHeight,
+    sourceLayer,
+  );
+  const centerX = sourceLayer.x + sourceLayer.width / 2;
+  const centerY = sourceLayer.y + sourceLayer.height / 2;
   return applyGeneratedMetadata(
     {
       ...sourceLayer,
       src: generated.imageSrc,
+      x: centerX - width / 2,
+      y: centerY - height / 2,
       width,
       height,
       originalWidth,
@@ -280,10 +302,8 @@ export function createIconSpritesheetResultLayers({
   const spritesheetResource = generated.spritesheetResource;
   const spritesheetAsset = generated.spritesheetAsset;
   const worldCenter = getViewportWorldCenter({ canvasSize, viewport });
-  const startX =
-    frame?.x ?? worldCenter.x - ICON_FRAME_DISPLAY_SIZE.width / 2;
-  const startY =
-    frame?.y ?? worldCenter.y - ICON_FRAME_DISPLAY_SIZE.height / 2;
+  const startX = frame?.x ?? worldCenter.x - ICON_FRAME_DISPLAY_SIZE.width / 2;
+  const startY = frame?.y ?? worldCenter.y - ICON_FRAME_DISPLAY_SIZE.height / 2;
   const spacing = 24;
   const maxRowWidth = 560;
   const spritesheetOriginalWidth =
@@ -319,8 +339,7 @@ export function createIconSpritesheetResultLayers({
     sourceAssetId: spritesheetAsset?.assetId,
     objectKey: spritesheetResource?.objectKey ?? undefined,
     assetObjectId: spritesheetResource?.assetObjectId ?? undefined,
-    generationInputs:
-      spritesheetResource?.generationInputs ?? generationInputs,
+    generationInputs: spritesheetResource?.generationInputs ?? generationInputs,
     generatedAssetSnapshot: spritesheetAsset,
   };
   const iconStartX = startX + spritesheetDisplaySize.width + 32;
@@ -348,7 +367,8 @@ export function createIconSpritesheetResultLayers({
     const generatedIndex = startIndex + index + 1;
     const layer: CanvasLayer = {
       id: `layer-icon-${generatedIndex}`,
-      resourceId: resource?.resourceId ?? `local-resource-icon-${generatedIndex}`,
+      resourceId:
+        resource?.resourceId ?? `local-resource-icon-${generatedIndex}`,
       title: icon.name,
       src: icon.imageSrc,
       x: cursorX,
@@ -412,11 +432,14 @@ export function createVideoResultLayer({
 
   return {
     id: `layer-video-${generatedIndex}`,
-    resourceId: resource?.resourceId ?? `local-resource-video-${generatedIndex}`,
+    resourceId:
+      resource?.resourceId ?? `local-resource-video-${generatedIndex}`,
     title,
     src: generated.videoSrc,
     mediaType: 'video',
-    assetKind: (resource?.assetKind as CanvasLayer['assetKind'] | undefined) ?? assetKind,
+    assetKind:
+      (resource?.assetKind as CanvasLayer['assetKind'] | undefined) ??
+      assetKind,
     x: frameX ?? worldCenter.x - width / 2,
     y: frameY ?? worldCenter.y - height / 2,
     width,
@@ -432,7 +455,8 @@ export function createVideoResultLayer({
     taskId: generated.taskId,
     objectKey: resource?.objectKey ?? generated.objectKey,
     assetObjectId: resource?.assetObjectId ?? generated.assetObjectId,
-    thumbnailSrc: generated.thumbnailSrc ?? generated.asset?.thumbnailSrc ?? undefined,
+    thumbnailSrc:
+      generated.thumbnailSrc ?? generated.asset?.thumbnailSrc ?? undefined,
     sourceResourceId: sourceLayer?.resourceId,
     sourceAssetId: asset?.assetId,
     groupId: sourceLayer?.groupId,
diff --git a/src/components/image-editor/ImageCanvasGenerationModel.test.ts b/src/components/image-editor/ImageCanvasGenerationModel.test.ts
index b33f507fd..492b04497 100644
--- a/src/components/image-editor/ImageCanvasGenerationModel.test.ts
+++ b/src/components/image-editor/ImageCanvasGenerationModel.test.ts
@@ -250,9 +250,7 @@ describe('ImageCanvasGenerationModel', () => {
         ],
       ),
     ).toEqual({
-      fields: [
-        { title: '角色设定', value: '主角骑士' },
-      ],
+      fields: [{ title: '角色设定', value: '主角骑士' }],
       references: [
         {
           title: '角色规范',
@@ -381,9 +379,17 @@ describe('ImageCanvasGenerationModel', () => {
       buildSpecPrompt('custom', { ...blankSpecValues, customPrompt: '自定义' }),
     ).toBe('自定义');
     expect(buildQuickEditModelOptions('nano-banana')).toEqual([
+      {
+        label: 'nanobanana2',
+        value: 'gemini-3.1-flash-image-preview',
+      },
       { label: 'gpt-image-2', value: 'gpt-image-2' },
     ]);
     expect(buildQuickEditModelOptions('nanobanana2')).toEqual([
+      {
+        label: 'nanobanana2',
+        value: 'gemini-3.1-flash-image-preview',
+      },
       { label: 'gpt-image-2', value: 'gpt-image-2' },
     ]);
   });
diff --git a/src/components/image-editor/ImageCanvasGenerationModel.ts b/src/components/image-editor/ImageCanvasGenerationModel.ts
index 339489fd6..9c6657f7e 100644
--- a/src/components/image-editor/ImageCanvasGenerationModel.ts
+++ b/src/components/image-editor/ImageCanvasGenerationModel.ts
@@ -111,9 +111,7 @@ export const EDITOR_IMAGE_MODEL_OPTIONS = [
   { label: 'nanobanana2', value: IMAGE_MODEL_NANOBANANA2 },
   { label: 'gpt-image-2', value: IMAGE_MODEL_GPT_IMAGE_2 },
 ] as const;
-export const QUICK_EDIT_MODEL_OPTIONS = [
-  { label: 'gpt-image-2', value: IMAGE_MODEL_GPT_IMAGE_2 },
-] as const;
+export const QUICK_EDIT_MODEL_OPTIONS = EDITOR_IMAGE_MODEL_OPTIONS;
 export const EDITOR_IMAGE_DIMENSION_OPTIONS = {
   [IMAGE_MODEL_NANOBANANA2]: {
     aspectRatios: ['1:1', '4:3', '3:2', '2:3', '9:16', '16:9'],
@@ -557,6 +555,10 @@ export function buildQuickEditModelOptions(currentModel: string) {
   return options;
 }
 
+export function isQuickEditUnsupportedAssetKind(layer: CanvasLayer) {
+  return layer.assetKind === 'icon' || layer.assetKind === 'icon-spritesheet';
+}
+
 export function buildCharacterSpecPrompt(values: SpecFormValues) {
   return [
     '生成2D 角色美术视觉规范设定图，纯白底板，整齐排布全身标准立绘；固定统一头身比例、勾线粗细恒定；展示待机行走攻击基础动作帧样例，重心对齐不变位，服饰配饰分层结构示意，搭配专属角色色卡标注色号，无多余杂物，精准尺寸标注，高清矢量规范稿',
diff --git a/src/components/image-editor/ImageCanvasGenerationSubmissionModel.test.ts b/src/components/image-editor/ImageCanvasGenerationSubmissionModel.test.ts
index fc221c4c4..4ce5c8dbe 100644
--- a/src/components/image-editor/ImageCanvasGenerationSubmissionModel.test.ts
+++ b/src/components/image-editor/ImageCanvasGenerationSubmissionModel.test.ts
@@ -61,6 +61,25 @@ describe('ImageCanvasGenerationSubmissionModel', () => {
     });
   });
 
+  it('trims custom asset names and limits them to 80 characters', () => {
+    const customName = `  ${'名'.repeat(81)}  `;
+    const plan = buildImageGenerationSubmissionPlan({
+      dialog: {
+        mode: 'generate',
+        prompt: '一张发光主视觉',
+        assetLabel: customName,
+        status: 'idle',
+      },
+      layers: [],
+      nextGeneratedIndex: 3,
+    });
+
+    expect(plan).toMatchObject({
+      kind: 'image',
+      result: { title: '名'.repeat(80) },
+    });
+  });
+
   it('normalizes legacy nanobanana aliases before submitting image generation', () => {
     const plan = buildImageGenerationSubmissionPlan({
       dialog: {
@@ -646,6 +665,7 @@ describe('ImageCanvasGenerationSubmissionModel', () => {
       imageModel: 'gpt-image-2',
       aspectRatio: '3:2',
       imageSize: '2K',
+      assetLabel: '  冒险游戏图标  ',
       iconSpecReference: {
         id: 'icon-spec',
         label: '图标规范',
@@ -694,6 +714,7 @@ describe('ImageCanvasGenerationSubmissionModel', () => {
         ],
       },
       rememberImageModel: 'gpt-image-2',
+      resultTitle: '冒险游戏图标',
     });
   });
 
@@ -711,6 +732,7 @@ describe('ImageCanvasGenerationSubmissionModel', () => {
       panel: {
         sourceLayerId: 'character-layer',
         promptText: '  循环奔跑动作  ',
+        assetLabel: '  勇者奔跑  ',
         resolution: '720p',
         ratio: 'same',
         frameCount: 48,
@@ -722,6 +744,7 @@ describe('ImageCanvasGenerationSubmissionModel', () => {
 
     expect(plan).toEqual({
       promptText: '循环奔跑动作',
+      resultTitle: '勇者奔跑',
       input: {
         sourceLayerId: 'character-layer',
         sourceImageSrc: 'generated/character.png',
@@ -734,6 +757,7 @@ describe('ImageCanvasGenerationSubmissionModel', () => {
         frameCount: 48,
         durationSeconds: 6,
         model: 'seedance2.0-fast',
+        assetLabel: '勇者奔跑',
       },
     });
   });
diff --git a/src/components/image-editor/ImageCanvasGenerationSubmissionModel.ts b/src/components/image-editor/ImageCanvasGenerationSubmissionModel.ts
index 7552c7837..4b073e855 100644
--- a/src/components/image-editor/ImageCanvasGenerationSubmissionModel.ts
+++ b/src/components/image-editor/ImageCanvasGenerationSubmissionModel.ts
@@ -58,6 +58,20 @@ type ImageGenerationSubmissionOptions = {
   nextGeneratedIndex: number;
 };
 
+export const EDITOR_GENERATED_ASSET_LABEL_MAX_CHARS = 80;
+
+export function resolveGenerationAssetLabel(
+  assetLabel: string | null | undefined,
+  fallback: string,
+) {
+  const normalized = assetLabel?.trim();
+  return normalized
+    ? Array.from(normalized)
+        .slice(0, EDITOR_GENERATED_ASSET_LABEL_MAX_CHARS)
+        .join('')
+    : fallback;
+}
+
 function isSeedanceVideoModel(model: string) {
   return model === 'seedance2.0' || model === 'seedance2.0-fast';
 }
@@ -147,6 +161,7 @@ export type ImageGenerationSubmissionPlan =
       kind: 'edit';
       normalizedPrompt: string;
       sourceLayer: CanvasLayer;
+      resultTitle: string;
       generationInputs: CanvasGenerationInputs;
     }
   | {
@@ -213,10 +228,12 @@ export type IconSpritesheetGenerationSubmissionPlan =
       input: EditorIconSpritesheetGenerationInput;
       generationInputs: CanvasGenerationInputs;
       rememberImageModel: string;
+      resultTitle: string;
     };
 
 export type CharacterAnimationSubmissionPlan = {
   promptText: string;
+  resultTitle: string;
   input: EditorCharacterAnimationGenerationInput;
 };
 
@@ -239,6 +256,10 @@ export function buildImageGenerationSubmissionPlan({
       kind: 'edit',
       normalizedPrompt,
       sourceLayer,
+      resultTitle: resolveGenerationAssetLabel(
+        dialog.assetLabel,
+        `${sourceLayer.title} 修改结果`,
+      ),
       generationInputs: buildEditGenerationInputs(
         '修改要求',
         normalizedPrompt,
@@ -266,7 +287,10 @@ export function buildImageGenerationSubmissionPlan({
         model: imageModel,
       },
       result: {
-        title: `${sourceLayer.title} 快速编辑`,
+        title: resolveGenerationAssetLabel(
+          dialog.assetLabel,
+          `${sourceLayer.title} 快速编辑`,
+        ),
         assetKind: sourceLayer.assetKind,
         generationInputs: buildQuickEditGenerationInputs(
           '快速编辑提示词',
@@ -308,7 +332,10 @@ export function buildImageGenerationSubmissionPlan({
         // 中文注释：生成规范菜单里的“图标规范”沿用历史 ui specType，但产物语义应作为图标规范供图标素材引用。
         assetKind:
           specType === 'ui' || specType === 'icon' ? 'icon-spec' : 'spec',
-        title: `${SPEC_TYPE_LABEL[specType]} ${nextGeneratedIndex}`,
+        title: resolveGenerationAssetLabel(
+          dialog.assetLabel,
+          `${SPEC_TYPE_LABEL[specType]} ${nextGeneratedIndex}`,
+        ),
         generationInputs: buildSpecGenerationInputs(
           specType,
           specValues,
@@ -345,7 +372,10 @@ export function buildImageGenerationSubmissionPlan({
       },
       result: {
         assetKind: 'character',
-        title: `角色形象 ${nextGeneratedIndex}`,
+        title: resolveGenerationAssetLabel(
+          dialog.assetLabel,
+          `角色形象 ${nextGeneratedIndex}`,
+        ),
         generationInputs: buildCharacterGenerationInputs(
           normalizedPrompt,
           dialog.characterSpecReference,
@@ -379,7 +409,10 @@ export function buildImageGenerationSubmissionPlan({
       },
       result: {
         assetKind: 'ui-design',
-        title: `UI设计图 ${nextGeneratedIndex}`,
+        title: resolveGenerationAssetLabel(
+          dialog.assetLabel,
+          `UI设计图 ${nextGeneratedIndex}`,
+        ),
         generationInputs: buildUiDesignGenerationInputs(
           normalizedPrompt,
           dialog.uiDesignSpecReference,
@@ -421,7 +454,10 @@ export function buildImageGenerationSubmissionPlan({
           : {}),
       },
       result: {
-        title: `${nextGeneratedIndex} 宣发素材`,
+        title: resolveGenerationAssetLabel(
+          dialog.assetLabel,
+          `${nextGeneratedIndex} 宣发素材`,
+        ),
         generationInputs: buildPublicationMaterialsGenerationInputs(
           dialog.publicationGameInfo,
           dialog.publicationReferences,
@@ -471,7 +507,10 @@ export function buildImageGenerationSubmissionPlan({
           : {}),
       },
       result: {
-        title: `生成视频 ${nextGeneratedIndex}`,
+        title: resolveGenerationAssetLabel(
+          dialog.assetLabel,
+          `生成视频 ${nextGeneratedIndex}`,
+        ),
         generationInputs: buildVideoGenerationInputs(
           normalizedPrompt,
           dialog.generationReferences,
@@ -496,7 +535,10 @@ export function buildImageGenerationSubmissionPlan({
         duration: durationSeconds,
       },
       result: {
-        title: `游戏音效 ${nextGeneratedIndex}`,
+        title: resolveGenerationAssetLabel(
+          dialog.assetLabel,
+          `游戏音效 ${nextGeneratedIndex}`,
+        ),
         generationInputs: buildSoundEffectGenerationInputs(
           normalizedPrompt,
           soundModel,
@@ -516,7 +558,10 @@ export function buildImageGenerationSubmissionPlan({
         makeInstrumental: true,
       },
       result: {
-        title: `游戏背景音乐 ${nextGeneratedIndex}`,
+        title: resolveGenerationAssetLabel(
+          dialog.assetLabel,
+          `游戏背景音乐 ${nextGeneratedIndex}`,
+        ),
         generationInputs:
           buildBackgroundMusicGenerationInputs(normalizedPrompt),
       },
@@ -541,7 +586,10 @@ export function buildImageGenerationSubmissionPlan({
         : {}),
     },
     result: {
-      title: `生成图片 ${nextGeneratedIndex}`,
+      title: resolveGenerationAssetLabel(
+        dialog.assetLabel,
+        `生成图片 ${nextGeneratedIndex}`,
+      ),
       generationInputs: buildImageGenerationInputs(
         normalizedPrompt,
         dialog.generationReferences,
@@ -553,6 +601,7 @@ export function buildImageGenerationSubmissionPlan({
 
 export function buildIconSpritesheetGenerationSubmissionPlan(
   dialog: GenerateDialogState,
+  nextGeneratedIndex = 1,
 ): IconSpritesheetGenerationSubmissionPlan {
   const iconDescriptionSource = dialog.prompt.trim()
     ? dialog.prompt.split(/[\r\n,，、;；/|]+/u)
@@ -610,6 +659,10 @@ export function buildIconSpritesheetGenerationSubmissionPlan(
       dialog.generationReferences,
     ),
     rememberImageModel,
+    resultTitle: resolveGenerationAssetLabel(
+      dialog.assetLabel,
+      `图标素材图集 ${nextGeneratedIndex}`,
+    ),
   };
 }
 
@@ -621,8 +674,10 @@ export function buildCharacterAnimationSubmissionPlan({
   sourceLayer: CanvasLayer;
 }): CharacterAnimationSubmissionPlan {
   const promptText = panel.promptText.trim();
+  const resultTitle = resolveGenerationAssetLabel(panel.assetLabel, '角色动作');
   return {
     promptText,
+    resultTitle,
     input: {
       sourceLayerId: sourceLayer.id,
       sourceImageSrc: resolveCharacterAnimationSourceImageSrc(sourceLayer),
@@ -636,6 +691,7 @@ export function buildCharacterAnimationSubmissionPlan({
       frameCount: panel.frameCount,
       durationSeconds: panel.durationSeconds,
       model: CHARACTER_ANIMATION_MODEL,
+      assetLabel: resultTitle,
     },
   };
 }
diff --git a/src/components/image-editor/ImageCanvasIconSpritesheetComposerView.tsx b/src/components/image-editor/ImageCanvasIconSpritesheetComposerView.tsx
index 8c3809cd4..8c4474e64 100644
--- a/src/components/image-editor/ImageCanvasIconSpritesheetComposerView.tsx
+++ b/src/components/image-editor/ImageCanvasIconSpritesheetComposerView.tsx
@@ -18,6 +18,7 @@ import type {
   SpecGenerationType,
   UploadTarget,
 } from './ImageCanvasEditorTypes';
+import { ImageCanvasGenerationAssetNameField } from './ImageCanvasGenerationAssetNameField';
 import { ImageCanvasGenerationImageOptionsView } from './ImageCanvasGenerationImageOptionsView';
 import {
   calculateEditorIconSpritesheetPrice,
@@ -223,6 +224,28 @@ export function ImageCanvasIconSpritesheetComposerView({
           onChange={(event) => onUpdateIconDescriptionText(event.target.value)}
         />
       </label>
+      <ImageCanvasGenerationAssetNameField
+        value={dialog.assetLabel}
+        disabled={dialog.status === 'generating'}
+        onChange={(assetLabel) =>
+          setGenerateDialog((currentDialog) =>
+            currentDialog?.mode === 'icon'
+              ? {
+                  ...currentDialog,
+                  status:
+                    currentDialog.status === 'failed'
+                      ? 'idle'
+                      : currentDialog.status,
+                  errorMessage:
+                    currentDialog.status === 'failed'
+                      ? undefined
+                      : currentDialog.errorMessage,
+                  assetLabel,
+                }
+              : currentDialog,
+          )
+        }
+      />
       {dialog.status === 'failed' ? (
         <PlatformStatusMessage
           tone="error"
diff --git a/src/components/image-editor/ImageCanvasPublicationMaterialsDemoPanelView.tsx b/src/components/image-editor/ImageCanvasPublicationMaterialsDemoPanelView.tsx
index 8d96176ad..4ccb83913 100644
--- a/src/components/image-editor/ImageCanvasPublicationMaterialsDemoPanelView.tsx
+++ b/src/components/image-editor/ImageCanvasPublicationMaterialsDemoPanelView.tsx
@@ -21,6 +21,7 @@ import type {
   PublicationMaterialsGameInfo,
   UploadTarget,
 } from './ImageCanvasEditorTypes';
+import { ImageCanvasGenerationAssetNameField } from './ImageCanvasGenerationAssetNameField';
 import { ImageCanvasGenerationImageOptionsView } from './ImageCanvasGenerationImageOptionsView';
 import {
   buildPublicationMaterialsPrompt,
@@ -286,6 +287,21 @@ export function ImageCanvasPublicationMaterialsDemoPanelView({
         </label>
       </div>
 
+      <ImageCanvasGenerationAssetNameField
+        value={dialog.assetLabel}
+        disabled={dialog.status === 'generating'}
+        onChange={(assetLabel) =>
+          setGenerateDialog((currentDialog) =>
+            currentDialog?.mode === 'publication'
+              ? {
+                  ...resetFailedDialogStatus(currentDialog),
+                  assetLabel,
+                }
+              : currentDialog,
+          )
+        }
+      />
+
       {dialog.status === 'failed' ? (
         <PlatformStatusMessage
           tone="error"
diff --git a/src/components/image-editor/ImageCanvasQuickEditPanelView.test.tsx b/src/components/image-editor/ImageCanvasQuickEditPanelView.test.tsx
index 221ef4ee9..776d1fbac 100644
--- a/src/components/image-editor/ImageCanvasQuickEditPanelView.test.tsx
+++ b/src/components/image-editor/ImageCanvasQuickEditPanelView.test.tsx
@@ -103,22 +103,22 @@ describe('ImageCanvasQuickEditPanelView', () => {
       target: { value: '新提示' },
     });
 
-    expect(
-      screen.getByPlaceholderText('写下每个编号要怎么改'),
-    ).toBeTruthy();
+    expect(screen.getByPlaceholderText('你希望素材如何修改？')).toBeTruthy();
     expect(screen.getByLabelText('当前提示词').textContent).toBe('新提示');
     expect(screen.getByLabelText('当前尺寸').textContent).toBe('1024x1024');
-    expect(screen.getByLabelText('当前模型').textContent).toBe('gpt-image-2');
+    expect(screen.getByLabelText('当前模型').textContent).toBe(
+      'gemini-3.1-flash-image-preview',
+    );
     expect(screen.getByLabelText('当前状态').textContent).toBe('idle');
     expect(screen.getByLabelText('当前错误').textContent).toBe('-');
     expect(
-      screen.queryByRole('button', { name: '快速编辑尺寸 1:1·1K' }),
-    ).toBeNull();
+      screen.getByRole('button', { name: '快速编辑尺寸 1:1·1K' }),
+    ).toBeTruthy();
 
     fireEvent.click(
-      screen.getByRole('button', { name: '快速编辑模型 gpt-image-2' }),
+      screen.getByRole('button', { name: '快速编辑模型 nanobanana2' }),
     );
-    expect(screen.queryByRole('button', { name: 'nanobanana2' })).toBeNull();
+    expect(screen.getByRole('button', { name: 'nanobanana2' })).toBeTruthy();
     fireEvent.click(screen.getByRole('button', { name: 'gpt-image-2' }));
     expect(screen.getByLabelText('当前模型').textContent).toBe('gpt-image-2');
     expect(rememberImageModel).toHaveBeenCalledWith('gpt-image-2');
diff --git a/src/components/image-editor/ImageCanvasQuickEditPanelView.tsx b/src/components/image-editor/ImageCanvasQuickEditPanelView.tsx
index 42e34c868..b95d23b8b 100644
--- a/src/components/image-editor/ImageCanvasQuickEditPanelView.tsx
+++ b/src/components/image-editor/ImageCanvasQuickEditPanelView.tsx
@@ -8,10 +8,7 @@ import {
 } from 'react';
 
 import { ImageCanvasBasicGenerationComposerView } from './ImageCanvasBasicGenerationComposerView';
-import {
-  IMAGE_MODEL_GPT_IMAGE_2,
-  QUICK_EDIT_REFERENCE_LIMIT,
-} from './ImageCanvasGenerationModel';
+import { QUICK_EDIT_REFERENCE_LIMIT } from './ImageCanvasGenerationModel';
 import type {
   CanvasLayer,
   GenerateDialogState,
@@ -58,7 +55,8 @@ function createQuickEditDialog(
     status: panel.status,
     sourceLayerId: panel.sourceLayerId,
     generationReferences: panel.quickEditReferences,
-    imageModel: isQuickEdit ? IMAGE_MODEL_GPT_IMAGE_2 : panel.model,
+    assetLabel: panel.assetLabel,
+    imageModel: panel.model,
     aspectRatio: panel.aspectRatio,
     imageSize: panel.imageSize,
   };
@@ -70,7 +68,6 @@ function syncPanelFromDialogUpdate(
 ) {
   const normalizedPanel = resetFailedPanelStatus(panel);
   const normalizedDialog = resetFailedPanelStatus(dialog);
-  const isQuickEdit = (normalizedPanel.mode ?? 'quick-edit') === 'quick-edit';
   return {
     ...normalizedPanel,
     size: panel.size,
@@ -78,10 +75,9 @@ function syncPanelFromDialogUpdate(
     aspectRatio:
       normalizedDialog.aspectRatio ?? normalizedPanel.aspectRatio ?? '1:1',
     imageSize: normalizedDialog.imageSize ?? normalizedPanel.imageSize ?? '1K',
-    model: isQuickEdit
-      ? IMAGE_MODEL_GPT_IMAGE_2
-      : (normalizedDialog.imageModel ?? normalizedPanel.model),
+    model: normalizedDialog.imageModel ?? normalizedPanel.model,
     quickEditReferences: normalizedDialog.generationReferences,
+    assetLabel: normalizedDialog.assetLabel,
     status: normalizedDialog.status,
     errorMessage: normalizedDialog.errorMessage,
   };
@@ -102,9 +98,8 @@ export function ImageCanvasQuickEditPanelView({
   onRememberImageModel = () => {},
   onSubmit,
 }: ImageCanvasQuickEditPanelViewProps) {
-  void sourceLayer;
-
   const isRedraw = panel.mode === 'redraw';
+  const isImageQuickEdit = !isRedraw && sourceLayer.mediaType !== 'video';
   const referenceCount = panel.quickEditReferences?.length ?? 0;
   const canAddReferences =
     !isRedraw && referenceCount < QUICK_EDIT_REFERENCE_LIMIT;
@@ -144,12 +139,12 @@ export function ImageCanvasQuickEditPanelView({
       onRememberImageModel={onRememberImageModel}
       onSubmit={onSubmit}
       dialogLabel={isRedraw ? '重绘图片' : '快速编辑图片'}
-      includeDimensions={isRedraw}
+      includeDimensions={isRedraw || isImageQuickEdit}
       includeModel={true}
       includeReferences={false}
       promptLabel={isRedraw ? '重绘提示词' : '快速编辑提示词'}
       promptPlaceholder={
-        isRedraw ? '把画面重绘成什么样？' : '写下每个编号要怎么改'
+        isRedraw ? '把画面重绘成什么样？' : '你希望素材如何修改？'
       }
       optionLabelPrefix={isRedraw ? '重绘' : '快速编辑'}
       dimensionRatioAriaLabelPrefix="比例"
diff --git a/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.test.tsx b/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.test.tsx
index 530e239e0..feb573752 100644
--- a/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.test.tsx
+++ b/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.test.tsx
@@ -31,7 +31,9 @@ function createLayer(overrides: Partial<CanvasLayer> = {}): CanvasLayer {
 }
 
 function renderSelectedToolbar(
-  overrides: Partial<Parameters<typeof ImageCanvasSelectedLayerToolbarView>[0]> = {},
+  overrides: Partial<
+    Parameters<typeof ImageCanvasSelectedLayerToolbarView>[0]
+  > = {},
 ) {
   const props: Parameters<typeof ImageCanvasSelectedLayerToolbarView>[0] = {
     selectedLayer: createLayer(),
@@ -40,6 +42,7 @@ function renderSelectedToolbar(
     onOpenRedrawPanel: vi.fn(),
     onOpenCropExpandPanel: vi.fn(),
     onRemoveBackground: vi.fn(),
+    onSplitIconSpritesheet: vi.fn(),
     onExtractUiDesignAssets: vi.fn(),
     onOpenCharacterAnimationPanel: vi.fn(),
     onDownloadLayer: vi.fn(),
@@ -73,7 +76,9 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
     fireEvent.click(within(toolbar).getByRole('button', { name: '改造' }));
     fireEvent.click(within(toolbar).getByRole('button', { name: '下载按钮' }));
 
-    expect(props.onOpenQuickEditPanel).toHaveBeenCalledWith(props.selectedLayer);
+    expect(props.onOpenQuickEditPanel).toHaveBeenCalledWith(
+      props.selectedLayer,
+    );
     expect(props.onOpenCropExpandPanel).toHaveBeenCalledWith(
       props.selectedLayer,
     );
@@ -122,6 +127,33 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
     expect(props.onExtractUiDesignAssets).toHaveBeenCalledWith(layer);
   });
 
+  it('renders icon spritesheet splitting after remove background', () => {
+    const layer = createLayer({
+      sourceType: 'generated',
+      assetKind: 'icon-spritesheet',
+    });
+    const props = renderSelectedToolbar({ selectedLayer: layer });
+    const toolbar = screen.getByRole('toolbar', { name: '图片工具栏' });
+    const buttons = within(toolbar).getAllByRole('button');
+
+    expect(buttons.map((button) => button.getAttribute('aria-label'))).toEqual([
+      '裁扩按钮',
+      '去除背景按钮',
+      '拆分图集',
+      '改造',
+      '下载按钮',
+    ]);
+
+    const splitButton = within(toolbar).getByRole('button', {
+      name: '拆分图集',
+    });
+    expect(splitButton.querySelector('.lucide-scissors')).toBeTruthy();
+
+    fireEvent.click(splitButton);
+
+    expect(props.onSplitIconSpritesheet).toHaveBeenCalledWith(layer);
+  });
+
   it('keeps only remodel and download for audio layers', () => {
     const layer = createLayer({
       title: '游戏音效',
@@ -137,7 +169,9 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
       '改造',
       '下载按钮',
     ]);
-    expect(within(toolbar).queryByRole('button', { name: '快速编辑' })).toBeNull();
+    expect(
+      within(toolbar).queryByRole('button', { name: '快速编辑' }),
+    ).toBeNull();
     expect(
       within(toolbar).queryByRole('button', { name: '裁扩按钮' }),
     ).toBeNull();
@@ -173,9 +207,9 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
       within(videoToolbar).queryByRole('button', { name: '去除背景按钮' }),
     ).toBeNull();
     expect(
-      within(videoToolbar).getAllByRole('button').map((button) =>
-        button.getAttribute('aria-label'),
-      ),
+      within(videoToolbar)
+        .getAllByRole('button')
+        .map((button) => button.getAttribute('aria-label')),
     ).toEqual(['快速编辑', '改造', '下载按钮']);
 
     cleanup();
@@ -196,9 +230,9 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
       within(actionToolbar).queryByRole('button', { name: '去除背景按钮' }),
     ).toBeNull();
     expect(
-      within(actionToolbar).getAllByRole('button').map((button) =>
-        button.getAttribute('aria-label'),
-      ),
+      within(actionToolbar)
+        .getAllByRole('button')
+        .map((button) => button.getAttribute('aria-label')),
     ).toEqual(['快速编辑', '改造', '下载按钮']);
   });
 
@@ -211,7 +245,9 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
     const animationButton = screen.getByRole('button', { name: '生成动画' });
 
     expect(animationButton.textContent).toContain('生成动画');
-    expect(animationButton.querySelector('.lucide-person-standing')).toBeTruthy();
+    expect(
+      animationButton.querySelector('.lucide-person-standing'),
+    ).toBeTruthy();
 
     fireEvent.click(animationButton);
 
@@ -222,6 +258,25 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
     expect(screen.queryByRole('button', { name: '生成动画' })).toBeNull();
   });
 
+  it.each(['icon', 'icon-spritesheet'] as const)(
+    'hides quick edit for %s assets',
+    (assetKind) => {
+      renderSelectedToolbar({
+        selectedLayer: createLayer({ assetKind }),
+      });
+
+      expect(screen.queryByRole('button', { name: '快速编辑' })).toBeNull();
+    },
+  );
+
+  it('keeps quick edit available for icon specs', () => {
+    renderSelectedToolbar({
+      selectedLayer: createLayer({ assetKind: 'icon-spec' }),
+    });
+
+    expect(screen.getByRole('button', { name: '快速编辑' })).toBeTruthy();
+  });
+
   it('renders nothing without a selected layer or toolbar position', () => {
     const { rerender } = render(
       <ImageCanvasSelectedLayerToolbarView
@@ -231,6 +286,7 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
         onOpenRedrawPanel={vi.fn()}
         onOpenCropExpandPanel={vi.fn()}
         onRemoveBackground={vi.fn()}
+        onSplitIconSpritesheet={vi.fn()}
         onExtractUiDesignAssets={vi.fn()}
         onOpenCharacterAnimationPanel={vi.fn()}
         onDownloadLayer={vi.fn()}
@@ -247,6 +303,7 @@ describe('ImageCanvasSelectedLayerToolbarView', () => {
         onOpenRedrawPanel={vi.fn()}
         onOpenCropExpandPanel={vi.fn()}
         onRemoveBackground={vi.fn()}
+        onSplitIconSpritesheet={vi.fn()}
         onExtractUiDesignAssets={vi.fn()}
         onOpenCharacterAnimationPanel={vi.fn()}
         onDownloadLayer={vi.fn()}
diff --git a/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.tsx b/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.tsx
index e8d5d67c9..2f0550523 100644
--- a/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.tsx
+++ b/src/components/image-editor/ImageCanvasSelectedLayerToolbarView.tsx
@@ -12,6 +12,7 @@ import type { CSSProperties } from 'react';
 import { PlatformIconButton } from '../common/PlatformIconButton';
 import { EditorIconButton } from './ImageCanvasEditorPrimitives';
 import type { CanvasLayer } from './ImageCanvasEditorTypes';
+import { isQuickEditUnsupportedAssetKind } from './ImageCanvasGenerationModel';
 
 type ImageCanvasSelectedLayerToolbarViewProps = {
   selectedLayer: CanvasLayer | null;
@@ -20,6 +21,7 @@ type ImageCanvasSelectedLayerToolbarViewProps = {
   onOpenRedrawPanel: (layer: CanvasLayer) => void;
   onOpenCropExpandPanel: (layer: CanvasLayer) => void;
   onRemoveBackground: (layer: CanvasLayer) => void;
+  onSplitIconSpritesheet: (layer: CanvasLayer) => void;
   onExtractUiDesignAssets: (layer: CanvasLayer) => void;
   onOpenCharacterAnimationPanel: (layer: CanvasLayer) => void;
   onDownloadLayer: (layer: CanvasLayer) => void;
@@ -32,6 +34,7 @@ export function ImageCanvasSelectedLayerToolbarView({
   onOpenRedrawPanel,
   onOpenCropExpandPanel,
   onRemoveBackground,
+  onSplitIconSpritesheet,
   onExtractUiDesignAssets,
   onOpenCharacterAnimationPanel,
   onDownloadLayer,
@@ -81,19 +84,23 @@ export function ImageCanvasSelectedLayerToolbarView({
       aria-label="图片工具栏"
       onPointerDown={(event) => event.stopPropagation()}
     >
-      <PlatformIconButton
-        className="image-canvas-editor__floating-toolbar-text-button"
-        label="快速编辑"
-        title="快速编辑"
-        icon={<Sparkles className="h-4 w-4" />}
-        onClick={() => onOpenQuickEditPanel(selectedLayer)}
-      >
-        <span>快速编辑</span>
-      </PlatformIconButton>
-      <span
-        aria-hidden="true"
-        className="image-canvas-editor__floating-toolbar-divider"
-      />
+      {!isQuickEditUnsupportedAssetKind(selectedLayer) ? (
+        <>
+          <PlatformIconButton
+            className="image-canvas-editor__floating-toolbar-text-button"
+            label="快速编辑"
+            title="快速编辑"
+            icon={<Sparkles className="h-4 w-4" />}
+            onClick={() => onOpenQuickEditPanel(selectedLayer)}
+          >
+            <span>快速编辑</span>
+          </PlatformIconButton>
+          <span
+            aria-hidden="true"
+            className="image-canvas-editor__floating-toolbar-divider"
+          />
+        </>
+      ) : null}
       {canRasterEdit ? (
         <>
           <EditorIconButton
@@ -110,6 +117,17 @@ export function ImageCanvasSelectedLayerToolbarView({
           />
         </>
       ) : null}
+      {selectedLayer.assetKind === 'icon-spritesheet' ? (
+        <PlatformIconButton
+          className="image-canvas-editor__floating-toolbar-text-button"
+          label="拆分图集"
+          title="拆分图集"
+          icon={<Scissors className="h-4 w-4" />}
+          onClick={() => onSplitIconSpritesheet(selectedLayer)}
+        >
+          <span>拆分图集</span>
+        </PlatformIconButton>
+      ) : null}
       {selectedLayer.assetKind === 'ui-design' ? (
         <PlatformIconButton
           className="image-canvas-editor__floating-toolbar-text-button"
diff --git a/src/components/image-editor/ImageCanvasSpecGenerationPanelView.tsx b/src/components/image-editor/ImageCanvasSpecGenerationPanelView.tsx
index 237bac044..adf1f05f4 100644
--- a/src/components/image-editor/ImageCanvasSpecGenerationPanelView.tsx
+++ b/src/components/image-editor/ImageCanvasSpecGenerationPanelView.tsx
@@ -25,6 +25,7 @@ import type {
   SpecGenerationType,
   UploadTarget,
 } from './ImageCanvasEditorTypes';
+import { ImageCanvasGenerationAssetNameField } from './ImageCanvasGenerationAssetNameField';
 import { ImageCanvasGenerationImageOptionsView } from './ImageCanvasGenerationImageOptionsView';
 import {
   calculateEditorSpecGenerationPrice,
@@ -415,6 +416,30 @@ export function ImageCanvasSpecGenerationPanelView({
             </>
           )}
         </div>
+        <ImageCanvasGenerationAssetNameField
+          value={dialog.assetLabel}
+          disabled={isGenerating}
+          onChange={(assetLabel) =>
+            setGenerateDialog?.((currentDialog) =>
+              currentDialog &&
+              (currentDialog.mode === 'spec' ||
+                currentDialog.mode === 'ui-design')
+                ? {
+                    ...currentDialog,
+                    status:
+                      currentDialog.status === 'failed'
+                        ? 'idle'
+                        : currentDialog.status,
+                    errorMessage:
+                      currentDialog.status === 'failed'
+                        ? undefined
+                        : currentDialog.errorMessage,
+                    assetLabel,
+                  }
+                : currentDialog,
+            )
+          }
+        />
         {dialog.status === 'failed' ? (
           <PlatformStatusMessage
             tone="error"
diff --git a/src/components/image-editor/ImageCanvasStageView.tsx b/src/components/image-editor/ImageCanvasStageView.tsx
index 240b4cbf0..0ca5ca04e 100644
--- a/src/components/image-editor/ImageCanvasStageView.tsx
+++ b/src/components/image-editor/ImageCanvasStageView.tsx
@@ -139,6 +139,7 @@ export type ImageCanvasStageViewProps = {
   onOpenRedrawPanel: (layer: CanvasLayer) => void;
   onOpenCropExpandPanel: (layer: CanvasLayer) => void;
   onRemoveBackground: (layer: CanvasLayer) => void;
+  onSplitIconSpritesheet: (layer: CanvasLayer) => void;
   onExtractUiDesignAssets: (layer: CanvasLayer) => void;
   onUiAssetExtractionToolChange: (tool: UiAssetExtractionTool | null) => void;
   onUiAssetExtractionModelChange: (model: string) => void;
@@ -269,6 +270,7 @@ export function ImageCanvasStageView({
   onOpenRedrawPanel,
   onOpenCropExpandPanel,
   onRemoveBackground,
+  onSplitIconSpritesheet,
   onExtractUiDesignAssets,
   onUiAssetExtractionToolChange,
   onUiAssetExtractionModelChange,
@@ -379,6 +381,7 @@ export function ImageCanvasStageView({
         onOpenRedrawPanel={onOpenRedrawPanel}
         onOpenCropExpandPanel={onOpenCropExpandPanel}
         onRemoveBackground={onRemoveBackground}
+        onSplitIconSpritesheet={onSplitIconSpritesheet}
         onExtractUiDesignAssets={onExtractUiDesignAssets}
         onOpenCharacterAnimationPanel={onOpenCharacterAnimationPanel}
         onDownloadLayer={onDownloadLayer}
diff --git a/src/components/image-editor/ImageCanvasTaskSidebarView.test.tsx b/src/components/image-editor/ImageCanvasTaskSidebarView.test.tsx
index ce29b9bda..0c2957dca 100644
--- a/src/components/image-editor/ImageCanvasTaskSidebarView.test.tsx
+++ b/src/components/image-editor/ImageCanvasTaskSidebarView.test.tsx
@@ -58,6 +58,7 @@ function createExternalTask(
     phaseDetail: overrides.phaseDetail ?? '正在生成第 2/4 段。',
     progress: overrides.progress ?? 35,
     error: overrides.error ?? null,
+    warning: overrides.warning ?? null,
     priceMudPoints: overrides.priceMudPoints ?? 1,
     refundLedgerId: overrides.refundLedgerId ?? null,
     notificationAcknowledgedAt: overrides.notificationAcknowledgedAt ?? null,
@@ -236,6 +237,7 @@ describe('ImageCanvasTaskSidebarView', () => {
                   updatedAt: completedAt,
                   progress: 100,
                   phaseDetail: '生成已完成。',
+                  warning: '连通域数量不足',
                 }),
                 createExternalTask({
                   jobId: 'done-other-project',
@@ -273,6 +275,7 @@ describe('ImageCanvasTaskSidebarView', () => {
 
     fireEvent.click(screen.getByRole('tab', { name: /已完成/u }));
     expect(await screen.findByText(/已完成提示词/u)).toBeTruthy();
+    expect(screen.getByText('连通域数量不足')).toBeTruthy();
     expect(screen.getByText(/完成于/u)).toBeTruthy();
     expect(screen.queryByText(/另一个项目的已完成任务/u)).toBeNull();
   });
diff --git a/src/components/image-editor/ImageCanvasTaskSidebarView.tsx b/src/components/image-editor/ImageCanvasTaskSidebarView.tsx
index f37ae1625..06655f49c 100644
--- a/src/components/image-editor/ImageCanvasTaskSidebarView.tsx
+++ b/src/components/image-editor/ImageCanvasTaskSidebarView.tsx
@@ -129,6 +129,9 @@ function externalTaskProgressDetail(
   task: ExternalGenerationTaskRecord,
   status: CanvasTaskStatus,
 ) {
+  if (status === 'done') {
+    return task.warning?.trim() || null;
+  }
   if (!isActiveTaskStatus(status)) {
     return null;
   }
diff --git a/src/components/image-editor/ImageCanvasWorldView.test.tsx b/src/components/image-editor/ImageCanvasWorldView.test.tsx
index d395f2437..f73afc989 100644
--- a/src/components/image-editor/ImageCanvasWorldView.test.tsx
+++ b/src/components/image-editor/ImageCanvasWorldView.test.tsx
@@ -281,6 +281,12 @@ describe('ImageCanvasWorldView', () => {
           title: '角色标签图层',
           assetKind: 'character',
         }),
+        createLayer({
+          id: 'layer-source',
+          resourceId: 'resource-source',
+          title: '角色原图',
+          assetKind: 'editor_green_screen_source',
+        }),
       ],
     });
 
@@ -288,9 +294,11 @@ describe('ImageCanvasWorldView', () => {
     const characterButton = screen.getByRole('button', {
       name: '选择角色标签图层',
     });
+    const sourceButton = screen.getByRole('button', { name: '选择角色原图' });
 
     expect(within(layerButton).getByText('未知')).toBeTruthy();
     expect(within(characterButton).getByText('角色')).toBeTruthy();
+    expect(within(sourceButton).getByText('原图')).toBeTruthy();
   });
 
   it('renders snap guides, marquee and floating generation status', () => {
@@ -926,6 +934,50 @@ describe('ImageCanvasWorldView', () => {
     expect(props.onLayerClick).not.toHaveBeenCalled();
   });
 
+  it('starts layer dragging from the audio card outside playback controls', () => {
+    const layer = createLayer({
+      title: '拖拽音效',
+      src: 'data:audio/mpeg;base64,audio',
+      mediaType: 'audio',
+      assetKind: 'sound-effect',
+      width: 420,
+      height: 120,
+      originalWidth: 420,
+      originalHeight: 120,
+      durationSeconds: 12,
+    });
+    const { props } = renderWorldView({
+      layers: [layer],
+      hoveredLayerId: layer.id,
+    });
+
+    const layerButton = screen.getByRole('button', { name: '选择拖拽音效' });
+    const audioCard = layerButton.querySelector(
+      '.image-canvas-editor__audio-card',
+    );
+    const playbackButton = within(layerButton).getByRole('button', {
+      name: '播放拖拽音效',
+    });
+    const controls = layerButton.querySelector(
+      '.image-canvas-editor__audio-card-controls',
+    );
+
+    expect(audioCard).toBeTruthy();
+    expect(controls).toBeTruthy();
+
+    fireEvent.pointerDown(audioCard as HTMLElement);
+
+    expect(props.onLayerPointerDown).toHaveBeenCalledWith(
+      expect.any(Object),
+      layer,
+    );
+
+    fireEvent.pointerDown(playbackButton);
+    fireEvent.pointerDown(controls as HTMLElement);
+
+    expect(props.onLayerPointerDown).toHaveBeenCalledTimes(1);
+  });
+
   it('places layer type labels to the left of the information action', () => {
     const layer = createLayer({ assetKind: 'character' });
     const { props } = renderWorldView({ layers: [layer] });
diff --git a/src/components/image-editor/ImageCanvasWorldView.tsx b/src/components/image-editor/ImageCanvasWorldView.tsx
index a28d6401b..39c52b17c 100644
--- a/src/components/image-editor/ImageCanvasWorldView.tsx
+++ b/src/components/image-editor/ImageCanvasWorldView.tsx
@@ -205,6 +205,11 @@ const CANVAS_ASSET_KIND_TAG_OPTIONS: Array<{
   { value: 'icon', label: '图标', className: 'icon' },
   { value: 'icon-spritesheet', label: '图集', className: 'icon-spritesheet' },
   { value: 'icon-spec', label: '图标规范', className: 'icon-spec' },
+  {
+    value: 'editor_green_screen_source',
+    label: '原图',
+    className: 'source-image',
+  },
   {
     value: 'publication-material',
     label: '宣发素材',
diff --git a/src/components/image-editor/useImageCanvasAssetCanvasBridge.test.tsx b/src/components/image-editor/useImageCanvasAssetCanvasBridge.test.tsx
index d61c6f0f7..020386c18 100644
--- a/src/components/image-editor/useImageCanvasAssetCanvasBridge.test.tsx
+++ b/src/components/image-editor/useImageCanvasAssetCanvasBridge.test.tsx
@@ -134,7 +134,7 @@ function AssetCanvasBridgeHarness({
     <div>
       <button
         type="button"
-        onClick={() => bridge.addAssetLayer(asset, { x: 450, y: 320 })}
+        onClick={() => bridge.addAssetLayer(asset)}
       >
         添加到画布
       </button>
@@ -234,7 +234,11 @@ describe('useImageCanvasAssetCanvasBridge', () => {
     });
 
     expect(appendCanvasLayersWithResources).toHaveBeenCalledWith([
-      expect.objectContaining({ sourceAssetId: 'asset-1' }),
+      expect.objectContaining({
+        sourceAssetId: 'asset-1',
+        x: 75,
+        y: 190,
+      }),
     ]);
     expect(screen.getByTestId('drag').textContent).toBe('none');
     expect(screen.getByTestId('drop-target').textContent).toBe('-');
diff --git a/src/components/image-editor/useImageCanvasAssetCanvasBridge.ts b/src/components/image-editor/useImageCanvasAssetCanvasBridge.ts
index fd93a6006..73148f038 100644
--- a/src/components/image-editor/useImageCanvasAssetCanvasBridge.ts
+++ b/src/components/image-editor/useImageCanvasAssetCanvasBridge.ts
@@ -139,6 +139,7 @@ export function useImageCanvasAssetCanvasBridge({
           x: position?.x ?? canvasSize.width / 2,
           y: position?.y ?? canvasSize.height / 2,
         },
+        { applyCascadeOffset: position === undefined },
       );
       captureCanvasHistory();
       appendCanvasLayersWithResources([nextLayer]);
diff --git a/src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.test.tsx b/src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.test.tsx
index 2d548bc06..dadeda990 100644
--- a/src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.test.tsx
+++ b/src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.test.tsx
@@ -166,6 +166,7 @@ function createQueueState(
     phaseDetail: string;
     progress: number;
     error: string | null;
+    warning: string | null;
     updatedAtMicros: number;
   }> = {},
 ) {
@@ -223,6 +224,9 @@ function SubmissionWorkflowHarness({
     useState<CharacterAnimationPanelState | null>(
       initialCharacterAnimationPanel,
     );
+  const [generationWarning, setGenerationWarning] = useState<string | null>(
+    null,
+  );
   const rememberedImageModelRef = useRef<string | null>(null);
   const fitLayersMockRef = useRef(vi.fn());
   const layerCounterRef = useRef(0);
@@ -284,6 +288,7 @@ function SubmissionWorkflowHarness({
     applyProjectSnapshot,
     onQueuedGenerationTask,
     onWalletBalanceMayHaveChanged,
+    onGenerationWarning: setGenerationWarning,
   });
 
   return (
@@ -328,6 +333,7 @@ function SubmissionWorkflowHarness({
       <span data-testid="remembered-model">
         {rememberedImageModelRef.current ?? '-'}
       </span>
+      <span data-testid="generation-warning">{generationWarning ?? '-'}</span>
       <button
         type="button"
         onClick={() => {
@@ -556,8 +562,8 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
         expect.objectContaining({
           prompt: '快速修图',
           sourceImageSrc: 'resource-source',
-          size: '1537x1025',
-          model: 'gpt-image-2',
+          size: '2048x1365',
+          model: 'gemini-3.1-flash-image-preview',
         }),
       );
     });
@@ -568,7 +574,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     expect(resolveEditorImageReferenceDataUrlMock).not.toHaveBeenCalled();
     await waitFor(() => {
       expect(screen.getByTestId('layers').textContent).toContain(
-        'layer-source:源图:resource-source:-:-:data:image/png;base64,generated',
+        'layer-source:源图 快速编辑:resource-source:-:-:data:image/png;base64,generated',
       );
     });
     expect(screen.getByTestId('quick-edit').textContent).toBe('-');
@@ -578,6 +584,61 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     expect(screen.getByTestId('fit-count').textContent).toBe('0');
   });
 
+  it('uses one custom name for quick-edit requests and local layer results', async () => {
+    editEditorImageMock.mockResolvedValueOnce(
+      createGenerated({ prompt: '改成雨天' }),
+    );
+    render(
+      <SubmissionWorkflowHarness
+        initialQuickEditPanel={{
+          mode: 'quick-edit',
+          sourceLayerId: 'layer-source',
+          prompt: '改成雨天',
+          assetLabel: '  雨天勇者  ',
+          size: '1024x768',
+          model: 'gpt-image-2',
+          status: 'idle',
+        }}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: '提交快速编辑' }));
+
+    await waitFor(() => {
+      expect(editEditorImageMock).toHaveBeenCalledWith(
+        expect.objectContaining({ assetLabel: '雨天勇者' }),
+      );
+      expect(screen.getByTestId('layers').textContent).toContain(
+        'layer-source:雨天勇者:resource-source',
+      );
+    });
+  });
+
+  it('rejects direct quick edit submission for icon assets', async () => {
+    render(
+      <SubmissionWorkflowHarness
+        initialLayers={[createLayer({ assetKind: 'icon' })]}
+        initialQuickEditPanel={{
+          mode: 'quick-edit',
+          sourceLayerId: 'layer-source',
+          prompt: '修改图标',
+          size: '1024x1024',
+          aspectRatio: '1:1',
+          imageSize: '1K',
+          model: 'gpt-image-2',
+          status: 'idle',
+        }}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: '提交快速编辑' }));
+
+    expect(editEditorImageMock).not.toHaveBeenCalled();
+    expect(screen.getByTestId('quick-edit').textContent).toContain(
+      'failed:修改图标:图标类素材不支持快速编辑',
+    );
+  });
+
   it('clears quick edit panel after a queued edit reloads the project snapshot', async () => {
     const applyProjectSnapshot = vi.fn();
     const refreshTaskList = vi.fn();
@@ -668,7 +729,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     expect(generateEditorImageMock).not.toHaveBeenCalled();
     await waitFor(() => {
       expect(screen.getByTestId('layers').textContent).toContain(
-        'layer-source:源图:resource-source',
+        'layer-source:源图 快速编辑:resource-source',
       );
     });
     expect(screen.getByTestId('quick-edit').textContent).toBe('-');
@@ -725,7 +786,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
 
     await waitFor(() => {
       expect(screen.getByTestId('layers').textContent).toContain(
-        'layer-source:源图:resource-source:-:-:data:image/png;base64,generated',
+        'layer-source:源图 快速编辑:resource-source:-:-:data:image/png;base64,generated',
       );
     });
     expect(screen.getByTestId('layers').textContent).not.toContain(
@@ -941,6 +1002,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     );
     render(
       <SubmissionWorkflowHarness
+        projectId="editor-project-1"
         initialLayers={[
           createLayer({
             assetKind: 'character',
@@ -951,6 +1013,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
           mode: 'redraw',
           sourceLayerId: 'layer-source',
           prompt: '  角色换成蓝色披风  ',
+          assetLabel: '  蓝披风勇者  ',
           size: '1024x768',
           model: 'gpt-image-2',
           status: 'idle',
@@ -971,12 +1034,16 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
           model: 'gpt-image-2',
           referenceImageSrcs: ['resource-source'],
           assetKind: 'character',
+          assetLabel: '蓝披风勇者',
+          canvasCompletion: expect.objectContaining({
+            title: '蓝披风勇者',
+          }),
         }),
       );
     });
     await waitFor(() => {
       expect(screen.getByTestId('layers').textContent).toContain(
-        'layer-quick-edit-1:源图 重绘:resource-source:character',
+        'layer-quick-edit-1:蓝披风勇者:resource-source:character',
       );
     });
     expect(screen.getByTestId('quick-edit').textContent).toBe(
@@ -1208,7 +1275,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     expect(generateEditorVideoMock).not.toHaveBeenCalled();
     await waitFor(() => {
       expect(screen.getByTestId('layers').textContent).toContain(
-        'layer-source:角色动作:resource-source:character-animation:image-sequence:data:image/png;base64,action-frame-edited',
+        'layer-source:角色动作 快速编辑:resource-source:character-animation:image-sequence:data:image/png;base64,action-frame-edited',
       );
     });
   });
@@ -1307,8 +1374,32 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
             layerId: 'layer-editor-resource-character',
             resourceId: 'editor-resource-character',
           },
+          {
+            layerId: 'layer-editor-resource-character-source',
+            resourceId: 'editor-resource-character-source',
+          },
+        ],
+        resources: [
+          {
+            resourceId: 'editor-resource-character',
+            projectId: 'editor-project-1',
+            imageSrc: '/generated-character-drafts/editor/character.png',
+            width: 1024,
+            height: 1024,
+            sourceType: 'generated',
+            assetKind: 'character',
+          },
+          {
+            resourceId: 'editor-resource-character-source',
+            projectId: 'editor-project-1',
+            imageSrc:
+              '/generated-character-drafts/editor/character-green-screen-source.png',
+            width: 1024,
+            height: 1024,
+            sourceType: 'generated',
+            assetKind: 'editor_green_screen_source',
+          },
         ],
-        resources: [],
         updatedAt: '2026-06-21T12:16:22.000Z',
       },
     });
@@ -1366,6 +1457,24 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
         expect.objectContaining({
           projectId: 'editor-project-1',
           title: '角色项目',
+          layers: expect.arrayContaining([
+            expect.objectContaining({
+              resourceId: 'editor-resource-character',
+            }),
+            expect.objectContaining({
+              resourceId: 'editor-resource-character-source',
+            }),
+          ]),
+          resources: expect.arrayContaining([
+            expect.objectContaining({
+              resourceId: 'editor-resource-character',
+              assetKind: 'character',
+            }),
+            expect.objectContaining({
+              resourceId: 'editor-resource-character-source',
+              assetKind: 'editor_green_screen_source',
+            }),
+          ]),
         }),
       );
     });
@@ -1627,6 +1736,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
         applyProjectSnapshot,
         refreshTaskList,
         refreshWalletBalance,
+        undefined,
         'dialog-background-removal',
       );
       await Promise.resolve();
@@ -1650,6 +1760,35 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     }
   });
 
+  it('reports a non-blocking warning after a queued generation completes', async () => {
+    const onGenerationWarning = vi.fn();
+    loadEditorProjectMock.mockResolvedValueOnce({
+      projectId: 'editor-project-1',
+      title: '队列图集项目',
+      viewport: { x: 0, y: 0, scale: 1 },
+      layers: [],
+      resources: [],
+      updatedAt: '2026-06-23T08:00:00.000Z',
+    });
+
+    await applyQueuedEditorGenerationProject(
+      {
+        queueState: createQueueState({
+          warning: '连通域数量不足',
+        }),
+      },
+      'editor-project-1',
+      vi.fn(),
+      vi.fn(),
+      vi.fn(),
+      onGenerationWarning,
+    );
+
+    expect(onGenerationWarning).toHaveBeenCalledWith(
+      '图集已生成，但自动拆分未完成：连通域数量不足',
+    );
+  });
+
   it('keeps a queued generation pending when the frontend queue wait expires', async () => {
     vi.useFakeTimers();
     try {
@@ -2015,13 +2154,19 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
       provider: 'VectorEngine',
       taskId: 'task-icons',
       iconImageSrcs: [],
+      sliceWarning: {
+        code: 'insufficient-connected-components',
+        reason: '连通域数量不足',
+      },
     });
     render(
       <SubmissionWorkflowHarness
+        projectId="editor-project-1"
         initialDialog={{
           id: 'dialog-icon',
           mode: 'icon',
           prompt: '  返回按钮  \n\n  设置按钮  ',
+          assetLabel: '  复古操作图标  ',
           status: 'idle',
           composerOpen: true,
           imageModel: 'gpt-image-2',
@@ -2053,12 +2198,16 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
             'generated-character-drafts/editor/generation-references/reference.png',
           iconDescriptions: ['返回按钮', '设置按钮'],
           model: 'gpt-image-2',
+          assetLabel: '复古操作图标',
+          canvasCompletion: expect.objectContaining({
+            title: '复古操作图标',
+          }),
         }),
       );
     });
     await waitFor(() => {
       expect(screen.getByTestId('layers').textContent).toContain(
-        'layer-icon-spritesheet-1:图标素材图集 1:-:icon-spritesheet',
+        'layer-icon-spritesheet-1:复古操作图标:-:icon-spritesheet',
       );
     });
     expect(screen.getByTestId('layers').textContent).not.toContain(
@@ -2073,6 +2222,9 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     expect(screen.getByTestId('remembered-model').textContent).toBe(
       'gpt-image-2',
     );
+    expect(screen.getByTestId('generation-warning').textContent).toBe(
+      '图集已生成，但自动拆分未完成：连通域数量不足',
+    );
   });
 
   it('submits uploaded objectKey icon references before submitting spritesheets', async () => {
@@ -2411,6 +2563,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     });
     render(
       <SubmissionWorkflowHarness
+        projectId="editor-project-1"
         initialLayers={[
           createLayer({
             id: 'character-layer',
@@ -2443,6 +2596,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
             'generated-character-drafts/editor/generation-references/reference.png',
           promptText: '跑步',
           model: 'seedance2.0-fast',
+          assetFolderId: 'project',
         }),
       );
     });
@@ -2499,6 +2653,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
     });
     render(
       <SubmissionWorkflowHarness
+        projectId="editor-project-1"
         initialLayers={[
           createLayer({
             id: 'character-layer',
@@ -2512,6 +2667,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
           mode: 'character-animation',
           sourceLayerId: 'character-layer',
           prompt: '  挥手动作  ',
+          assetLabel: '  勇者挥手  ',
           status: 'idle',
           composerOpen: true,
           characterAnimationResolution: '480p',
@@ -2530,6 +2686,7 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
         initialCharacterAnimationPanel={{
           sourceLayerId: 'character-layer',
           promptText: '  挥手动作  ',
+          assetLabel: '  勇者挥手  ',
           resolution: '480p',
           ratio: 'same',
           frameCount: 32,
@@ -2549,12 +2706,16 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
           sourceImageSrc: 'generated/character.png',
           promptText: '挥手动作',
           model: 'seedance2.0-fast',
+          assetLabel: '勇者挥手',
+          canvasCompletion: expect.objectContaining({
+            title: '勇者挥手',
+          }),
         }),
       );
     });
     await waitFor(() => {
       expect(screen.getByTestId('layers').textContent).toContain(
-        'layer-character-animation-1:角色动作:resource-source:character-animation:image-sequence:data:image/png;base64,action-frame:data:image/png;base64,action-frame:4',
+        'layer-character-animation-1:勇者挥手:resource-source:character-animation:image-sequence:data:image/png;base64,action-frame:data:image/png;base64,action-frame:4',
       );
     });
     expect(screen.getByTestId('dialog').textContent).toBe(
diff --git a/src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.ts b/src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.ts
index 69f6a1e35..0a12470a8 100644
--- a/src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.ts
+++ b/src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.ts
@@ -67,6 +67,7 @@ import {
   inferEditorImageAspectRatio,
   inferEditorImageSizeLabel,
   isCanvasGenerationDialog,
+  isQuickEditUnsupportedAssetKind,
   normalizeEditorImageModel,
   resolveEditorImageGenerationPixelSize,
   resolveImageGenerationErrorMessage,
@@ -76,6 +77,7 @@ import {
   buildCharacterAnimationSubmissionPlan,
   buildIconSpritesheetGenerationSubmissionPlan,
   buildImageGenerationSubmissionPlan,
+  resolveGenerationAssetLabel,
 } from './ImageCanvasGenerationSubmissionModel';
 import type {
   UiAssetExtractionMark,
@@ -292,6 +294,7 @@ type GenerationSubmissionWorkflowOptions = {
   applyProjectSnapshot?: (project: EditorProjectSnapshot) => void;
   onQueuedGenerationTask?: () => void;
   onWalletBalanceMayHaveChanged?: () => void;
+  onGenerationWarning?: (message: string) => void;
 };
 
 async function normalizeImageGenerationReferenceImages(
@@ -427,6 +430,17 @@ function notifyWalletBalanceMayHaveChanged(callback?: () => void) {
   callback?.();
 }
 
+function notifyEditorGenerationWarning(
+  warning: string | null | undefined,
+  callback?: (message: string) => void,
+) {
+  const reason = warning?.trim();
+  if (!reason) {
+    return;
+  }
+  callback?.(`图集已生成，但自动拆分未完成：${reason}`);
+}
+
 async function runEditorGenerationWithWalletRefresh<T>(
   operation: Promise<T>,
   onWalletBalanceMayHaveChanged?: () => void,
@@ -471,6 +485,7 @@ export async function applyQueuedEditorGenerationProject(
   applyProjectSnapshot: ((project: EditorProjectSnapshot) => void) | undefined,
   onQueuedGenerationTask?: () => void,
   onWalletBalanceMayHaveChanged?: () => void,
+  onGenerationWarning?: (message: string) => void,
   completionDialogId?: string | null,
   transformProjectSnapshot?: (
     project: EditorProjectSnapshot,
@@ -490,6 +505,7 @@ export async function applyQueuedEditorGenerationProject(
   if (!terminalState) {
     return true;
   }
+  notifyEditorGenerationWarning(terminalState.warning, onGenerationWarning);
   if (projectId && applyProjectSnapshot) {
     const applyLoadedProject = (project: EditorProjectSnapshot) => {
       applyProjectSnapshot(transformProjectSnapshot?.(project) ?? project);
@@ -575,6 +591,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
   applyProjectSnapshot,
   onQueuedGenerationTask,
   onWalletBalanceMayHaveChanged,
+  onGenerationWarning,
 }: GenerationSubmissionWorkflowOptions) {
   const addGeneratedLayersToCanvas = useCallback(
     (nextLayers: CanvasLayer[]) => {
@@ -664,6 +681,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
       options: {
         frame?: GenerateDialogState['placeholder'];
         dialogId?: string;
+        title?: string;
       } = {},
     ) => {
       if (
@@ -681,6 +699,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
         generationInputs,
         mode,
         frame: options.frame,
+        title: options.title,
       });
 
       addGeneratedLayersToCanvas([nextLayer]);
@@ -736,15 +755,18 @@ export function useImageCanvasGenerationSubmissionWorkflow({
       sourceLayer: CanvasLayer,
       generationInputs: CanvasGenerationInputs,
       dialogId?: string,
+      title?: string,
     ) => {
       updateSourceLayer(
         sourceLayer.id,
-        (layer) =>
-          applyImageEditResultToSourceLayer({
+        (layer) => ({
+          ...applyImageEditResultToSourceLayer({
             generated,
             sourceLayer: layer,
             generationInputs,
           }),
+          ...(title ? { title } : {}),
+        }),
         { fit: false, persist: false },
       );
       setQuickEditPanel(null);
@@ -1074,6 +1096,10 @@ export function useImageCanvasGenerationSubmissionWorkflow({
           }),
           onWalletBalanceMayHaveChanged,
         );
+        notifyEditorGenerationWarning(
+          generated.sliceWarning?.reason,
+          onGenerationWarning,
+        );
         if (
           await applyQueuedEditorGenerationProject(
             generated,
@@ -1081,6 +1107,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
             applyProjectSnapshot,
             onQueuedGenerationTask,
             onWalletBalanceMayHaveChanged,
+            onGenerationWarning,
           )
         ) {
           return;
@@ -1119,6 +1146,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
       fitLayers,
       projectId,
       assetFolderId,
+      onGenerationWarning,
       onWalletBalanceMayHaveChanged,
     ],
   );
@@ -1134,8 +1162,10 @@ export function useImageCanvasGenerationSubmissionWorkflow({
       ) => {
         updateCanvasGenerationDialogById(nextDialog.id, () => nextDialog);
       };
-      const submissionPlan =
-        buildIconSpritesheetGenerationSubmissionPlan(dialog);
+      const submissionPlan = buildIconSpritesheetGenerationSubmissionPlan(
+        dialog,
+        layerCounterRef.current + 1,
+      );
       if (submissionPlan.ok === false) {
         if (canvasDialog) {
           setSubmittingIconDialog({
@@ -1189,11 +1219,12 @@ export function useImageCanvasGenerationSubmissionWorkflow({
             projectId,
             generationInputs: submissionPlan.generationInputs,
             assetFolderId,
+            assetLabel: submissionPlan.resultTitle,
             ...(projectId && canvasCompletionPlaceholder
               ? {
                   canvasCompletion: {
                     dialogId: canvasDialog.id,
-                    title: '图标素材图集',
+                    title: submissionPlan.resultTitle,
                     placeholder: canvasCompletionPlaceholder,
                   },
                 }
@@ -1202,6 +1233,10 @@ export function useImageCanvasGenerationSubmissionWorkflow({
           onWalletBalanceMayHaveChanged,
         );
         rememberImageModel(submissionPlan.rememberImageModel);
+        notifyEditorGenerationWarning(
+          generated.sliceWarning?.reason,
+          onGenerationWarning,
+        );
         if (
           await applyQueuedEditorGenerationProject(
             generated,
@@ -1209,6 +1244,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
             applyProjectSnapshot,
             onQueuedGenerationTask,
             onWalletBalanceMayHaveChanged,
+            onGenerationWarning,
           )
         ) {
           return;
@@ -1223,6 +1259,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
           submissionPlan.generationInputs,
           canvasCompletionPlaceholder,
           canvasDialog.id,
+          { spritesheetTitle: submissionPlan.resultTitle },
         );
       } catch (error) {
         setSubmittingIconDialog({
@@ -1238,10 +1275,12 @@ export function useImageCanvasGenerationSubmissionWorkflow({
       addIconSpritesheetResultLayers,
       applyProjectSnapshot,
       getGeneratingDialogPlaceholder,
+      layerCounterRef,
       rememberImageModel,
       projectId,
       assetFolderId,
       updateCanvasGenerationDialogById,
+      onGenerationWarning,
       onWalletBalanceMayHaveChanged,
     ],
   );
@@ -1251,7 +1290,20 @@ export function useImageCanvasGenerationSubmissionWorkflow({
       return;
     }
 
+    if (isQuickEditUnsupportedAssetKind(quickEditSourceLayer)) {
+      setQuickEditPanel({
+        ...quickEditPanel,
+        status: 'failed',
+        errorMessage: '图标类素材不支持快速编辑',
+      });
+      return;
+    }
+
     const panelMode = quickEditPanel.mode ?? 'quick-edit';
+    const quickEditResultTitle = resolveGenerationAssetLabel(
+      quickEditPanel.assetLabel,
+      `${quickEditSourceLayer.title} ${panelMode === 'redraw' ? '重绘' : '快速编辑'}`,
+    );
     const quickEditReferences =
       panelMode === 'redraw' || panelMode === 'quick-edit'
         ? []
@@ -1268,11 +1320,20 @@ export function useImageCanvasGenerationSubmissionWorkflow({
         quickEditSourceLayer.originalWidth,
         quickEditSourceLayer.originalHeight,
       );
-    const quickEditOutputSize = {
-      width: quickEditSourceLayer.originalWidth,
-      height: quickEditSourceLayer.originalHeight,
-    };
-    const quickEditSize = `${quickEditSourceLayer.originalWidth}x${quickEditSourceLayer.originalHeight}`;
+    const normalizedQuickEditModel = normalizeEditorImageModel(
+      quickEditPanel.model,
+    );
+    const quickEditOutputSize = isVideoQuickEditSource(quickEditSourceLayer)
+      ? {
+          width: quickEditSourceLayer.originalWidth,
+          height: quickEditSourceLayer.originalHeight,
+        }
+      : resolveEditorImageGenerationPixelSize({
+          model: normalizedQuickEditModel,
+          aspectRatio: quickEditAspectRatio,
+          imageSize: quickEditImageSize,
+        });
+    const quickEditSize = `${quickEditOutputSize.width}x${quickEditOutputSize.height}`;
     const basePrompt =
       quickEditPanel.prompt.trim() ||
       (panelMode === 'redraw' ? '重绘图片' : '快速编辑图片');
@@ -1294,6 +1355,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
           width: quickEditOutputSize.width,
           height: quickEditOutputSize.height,
         },
+        assetLabel: quickEditResultTitle,
       });
       const quickEditPlacement = quickEditDraft.placeholder
         ? chooseGenerationPlacement({
@@ -1390,12 +1452,12 @@ export function useImageCanvasGenerationSubmissionWorkflow({
             sourceResourceId: quickEditSourceLayer.resourceId,
             assetKind: quickEditSourceLayer.assetKind,
             assetFolderId,
-            assetLabel: `${quickEditSourceLayer.title} 快速编辑`,
+            assetLabel: quickEditResultTitle,
             ...(projectId && quickEditCanvasCompletionPlaceholder
               ? {
                   canvasCompletion: {
                     dialogId: quickEditDialogId,
-                    title: `${quickEditSourceLayer.title} 快速编辑`,
+                    title: quickEditResultTitle,
                     placeholder: quickEditCanvasCompletionPlaceholder,
                   },
                 }
@@ -1423,7 +1485,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
         }
         addVideoResultLayer(
           generated,
-          `${quickEditSourceLayer.title} 快速编辑`,
+          quickEditResultTitle,
           generationInputs,
           quickEditFrame,
           quickEditDialogId,
@@ -1484,7 +1546,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
                 prompt: normalizedPrompt,
                 sourceImageSrc: sourceReferenceImageSrc,
                 size: quickEditSize,
-                model: IMAGE_MODEL_GPT_IMAGE_2,
+                model: normalizedQuickEditModel,
                 ...(extraReferenceImageSrcs.length
                   ? { referenceImageSrcs: extraReferenceImageSrcs }
                   : {}),
@@ -1492,7 +1554,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
                 assetKind: quickEditSourceLayer.assetKind,
                 generationInputs,
                 assetFolderId,
-                assetLabel: `${quickEditSourceLayer.title} 快速编辑`,
+                assetLabel: quickEditResultTitle,
                 sourceResourceId: quickEditSourceLayer.resourceId,
                 targetLayerId: quickEditSourceLayer.id,
               }),
@@ -1505,7 +1567,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
                 aspectRatio: quickEditAspectRatio,
                 imageSize: quickEditImageSize,
                 kind: isCharacterRedraw ? 'character' : 'quick-edit',
-                model: normalizeEditorImageModel(quickEditPanel.model),
+                model: normalizedQuickEditModel,
                 referenceImageSrcs: [
                   ...extraReferenceImageSrcs,
                   sourceReferenceImageSrc,
@@ -1514,13 +1576,13 @@ export function useImageCanvasGenerationSubmissionWorkflow({
                 assetKind: quickEditSourceLayer.assetKind,
                 generationInputs,
                 assetFolderId,
-                assetLabel: `${quickEditSourceLayer.title} 重绘`,
+                assetLabel: quickEditResultTitle,
                 sourceResourceId: quickEditSourceLayer.resourceId,
                 ...(projectId && quickEditCanvasCompletionPlaceholder
                   ? {
                       canvasCompletion: {
                         dialogId: quickEditDialogId,
-                        title: `${quickEditSourceLayer.title} 重绘`,
+                        title: quickEditResultTitle,
                         placeholder: quickEditCanvasCompletionPlaceholder,
                       },
                     }
@@ -1559,6 +1621,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
           quickEditSourceLayer,
           generationInputs,
           quickEditDialogId,
+          quickEditResultTitle,
         );
       } else {
         addQuickEditResultLayer(
@@ -1570,8 +1633,9 @@ export function useImageCanvasGenerationSubmissionWorkflow({
             ? {
                 frame: quickEditFrame,
                 dialogId: quickEditDialogId,
+                title: quickEditResultTitle,
               }
-            : {},
+            : { title: quickEditResultTitle },
         );
       }
     } catch (error) {
@@ -1682,13 +1746,13 @@ export function useImageCanvasGenerationSubmissionWorkflow({
               assetKind: submissionPlan.sourceLayer.assetKind,
               generationInputs: submissionPlan.generationInputs,
               assetFolderId,
-              assetLabel: `${submissionPlan.sourceLayer.title} 修改结果`,
+              assetLabel: submissionPlan.resultTitle,
               sourceResourceId: submissionPlan.sourceLayer.resourceId,
               ...(projectId && editCanvasCompletionPlaceholder
                 ? {
                     canvasCompletion: {
                       dialogId: canvasDialog?.id,
-                      title: `${submissionPlan.sourceLayer.title} 修改结果`,
+                      title: submissionPlan.resultTitle,
                       placeholder: editCanvasCompletionPlaceholder,
                     },
                   }
@@ -1713,6 +1777,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
           }
           addGeneratedResultLayer(generated, {
             sourceLayer: submissionPlan.sourceLayer,
+            title: submissionPlan.resultTitle,
             generationInputs: submissionPlan.generationInputs,
           });
         } else if (submissionPlan.kind === 'quick-edit') {
@@ -1783,6 +1848,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
             submissionPlan.sourceLayer,
             submissionPlan.result.generationInputs,
             canvasDialog?.id,
+            submissionPlan.result.title,
           );
         } else if (submissionPlan.kind === 'video') {
           const canvasCompletionPlaceholder =
@@ -2041,6 +2107,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
         characterAnimationFrameCount: characterAnimationPanel.frameCount,
         characterAnimationDurationSeconds:
           characterAnimationPanel.durationSeconds,
+        assetLabel: submissionPlan.resultTitle,
         characterAnimationResult: undefined,
         status: 'generating',
         composerOpen: false,
@@ -2050,6 +2117,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
     const nextPanel = {
       ...characterAnimationPanel,
       promptText: submissionPlan.promptText,
+      assetLabel: submissionPlan.resultTitle,
       status: 'generating' as const,
       errorMessage: undefined,
       result: undefined,
@@ -2082,11 +2150,12 @@ export function useImageCanvasGenerationSubmissionWorkflow({
           projectId,
           generationInputs,
           sourceResourceId: characterAnimationSourceLayer.resourceId,
+          assetFolderId,
           ...(canvasDialog && projectId && canvasCompletionPlaceholder
             ? {
                 canvasCompletion: {
                   dialogId: canvasDialog.id,
-                  title: '角色动作',
+                  title: submissionPlan.resultTitle,
                   placeholder: canvasCompletionPlaceholder,
                 },
               }
@@ -2112,7 +2181,7 @@ export function useImageCanvasGenerationSubmissionWorkflow({
       if (canvasDialog) {
         addCharacterAnimationResultLayer(
           result,
-          '角色动作',
+          submissionPlan.resultTitle,
           generationInputs,
           canvasCompletionPlaceholder,
           canvasDialog.id,
diff --git a/src/components/image-editor/useImageCanvasGenerationSurface.tsx b/src/components/image-editor/useImageCanvasGenerationSurface.tsx
index 4ad836552..e132fdc64 100644
--- a/src/components/image-editor/useImageCanvasGenerationSurface.tsx
+++ b/src/components/image-editor/useImageCanvasGenerationSurface.tsx
@@ -343,7 +343,7 @@ export function useImageCanvasGenerationSurface({
 
   const generationComposerNode = (
     <>
-      {generationWorkflow.referencePickWarning ? (
+      {generationWorkflow.generationWarning ? (
         <PlatformRuntimeStatusToast
           tone="warning"
           surface="solid"
@@ -351,12 +351,12 @@ export function useImageCanvasGenerationSurface({
           className="image-canvas-editor__reference-pick-toast"
           role="alert"
         >
-          <span>{generationWorkflow.referencePickWarning}</span>
+          <span>{generationWorkflow.generationWarning}</span>
           <button
             type="button"
             className="image-canvas-editor__reference-pick-toast-close"
             aria-label="关闭提示"
-            onClick={generationWorkflow.clearReferencePickWarning}
+            onClick={generationWorkflow.clearGenerationWarning}
           >
             <X aria-hidden="true" size={14} strokeWidth={2.4} />
           </button>
diff --git a/src/components/image-editor/useImageCanvasGenerationWorkflow.test.tsx b/src/components/image-editor/useImageCanvasGenerationWorkflow.test.tsx
index d4a5eacfa..0905ad930 100644
--- a/src/components/image-editor/useImageCanvasGenerationWorkflow.test.tsx
+++ b/src/components/image-editor/useImageCanvasGenerationWorkflow.test.tsx
@@ -29,6 +29,7 @@ const generateEditorSoundEffectMock = vi.hoisted(() => vi.fn());
 const generateEditorBackgroundMusicMock = vi.hoisted(() => vi.fn());
 const editEditorImageMock = vi.hoisted(() => vi.fn());
 const createEditorProjectResourceMock = vi.hoisted(() => vi.fn());
+const splitEditorIconSpritesheetMock = vi.hoisted(() => vi.fn());
 const uploadEditorMediaAssetFileMock = vi.hoisted(() => vi.fn());
 const renderCropExpandImageMock = vi.hoisted(() => vi.fn());
 const removeImageBackgroundMock = vi.hoisted(() => vi.fn());
@@ -60,6 +61,7 @@ vi.mock('../../services/image-editor/editorProjectClient', async () => {
     generateEditorIconSpritesheet: generateEditorIconSpritesheetMock,
     generateEditorImage: generateEditorImageMock,
     generateEditorSoundEffect: generateEditorSoundEffectMock,
+    splitEditorIconSpritesheet: splitEditorIconSpritesheetMock,
   };
 });
 
@@ -245,7 +247,7 @@ function GenerationWorkflowHarness({
         {activeDialog?.uiDesignSpecReference?.label ?? '-'}
       </span>
       <span data-testid="reference-pick-warning">
-        {workflow.referencePickWarning ?? '-'}
+        {workflow.generationWarning ?? '-'}
       </span>
       <span data-testid="quick-edit">
         {workflow.quickEditPanel
@@ -280,6 +282,9 @@ function GenerationWorkflowHarness({
           ? `${workflow.characterAnimationPanel.sourceLayerId}:${workflow.characterAnimationPanel.status}`
           : '-'}
       </span>
+      <span data-testid="character-animation-name">
+        {`${workflow.characterAnimationPanel?.assetLabel ?? '-'}:${activeDialog?.assetLabel ?? '-'}`}
+      </span>
       <span data-testid="character-animation-price">
         {workflow.characterAnimationPrice}
       </span>
@@ -507,6 +512,12 @@ function GenerationWorkflowHarness({
       >
         去除背景
       </button>
+      <button
+        type="button"
+        onClick={() => void workflow.splitSelectedIconSpritesheet(layers[0]!)}
+      >
+        拆分图集
+      </button>
       <button
         type="button"
         onClick={() =>
@@ -527,6 +538,18 @@ function GenerationWorkflowHarness({
       >
         打开普通动画
       </button>
+      <button
+        type="button"
+        onClick={() =>
+          workflow.setCharacterAnimationPanel((currentPanel) =>
+            currentPanel
+              ? { ...currentPanel, assetLabel: '勇者挥手' }
+              : currentPanel,
+          )
+        }
+      >
+        命名角色动画
+      </button>
       <button
         type="button"
         onClick={() =>
@@ -915,7 +938,7 @@ describe('useImageCanvasGenerationWorkflow', () => {
     );
   });
 
-  it('opens quick edit for plain generated images without inheriting hidden source dimensions', () => {
+  it('opens quick edit for plain generated images with source model parameters', () => {
     render(<GenerationWorkflowHarness />);
 
     fireEvent.click(
@@ -929,7 +952,7 @@ describe('useImageCanvasGenerationWorkflow', () => {
       'layer-source:idle:-',
     );
     expect(screen.getByTestId('quick-edit-image-options').textContent).toBe(
-      'quick-edit:gpt-image-2:4:3:1K',
+      'quick-edit:gpt-image-2:2:3:2K',
     );
     expect(screen.getByTestId('quick-edit-selection').textContent).toBe(
       'layer-source:none:0',
@@ -1074,7 +1097,7 @@ describe('useImageCanvasGenerationWorkflow', () => {
     );
   });
 
-  it('keeps source image model and infers dimensions from the current image when opening quick edit', () => {
+  it('prefers the source generation parameter snapshot when opening quick edit', () => {
     render(
       <GenerationWorkflowHarness
         initialLayers={[
@@ -1094,7 +1117,7 @@ describe('useImageCanvasGenerationWorkflow', () => {
 
     expect(screen.getByTestId('dialog').textContent).toBe('-');
     expect(screen.getByTestId('quick-edit-image-options').textContent).toBe(
-      'quick-edit:gpt-image-2:3:2:2K',
+      'quick-edit:gpt-image-2:2:3:2K',
     );
   });
 
@@ -1667,7 +1690,7 @@ describe('useImageCanvasGenerationWorkflow', () => {
 
     await waitFor(() => {
       expect(screen.getByTestId('layers').textContent).toContain(
-        'layer-source:源图:resource-source:-:data:image/png;base64,generated:task-generated',
+        'layer-source:源图 快速编辑:resource-source:-:data:image/png;base64,generated:task-generated',
       );
     });
     expect(screen.getByTestId('quick-edit').textContent).toBe('-');
@@ -1771,6 +1794,66 @@ describe('useImageCanvasGenerationWorkflow', () => {
     );
   });
 
+  it('splits an icon spritesheet through the project endpoint and applies the project snapshot', async () => {
+    const applyProjectSnapshot = vi.fn();
+    const project = {
+      projectId: 'project-1',
+      title: '未命名画布',
+      canvas: {
+        canvasId: 'project-1:canvas:default',
+        projectId: 'project-1',
+        title: '默认画布',
+        viewport: { x: 0, y: 0, scale: 1 },
+        layers: [],
+        updatedAt: '2026-07-13T00:00:00.000Z',
+      },
+      viewport: { x: 0, y: 0, scale: 1 },
+      layers: [],
+      resources: [],
+      updatedAt: '2026-07-13T00:00:00.000Z',
+    };
+    splitEditorIconSpritesheetMock.mockResolvedValueOnce({
+      iconImageSrcs: [],
+      project,
+    });
+    render(
+      <GenerationWorkflowHarness
+        projectId="project-1"
+        applyProjectSnapshot={applyProjectSnapshot}
+        initialLayers={[
+          createLayer({
+            assetKind: 'icon-spritesheet',
+            originalWidth: 1024,
+            originalHeight: 1024,
+          }),
+        ]}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: '拆分图集' }));
+
+    await waitFor(() => {
+      expect(splitEditorIconSpritesheetMock).toHaveBeenCalledWith({
+        projectId: 'project-1',
+        sourceResourceId: 'resource-source',
+        assetFolderId: undefined,
+        canvasCompletion: {
+          title: '拆分图集',
+          placeholder: {
+            x: 120,
+            y: 140,
+            width: 320,
+            height: 240,
+            originalWidth: 1024,
+            originalHeight: 1024,
+          },
+        },
+      });
+    });
+    expect(applyProjectSnapshot).toHaveBeenCalledWith(project);
+    expect(screen.getByTestId('sidebar').textContent).toBe('layers');
+  });
+
   it('resolves private character image before removing background', async () => {
     resolveEditorImageReferenceDataUrlMock.mockResolvedValueOnce(
       'data:image/png;base64,resolved-character',
@@ -2053,6 +2136,17 @@ describe('useImageCanvasGenerationWorkflow', () => {
     expect(screen.getByTestId('image-context').textContent).toBe('-');
   });
 
+  it('keeps character animation asset names synchronized with the dialog', () => {
+    render(<GenerationWorkflowHarness />);
+
+    fireEvent.click(screen.getByRole('button', { name: '打开角色动画' }));
+    fireEvent.click(screen.getByRole('button', { name: '命名角色动画' }));
+
+    expect(screen.getByTestId('character-animation-name').textContent).toBe(
+      '勇者挥手:勇者挥手',
+    );
+  });
+
   it('hides non-generating canvas generation composers without deleting placeholders', () => {
     render(<GenerationWorkflowHarness />);
 
diff --git a/src/components/image-editor/useImageCanvasGenerationWorkflow.ts b/src/components/image-editor/useImageCanvasGenerationWorkflow.ts
index 9e64ea448..fae402d45 100644
--- a/src/components/image-editor/useImageCanvasGenerationWorkflow.ts
+++ b/src/components/image-editor/useImageCanvasGenerationWorkflow.ts
@@ -14,6 +14,7 @@ import { resolveEditorImageReferenceDataUrl } from '../../services/image-editor/
 import { uploadEditorMediaAssetFile } from '../../services/image-editor/editorMediaAssetUploadClient';
 import {
   createEditorProjectResource,
+  splitEditorIconSpritesheet,
   type EditorAssetSnapshot,
   type EditorProjectLayerSnapshot,
   type EditorProjectResourceSnapshot,
@@ -79,6 +80,7 @@ import {
   ICON_DESCRIPTION_LIMIT,
   IMAGE_MODEL_GPT_IMAGE_2,
   isCanvasGenerationDialog,
+  isQuickEditUnsupportedAssetKind,
   normalizeEditorImageModel,
   resizeGenerationPlaceholderToImageSelection,
   resolveEditorImageGenerationPixelSize,
@@ -484,6 +486,7 @@ function createCharacterAnimationPanelFromDialog(
   return {
     sourceLayerId: dialog.sourceLayerId,
     promptText: dialog.prompt,
+    assetLabel: dialog.assetLabel,
     resolution: dialog.characterAnimationResolution ?? '480p',
     ratio: dialog.characterAnimationRatio ?? 'same',
     frameCount: dialog.characterAnimationFrameCount ?? 32,
@@ -517,6 +520,7 @@ function applyCharacterAnimationPanelToDialog(
   return {
     ...dialog,
     prompt: panel.promptText,
+    assetLabel: panel.assetLabel,
     characterAnimationResolution: panel.resolution,
     characterAnimationRatio: panel.ratio,
     characterAnimationFrameCount: panel.frameCount,
@@ -616,6 +620,7 @@ export function useImageCanvasGenerationWorkflow({
     setTaskListRefreshKey((key) => key + 1);
   }, []);
   const previousTaskCountRef = useRef(canvasGenerationDialogs.length);
+  const splittingIconSpritesheetLayerIdsRef = useRef(new Set<string>());
   const [isSpecMenuOpen, setIsSpecMenuOpen] = useState(false);
   const [isGenerationReferenceMenuOpen, setIsGenerationReferenceMenuOpen] =
     useState(false);
@@ -654,9 +659,9 @@ export function useImageCanvasGenerationWorkflow({
   ] = useState(false);
   const [quickEditPanel, setQuickEditPanel] =
     useState<QuickEditPanelState | null>(null);
-  const [referencePickWarning, setReferencePickWarning] = useState<
-    string | null
-  >(null);
+  const [generationWarning, setGenerationWarning] = useState<string | null>(
+    null,
+  );
   const [cropExpandPanel, setCropExpandPanel] =
     useState<CropExpandPanelState | null>(null);
   const [uiAssetExtractionState, setUiAssetExtractionState] =
@@ -1122,6 +1127,8 @@ export function useImageCanvasGenerationWorkflow({
       );
       return createQuickEditPanelDraft(sourceLayer, {
         imageModel: sourceDialog?.imageModel,
+        aspectRatio: sourceDialog?.aspectRatio,
+        imageSize: sourceDialog?.imageSize,
       });
     },
     [canvasGenerationDialogs],
@@ -1129,6 +1136,9 @@ export function useImageCanvasGenerationWorkflow({
 
   const openQuickEditPanel = useCallback(
     (sourceLayer: CanvasLayer) => {
+      if (isQuickEditUnsupportedAssetKind(sourceLayer)) {
+        return;
+      }
       setImageContextMenu(null);
       setMetadataLayer(null);
       setUiAssetExtractionState(null);
@@ -1613,6 +1623,7 @@ export function useImageCanvasGenerationWorkflow({
             applyProjectSnapshot,
             refreshTaskListForQueuedGeneration,
             onWalletBalanceMayHaveChanged,
+            setGenerationWarning,
             backgroundRemovalDialogId,
             applyBackgroundRemovalProjectSnapshot
               ? (project) =>
@@ -1689,13 +1700,73 @@ export function useImageCanvasGenerationWorkflow({
     ],
   );
 
+  const splitSelectedIconSpritesheet = useCallback(
+    async (sourceLayer: CanvasLayer) => {
+      if (
+        sourceLayer.assetKind !== 'icon-spritesheet' ||
+        !projectId ||
+        !applyProjectSnapshot ||
+        splittingIconSpritesheetLayerIdsRef.current.has(sourceLayer.id)
+      ) {
+        return;
+      }
+      splittingIconSpritesheetLayerIdsRef.current.add(sourceLayer.id);
+      closeGenerationTransientState();
+      setImageContextMenu(null);
+      setMetadataLayer(null);
+      setCropExpandPanel(null);
+      setQuickEditPanel(null);
+      try {
+        const result = await splitEditorIconSpritesheet({
+          projectId,
+          sourceResourceId: sourceLayer.resourceId,
+          assetFolderId,
+          canvasCompletion: {
+            title: '拆分图集',
+            placeholder: {
+              x: sourceLayer.x,
+              y: sourceLayer.y,
+              width: sourceLayer.width,
+              height: sourceLayer.height,
+              originalWidth: sourceLayer.originalWidth,
+              originalHeight: sourceLayer.originalHeight,
+            },
+          },
+        });
+        applyProjectSnapshot(result.project);
+        setActiveTool('select');
+        setActiveSidebarPanel('layers');
+      } catch (error) {
+        window.alert(
+          error instanceof Error && error.message.trim()
+            ? error.message
+            : '拆分图集失败',
+        );
+      } finally {
+        splittingIconSpritesheetLayerIdsRef.current.delete(sourceLayer.id);
+      }
+    },
+    [
+      applyProjectSnapshot,
+      assetFolderId,
+      closeGenerationTransientState,
+      projectId,
+      setActiveSidebarPanel,
+      setActiveTool,
+      setCropExpandPanel,
+      setImageContextMenu,
+      setMetadataLayer,
+      setQuickEditPanel,
+    ],
+  );
+
   const pickCharacterSpecFromLayer = useCallback(
     (layer: CanvasLayer) => {
       if (!isCharacterSpecReferenceLayer(layer)) {
-        setReferencePickWarning(INVALID_CHARACTER_SPEC_WARNING);
+        setGenerationWarning(INVALID_CHARACTER_SPEC_WARNING);
         return;
       }
-      setReferencePickWarning(null);
+      setGenerationWarning(null);
       setGenerateDialog((currentDialog) => {
         const nextDialog = assignCharacterSpecReference(currentDialog, layer);
         if (
@@ -1752,10 +1823,10 @@ export function useImageCanvasGenerationWorkflow({
   const pickIconSpecFromLayer = useCallback(
     (layer: CanvasLayer) => {
       if (!isIconSpecReferenceLayer(layer)) {
-        setReferencePickWarning(INVALID_ICON_SPEC_WARNING);
+        setGenerationWarning(INVALID_ICON_SPEC_WARNING);
         return;
       }
-      setReferencePickWarning(null);
+      setGenerationWarning(null);
       const nextDialog = assignIconSpecReference(generateDialog, layer);
       if (nextDialog?.mode === 'icon' && nextDialog.iconSpecReference) {
         lastIconSpecReferenceRef.current = nextDialog.iconSpecReference;
@@ -1774,10 +1845,10 @@ export function useImageCanvasGenerationWorkflow({
   const pickUiDesignSpecFromLayer = useCallback(
     (layer: CanvasLayer) => {
       if (!isIconSpecReferenceLayer(layer)) {
-        setReferencePickWarning(INVALID_ICON_SPEC_WARNING);
+        setGenerationWarning(INVALID_ICON_SPEC_WARNING);
         return;
       }
-      setReferencePickWarning(null);
+      setGenerationWarning(null);
       const nextDialog = assignUiDesignSpecReference(generateDialog, layer);
       if (
         nextDialog?.mode === 'ui-design' &&
@@ -1858,6 +1929,7 @@ export function useImageCanvasGenerationWorkflow({
       applyProjectSnapshot,
       onQueuedGenerationTask: refreshTaskListForQueuedGeneration,
       onWalletBalanceMayHaveChanged,
+      onGenerationWarning: setGenerationWarning,
     });
 
   const setEffectiveCharacterAnimationPanel: Dispatch<
@@ -2423,8 +2495,9 @@ export function useImageCanvasGenerationWorkflow({
       setIsPublicationReferenceMenuOpen,
       isPickingPublicationReferenceFromCanvas,
       setIsPickingPublicationReferenceFromCanvas,
-      referencePickWarning,
-      clearReferencePickWarning: () => setReferencePickWarning(null),
+      generationWarning,
+      showGenerationWarning: setGenerationWarning,
+      clearGenerationWarning: () => setGenerationWarning(null),
       openGenerateDialog,
       openSpecDialog,
       openCharacterAnimationPanel,
@@ -2441,6 +2514,7 @@ export function useImageCanvasGenerationWorkflow({
       openCropExpandPanel,
       startCropExpandFrameResize,
       removeSelectedLayerBackground,
+      splitSelectedIconSpritesheet,
       taskListRefreshKey,
       refreshTaskList,
       isTaskSidebarOpen,
@@ -2515,7 +2589,7 @@ export function useImageCanvasGenerationWorkflow({
       isPublicationReferenceMenuOpen,
       isSpecMenuOpen,
       isPickingPublicationReferenceFromCanvas,
-      referencePickWarning,
+      generationWarning,
       openBackgroundMusicGenerationDialog,
       openCharacterAnimationPanel,
       openCharacterGenerationDialog,
@@ -2542,6 +2616,7 @@ export function useImageCanvasGenerationWorkflow({
       quickEditPanel,
       quickEditSourceLayer,
       removeSelectedLayerBackground,
+      splitSelectedIconSpritesheet,
       submitCharacterAnimation,
       submitCropExpand,
       submitIconSpritesheetGeneration,
diff --git a/src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx b/src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx
index d0298e996..dbdbf58db 100644
--- a/src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx
+++ b/src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx
@@ -4133,6 +4133,9 @@ test('desktop home exposes one product h1 and section h2 headings', () => {
 
   expect(screen.getAllByRole('heading', { level: 1 })).toHaveLength(1);
   expect(productHeading.closest('button')).toBeNull();
+  expect(productHeading.closest('header')?.classList.contains('sr-only')).toBe(
+    false,
+  );
   expect(
     screen.getByRole('heading', { level: 2, name: '今日游戏' }),
   ).toBeTruthy();
@@ -4142,7 +4145,7 @@ test('desktop home exposes one product h1 and section h2 headings', () => {
   ).toBeTruthy();
 });
 
-test('mobile shell exposes one product h1 outside interactive content', () => {
+test('mobile shell keeps the product h1 visually hidden outside interactive content', () => {
   renderLoggedOutHomeView(vi.fn(), {}, 'profile');
 
   const productHeading = screen.getByRole('heading', {
@@ -4152,6 +4155,9 @@ test('mobile shell exposes one product h1 outside interactive content', () => {
 
   expect(screen.getAllByRole('heading', { level: 1 })).toHaveLength(1);
   expect(productHeading.closest('button')).toBeNull();
+  expect(productHeading.closest('header')?.classList.contains('sr-only')).toBe(
+    true,
+  );
 });
 
 test('logged in create tab shows real wallet balance beside the brand', () => {
diff --git a/src/components/rpg-entry/RpgEntryHomeView.tsx b/src/components/rpg-entry/RpgEntryHomeView.tsx
index 78b66671a..702c6367e 100644
--- a/src/components/rpg-entry/RpgEntryHomeView.tsx
+++ b/src/components/rpg-entry/RpgEntryHomeView.tsx
@@ -1006,9 +1006,15 @@ function SectionHeader({ title, detail }: { title: string; detail: string }) {
   );
 }
 
-function HomeSeoIntro() {
+function HomeSeoIntro({
+  visuallyHidden = false,
+}: {
+  visuallyHidden?: boolean;
+}) {
   return (
-    <header className="mb-2 min-w-0 shrink-0 px-1">
+    <header
+      className={visuallyHidden ? 'sr-only' : 'mb-2 min-w-0 shrink-0 px-1'}
+    >
       <h1 className="text-sm font-semibold leading-5 text-[var(--platform-text-strong)]">
         游戏美术AI工作台，让个人创作者更快做出角色、场景与宣发素材
       </h1>
@@ -5029,7 +5035,7 @@ export function RpgEntryHomeView({
             </div>
           ) : null}
 
-          <HomeSeoIntro />
+          <HomeSeoIntro visuallyHidden />
 
           <div className="platform-tab-panel-stack min-w-0 flex-1">
             {tabPanels}
diff --git a/src/index.css b/src/index.css
index 8df8a0ccb..d8c13ac58 100644
--- a/src/index.css
+++ b/src/index.css
@@ -5714,14 +5714,19 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
 
 .image-canvas-editor__audio-card-playback {
   position: absolute;
-  inset: 0;
+  left: 50%;
+  top: 50%;
   z-index: 1;
   display: grid;
+  width: 2.75rem;
+  height: 2.75rem;
   place-items: center;
   border: 0;
+  border-radius: 999px;
   background: transparent;
   color: rgba(255, 255, 255, 0.9);
   cursor: pointer;
+  transform: translate(-50%, -50%);
 }
 
 .image-canvas-editor__audio-card-playback:hover {
@@ -6335,6 +6340,11 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
   box-shadow: 0 8px 18px rgba(13, 148, 136, 0.24);
 }
 
+.image-canvas-editor__kind-badge--source-image {
+  background: rgba(71, 85, 105, 0.9);
+  box-shadow: 0 8px 18px rgba(71, 85, 105, 0.22);
+}
+
 .image-canvas-editor__kind-badge--ui-design {
   background: rgba(245, 158, 11, 0.94);
   box-shadow: 0 8px 18px rgba(245, 158, 11, 0.24);
@@ -7236,6 +7246,18 @@ html[data-mobile-keyboard-open='true'] .platform-mobile-bottom-dock {
   color: #94a3b8;
 }
 
+.image-canvas-editor__generation-asset-name-field {
+  display: grid;
+  grid-column: 1 / -1;
+  gap: 0.24rem;
+  min-width: 0;
+}
+
+.image-canvas-editor__generation-asset-name-input {
+  width: 100%;
+  min-width: 0;
+}
+
 .image-canvas-editor__generation-prompt--borderless {
   border-color: transparent;
   background: transparent;
@@ -8616,6 +8638,13 @@ button.image-canvas-editor__reference-chip:disabled {
 .image-canvas-editor__quick-edit-footer
   .image-canvas-editor__option-popover-anchor--model {
   grid-column: 3;
+  width: 9.75rem;
+}
+
+.image-canvas-editor__quick-edit-footer
+  .image-canvas-editor__option-cluster--model {
+  width: 100%;
+  max-width: none;
 }
 
 .image-canvas-editor__quick-edit-footer
@@ -9371,7 +9400,7 @@ button.image-canvas-editor__reference-chip:disabled {
 
   .image-canvas-editor__quick-edit-panel.image-canvas-editor__generation-composer {
     width: auto;
-    bottom: 3.85rem;
+    bottom: calc(9rem + env(safe-area-inset-bottom, 0px));
   }
 
   .image-canvas-editor__generation-composer {
@@ -9393,6 +9422,13 @@ button.image-canvas-editor__reference-chip:disabled {
     align-items: stretch;
   }
 
+  .image-canvas-editor__option-popover-anchor--dimensions,
+  .image-canvas-editor__option-popover-anchor--model {
+    grid-column: auto;
+    width: 100%;
+    justify-self: stretch;
+  }
+
   .image-canvas-editor__option-cluster--dimensions,
   .image-canvas-editor__option-cluster--model,
   .image-canvas-editor__readonly-generation-option,
@@ -9556,6 +9592,12 @@ button.image-canvas-editor__reference-chip:disabled {
     overflow-x: auto;
   }
 
+  .image-canvas-editor__task-sidebar {
+    position: fixed;
+    top: 7.25rem;
+    right: 0.75rem;
+  }
+
   .image-canvas-editor__bottom-toolbar {
     left: 0.75rem;
     right: 0.75rem;
diff --git a/src/services/image-editor/editorProjectClient.test.ts b/src/services/image-editor/editorProjectClient.test.ts
index 1b8c34627..545d70efa 100644
--- a/src/services/image-editor/editorProjectClient.test.ts
+++ b/src/services/image-editor/editorProjectClient.test.ts
@@ -25,6 +25,7 @@ import {
   removeEditorImageBackground,
   renameEditorProject,
   saveEditorProjectLayout,
+  splitEditorIconSpritesheet,
   submitEditorAssetShowcase,
   toggleEditorShowcaseAssetLike,
   updateEditorAsset,
@@ -896,6 +897,10 @@ describe('editorProjectClient', () => {
       spritesheetWidth: 512,
       spritesheetHeight: 512,
       iconImageSrcs: [],
+      sliceWarning: {
+        code: 'insufficient-connected-components',
+        reason: '连通域数量不足',
+      },
       prompt: '图标素材 prompt',
       actualPrompt: '图标素材 prompt',
       model: 'gemini-3.1-flash-image-preview',
@@ -907,9 +912,14 @@ describe('editorProjectClient', () => {
       referenceImageSrc: 'data:image/png;base64,spec',
       referenceImageSrcs: ['data:image/png;base64,icon-ref'],
       iconDescriptions: ['返回按钮', '设置按钮'],
+      assetLabel: '冒险游戏图标',
     });
 
     expect(result.taskId).toBe('icon-spritesheet-task-1');
+    expect(result.sliceWarning).toEqual({
+      code: 'insufficient-connected-components',
+      reason: '连通域数量不足',
+    });
     expect(requestJsonMock).toHaveBeenCalledWith(
       '/api/editor/icon-spritesheets/generations',
       expect.objectContaining({
@@ -920,6 +930,7 @@ describe('editorProjectClient', () => {
           referenceImageSrcs: ['data:image/png;base64,icon-ref'],
           iconDescriptions: ['返回按钮', '设置按钮'],
           model: 'gemini-3.1-flash-image-preview',
+          assetLabel: '冒险游戏图标',
         }),
       }),
       '生成图标素材失败',
@@ -988,6 +999,79 @@ describe('editorProjectClient', () => {
     );
   });
 
+  it('splits an existing icon spritesheet into project assets', async () => {
+    const project = {
+      projectId: 'editor-project-1',
+      title: '未命名画布',
+      canvas: {
+        canvasId: 'editor-project-1:canvas:default',
+        projectId: 'editor-project-1',
+        title: '默认画布',
+        viewport: { x: 0, y: 0, scale: 1 },
+        layers: [],
+        updatedAt: '2026-07-13T00:00:00.000Z',
+      },
+      viewport: { x: 0, y: 0, scale: 1 },
+      layers: [],
+      resources: [],
+      updatedAt: '2026-07-13T00:00:00.000Z',
+    };
+    requestJsonMock.mockResolvedValueOnce({
+      iconImageSrcs: [
+        {
+          name: '素材 1',
+          imageSrc: '/generated/atlas/asset-001.png',
+          width: 128,
+          height: 128,
+        },
+      ],
+      project,
+    });
+
+    const result = await splitEditorIconSpritesheet({
+      projectId: 'editor-project-1',
+      sourceResourceId: 'resource-atlas-1',
+      assetFolderId: 'project',
+      canvasCompletion: {
+        title: '拆分图集',
+        placeholder: {
+          x: 120,
+          y: 80,
+          width: 360,
+          height: 360,
+          originalWidth: 1024,
+          originalHeight: 1024,
+        },
+      },
+    });
+
+    expect(result.project).toBe(project);
+    expect(requestJsonMock).toHaveBeenCalledWith(
+      '/api/editor/icon-spritesheets/slices',
+      expect.objectContaining({
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          projectId: 'editor-project-1',
+          sourceResourceId: 'resource-atlas-1',
+          assetFolderId: 'project',
+          canvasCompletion: {
+            title: '拆分图集',
+            placeholder: {
+              x: 120,
+              y: 80,
+              width: 360,
+              height: 360,
+              originalWidth: 1024,
+              originalHeight: 1024,
+            },
+          },
+        }),
+      }),
+      '拆分图集失败',
+    );
+  });
+
   it('extracts UI design assets through the dedicated backend BFF', async () => {
     requestJsonMock.mockResolvedValueOnce({
       spritesheetImageSrc: 'data:image/png;base64,ui-sheet',
@@ -1174,6 +1258,7 @@ describe('editorProjectClient', () => {
       frameCount: 32,
       durationSeconds: 4,
       model: 'seedance2.0-fast',
+      assetLabel: '勇者待机',
     });
 
     expect(result.taskId).toBe('character-animation-1');
@@ -1193,6 +1278,7 @@ describe('editorProjectClient', () => {
           frameCount: 32,
           durationSeconds: 4,
           model: 'seedance2.0-fast',
+          assetLabel: '勇者待机',
         }),
       }),
       '生成角色动画失败',
diff --git a/src/services/image-editor/editorProjectClient.ts b/src/services/image-editor/editorProjectClient.ts
index 5c0ef5c53..d4d1e8360 100644
--- a/src/services/image-editor/editorProjectClient.ts
+++ b/src/services/image-editor/editorProjectClient.ts
@@ -12,6 +12,8 @@ const EDITOR_IMAGE_EDIT_API = '/api/editor/images/edits';
 const EDITOR_BACKGROUND_REMOVAL_API = '/api/editor/images/background-removals';
 const EDITOR_ICON_SPRITESHEET_GENERATION_API =
   '/api/editor/icon-spritesheets/generations';
+const EDITOR_ICON_SPRITESHEET_SLICE_API =
+  '/api/editor/icon-spritesheets/slices';
 const EDITOR_UI_DESIGN_ASSET_EXTRACTION_API =
   '/api/editor/ui-designs/assets/extractions';
 const EDITOR_CHARACTER_ANIMATION_GENERATION_API =
@@ -201,9 +203,17 @@ export type EditorIconSpritesheetGenerationInput = {
   projectId?: string | null;
   generationInputs?: EditorAssetGenerationInputs | null;
   assetFolderId?: string | null;
+  assetLabel?: string | null;
   canvasCompletion?: EditorCanvasGenerationCompletionInput | null;
 };
 
+export type EditorIconSpritesheetSliceInput = {
+  projectId: string;
+  sourceResourceId: string;
+  assetFolderId?: string | null;
+  canvasCompletion: EditorCanvasGenerationCompletionInput;
+};
+
 export type EditorUiDesignAssetExtractionInput = {
   sourceImageSrc: string;
   model?: string;
@@ -291,11 +301,17 @@ export type EditorIconSpritesheetIconResult = {
   asset?: EditorAssetSnapshot | null;
 };
 
+export type EditorIconSpritesheetSliceWarning = {
+  code: string;
+  reason: string;
+};
+
 export type EditorIconSpritesheetGenerationResult = {
   spritesheetImageSrc: string;
   spritesheetWidth: number;
   spritesheetHeight: number;
   iconImageSrcs: EditorIconSpritesheetIconResult[];
+  sliceWarning?: EditorIconSpritesheetSliceWarning | null;
   prompt: string;
   actualPrompt?: string | null;
   model: string;
@@ -308,6 +324,11 @@ export type EditorIconSpritesheetGenerationResult = {
   queueState?: ExternalGenerationJobStatusRecord | null;
 };
 
+export type EditorIconSpritesheetSliceResult = {
+  iconImageSrcs: EditorIconSpritesheetIconResult[];
+  project: EditorProjectSnapshot;
+};
+
 export type EditorCharacterAnimationResolution = '480p' | '720p';
 
 export type EditorCharacterAnimationRatio =
@@ -339,6 +360,8 @@ export type EditorCharacterAnimationGenerationInput = {
   canvasCompletion?: EditorCanvasGenerationCompletionInput | null;
   generationInputs?: EditorAssetGenerationInputs | null;
   sourceResourceId?: string | null;
+  assetFolderId?: string | null;
+  assetLabel?: string | null;
 };
 
 export type EditorCharacterAnimationFrameResult = {
@@ -914,6 +937,7 @@ export async function generateEditorIconSpritesheet(
         ? { generationInputs: input.generationInputs }
         : {}),
       ...(input.assetFolderId ? { assetFolderId: input.assetFolderId } : {}),
+      ...(input.assetLabel ? { assetLabel: input.assetLabel } : {}),
       ...(input.canvasCompletion
         ? { canvasCompletion: input.canvasCompletion }
         : {}),
@@ -926,6 +950,21 @@ export async function generateEditorIconSpritesheet(
   );
 }
 
+export async function splitEditorIconSpritesheet(
+  input: EditorIconSpritesheetSliceInput,
+) {
+  return requestJson<EditorIconSpritesheetSliceResult>(
+    EDITOR_ICON_SPRITESHEET_SLICE_API,
+    jsonRequest('POST', {
+      projectId: input.projectId,
+      sourceResourceId: input.sourceResourceId,
+      ...(input.assetFolderId ? { assetFolderId: input.assetFolderId } : {}),
+      canvasCompletion: input.canvasCompletion,
+    }),
+    '拆分图集失败',
+  );
+}
+
 export async function extractEditorUiDesignAssets(
   input: EditorUiDesignAssetExtractionInput,
 ) {