888ea76cb2
Project CI / AI game creator shell Rust lane 1/2 (pull_request) Has been cancelled
Project CI / AI game creator shell Rust lane 2/2 (pull_request) Has been cancelled
Project CI / AI game creator shell Rust crates (pull_request) Has been cancelled
Project CI / Backend tests (pull_request) Has been cancelled
Project CI / Native shell tests (pull_request) Has been cancelled
Project CI / Frontend tests (pull_request) Has been cancelled
Project CI / Repository checks (pull_request) Has been cancelled
Project CI / AI game creator shell web tests (pull_request) Has been cancelled
解冲突口径(本次同步 master 16 个提交): - `agent/generation/canvas_generation.rs`、`command_exec.rs` 两个冲突文件不再整文件取一边,改为按 hunk 三分法:master 的功能 hunk 全量移植;我们的清理只在 master 调用方不依赖时才保留。 未恢复整块模块 / 整文件,未新增任何 `#[allow]` / `#[expect]`。 - 成对回退我们的「摘掉 brief 传参空转」清理:master #628 等新代码仍按带 briefs 的契约调用生成链, 故 cg 的 8 处签名与 6 个调用方(direct_runtime / direct_tool_bridge / commands / commands/desktop / asset_generation_tasks)回到 master 形状,并按最小集恢复 `main.rs` 的 `AgentRoleBrief` / `AgentGroupBrief`(未恢复其它已删模块)。 - master #628 已收敛切片用途判定:客户端不再暴露/发送 `sliceCount`,本次跟 master 走( `PlatformArtAssetGenerationOptions` 不再有该字段),只保留结果侧 256 上限门。 - command_exec 的 `project_command_actual_target` 采用 master 的 `Vec<OsString>` 字节精确契约, 同时保留我们「调用点全在 Linux 编译面」的 `#[cfg(target_os = "linux")]` 收窄(与 master 调用方不冲突)。 - 脚本缺陷修复:`scripts/check-rust-warnings.mjs` 编译失败不再可能假通过(cargo 退出码非 0 一律 exit 1, 并把 stderr 尾部提到前面打印;去掉 `warnings.length === 0` 条件)。 - 取 master 版本带来的回流告警 2 条(`main.rs` 两个 brief 结构体的字段未被读)已登记进 `scripts/warning-baseline.json`(agc-windows 16 条 / agc-linux 71 条,server-rs 0 条); 按既定口径「不修上游告警」,只做记账。