suzmii
87fbf92c58
Project CI / Repository checks (pull_request) Successful in 3m14s
Project CI / Frontend tests (pull_request) Successful in 3m57s
Project CI / Backend tests (pull_request) Successful in 6m30s
Project CI / Native shell tests (pull_request) Successful in 17m27s
合并 origin/master 到资源工作台 V3 分支：解 4 处冲突并保留两侧行为
- WorkspaceLauncher.tsx：保留本分支清单快照 CAS 拒收提示（manifestMergeNotice 提示条、data-manifest-merge-* 观察点、recoverRejectedManifestSnapshot「重新读取清单」）与 activeVersionId/onActiveVersionChange 版本口径，并入 master 的策划/游戏运行态切换（onMakeGame + switchToGameRuntime、suppressInitialGameTurn 抑制首轮、supervisor key 带 agentRuntimeMode、onSwitchToGameRuntime），planningStartMode 统一取 master 的派生值（上下文 startMode 为 planning 且未切到 game 运行时）
- ProjectSupervisorView.tsx：props 同时保留本分支 versions/activeVersionId 与 master 的 designView/onDesignApprove/onDesignClarify/onDesignRetry，DesignAgentSurface 审批链路与本分支资源引用输入区并存；directCodex 输入区保留本分支 @ 引用按钮 + 模型选择 + 发送按钮控制条，发送按钮禁用条件并入 master 的 designView 审批待定口径，模型选择沿用 master 的「对话中可切换」口径
- styles.css：本分支追加的资源画布/输入区样式块与 master 追加的 .design-agent-reasoning 样式块都保留，并补上本分支最后一条规则的收尾大括号
- view/project-development/index.tsx：保留本分支的 image-editor 引用（ImageCanvasProjectAssetPickerDialog、ImageCanvasQuickEditPanelView、ImageCanvasSelectedLayerToolbarView、useImageCanvasFloatingOptionDismiss），去掉 master 对已退役 features/asset-canvas 的 import（本分支已由 resource-canvas 取代），保留 master 的 DesignWorkspacePanel 与 planningStartMode 策划工作台分支
- tests/workspaceLauncherManifestMerge.test.tsx：补 master 新引入的 get_design_agent_runtime_mode mock（返回 null，与 master 各套件同口径），拒收提示断言不变
- tests/appSurface/design-agent.suite.ts：审批待定禁用输入的断言改用本分支 Lexical 输入区的禁用口径（容器 data-disabled + editor.setEditable(false)），断言意图不变
- 验证：npm run typecheck 通过；apps/ai-game-creator-shell typecheck 通过；apps/ai-game-creator-shell/tests 96 个测试文件 1380 通过 4 跳过 0 失败；全仓 vitest 297 通过 2 失败（scripts 下两例为 Windows 权限语义导致的既有失败，相关文件与实现均未参与本次合并）；npm run check:encoding 与 git diff --check 通过
2026-09-12 17:31:51 +08:00
..
2026-07-12 19:32:11 +08:00
2026-07-17 21:03:15 +08:00
2026-09-03 20:02:48 +08:00
2026-06-23 21:02:13 +08:00
2026-08-31 14:10:44 +08:00
2026-08-08 11:11:25 +08:00
2026-08-21 15:33:02 +08:00
2026-09-09 20:28:22 +08:00
2026-08-08 15:10:16 +08:00
2026-09-03 20:02:48 +08:00
2026-07-15 22:14:52 +08:00
2026-09-03 10:02:05 +08:00
2026-09-01 16:28:34 +08:00
2026-09-03 15:33:26 +08:00
2026-09-01 16:28:34 +08:00
2026-08-07 18:03:30 +08:00
2026-09-01 16:28:34 +08:00
2026-09-03 11:38:40 +08:00
2026-09-01 16:28:34 +08:00
2026-06-11 22:33:05 +08:00
2026-09-09 12:00:10 +08:00
2026-09-03 10:36:43 +08:00
2026-09-11 20:24:41 +08:00
2026-09-07 15:17:21 +08:00
2026-09-03 14:24:40 +08:00
2026-09-12 17:31:51 +08:00
2026-09-11 18:36:29 +08:00
2026-09-08 22:01:29 +08:00
2026-09-01 16:28:34 +08:00
2026-09-08 22:01:29 +08:00
2026-09-11 20:09:51 +08:00
2026-09-06 00:36:31 +08:00
2026-08-25 15:41:55 +08:00
2026-09-04 16:30:43 +08:00
2026-08-20 19:07:25 +08:00
2026-08-12 14:46:24 +08:00
2026-06-14 19:34:44 +08:00
2026-09-10 20:12:28 +08:00
2026-09-12 06:41:49 +00:00
2026-09-08 13:25:24 +00:00
2026-09-08 10:43:38 +00:00
2026-09-01 16:28:34 +08:00
2026-09-12 16:57:28 +08:00
2026-06-14 19:34:44 +08:00
2026-09-03 19:36:18 +08:00
2026-09-08 11:56:36 +08:00
2026-09-01 20:13:48 +08:00