lhk229
bfa112094c
Project CI / Frontend tests (pull_request) Failing after 3m11s
Project CI / Backend tests (pull_request) Successful in 3m44s
Project CI / Native shell tests (pull_request) Failing after 9m13s
Project CI / Repository checks (pull_request) Failing after 2m16s
合并远端 master(直连 Codex 改造)
冲突 19 处 / 6 个文件,逐处判定归属而不是二选一:
· commands.rs —— 保留本分支的 hydrate_game_creator_plan_gdd_state 输入解析,
丢掉与 master 重复的项目根定义(master 把它挪到了后面)。
· types.ts / useHomeProjectCreation.ts —— 取 master 把 mode/prompt/attachments
重构成 HomeDraft 的形状,保留本分支新增的 startMode。
· App.tsx —— directGameChatRuntime(master)与 !planningStartMode(本分支)是两个
互不相干的条件,合并保留;refreshDirectProjectSurface 在 merge base 里就带预览
逻辑,是 master 主动删掉并改名成 refreshDirectProjectManifest 的,取 master;
capturePendingGameChatStageManifestBeforeNextRun 是分支新增且仍被调用,保留。
· SupervisorChatOnlyView.tsx —— master 的 directCodex 短路与本分支的
projectedRuntime / descendantsStillActive 正交,逐处合成。
· project-development.suite.ts —— 那段专业 Agent 断言 base 里就有、master 主动
删除(直连 Codex 之后不再适用),取 master。
两处语义缺口一并补上:master 新增的 codex_app_server 构造
AgentRuntimeProviderRequestSnapshot 时缺本分支新增的 planning_session_binding
字段(首页直连对话不属于任何立项 session,填 None);首页提交按钮的 aria-label
还引用着已被删除的 homeAgentMode,取 master 的固定文案。
**做方案 UI 入口暂时缺失,待定。** master 在 bacd7a9da 里把 HomeAgentMode 整个删了,
首页的「做游戏 / 做素材 / 做方案」模式选择不再存在,而 startMode 在前端只有那一个
来源(homeDraftStartMode(mode))。立项策划链路的代码全部保留——后端、prompt、
澄清卡、审批卡、E2E 都在——但首页现在统一按 direct-build 进入
(HOME_DRAFT_START_MODE 常量,已在原处留注释)。入口放哪由产品侧决定后另做一笔。
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-21 13:49:37 +00:00
..
2026-08-08 15:10:16 +08:00
2026-08-12 10:54:16 +08:00
2026-07-31 17:25:35 +08:00
2026-07-31 17:25:35 +08:00
2026-07-31 17:25:35 +08:00
2026-08-08 11:11:25 +08:00
2026-08-08 11:11:25 +08:00
2026-08-08 11:11:25 +08:00
2026-08-08 11:11:25 +08:00
2026-08-08 11:11:25 +08:00
2026-08-08 11:11:25 +08:00
2026-08-07 04:38:00 +00:00
2026-08-07 05:16:31 +00:00
2026-08-07 03:49:04 +00:00
2026-08-06 17:54:40 +08:00
2026-08-06 17:54:40 +08:00
2026-08-06 17:54:40 +08:00
2026-08-06 17:54:40 +08:00
2026-08-21 11:55:32 +08:00
2026-08-08 15:10:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-08 15:10:16 +08:00
2026-08-08 15:10:16 +08:00
2026-08-08 15:10:16 +08:00
2026-08-08 15:10:16 +08:00
2026-08-14 18:52:56 +08:00
2026-08-12 14:46:24 +08:00
2026-06-18 22:50:42 +08:00
2026-07-17 16:56:46 +08:00
2026-08-08 15:10:16 +08:00
2026-08-08 15:10:16 +08:00
2026-08-08 15:10:16 +08:00
2026-08-12 14:46:24 +08:00
2026-08-21 11:55:32 +08:00
2026-08-12 14:46:24 +08:00
2026-08-12 14:46:24 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-08 11:11:25 +08:00
2026-06-28 17:43:52 +08:00
2026-08-12 14:46:24 +08:00
2026-08-06 16:57:38 +08:00
2026-08-12 10:54:16 +08:00
2026-08-21 11:55:32 +08:00
2026-08-08 11:11:58 +08:00
2026-08-08 22:21:57 +08:00
2026-06-19 17:36:20 +08:00
2026-06-29 11:29:48 +08:00
2026-08-08 07:53:47 +00:00
2026-08-21 11:19:17 +08:00
2026-08-21 11:55:32 +08:00
2026-08-21 11:55:32 +08:00
2026-08-08 15:10:16 +08:00
2026-08-08 15:10:16 +08:00
2026-08-09 13:47:16 +08:00
2026-08-11 12:36:30 +08:00
2026-08-11 12:36:30 +08:00
2026-08-21 11:55:32 +08:00
2026-08-21 11:55:32 +08:00
2026-07-17 16:56:46 +08:00
2026-06-18 11:40:19 +08:00
2026-08-14 18:52:56 +08:00
2026-08-21 11:55:32 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-08 15:23:29 +08:00
2026-08-08 15:23:29 +08:00
2026-07-21 20:50:03 +08:00
2026-08-12 10:54:16 +08:00
2026-08-06 13:06:10 +00:00
2026-08-12 10:54:16 +08:00
2026-07-06 14:44:43 +08:00
2026-08-06 16:57:38 +08:00
2026-08-09 13:47:16 +08:00
2026-08-09 13:47:16 +08:00
2026-07-07 19:36:20 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-06 16:57:38 +08:00
2026-08-06 16:57:38 +08:00
2026-07-29 16:09:30 +08:00
2026-07-29 16:09:30 +08:00
2026-08-08 15:10:16 +08:00
2026-08-08 15:10:16 +08:00
2026-06-19 23:16:59 +08:00
2026-08-14 18:52:56 +08:00
2026-08-14 18:52:56 +08:00
2026-07-17 16:56:46 +08:00
2026-08-05 21:28:40 +08:00
2026-08-21 11:55:32 +08:00
2026-08-21 11:55:32 +08:00
2026-08-08 10:25:42 +08:00
2026-08-08 10:25:42 +08:00
2026-08-14 18:52:56 +08:00
2026-08-12 12:38:03 +00:00
2026-08-12 10:54:16 +08:00
2026-08-03 17:55:47 +08:00
2026-08-03 17:55:47 +08:00
2026-07-21 20:50:03 +08:00
2026-08-08 11:11:25 +08:00
2026-08-08 11:11:25 +08:00
2026-08-07 04:38:00 +00:00
2026-08-07 03:49:04 +00:00
2026-08-07 07:27:52 +00:00
2026-08-06 13:06:10 +00:00
2026-08-07 07:27:52 +00:00
2026-08-07 07:27:52 +00:00
2026-08-21 11:55:32 +08:00
2026-08-21 11:55:32 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-07-20 14:49:00 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-08 10:25:02 +08:00
2026-08-08 10:25:02 +08:00
2026-07-29 16:09:30 +08:00
2026-07-30 18:01:19 +08:00
2026-08-05 23:31:16 +08:00
2026-08-05 23:31:16 +08:00
2026-08-12 10:54:16 +08:00
2026-06-22 19:13:37 +08:00
2026-08-21 11:55:32 +08:00
2026-08-21 11:55:32 +08:00
2026-08-12 14:46:24 +08:00
2026-08-12 14:46:24 +08:00
2026-08-21 15:33:02 +08:00
2026-08-21 15:33:02 +08:00
2026-08-07 11:53:25 +08:00
2026-08-05 21:28:40 +08:00
2026-08-03 17:55:47 +08:00
2026-08-06 17:54:40 +08:00
2026-08-06 17:54:40 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-06 16:57:38 +08:00
2026-08-06 16:57:38 +08:00
2026-08-08 11:11:25 +08:00
2026-08-08 11:11:25 +08:00
2026-08-12 14:46:24 +08:00
2026-08-08 11:11:25 +08:00
2026-06-17 12:20:04 +08:00
2026-06-17 12:20:04 +08:00
2026-08-08 11:11:25 +08:00
2026-08-08 11:11:25 +08:00
2026-08-06 17:54:40 +08:00
2026-08-06 17:54:40 +08:00
2026-06-17 10:17:07 +08:00
2026-07-17 16:56:46 +08:00
2026-07-07 14:56:28 +08:00
2026-07-04 12:03:58 +08:00
2026-07-04 12:03:58 +08:00
2026-08-07 05:16:31 +00:00
2026-08-21 11:55:32 +08:00
2026-08-21 11:55:32 +08:00
2026-08-06 17:54:40 +08:00
2026-08-08 05:33:40 +00:00
2026-08-21 11:19:17 +08:00
2026-08-21 11:19:17 +08:00
2026-07-20 15:19:48 +08:00
2026-08-08 10:25:42 +08:00
2026-08-06 16:57:38 +08:00
2026-08-05 23:31:16 +08:00
2026-08-12 12:38:03 +00:00
2026-08-06 16:57:38 +08:00
2026-08-07 07:27:52 +00:00
2026-08-07 03:49:04 +00:00
2026-07-04 16:41:33 +08:00
2026-08-12 10:54:16 +08:00
2026-08-21 15:33:02 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 14:46:24 +08:00
2026-08-21 11:55:32 +08:00
2026-08-12 10:54:16 +08:00
2026-08-12 10:54:16 +08:00
2026-08-05 21:28:40 +08:00
2026-08-05 21:28:40 +08:00