lhk229
c2d5273873
Project CI / Repository checks (pull_request) Successful in 2m58s
Project CI / Frontend tests (pull_request) Successful in 3m4s
Project CI / Backend tests (pull_request) Successful in 4m6s
Project CI / Native shell tests (pull_request) Failing after 11m28s
重做 master 合并,找回上次合并丢失的分支工作
上次合并 3d8abac33 把 24 个双边改动文件里的 7 个整份取了 master,另有数个
实质取了 master 版本,静默回滚了分支工作;其中 main_loop.rs 保留 master 的
调用点、provider_recovery.rs 保留分支的 cfg(test) 门,导致非测试构建编译失败。
本次从 ca6a3cd4c 对最新 master(341761ee3) 重做,逐个人工解析 38 处冲突:
- 澄清等待态:保留分支的 lane 外 parent-wake 设计与锁守卫,套上 master 新增的
parent task 身份校验与 game-chat 安全默认返工;`_locked` 两种 false 语义在
delivery.rs 按 trusted_game_chat_autonomous_parent_chain_at 区分。
- decision-log:按日期把 master 三条插进分支条目之间,57 处 M1 记录全部保留。
- manifest.rs:采用 master 的 windows_sys 绑定,保留分支的目录/reparse point 拒绝。
- 做方案入口按 master 的提交重构改造:resolveProjectSupervisorRuntimeSubmission
新增 planningEntry,startMode 经 launcher context 传到 App;并把策划入口从
direct-codex 产品默认中摘出,做游戏与做素材保持 master 新默认。
- 首页两条入口用例按 master 已改的创建流程更新;非空目录确认用例因该流程
在首页入口不再可达而移除。
验证:cargo check --all-targets 通过;agc typecheck 通过;appSurface 395 passed。
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-19 13:15:16 +00:00
..
2026-08-15 17:18:10 +08:00
2026-05-15 11:52:51 +08:00
2026-07-18 22:02:22 +08:00
2026-07-23 18:06:29 +08:00
2026-06-16 16:06:54 +08:00
2026-05-01 17:57:59 +08:00
2026-07-23 18:06:29 +08:00
2026-07-23 18:06:29 +08:00
2026-05-01 17:57:59 +08:00
2026-08-12 14:46:24 +08:00
2026-07-28 16:20:43 +08:00
2026-07-18 22:02:22 +08:00
2026-07-31 12:08:45 +08:00
2026-04-26 18:06:23 +08:00
2026-08-07 19:22:46 +08:00
2026-07-22 15:57:22 +08:00
2026-08-13 14:01:34 +08:00
2026-08-05 21:28:40 +08:00
2026-08-19 19:03:54 +08:00
2026-07-17 22:07:52 +08:00
2026-07-27 21:57:30 +08:00
2026-07-17 22:07:52 +08:00
2026-07-17 22:07:52 +08:00
2026-07-18 22:02:22 +08:00
2026-07-17 22:07:52 +08:00
2026-07-17 22:07:52 +08:00
2026-07-17 16:56:46 +08:00
2026-06-17 20:16:51 +08:00
2026-06-18 21:10:45 +08:00
2026-07-17 22:07:52 +08:00
2026-07-17 16:56:46 +08:00
2026-06-18 21:10:45 +08:00
2026-07-17 16:56:46 +08:00
2026-06-17 23:00:28 +08:00
2026-07-17 22:07:52 +08:00
2026-06-17 20:16:51 +08:00
2026-07-17 16:56:46 +08:00
2026-06-18 21:10:45 +08:00
2026-06-17 20:16:51 +08:00
2026-07-17 16:56:46 +08:00
2026-07-27 21:57:30 +08:00
2026-07-17 16:56:46 +08:00
2026-06-17 20:16:51 +08:00
2026-07-17 16:56:46 +08:00
2026-07-17 22:07:52 +08:00
2026-07-17 22:07:52 +08:00
2026-07-18 22:02:22 +08:00
2026-06-17 22:44:10 +08:00
2026-08-17 22:55:27 +08:00
2026-08-05 19:15:46 +08:00
2026-07-23 18:06:29 +08:00
2026-06-17 20:16:51 +08:00
2026-06-17 20:16:51 +08:00
2026-07-23 18:06:29 +08:00
2026-08-15 15:20:30 +08:00
2026-08-18 22:15:49 +08:00
2026-07-23 13:47:32 +08:00
2026-07-17 22:07:52 +08:00
2026-07-17 22:07:52 +08:00
2026-07-21 13:57:10 +08:00
2026-07-21 13:57:10 +08:00
2026-07-17 16:56:46 +08:00
2026-05-15 11:52:51 +08:00
2026-06-18 17:48:03 +08:00
2026-07-13 13:39:59 +08:00
2026-08-07 19:22:46 +08:00
2026-07-18 22:02:22 +08:00
2026-07-23 13:47:32 +08:00
2026-07-31 12:08:45 +08:00
2026-07-10 18:28:06 +08:00
2026-08-08 16:18:45 +08:00
2026-08-08 16:18:45 +08:00
2026-05-18 23:13:49 +08:00
2026-06-03 22:11:46 +08:00
2026-08-08 16:18:45 +08:00
2026-08-08 16:18:45 +08:00
2026-05-26 00:13:08 +08:00
2026-07-17 16:56:46 +08:00
2026-05-24 02:49:13 +08:00
2026-05-24 02:49:13 +08:00
2026-05-25 00:41:30 +08:00
2026-08-18 22:15:49 +08:00
2026-08-07 19:22:46 +08:00
2026-07-20 20:56:36 +08:00
2026-06-19 21:38:07 +08:00
2026-05-02 17:04:11 +08:00
2026-06-05 16:14:30 +08:00
2026-05-15 17:10:07 +08:00
2026-08-17 22:55:27 +08:00
2026-07-23 18:06:29 +08:00
2026-08-12 22:06:35 +08:00
2026-05-20 14:02:36 +08:00
2026-06-21 15:47:00 +08:00
2026-08-12 22:06:35 +08:00
2026-07-23 13:47:32 +08:00
2026-08-15 17:18:10 +08:00
2026-08-18 22:35:36 +08:00
2026-05-27 22:44:01 +08:00
2026-07-17 16:56:46 +08:00
2026-07-13 13:39:59 +08:00
2026-06-30 17:12:13 +08:00
2026-07-17 16:56:46 +08:00
2026-07-17 16:56:46 +08:00
2026-05-16 22:44:30 +08:00
2026-04-26 18:06:23 +08:00
2026-07-17 16:56:46 +08:00
2026-07-10 18:28:06 +08:00
2026-08-12 14:46:24 +08:00
2026-08-12 12:38:03 +00:00
2026-07-17 16:56:46 +08:00
2026-07-17 16:56:46 +08:00
2026-07-17 16:56:46 +08:00
2026-07-11 13:55:05 +08:00
2026-07-20 20:45:15 +08:00
2026-08-12 14:46:24 +08:00
2026-08-12 14:46:24 +08:00
2026-08-06 16:57:38 +08:00
2026-08-06 16:57:38 +08:00
2026-08-05 19:15:46 +08:00
2026-07-20 20:45:15 +08:00
2026-08-06 16:57:38 +08:00
2026-08-06 20:39:19 +08:00
2026-04-26 18:06:23 +08:00
2026-04-26 18:06:23 +08:00
2026-05-11 18:01:55 +08:00
2026-08-08 15:50:55 +08:00