Merge remote-tracking branch 'refs/remotes/origin/master' into feat/gptimage2to2.5

# Conflicts:
#	docs/project-memory/shared-memory/decision-log.md
#	server-rs/crates/api-server/src/state.rs
#	src/components/image-editor/ImageCanvasGenerationSubmissionModel.test.ts

docs/openapi/genarrative-external-v1.openapi.json

@@ -3363,7 +3363,7 @@
       },
       "EditorIconSpritesheetGenerationRequest": {
         "type": "object",
-        "required": ["referenceId", "iconDescriptions"],
+        "required": ["referenceId", "iconDescriptions", "sliceMode"],
         "properties": {
           "referenceId": {
             "type": "string",
@@ -3395,26 +3395,25 @@
               "connected-components",
               "grid"
             ],
-            "default": "connected-components",
-            "description": "图集切分模式。connected-components 按透明像素 alpha 连通域识别独立素材；grid 按用户提供的 gridX/gridY 划分网格槽。省略时使用 connected-components。"
+            "description": "必填，没有默认值：必须在引用解析、定价、入队和任何 provider / OSS 副作用之前显式声明切分模式。需求明确要求等分网格、固定槽位或指定行列数时传 grid，并用 gridX/gridY 传入来自需求本身的行列数；自由排布、数量不定或只要求一张图集时传 connected-components，需要约束素材张数时用 sliceCount。connected-components 不接受 gridX/gridY，grid 必须同时提供 gridX/gridY（各 1..32）。省略、null 或空字符串返回 400（field=sliceMode），模式与网格参数互相矛盾返回 400（field=gridX/gridY），两者都不会产生计费、入队或 provider 调用。响应中的 sliceMode 回显本次实际采用的模式。"
           },
           "gridX": {
             "type": "integer",
             "minimum": 1,
             "maximum": 32,
-            "description": "grid 模式的横向网格数量。"
+            "description": "grid 模式的横向网格数量，只能与 sliceMode=grid 同时出现；与 connected-components 同时提交返回 400。"
           },
           "gridY": {
             "type": "integer",
             "minimum": 1,
             "maximum": 32,
-            "description": "grid 模式的纵向网格数量。"
+            "description": "grid 模式的纵向网格数量，只能与 sliceMode=grid 同时出现；与 connected-components 同时提交返回 400。"
           },
           "sliceCount": {
             "type": "integer",
             "minimum": 1,
-            "maximum": 100,
-            "description": "connected-components 模式下可选的目标切片数量；省略时按图像内容自动识别。grid 模式的切片数量由 gridX×gridY 决定。"
+            "maximum": 256,
+            "description": "connected-components 模式下可选的目标切片数量（1..256）；省略时按图像内容自动识别上限。识别结果与该目标数量不一致、为 0 或超过 256 时返回 422 并给出实际识别数量，不会静默截断。grid 模式的切片数量由 gridX×gridY 决定，不接受该字段。"
           },
           "screenColor": {
             "type": ["string", "null"],
@@ -3649,7 +3648,7 @@
               "connected-components",
               "grid"
             ],
-            "description": "实际采用的图集切分模式。"
+            "description": "本次实际采用的图集切分模式，与请求显式声明的 sliceMode 一致；图集生成入口不回退到任何默认模式。"
           },
           "gridX": {
             "type": "integer",
@@ -3664,7 +3663,7 @@
           "sliceCount": {
             "type": "integer",
             "minimum": 0,
-            "maximum": 100,
+            "maximum": 256,
             "description": "实际生成的切片数量。"
           },
           "sliceWarning": {