删除策划agent v2,删除supervisor,与退役功能解耦 #355
Open
lhk229
wants to merge 44 commits from
rm/design-v2 into master
pull from: rm/design-v2
merge into: GenarrativeAI:master
GenarrativeAI:master
GenarrativeAI:codex/agc-project-upload-download
GenarrativeAI:feat/jenkins-mac-build
GenarrativeAI:feat/gptimage2to2.5
GenarrativeAI:feat/tribo3d-integeration
GenarrativeAI:feat/agc-organize-assetkind
GenarrativeAI:feat/mac-universal-package
GenarrativeAI:feat/ui-editor-v3
GenarrativeAI:refactor/split-direct-project
GenarrativeAI:fix/agc-acceptance-followup
GenarrativeAI:feat/agc-canvas-acceptance
GenarrativeAI:fix/ref-persistent
GenarrativeAI:feat/more-ref
GenarrativeAI:feat/bgfilter-api
GenarrativeAI:fix/ci
GenarrativeAI:codex/platform-session-identity-credential-split
GenarrativeAI:fix/chat-state
GenarrativeAI:feat/Crt_Ws
GenarrativeAI:codex/fix-model-refresh
GenarrativeAI:feat/smart-ref-ui-res
GenarrativeAI:codex/preview-llm-router-config
GenarrativeAI:fix/stroke-width-regression-from-285
GenarrativeAI:agent-organize
GenarrativeAI:feat/expose-image2edit
GenarrativeAI:feat/game-agent-canvas-resource-workbench-v2
GenarrativeAI:feat/agc-new-workflow
GenarrativeAI:fix/agc-release-version-sync
GenarrativeAI:codex/shared-components-followup
GenarrativeAI:codex/agc-runtime-generation-reliability
GenarrativeAI:codex/game-agent-runtime-interaction-design
GenarrativeAI:feat/spine-sequence-export-v2
GenarrativeAI:codex/agc-platform-account-editor-api
GenarrativeAI:codex/game-agent-run
GenarrativeAI:codex/ui-spritesheet-durable-transaction-latest
GenarrativeAI:feat/art-agent-more-tools
GenarrativeAI:codex/editor-canvas-null-source-repair
GenarrativeAI:hotfix/editor-layout-2mib
GenarrativeAI:codex/showcase
Labels
Clear labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Breaking change that won't be backward compatible
Something is not working
Documentation changes
Improve existing functionality
New functionality
This is security issue
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
陶泥儿gameAgent
No Assignees
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: GenarrativeAI/Genarrative#355
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Delete Branch "rm/design-v2"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
e7117f6feetobd40ca45f1审查结论(rm/design-v2 → master,HEAD 90b707727)
策划 V1/V2 退役本体做得干净彻底:Rust 三模块(planning_session_v2 / planning_policy_v2 / planning_gdd_model)、4 个 Tauri 命令、
.agent/planning/**与game/fast_gdd.md的写入保护门(patchset / file_ops / checkpoint / filesystem)、前端 GDD 审批卡与策划会话状态、测试夹具、docs 与共享记忆同步,删除边界一致,符合"四不写"。但当前分支不可合并:最近两次合入 master 时的冲突解决把 master 的 Direct 前端新架构回退成了旧版,前端测试大面积失败。阻塞项
1. 合并冲突解决回退了 master 的 Direct 前端架构(#384「保留唯一的 thread manager 作为状态来源」及后续过程折叠 / 计时 PR)
合并提交
bd40ca45f/945b3efa6在冲突文件上整体取了分支侧旧版本:directThreadChat.ts、directHistoryPaging.ts、directHistoryAnchorGate.ts、directThreadItemProjection.tsdirectThreadEvents.ts从 ts-rs 生成绑定的纯转发退回手写类型(违背「字段增删必须改 Rust」的现行约定)directTurnPresentation.ts、toolCallGroupPresentation.ts、ProjectSupervisorView.tsx、tests/appSurface/harness.ts均为旧版实现resolveToolGroupTiming is not a function、buildDirectChatTurns is not a function、directHarness.emitDirectThreadEvents is not a function,另有多条 5s 超时)这些文件与策划退役无关,建议重做这两次合并的冲突解决、Direct 相关文件取 master 侧;若确有意回退 #384,需同步删除/重写对应测试并在 PR 说明中写明。
2. CI 无全绿:8e6fb7d078(09-15)之后的合并均未跑完,最新 run 2496 仍在排队,按上述结果 web tests 必失败。合前需要一次全绿。
非阻塞建议
src/services/apiClient.ts、src/services/image-editor/*、src/components/image-editor/ImageCanvasWorldView.tsx(虽符合 prettier 配置,但属另一个应用的代码,建议拆出);另外generated/DirectThreadRequestKind.ts是 ts-rs 生成文件,手工改格式下次export_bindings会回弹。App.tsx残留const planningLaneActive = designAgentActive别名(9 处使用),退役命名建议一并改掉。agent-runtime/model.ts中planning_invalid/gdd 结构无效/策划输出格式的错误映射在后端已无可达来源,按四不写应删。view/project-development/index.tsx:2849注释仍写「GDD 审批」,审批卡已删,措辞过时。.agent/planning-v2会话的存量项目现在静默新开 Design 会话(原逻辑会给「此项目包含旧策划会话」的明确报错)。无数据丢失,如属预期可忽略。WIP: 删除策划agent v2to WIP: 删除策划agent v2,删除supervisorWIP: 删除策划agent v2,删除supervisorto WIP: 删除策划agent v2,删除supervisor,与退役功能解耦这个pr的工作量已经太大了,彻底解耦supervisor需要另开
复审结论(HEAD 43b739690)
上一轮阻塞项已全部解决,本地独立验证通过,LGTM,待 CI 全绿后可合并。
阻塞项复核
1. Direct 前端架构恢复 ✅(8909b18a1)
directThreadEvents.ts、directTurnPresentation.ts、toolCallGroupPresentation.ts、directThreadChat.ts已与 origin/master 逐字节一致;harness.ts剩余差异仅为策划 GDD 测试夹具删除(正确)。本地从仓库根目录全量跑 shell 前端测试:154 个文件、1928 通过 / 0 失败 / 22 跳过,其中 appSurface 448 通过 17 跳过、directTurnPresentation 全过,与提交说明一致。2. CI:43b739690 各检查当前均为 pending,等一次全绿即可。
非阻塞项复核
planningLaneActive别名 ✅ 已删(43b739690)。planning_invalid/ GDD 错误映射 ✅ 已删(43b739690)。designAgentActive = Boolean(designView || onDesignApprove)的推导与设计 Agent 面板逻辑一致。保留验证结果
start_planning_session_v2等 4 个命令、PLAN_FAST_GDD_PATH、planningSessionV2.ts、GddApprovalCard.tsx等均已删除且无残留引用。tsc --noEmit、skill-pack:check、check-config.mjs、git diff --check全部通过。一个小提醒(不阻塞):
generated/DirectThreadRequestKind.ts是 ts-rs 生成文件,后续重新export_bindings时若格式回弹,重新过一遍 prettier 即可。close #424
那个supervisor在我那里删吧
View command line instructions
Checkout
From your project repository, check out a new branch and test the changes.