Compare commits
86 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e69865a3b5 | |||
| 43b7396909 | |||
| 8909b18a15 | |||
| 5a712910b7 | |||
| 90b707727c | |||
| 4efaec42ea | |||
| 945b3efa6f | |||
| bd40ca45f1 | |||
| 9a21690fe9 | |||
| deff6319e2 | |||
| 2257a78d6b | |||
| a0f6b7c67d | |||
| 21b059bd41 | |||
| 2d90b73b94 | |||
| cd8f480719 | |||
| 2ffccb844c | |||
| 1bd153d7f2 | |||
| f5a333b839 | |||
| 20b1fd63de | |||
| 3de9341a9c | |||
| 105591bac5 | |||
| da44d66dc8 | |||
| 0a85c4f87e | |||
| efce7b102f | |||
| db5edc948c | |||
| 45c3780bf5 | |||
| 6fcf42e4ac | |||
| e0f9f811b7 | |||
| 03b5c1c9f4 | |||
| 58992330aa | |||
| 2c687b01a4 | |||
| c0e377f479 | |||
| 6001b87215 | |||
| b08ab6ee66 | |||
| 7f80012d7f | |||
| fbe95591d5 | |||
| d222aad2ec | |||
| 13b28ebbc7 | |||
| 30648e6b93 | |||
| 9dd1052374 | |||
| aec9568c39 | |||
| 0a1f0e0b26 | |||
| 5c31ae91ca | |||
| 3ba6168c6a | |||
| 2628b83d4b | |||
| a7b2b0e23b | |||
| ef982fdb78 | |||
| 91b65f94ca | |||
| 70513cf049 | |||
| 87aed0b765 | |||
| 733a7015af | |||
| 3e3b35713d | |||
| ea34cbdea6 | |||
| f957a545bf | |||
| c2064836ce | |||
| 8e6fb7d078 | |||
| 94bd7310a9 | |||
| 1d50f4fef5 | |||
| 23bb0bf131 | |||
| 758ef5ceec | |||
| ea843641e8 | |||
| 26d31d73e2 | |||
| 2bce007a0a | |||
| 337cb39340 | |||
| 6d4f7a976f | |||
| 12092ceb50 | |||
| bcbf398b65 | |||
| 151c61ad08 | |||
| 79b49519b6 | |||
| ec2180f281 | |||
| 341080f42d | |||
| 45401de57e | |||
| 908d248f27 | |||
| 65598b9886 | |||
| 64ab959d4f | |||
| 9833a53e06 | |||
| 0847b1bb83 | |||
| 8f691d4c8c | |||
| d3b9f326f0 | |||
| 7eb2326a76 | |||
| 9fc28790a4 | |||
| cea45a608d | |||
| ee03ade156 | |||
| 4933c6c380 | |||
| 931f3eae0a | |||
| c5f8fa1ef6 |
@@ -957,9 +957,6 @@ async function runInteractiveCargo(cliArguments, setActiveChild) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 立项策划跑 standard 档,`agent.delegate` 这类动作按项目权限策略必须逐个确认,
|
|
||||||
// 而确认和问询都只从 CLI 的 stdin 读。自主构建档没有这一步,所以只有 --plan 需要
|
|
||||||
// 一个把「人坐在终端前敲 approve」自动化掉的应答器;判据本身仍然走后端确认命令。
|
|
||||||
const swarmConfirmationPromptPattern = /输入 approve 或 reject:$/u;
|
const swarmConfirmationPromptPattern = /输入 approve 或 reject:$/u;
|
||||||
const swarmUserInputPromptPattern = /请选择 1-\d+,或直接输入其他答案:$/u;
|
const swarmUserInputPromptPattern = /请选择 1-\d+,或直接输入其他答案:$/u;
|
||||||
|
|
||||||
|
|||||||
@@ -1590,13 +1590,11 @@ if (!viteConfigSource.includes('allow: [repoRoot]')) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (!(
|
||||||
!(
|
tauriConfig.build?.beforeDevCommand?.includes(
|
||||||
tauriConfig.build?.beforeDevCommand?.includes(
|
'run ai-game-creator-shell:dev-server',
|
||||||
'run ai-game-creator-shell:dev-server',
|
) || tauriConfig.build?.beforeDevCommand?.includes('run agc:serve')
|
||||||
) || tauriConfig.build?.beforeDevCommand?.includes('run agc:serve')
|
)) {
|
||||||
)
|
|
||||||
) {
|
|
||||||
throw new Error(
|
throw new Error(
|
||||||
'AI game creator shell beforeDevCommand must start the selected Vite dev server',
|
'AI game creator shell beforeDevCommand must start the selected Vite dev server',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1192,7 +1192,7 @@ async function main() {
|
|||||||
function isDirectModuleExecution() {
|
function isDirectModuleExecution() {
|
||||||
return Boolean(
|
return Boolean(
|
||||||
process.argv[1] &&
|
process.argv[1] &&
|
||||||
resolve(process.argv[1]) === fileURLToPath(import.meta.url),
|
resolve(process.argv[1]) === fileURLToPath(import.meta.url),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -2,8 +2,4 @@
|
|||||||
|
|
||||||
需要等待专业 Agent 时不得调用 respond_to_user;Runtime 会通过 delegate/all-join 完成屏障保持同一父 run,取得 readyDelegateReceipts 或 readyIsolatedJoins 后直接整合结果。readyDelegateReceipts 中 contractStatus=evidence-ready 只说明终态、产物和验证等客观证据齐全,你仍须按 acceptanceCriteria 判断语义是否满足;needs-repair 不得当作成功。contractStatus=needs-user-input 时,Runtime 会按原 delivery 逐一发起 user.input_request;每个请求答案收齐后,为对应原 delivery 仅创建一次 continuation 委派,repairOfDelegationId 与 continuationOfDelegationId 都指向该原 delivery,并提交 observation 给出的 questionsSha256、answersSha256;Runtime 自动派生稳定 continuation identity,禁止跨 delivery 混用指纹。客观或语义不满足时可以发起一次新 agent.delegate,并把 repairOfDelegationId 指向已认领原 delivery;不得对返工再返工或为同一原 delivery 创建第二个返工。专业结果冲突且无法依据用户目标裁决时,合并问题后用一次 user.input_request 询问用户。只有实现路径、产品取舍或缺失事实会实质改变结果时才调用 user.input_request;项目内可读取事实、权限确认和工具失败不得伪装成用户问题。
|
需要等待专业 Agent 时不得调用 respond_to_user;Runtime 会通过 delegate/all-join 完成屏障保持同一父 run,取得 readyDelegateReceipts 或 readyIsolatedJoins 后直接整合结果。readyDelegateReceipts 中 contractStatus=evidence-ready 只说明终态、产物和验证等客观证据齐全,你仍须按 acceptanceCriteria 判断语义是否满足;needs-repair 不得当作成功。contractStatus=needs-user-input 时,Runtime 会按原 delivery 逐一发起 user.input_request;每个请求答案收齐后,为对应原 delivery 仅创建一次 continuation 委派,repairOfDelegationId 与 continuationOfDelegationId 都指向该原 delivery,并提交 observation 给出的 questionsSha256、answersSha256;Runtime 自动派生稳定 continuation identity,禁止跨 delivery 混用指纹。客观或语义不满足时可以发起一次新 agent.delegate,并把 repairOfDelegationId 指向已认领原 delivery;不得对返工再返工或为同一原 delivery 创建第二个返工。专业结果冲突且无法依据用户目标裁决时,合并问题后用一次 user.input_request 询问用户。只有实现路径、产品取舍或缺失事实会实质改变结果时才调用 user.input_request;项目内可读取事实、权限确认和工具失败不得伪装成用户问题。
|
||||||
|
|
||||||
委派 `project-planning` 时,acceptanceCriteria 只写产物形状、覆盖范围与红线(例如必须交付 `game/fast_gdd.md`、必须原创、必须只定义一个 MVP 闭环),**不得替用户预先裁定产品取舍**。用户没有指定的玩法规则、数值、关卡量级、美术方向和目标人群,一律留给策划子 Agent 按其 3 轮问询预算决定是提问还是按默认建议填写;不要写“未指定的标注为立项假设”“自行假设后继续”这类指令,那会把问询预算作废。平台事实(自包含 Web、desktop/mobile 双视口、keyboard/touch 双输入、本地 HTTP 预览)由 Runtime 固定注入,属于已定事实,不得要求标为待定、建议或开放项。
|
|
||||||
|
|
||||||
对 `project-planning` 的澄清 continuation,必须按 A/B/“需要原型验证”三项合同原样转述;B 是用户确认的 `confirmed/user_option`,不能转成默认建议。若用户后续自由填写推翻已确认决定,保留用户答案原文逐字不改写、不拆分、不搬轮次,并在被推翻决定后注明“已被第 N 轮回答推翻,以后者为准”,在新决定 topic 中写明推翻关系。
|
|
||||||
|
|
||||||
只在所有必要回执已认领、manifest 正式任务图已经完成、所有必要返工也已认领、项目副作用已验证且没有待确认动作或待回答请求时给用户最终回复。不要向用户暴露内部 task/event、工具计划、动态 child ID 或调试状态。
|
只在所有必要回执已认领、manifest 正式任务图已经完成、所有必要返工也已认领、项目副作用已验证且没有待确认动作或待回答请求时给用户最终回复。不要向用户暴露内部 task/event、工具计划、动态 child ID 或调试状态。
|
||||||
|
|||||||
+3
@@ -14,6 +14,9 @@ Implement the user's actual game request in the current project as an npm-manage
|
|||||||
3. Build with the project's npm script before previewing. The playable entry is the package directory's `dist/index.html`; never report an unbuilt bare-module page as playable. Import assets or configure public assets so all runtime media is included in dist; preview and exports cannot read outside it.
|
3. Build with the project's npm script before previewing. The playable entry is the package directory's `dist/index.html`; never report an unbuilt bare-module page as playable. Import assets or configure public assets so all runtime media is included in dist; preview and exports cannot read outside it.
|
||||||
4. Build a complete playable loop: visible objective, responsive input, meaningful state changes, success or failure feedback, and a reliable restart path where the game needs one.
|
4. Build a complete playable loop: visible objective, responsive input, meaningful state changes, success or failure feedback, and a reliable restart path where the game needs one.
|
||||||
5. Fit the active game scene to desktop and mobile viewports without accidental page scrollbars. Reserve deliberate safe space for HUD elements instead of covering interactive content.
|
5. Fit the active game scene to desktop and mobile viewports without accidental page scrollbars. Reserve deliberate safe space for HUD elements instead of covering interactive content.
|
||||||
|
- **画布居中只能由一处负责。** 使用 `Phaser.Scale.FIT` 与 `autoCenter: Phaser.Scale.CENTER_BOTH` 时,canvas 的直接父容器应使用尺寸明确的普通块布局,不再对同一 canvas 叠加 Grid/Flex 居中、`place-items: center`、自动外边距或居中 transform。Phaser 自动计算的 margin 与 CSS 居中叠加会使竖屏画面向右偏移。
|
||||||
|
- 若决定由 CSS 居中,则显式使用 `autoCenter: Phaser.Scale.NO_CENTER`,由 CSS 独立完成定位;外围页面可以继续使用 Grid/Flex,限制只针对同一 canvas 的重复定位。
|
||||||
|
- 出现偏移先检查游戏自身的 CSS 与 Phaser scale 配置,不添加 AGC 预览容器固定偏移补偿。修改布局后重新构建 dist,在桌面、移动及窗口 resize 后检查 canvas 相对游戏父容器居中(误差不超过 1 CSS px)、画面完整且无意外滚动条;不能仅凭 build 成功宣称布局通过。
|
||||||
6. Invoke `taonier-art-assets` for every new game brief that needs visual assets. First reuse suitable registered Taonier art; when the brief's required visual elements are missing or unsuitable, call the reviewed `agc_tools` generation/edit workflow in the same task. After the tool returns, wire its relative paths into the game and verify the rendered result. A game with unused generated assets or placeholder emoji/CSS where requested art should appear is not complete. Load media defensively only for genuinely optional effects, and never relabel a local placeholder as platform art.
|
6. Invoke `taonier-art-assets` for every new game brief that needs visual assets. First reuse suitable registered Taonier art; when the brief's required visual elements are missing or unsuitable, call the reviewed `agc_tools` generation/edit workflow in the same task. After the tool returns, wire its relative paths into the game and verify the rendered result. A game with unused generated assets or placeholder emoji/CSS where requested art should appear is not complete. Load media defensively only for genuinely optional effects, and never relabel a local placeholder as platform art.
|
||||||
7. Let Phaser own the render loop and input dispatch. Avoid duplicate scenes, stale event listeners, and state that survives restart unintentionally.
|
7. Let Phaser own the render loop and input dispatch. Avoid duplicate scenes, stale event listeners, and state that survives restart unintentionally.
|
||||||
8. After a meaningful game change, use the browser playtest Skill and fix issues shown by real evidence before reporting completion.
|
8. After a meaningful game change, use the browser playtest Skill and fix issues shown by real evidence before reporting completion.
|
||||||
|
|||||||
+2
@@ -7,5 +7,7 @@
|
|||||||
- Score, steps, health, timer, or other core state updates consistently.
|
- Score, steps, health, timer, or other core state updates consistently.
|
||||||
- Restart restores all state and does not duplicate timers, animation loops, or event listeners.
|
- Restart restores all state and does not duplicate timers, animation loops, or event listeners.
|
||||||
- Desktop and mobile layouts keep the core scene visible without accidental document scrolling.
|
- Desktop and mobile layouts keep the core scene visible without accidental document scrolling.
|
||||||
|
- 画布的缩放与居中由 Phaser 或 CSS 中的一方独立负责。`FIT + CENTER_BOTH` 不与同一 canvas 父容器的 Grid/Flex 居中、自动外边距或居中 transform 叠加;使用 CSS 居中时关闭 Phaser 自动居中(`NO_CENTER`)。
|
||||||
|
- 在构建后的实际页面检查桌面、移动和 resize:比较 canvas 与游戏父容器的中心,预期居中时水平/垂直误差不超过 1 CSS px,并检查画面没有溢出或意外滚动条。偏移先修游戏 CSS/scale 配置,不用修改 AGC 预览位置掩盖。
|
||||||
- HUD and overlays reserve space and do not cover essential interactive content.
|
- HUD and overlays reserve space and do not cover essential interactive content.
|
||||||
- Requested Taonier art is visibly integrated into the core experience when available.
|
- Requested Taonier art is visibly integrated into the core experience when available.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"schemaVersion": "agc-skill-pack.v1",
|
"schemaVersion": "agc-skill-pack.v1",
|
||||||
"version": "2026-08-26.24",
|
"version": "2026-08-26.25",
|
||||||
"skills": [
|
"skills": [
|
||||||
{
|
{
|
||||||
"name": "agc-game-production-workflow",
|
"name": "agc-game-production-workflow",
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
"agents/openai.yaml",
|
"agents/openai.yaml",
|
||||||
"references/game-quality-checklist.md"
|
"references/game-quality-checklist.md"
|
||||||
],
|
],
|
||||||
"sha256": "05b5cfbf7a40fd303717491f5cea84ff339a73359c9678b283fd54d2b5c45efd"
|
"sha256": "e122d8f3a6d986b594b95c971754d68197bf7896912fa8267d44a7aa129a57ba"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "agc-browser-playtest",
|
"name": "agc-browser-playtest",
|
||||||
|
|||||||
@@ -797,6 +797,16 @@ fn direct_thread_visible_item(
|
|||||||
direct_thread_event_item(root, item)
|
direct_thread_event_item(root, item)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// AGC 预写的 canonical 用户条目 id:`direct-codex:{clientTurnId}:user`。
|
||||||
|
///
|
||||||
|
/// 与 `direct_project_history::is_direct_project_codex_user_item` 的判据同一份口径(前缀 +
|
||||||
|
/// `:user` 后缀)。回合生命周期事件的 `userItemId` 只能来自这里或已落盘条目自身的 id;
|
||||||
|
/// clientTurnId 缺失时不猜身份,返回 `None` 让前端按"未知归属"处理。
|
||||||
|
fn direct_codex_user_item_id_for_client_turn_id(client_turn_id: &str) -> Option<String> {
|
||||||
|
let client_turn_id = client_turn_id.trim();
|
||||||
|
(!client_turn_id.is_empty()).then(|| format!("direct-codex:{client_turn_id}:user"))
|
||||||
|
}
|
||||||
|
|
||||||
fn direct_codex_command_is_game_verification(command: &str) -> bool {
|
fn direct_codex_command_is_game_verification(command: &str) -> bool {
|
||||||
let command = command.to_ascii_lowercase();
|
let command = command.to_ascii_lowercase();
|
||||||
command.contains("game.static_smoke")
|
command.contains("game.static_smoke")
|
||||||
@@ -2927,7 +2937,7 @@ impl CodexAppServerConnection {
|
|||||||
None => direct_project_local_message_item(
|
None => direct_project_local_message_item(
|
||||||
"user",
|
"user",
|
||||||
current_prompt,
|
current_prompt,
|
||||||
Some(&format!("direct-codex:{client_turn_id}:user")),
|
direct_codex_user_item_id_for_client_turn_id(client_turn_id).as_deref(),
|
||||||
)
|
)
|
||||||
.map_err(platform_llm::LlmError::InvalidRequest)?,
|
.map_err(platform_llm::LlmError::InvalidRequest)?,
|
||||||
};
|
};
|
||||||
@@ -3046,13 +3056,30 @@ impl CodexAppServerConnection {
|
|||||||
};
|
};
|
||||||
turn_start_guard.armed = false;
|
turn_start_guard.armed = false;
|
||||||
let direct_thread_id = direct_thread_id_for_project(history_root);
|
let direct_thread_id = direct_thread_id_for_project(history_root);
|
||||||
|
// 回合边界的阶段时间:Turn 上游只有**秒**级 `startedAt` / `completedAt`,秒级截断
|
||||||
|
// 撑不起前端 0.1 秒粒度的展示,也可能让完成时刻落进该轮用户消息的同一秒、落在真实
|
||||||
|
// 发送时间之前,被判成无效边界后整轮新回合被吞掉。因此这里只在宿主处理对应阶段时取
|
||||||
|
// 毫秒钟(与条目侧"没有原生阶段时间就用宿主钟"同一口径),不再读上游秒字段。
|
||||||
|
let direct_turn_started_at_ms = direct_tool_call_now_ms();
|
||||||
|
// 本轮开口用户条目的 canonical id:只从已落盘的那条条目上读身份(`id`,工具条目才用
|
||||||
|
// `call_id`),不在事件侧重造一份。拿不到就留空,让前端按"归属不可证明"处理。
|
||||||
|
let direct_turn_user_item_id = direct_persisted_user_item
|
||||||
|
.as_ref()
|
||||||
|
.and_then(direct_thread_item_identity);
|
||||||
if self.inner.workspace_mode == CodexAppServerWorkspaceMode::DirectProject {
|
if self.inner.workspace_mode == CodexAppServerWorkspaceMode::DirectProject {
|
||||||
append_direct_thread_event(&direct_thread_id, DirectThreadEvent::turn_started());
|
append_direct_thread_event(
|
||||||
|
&direct_thread_id,
|
||||||
|
DirectThreadEvent::turn_started(direct_turn_started_at_ms)
|
||||||
|
.with_user_item_id(direct_turn_user_item_id.as_deref()),
|
||||||
|
);
|
||||||
if let Some(user_item) = direct_persisted_user_item.as_ref() {
|
if let Some(user_item) = direct_persisted_user_item.as_ref() {
|
||||||
if let Some(entry_item) = direct_thread_event_item(history_root, user_item) {
|
if let Some(entry_item) = direct_thread_event_item(history_root, user_item) {
|
||||||
|
// 这里的条目时间可能是启动应答后的观测时间;前端按同一用户条目身份
|
||||||
|
// 保留更早的真实发送时间,不用此事件时间覆盖它。
|
||||||
|
let user_item_at = entry_item.at();
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id,
|
&direct_thread_id,
|
||||||
DirectThreadEvent::item_completed(entry_item),
|
DirectThreadEvent::item_completed(entry_item, user_item_at),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3191,9 +3218,14 @@ impl CodexAppServerConnection {
|
|||||||
.map_err(platform_llm::LlmError::InvalidRequest)?;
|
.map_err(platform_llm::LlmError::InvalidRequest)?;
|
||||||
direct_project_history.complete_item(&item);
|
direct_project_history.complete_item(&item);
|
||||||
if let Some(entry_item) = entry_item {
|
if let Some(entry_item) = entry_item {
|
||||||
|
// `rawResponseItem/completed` 不带阶段时间,宿主处理到这条
|
||||||
|
// 通知的钟就是该阶段唯一可证明的时间。
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id,
|
&direct_thread_id,
|
||||||
DirectThreadEvent::item_completed(entry_item),
|
DirectThreadEvent::item_completed(
|
||||||
|
entry_item,
|
||||||
|
direct_tool_call_now_ms(),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3322,9 +3354,19 @@ impl CodexAppServerConnection {
|
|||||||
if let Some(entry_item) =
|
if let Some(entry_item) =
|
||||||
direct_thread_visible_item(history_root, item)
|
direct_thread_visible_item(history_root, item)
|
||||||
{
|
{
|
||||||
|
// `item/started` 的通知层带 `startedAtMs`:这是工具真正
|
||||||
|
// 开始的阶段时间,优先于条目展示时间与宿主钟。
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id,
|
&direct_thread_id,
|
||||||
DirectThreadEvent::item_started(entry_item),
|
DirectThreadEvent::item_started(
|
||||||
|
entry_item,
|
||||||
|
direct_thread_item_event_at_ms(
|
||||||
|
¶ms,
|
||||||
|
item,
|
||||||
|
false,
|
||||||
|
direct_tool_call_now_ms(),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3367,9 +3409,19 @@ impl CodexAppServerConnection {
|
|||||||
&& matches!(status, "completed" | "interrupted" | "failed")
|
&& matches!(status, "completed" | "interrupted" | "failed")
|
||||||
{
|
{
|
||||||
terminal_recorded = true;
|
terminal_recorded = true;
|
||||||
|
// 终态时间:`durationMs` 与宿主记下的毫秒起点都可靠时才派生,
|
||||||
|
// 否则取宿主处理这条终态的钟;上游秒级 `completedAt` 一律不用。
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id,
|
&direct_thread_id,
|
||||||
DirectThreadEvent::turn_completed(status.to_string()),
|
DirectThreadEvent::turn_completed(
|
||||||
|
status.to_string(),
|
||||||
|
direct_thread_turn_completed_at_ms(
|
||||||
|
turn,
|
||||||
|
Some(direct_turn_started_at_ms),
|
||||||
|
direct_tool_call_now_ms(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.with_user_item_id(direct_turn_user_item_id.as_deref()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
match status {
|
match status {
|
||||||
@@ -3426,7 +3478,11 @@ impl CodexAppServerConnection {
|
|||||||
"failed"
|
"failed"
|
||||||
}
|
}
|
||||||
.to_string(),
|
.to_string(),
|
||||||
),
|
// 这条兜底终态没有对应的 app-server 终态载荷,只能取宿主处理它的钟,
|
||||||
|
// 不能拿最后一次正文或工具更新时间当回合终点。
|
||||||
|
direct_tool_call_now_ms(),
|
||||||
|
)
|
||||||
|
.with_user_item_id(direct_turn_user_item_id.as_deref()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
let text = match collect_result {
|
let text = match collect_result {
|
||||||
@@ -3624,6 +3680,15 @@ enum DirectCodexTurnCancelTarget {
|
|||||||
/// 这时显式释放这条守卫并把可读原因返回给界面。释放条件见
|
/// 这时显式释放这条守卫并把可读原因返回给界面。释放条件见
|
||||||
/// [`release_stale_direct_taonier_active_invocation`] 的注释;"正在跑的是另一轮"仍然
|
/// [`release_stale_direct_taonier_active_invocation`] 的注释;"正在跑的是另一轮"仍然
|
||||||
/// 保持原拒绝语义,什么都不释放。
|
/// 保持原拒绝语义,什么都不释放。
|
||||||
|
///
|
||||||
|
/// 兜底终态带 `userItemId`:身份取 `release_stale_direct_taonier_active_invocation` 返回的
|
||||||
|
/// clientTurnId(客户端回合身份的唯一来源),与正常路径的开口条目 id 同一份 canonical 口径。
|
||||||
|
/// 拿不到 clientTurnId 就留空——这一轮不会再有原生终态,猜一个身份会让前端把边界盖到别人身上。
|
||||||
|
fn direct_stale_cancel_turn_completed_event(client_turn_id: &str) -> DirectThreadEvent {
|
||||||
|
DirectThreadEvent::turn_completed("aborted".to_string(), direct_tool_call_now_ms())
|
||||||
|
.with_user_item_id(direct_codex_user_item_id_for_client_turn_id(client_turn_id).as_deref())
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn cancel_direct_codex_turn_at(
|
pub(crate) fn cancel_direct_codex_turn_at(
|
||||||
root: &Path,
|
root: &Path,
|
||||||
client_turn_id: Option<&str>,
|
client_turn_id: Option<&str>,
|
||||||
@@ -3680,7 +3745,7 @@ pub(crate) fn cancel_direct_codex_turn_at(
|
|||||||
// 兜底补一条,否则前端的"最新回合是否在跑"会永远停在运行中。
|
// 兜底补一条,否则前端的"最新回合是否在跑"会永远停在运行中。
|
||||||
append_direct_thread_event(
|
append_direct_thread_event(
|
||||||
&direct_thread_id_for_project(root),
|
&direct_thread_id_for_project(root),
|
||||||
DirectThreadEvent::turn_completed("aborted".to_string()),
|
direct_stale_cancel_turn_completed_event(&released),
|
||||||
);
|
);
|
||||||
Ok(DirectTurnCancelView {
|
Ok(DirectTurnCancelView {
|
||||||
outcome: DIRECT_TURN_CANCEL_OUTCOME_RELEASED.to_string(),
|
outcome: DIRECT_TURN_CANCEL_OUTCOME_RELEASED.to_string(),
|
||||||
@@ -5006,6 +5071,109 @@ mod tests {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 阶段时间取自**通知层**字段,形状照抄 codex-cli 0.147 / 0.155 的 v2 协议 schema:
|
||||||
|
/// `item/started` 带 `startedAtMs`、`item/completed` 带 `completedAtMs`(毫秒),
|
||||||
|
/// `turn/completed` 带 `turn.startedAt` / `turn.completedAt`(秒)与 `turn.durationMs`(毫秒)。
|
||||||
|
/// 分类函数把 params 原样交给事件级 `at` 的投影函数,所以字段位置必须在这里钉住;
|
||||||
|
/// 回合边界的秒字段按"不用"锁在这里,避免以后有人再把秒级截断当 0.1 秒精度。
|
||||||
|
#[test]
|
||||||
|
fn direct_lifecycle_stage_times_come_from_notification_params() {
|
||||||
|
let started = serde_json::json!({
|
||||||
|
"threadId": "thread-1",
|
||||||
|
"turnId": "turn-1",
|
||||||
|
"startedAtMs": 1_700_000_000_123u64,
|
||||||
|
"item": {"id": "call-1", "type": "commandExecution", "command": "ls"},
|
||||||
|
});
|
||||||
|
let completed = serde_json::json!({
|
||||||
|
"threadId": "thread-1",
|
||||||
|
"turnId": "turn-1",
|
||||||
|
"completedAtMs": 1_700_000_001_500u64,
|
||||||
|
"item": {"id": "call-1", "type": "commandExecution", "command": "ls"},
|
||||||
|
});
|
||||||
|
for (method, params, expected_at_ms) in [
|
||||||
|
("item/started", &started, 1_700_000_000_123u64),
|
||||||
|
("item/completed", &completed, 1_700_000_001_500u64),
|
||||||
|
] {
|
||||||
|
let Some(CodexTurnEvent::Item {
|
||||||
|
completed,
|
||||||
|
params: event_params,
|
||||||
|
}) = direct_codex_notification_event(method, params, None, None, "turn-1")
|
||||||
|
else {
|
||||||
|
panic!("{method} 必须分类成条目生命周期事件");
|
||||||
|
};
|
||||||
|
let item = event_params.get("item").expect("item payload");
|
||||||
|
assert_eq!(
|
||||||
|
direct_thread_item_event_at_ms(&event_params, item, completed, 9_999),
|
||||||
|
expected_at_ms,
|
||||||
|
"{method} 必须用通知层的阶段时间,而不是宿主钟"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
let terminal = serde_json::json!({
|
||||||
|
"threadId": "thread-1",
|
||||||
|
"turn": {
|
||||||
|
"id": "turn-1",
|
||||||
|
"items": [],
|
||||||
|
"status": "completed",
|
||||||
|
"startedAt": 1_700_000_000i64,
|
||||||
|
"completedAt": 1_700_000_042i64,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
let Some(CodexTurnEvent::Terminal(params)) =
|
||||||
|
direct_codex_notification_event("turn/completed", &terminal, None, None, "turn-1")
|
||||||
|
else {
|
||||||
|
panic!("turn/completed 必须分类成终态事件");
|
||||||
|
};
|
||||||
|
let turn = params.get("turn").unwrap_or(¶ms);
|
||||||
|
assert_eq!(
|
||||||
|
direct_thread_turn_completed_at_ms(turn, Some(1_700_000_000_500), 9_999),
|
||||||
|
9_999,
|
||||||
|
"上游只有秒级 completedAt:不采用,取宿主处理终态的毫秒钟"
|
||||||
|
);
|
||||||
|
let with_duration = serde_json::json!({
|
||||||
|
"id": "turn-1",
|
||||||
|
"items": [],
|
||||||
|
"status": "completed",
|
||||||
|
"startedAt": 1_700_000_000i64,
|
||||||
|
"completedAt": 1_700_000_042i64,
|
||||||
|
"durationMs": 42_500u64,
|
||||||
|
});
|
||||||
|
assert_eq!(
|
||||||
|
direct_thread_turn_completed_at_ms(&with_duration, Some(1_700_000_000_500), 9_999),
|
||||||
|
1_700_000_043_000,
|
||||||
|
"durationMs + 宿主高精度起点才派生结束"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取消兜底终态也要带开口用户条目身份,且身份只有一个来源:release 返回的 clientTurnId
|
||||||
|
/// 走与正常路径同一份 canonical 口径;拿不到(空 / 空白)就留空,不猜。
|
||||||
|
#[test]
|
||||||
|
fn stale_cancel_terminal_event_keeps_opener_user_item_id_from_client_turn_id() {
|
||||||
|
let event = direct_stale_cancel_turn_completed_event("turn-0001");
|
||||||
|
assert_eq!(event.user_item_id(), Some("direct-codex:turn-0001:user"));
|
||||||
|
assert!(event.at().is_some(), "兜底终态仍要带宿主观测时间");
|
||||||
|
assert!(matches!(
|
||||||
|
event,
|
||||||
|
DirectThreadEvent::TurnCompleted { ref status, .. } if status == "aborted"
|
||||||
|
));
|
||||||
|
|
||||||
|
for missing in ["", " "] {
|
||||||
|
let event = direct_stale_cancel_turn_completed_event(missing);
|
||||||
|
assert_eq!(
|
||||||
|
event.user_item_id(),
|
||||||
|
None,
|
||||||
|
"拿不到 clientTurnId 时不得编造开口条目身份"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// canonical 口径与落盘侧同一份:`direct-codex:{clientTurnId}:user`。
|
||||||
|
assert_eq!(
|
||||||
|
direct_codex_user_item_id_for_client_turn_id(" turn-0001 ").as_deref(),
|
||||||
|
Some("direct-codex:turn-0001:user")
|
||||||
|
);
|
||||||
|
assert_eq!(direct_codex_user_item_id_for_client_turn_id(""), None);
|
||||||
|
}
|
||||||
|
|
||||||
fn test_llm() -> GameCreatorLlmConfig {
|
fn test_llm() -> GameCreatorLlmConfig {
|
||||||
GameCreatorLlmConfig {
|
GameCreatorLlmConfig {
|
||||||
custom_enabled: false,
|
custom_enabled: false,
|
||||||
@@ -6740,12 +6908,33 @@ done
|
|||||||
|
|
||||||
let consumed = crate::agent::consume_direct_thread(&bootstrap.subscription_id)
|
let consumed = crate::agent::consume_direct_thread(&bootstrap.subscription_id)
|
||||||
.expect("consume events");
|
.expect("consume events");
|
||||||
|
// 回合起止必须与开口用户条目同源:前端在「只有锚点 + 历史、运行态为空」的回合里靠这个
|
||||||
|
// 身份把边界认领给同一条用户条目,缺了它就只能隐藏未知用时。
|
||||||
|
let lifecycle_user_item_ids = consumed
|
||||||
|
.events
|
||||||
|
.iter()
|
||||||
|
.filter(|event| {
|
||||||
|
matches!(
|
||||||
|
event,
|
||||||
|
DirectThreadEvent::TurnStarted { .. } | DirectThreadEvent::TurnCompleted { .. }
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.map(DirectThreadEvent::user_item_id)
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
assert_eq!(
|
||||||
|
lifecycle_user_item_ids,
|
||||||
|
vec![
|
||||||
|
Some("direct-codex:turn-0001:user"),
|
||||||
|
Some("direct-codex:turn-0001:user"),
|
||||||
|
],
|
||||||
|
"turn.started / turn.completed 都要带本轮开口用户条目的 canonical itemId"
|
||||||
|
);
|
||||||
let mut user_items = Vec::new();
|
let mut user_items = Vec::new();
|
||||||
let mut assistant_items = Vec::new();
|
let mut assistant_items = Vec::new();
|
||||||
for event in &consumed.events {
|
for event in &consumed.events {
|
||||||
let item = match event {
|
let item = match event {
|
||||||
DirectThreadEvent::ItemStarted { item }
|
DirectThreadEvent::ItemStarted { item, .. }
|
||||||
| DirectThreadEvent::ItemCompleted { item } => item,
|
| DirectThreadEvent::ItemCompleted { item, .. } => item,
|
||||||
_ => continue,
|
_ => continue,
|
||||||
};
|
};
|
||||||
match item {
|
match item {
|
||||||
|
|||||||
@@ -1069,15 +1069,10 @@ pub(crate) async fn continue_design_agent_at(
|
|||||||
.ok_or("策划 Agent 当前正在工作")?;
|
.ok_or("策划 Agent 当前正在工作")?;
|
||||||
let mut session = match read_design_session(root)? {
|
let mut session = match read_design_session(root)? {
|
||||||
Some(session) => session,
|
Some(session) => session,
|
||||||
None => {
|
None => new_design_session(
|
||||||
if read_planning_session_v2(root)?.is_some() {
|
&project_id,
|
||||||
return Err("此项目包含旧策划会话,请查看原有记录或在新项目开始五阶段策划".into());
|
&load_game_creator_app_config()?.selected_model_id,
|
||||||
}
|
),
|
||||||
new_design_session(
|
|
||||||
&project_id,
|
|
||||||
&load_game_creator_app_config()?.selected_model_id,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
if session.project_id != project_id {
|
if session.project_id != project_id {
|
||||||
return Err("策划会话与当前项目不匹配".into());
|
return Err("策划会话与当前项目不匹配".into());
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -427,12 +427,16 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 事件级阶段时间只在重放稳定性用例里逐个指定;其余用例用一个固定值即可,
|
||||||
|
/// 它们断言的是队列 / 游标语义,不是时间本身。
|
||||||
|
const FIXED_AT_MS: u64 = 1_000;
|
||||||
|
|
||||||
fn item_started(item_id: &str) -> DirectThreadEvent {
|
fn item_started(item_id: &str) -> DirectThreadEvent {
|
||||||
DirectThreadEvent::item_started(message(item_id))
|
DirectThreadEvent::item_started(message(item_id), FIXED_AT_MS)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn item_completed(item_id: &str) -> DirectThreadEvent {
|
fn item_completed(item_id: &str) -> DirectThreadEvent {
|
||||||
DirectThreadEvent::item_completed(message(item_id))
|
DirectThreadEvent::item_completed(message(item_id), FIXED_AT_MS)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn item_delta(item_id: &str) -> DirectThreadEvent {
|
fn item_delta(item_id: &str) -> DirectThreadEvent {
|
||||||
@@ -450,7 +454,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn subscribers_have_independent_cursors_on_one_global_queue() {
|
fn subscribers_have_independent_cursors_on_one_global_queue() {
|
||||||
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
manager.append("thread-1", DirectThreadEvent::turn_started());
|
manager.append("thread-1", DirectThreadEvent::turn_started(FIXED_AT_MS));
|
||||||
let first = manager.subscribe("thread-1");
|
let first = manager.subscribe("thread-1");
|
||||||
let second = manager.subscribe("thread-1");
|
let second = manager.subscribe("thread-1");
|
||||||
manager.append("thread-1", item_started("item-1"));
|
manager.append("thread-1", item_started("item-1"));
|
||||||
@@ -474,7 +478,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn bootstrap_contains_lifecycle_anchor_and_unfinished_events_only() {
|
fn bootstrap_contains_lifecycle_anchor_and_unfinished_events_only() {
|
||||||
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
manager.append("thread-1", DirectThreadEvent::turn_started());
|
manager.append("thread-1", DirectThreadEvent::turn_started(FIXED_AT_MS));
|
||||||
manager.append("thread-1", item_started("item-1"));
|
manager.append("thread-1", item_started("item-1"));
|
||||||
manager.append("thread-1", item_delta("item-1"));
|
manager.append("thread-1", item_delta("item-1"));
|
||||||
manager.append("thread-1", item_completed("item-1"));
|
manager.append("thread-1", item_completed("item-1"));
|
||||||
@@ -484,7 +488,7 @@ mod tests {
|
|||||||
assert!(matches!(
|
assert!(matches!(
|
||||||
bootstrap.events.as_slice(),
|
bootstrap.events.as_slice(),
|
||||||
[
|
[
|
||||||
DirectThreadEvent::TurnStarted {},
|
DirectThreadEvent::TurnStarted { .. },
|
||||||
DirectThreadEvent::ItemStarted { item, .. },
|
DirectThreadEvent::ItemStarted { item, .. },
|
||||||
] if item.item_id() == "item-2"
|
] if item.item_id() == "item-2"
|
||||||
));
|
));
|
||||||
@@ -589,15 +593,118 @@ mod tests {
|
|||||||
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
manager.append(
|
manager.append(
|
||||||
"thread-1",
|
"thread-1",
|
||||||
DirectThreadEvent::turn_completed("completed".to_string()),
|
DirectThreadEvent::turn_completed("completed".to_string(), FIXED_AT_MS),
|
||||||
);
|
);
|
||||||
let bootstrap = manager.subscribe("thread-1");
|
let bootstrap = manager.subscribe("thread-1");
|
||||||
assert!(matches!(
|
assert!(matches!(
|
||||||
bootstrap.events.as_slice(),
|
bootstrap.events.as_slice(),
|
||||||
[DirectThreadEvent::TurnCompleted { status }] if status == "completed"
|
[DirectThreadEvent::TurnCompleted { status, at, .. }]
|
||||||
|
if status == "completed" && *at == Some(FIXED_AT_MS)
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 阶段时间必须随事件一起进队列:bootstrap 与重复订阅都拿到**原值**,
|
||||||
|
/// 重放不得重新取钟(否则每次重连都会把已固定的起止时间改掉)。
|
||||||
|
#[test]
|
||||||
|
fn replayed_events_keep_their_original_stage_time() {
|
||||||
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
|
manager.append("thread-1", DirectThreadEvent::turn_started(1_000));
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::item_started(message("item-1"), 2_000),
|
||||||
|
);
|
||||||
|
|
||||||
|
let first = manager.subscribe("thread-1");
|
||||||
|
assert_eq!(
|
||||||
|
first
|
||||||
|
.events
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::at)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some(1_000), Some(2_000)]
|
||||||
|
);
|
||||||
|
|
||||||
|
// 第二个订阅看到的是同一份事件,时间不因"又取了一次当前时间"而漂移。
|
||||||
|
let second = manager.subscribe("thread-1");
|
||||||
|
assert_eq!(second.events, first.events);
|
||||||
|
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::item_completed(message("item-1"), 3_000),
|
||||||
|
);
|
||||||
|
let completion = manager
|
||||||
|
.consume(&first.subscription_id)
|
||||||
|
.expect("consume completion")
|
||||||
|
.events;
|
||||||
|
assert_eq!(
|
||||||
|
completion
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::at)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some(3_000)]
|
||||||
|
);
|
||||||
|
// 重复消费不产生新事件,也不改写已下发过的时间。
|
||||||
|
assert!(manager
|
||||||
|
.consume(&first.subscription_id)
|
||||||
|
.expect("empty consume")
|
||||||
|
.events
|
||||||
|
.is_empty());
|
||||||
|
assert_eq!(
|
||||||
|
completion
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::at)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some(3_000)]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 生命周期锚点重放时必须带上开口用户条目身份:前端在「只有锚点 + 历史切片、运行态一直空」
|
||||||
|
/// 的回合里也要能把边界认领给同一条用户条目,而不是按时间戳猜。
|
||||||
|
#[test]
|
||||||
|
fn bootstrap_replays_opener_user_item_id() {
|
||||||
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::turn_started(1_000)
|
||||||
|
.with_user_item_id(Some("direct-codex:turn-1:user")),
|
||||||
|
);
|
||||||
|
let bootstrap = manager.subscribe("thread-1");
|
||||||
|
assert_eq!(
|
||||||
|
bootstrap
|
||||||
|
.events
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::user_item_id)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some("direct-codex:turn-1:user")]
|
||||||
|
);
|
||||||
|
assert_eq!(bootstrap.events[0].at(), Some(1_000));
|
||||||
|
|
||||||
|
// 锚点是独立保存的副本:队列里那条事件被回收之后,新订阅仍拿到同一个身份。
|
||||||
|
manager
|
||||||
|
.consume(&bootstrap.subscription_id)
|
||||||
|
.expect("consume anchor");
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::item_completed(message("item-1"), 2_000),
|
||||||
|
);
|
||||||
|
manager.append(
|
||||||
|
"thread-1",
|
||||||
|
DirectThreadEvent::turn_completed("completed".to_string(), 3_000)
|
||||||
|
.with_user_item_id(Some("direct-codex:turn-1:user")),
|
||||||
|
);
|
||||||
|
let second = manager.subscribe("thread-1");
|
||||||
|
assert_eq!(
|
||||||
|
second
|
||||||
|
.events
|
||||||
|
.iter()
|
||||||
|
.map(DirectThreadEvent::user_item_id)
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
vec![Some("direct-codex:turn-1:user")],
|
||||||
|
"起止同源:终态锚点也带同一个开口用户条目身份"
|
||||||
|
);
|
||||||
|
assert_eq!(second.events[0].at(), Some(3_000));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn queue_cleanup_only_removes_a_cleanable_prefix() {
|
fn queue_cleanup_only_removes_a_cleanable_prefix() {
|
||||||
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
let mut manager = DirectThreadManager::with_limits(100, 100_000);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -2391,6 +2391,8 @@ async fn bridge_generate_image(state: &DirectToolBridgeState, arguments: &Value)
|
|||||||
slice_mode,
|
slice_mode,
|
||||||
grid_x,
|
grid_x,
|
||||||
grid_y,
|
grid_y,
|
||||||
|
reference_asset_ids: Vec::new(),
|
||||||
|
target_category: None,
|
||||||
screen_color,
|
screen_color,
|
||||||
};
|
};
|
||||||
let _generation_guard = state.image_generation_gate.lock().await;
|
let _generation_guard = state.image_generation_gate.lock().await;
|
||||||
|
|||||||
@@ -67,10 +67,11 @@ pub(crate) use canvas_generation::{
|
|||||||
generate_platform_art_asset_with_options_at,
|
generate_platform_art_asset_with_options_at,
|
||||||
generate_platform_art_asset_with_required_slices_at, maybe_generate_platform_art_asset_step,
|
generate_platform_art_asset_with_required_slices_at, maybe_generate_platform_art_asset_step,
|
||||||
needs_platform_art_asset_generation, normalize_platform_art_asset_generation_kind,
|
needs_platform_art_asset_generation, normalize_platform_art_asset_generation_kind,
|
||||||
|
normalize_platform_art_reference_asset_ids, normalize_platform_art_target_category,
|
||||||
platform_art_asset_art_spec, platform_art_asset_output_extension_matches,
|
platform_art_asset_art_spec, platform_art_asset_output_extension_matches,
|
||||||
prepare_platform_art_asset_output_path, project_canvas_asset_media_types,
|
platform_art_runtime_references_match_request_contract, prepare_platform_art_asset_output_path,
|
||||||
role_has_canvas_assets, suggested_canvas_tool_call, PlatformArtAssetGenerationOptions,
|
project_canvas_asset_media_types, role_has_canvas_assets, suggested_canvas_tool_call,
|
||||||
PLATFORM_ART_ASSET_GENERATION_KINDS,
|
PlatformArtAssetGenerationOptions, PLATFORM_ART_ASSET_GENERATION_KINDS,
|
||||||
};
|
};
|
||||||
#[allow(unused_imports)]
|
#[allow(unused_imports)]
|
||||||
pub(crate) use draft_validation::{
|
pub(crate) use draft_validation::{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -549,7 +549,7 @@ fn append_agent_runtime_file_read_evidence_ref(
|
|||||||
// 给的是**整个三元组**,不是一个碎片。`agent.acceptance_update` 的 evidence 引用
|
// 给的是**整个三元组**,不是一个碎片。`agent.acceptance_update` 的 evidence 引用
|
||||||
// 要求 {agentId, runId, actionId} 三个字段,回执查找也按三元组整体做 key。早期
|
// 要求 {agentId, runId, actionId} 三个字段,回执查找也按三元组整体做 key。早期
|
||||||
// 只给 actionId,另外两个靠模型回忆——实测它第一次就把其中一个记错,白吃一次
|
// 只给 actionId,另外两个靠模型回忆——实测它第一次就把其中一个记错,白吃一次
|
||||||
// 拒绝。反正 `validate_fast_gdd_evidence_identity` 只接受当前根 run 的回执,
|
// 拒绝。验收证据只接受当前根 run 的回执,
|
||||||
// 合法取值唯一,本来就不该让它猜。
|
// 合法取值唯一,本来就不该让它猜。
|
||||||
observation.summary = format!(
|
observation.summary = format!(
|
||||||
"{} · sourceAgentId={agent_id} · sourceRunId={run_id} · sourceActionId={action_id}",
|
"{} · sourceAgentId={agent_id} · sourceRunId={run_id} · sourceActionId={action_id}",
|
||||||
@@ -919,9 +919,9 @@ mod file_read_source_action_id_tests {
|
|||||||
AgentRuntimeToolObservation {
|
AgentRuntimeToolObservation {
|
||||||
tool: "file.read".to_string(),
|
tool: "file.read".to_string(),
|
||||||
status: "ok".to_string(),
|
status: "ok".to_string(),
|
||||||
summary: "已读取 game/fast_gdd.md 第 1-134 行(共 134 行)".to_string(),
|
summary: "已读取 design.md 第 1-134 行(共 134 行)".to_string(),
|
||||||
detail: Some(format!(
|
detail: Some(format!(
|
||||||
"game/fast_gdd.md · sha256={} · lines 1-134 of 134
|
"design.md · sha256={} · lines 1-134 of 134
|
||||||
第一行内容",
|
第一行内容",
|
||||||
"a".repeat(64)
|
"a".repeat(64)
|
||||||
)),
|
)),
|
||||||
@@ -954,7 +954,7 @@ mod file_read_source_action_id_tests {
|
|||||||
agent_runtime_action_receipt_public_safe_detail_for_test(&root, &observation)
|
agent_runtime_action_receipt_public_safe_detail_for_test(&root, &observation)
|
||||||
.expect("safe detail still parses");
|
.expect("safe detail still parses");
|
||||||
let value = serde_json::from_str::<serde_json::Value>(&safe_detail).expect("json");
|
let value = serde_json::from_str::<serde_json::Value>(&safe_detail).expect("json");
|
||||||
assert_eq!(value["path"], "game/fast_gdd.md");
|
assert_eq!(value["path"], "design.md");
|
||||||
assert_eq!(value["lines"], "1-134 of 134");
|
assert_eq!(value["lines"], "1-134 of 134");
|
||||||
assert_eq!(value["contentSha256"], "a".repeat(64));
|
assert_eq!(value["contentSha256"], "a".repeat(64));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,12 +78,6 @@ pub(super) fn game_creator_agent_final_reply_error_allows_fallback(error: &str)
|
|||||||
matches!(kind.as_str(), "empty-response" | "deserialize")
|
matches!(kind.as_str(), "empty-response" | "deserialize")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 这些错误只描述本次 Provider input 或候选 GDD;真正的 session CAS 冲突不在
|
|
||||||
/// 此列——那说明 durable session 已被推进或损坏,必须 reconcile。
|
|
||||||
fn plan_submit_error_is_business_rejection(error: &PlanningStorageError) -> bool {
|
|
||||||
matches!(error.code(), "PLAN_INVALID_REQUEST" | "PLAN_SIZE_LIMIT")
|
|
||||||
}
|
|
||||||
|
|
||||||
const AGENT_RUNTIME_PLAN_UPDATE_IDLE_LIMIT: u32 = 4;
|
const AGENT_RUNTIME_PLAN_UPDATE_IDLE_LIMIT: u32 = 4;
|
||||||
|
|
||||||
/// 最终回复被收束门禁拦下后 run 会原地续跑重试。多数 blocker 是模型自己能解的
|
/// 最终回复被收束门禁拦下后 run 会原地续跑重试。多数 blocker 是模型自己能解的
|
||||||
|
|||||||
@@ -7,9 +7,6 @@ mod design_session;
|
|||||||
mod finalization;
|
mod finalization;
|
||||||
mod json_sidecar;
|
mod json_sidecar;
|
||||||
mod models;
|
mod models;
|
||||||
mod planning_gdd_model;
|
|
||||||
mod planning_policy_v2;
|
|
||||||
mod planning_session_v2;
|
|
||||||
mod provider_control;
|
mod provider_control;
|
||||||
mod provider_retry;
|
mod provider_retry;
|
||||||
mod real_e2e_checkpoint;
|
mod real_e2e_checkpoint;
|
||||||
@@ -24,9 +21,6 @@ pub(crate) use design_session::*;
|
|||||||
pub(in crate::agent) use finalization::*;
|
pub(in crate::agent) use finalization::*;
|
||||||
pub(in crate::agent) use json_sidecar::*;
|
pub(in crate::agent) use json_sidecar::*;
|
||||||
pub(in crate::agent) use models::*;
|
pub(in crate::agent) use models::*;
|
||||||
pub(crate) use planning_gdd_model::*;
|
|
||||||
pub(crate) use planning_policy_v2::*;
|
|
||||||
pub(crate) use planning_session_v2::*;
|
|
||||||
pub(in crate::agent) use provider_control::*;
|
pub(in crate::agent) use provider_control::*;
|
||||||
pub(in crate::agent) use provider_retry::*;
|
pub(in crate::agent) use provider_retry::*;
|
||||||
pub(in crate::agent) use real_e2e_checkpoint::*;
|
pub(in crate::agent) use real_e2e_checkpoint::*;
|
||||||
|
|||||||
-1082
File diff suppressed because it is too large
Load Diff
-2021
File diff suppressed because it is too large
Load Diff
-1756
File diff suppressed because it is too large
Load Diff
@@ -781,7 +781,7 @@ mod provider_reconciliation_diagnostic_tests {
|
|||||||
let directory = tempfile::tempdir().expect("diagnostic directory");
|
let directory = tempfile::tempdir().expect("diagnostic directory");
|
||||||
let snapshot = AgentRuntimeProviderRequestSnapshot {
|
let snapshot = AgentRuntimeProviderRequestSnapshot {
|
||||||
project_id: "project-1".to_string(),
|
project_id: "project-1".to_string(),
|
||||||
agent_id: "project-planning".to_string(),
|
agent_id: "project-supervisor".to_string(),
|
||||||
task_id: "task-1".to_string(),
|
task_id: "task-1".to_string(),
|
||||||
session_id: "session-1".to_string(),
|
session_id: "session-1".to_string(),
|
||||||
run_id: "run-1".to_string(),
|
run_id: "run-1".to_string(),
|
||||||
@@ -805,7 +805,7 @@ mod provider_reconciliation_diagnostic_tests {
|
|||||||
usage: None,
|
usage: None,
|
||||||
tool_calls: vec![platform_llm::LlmToolCall {
|
tool_calls: vec![platform_llm::LlmToolCall {
|
||||||
id: "call-1".to_string(),
|
id: "call-1".to_string(),
|
||||||
name: "runtime_tool_plan_submit_gdd".to_string(),
|
name: "runtime_tool_agent_message".to_string(),
|
||||||
arguments: "{\"path\":\"C:\\\\private\\\\argument\"}".to_string(),
|
arguments: "{\"path\":\"C:\\\\private\\\\argument\"}".to_string(),
|
||||||
}],
|
}],
|
||||||
responses_output: Vec::new(),
|
responses_output: Vec::new(),
|
||||||
|
|||||||
@@ -201,39 +201,17 @@ pub(crate) fn observe_agent_runtime_agent_message(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 委派 task 末尾那句「你在这条链路上的位置」。三种跳的语义互不相同,共用一句话
|
/// 委派 task 末尾那句「你在这条链路上的位置」。返工和普通委派的语义不同,单独保留。
|
||||||
/// 就会说谎,所以这里把它显式化。
|
|
||||||
///
|
///
|
||||||
/// - `Repair`:质量返工,`repair_depth` 上限 1,「唯一返工轮」是真的。而且这句话是
|
/// - `Repair`:质量返工,`repair_depth` 上限 1,「唯一返工轮」是真的。而且这句话是
|
||||||
/// 做游戏链路的**授权信号**——`design-foundation` / `art-director` /
|
/// 做游戏链路的**授权信号**——`design-foundation` / `art-director` /
|
||||||
/// `art-asset-plan` 的角色提示词都把「任务正文明确标识这是带 repairOfDelegationId
|
/// `art-asset-plan` 的角色提示词都把「任务正文明确标识这是带 repairOfDelegationId
|
||||||
/// 的唯一返工轮」当作 `replaceExisting=true` 的唯一许可(见 agent/prompt.rs 的三处
|
/// 的唯一返工轮」当作 `replaceExisting=true` 的唯一许可(见 agent/prompt.rs 的三处
|
||||||
/// 角色 prompt)。这一支逐字不能动。
|
/// 角色 prompt)。这一支逐字不能动。
|
||||||
/// - `PlanClarification`:澄清续跑不消耗 `repair_depth`,预算是
|
|
||||||
/// `static_delegate_clarification_round_limit_at`(plan 链路 3 轮)。master 只有一道
|
|
||||||
/// 平坦的 depth <= 1 门,那时「唯一返工轮」对澄清跳也成立;本仓库改成按谱系分类后
|
|
||||||
/// 把预算抬到 3,这句话就变成了假天花板——生产实测 4 次澄清续跑全部命中它,命中后
|
|
||||||
/// 全部直接出稿,没有任何一个 run 走到第 2 轮。
|
|
||||||
/// - `UserRevision`:用户在审批卡上点「修改 / 退回」后的修订轮。它同样带
|
|
||||||
/// `repairOfDelegationId`,但 `repair_depth` 防的是 runaway agent,而这一跳每一轮
|
|
||||||
/// 都由人触发——人本身就是循环边界,所以 `static_delegate_lineage_counters` 早就
|
|
||||||
/// 把 depth/round 原样继承了。缺的是这句话:走 `Repair` 分支时用户第一次点修改就
|
|
||||||
/// 会被告知「这是唯一返工轮」,和澄清跳当初那个假天花板是同一个错误。原型对应的是
|
|
||||||
/// `USER_REVISION_SOFT_LIMIT = 16`,且超过只提示、不拒绝。
|
|
||||||
/// - `None`:普通委派,不加这一段。
|
/// - `None`:普通委派,不加这一段。
|
||||||
pub(in crate::agent) enum StaticDelegateHopNote<'a> {
|
pub(in crate::agent) enum StaticDelegateHopNote<'a> {
|
||||||
None,
|
None,
|
||||||
Repair {
|
Repair { original_delegation_id: &'a str },
|
||||||
original_delegation_id: &'a str,
|
|
||||||
},
|
|
||||||
UserRevision {
|
|
||||||
original_delegation_id: &'a str,
|
|
||||||
},
|
|
||||||
PlanClarification {
|
|
||||||
original_delegation_id: &'a str,
|
|
||||||
rounds_used: u32,
|
|
||||||
rounds_limit: u32,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl StaticDelegateHopNote<'_> {
|
impl StaticDelegateHopNote<'_> {
|
||||||
@@ -247,32 +225,6 @@ impl StaticDelegateHopNote<'_> {
|
|||||||
StaticDelegateHopNote::Repair {
|
StaticDelegateHopNote::Repair {
|
||||||
original_delegation_id,
|
original_delegation_id,
|
||||||
} => format!("\n\n这是对已认领委派 {original_delegation_id} 的唯一返工轮。"),
|
} => format!("\n\n这是对已认领委派 {original_delegation_id} 的唯一返工轮。"),
|
||||||
StaticDelegateHopNote::UserRevision {
|
|
||||||
original_delegation_id,
|
|
||||||
} => format!(
|
|
||||||
"\n\n这是对已认领委派 {original_delegation_id} 的用户修订轮,由用户在审批卡上提出,不是质量返工,不消耗返工深度,也不重置澄清轮次。按任务正文里的用户意见原文修订同一份 GDD 谱系后重新提交;用户看过新稿还可以再次提出修改,这不是最后一轮,不要因此压缩改动或提前收尾。"
|
|
||||||
),
|
|
||||||
// 预算用尽:planning_coordinator 出卡时会用
|
|
||||||
// `current_round >= 3` 直接拒掉第四张卡,所以这里不能再邀请提问,
|
|
||||||
// 只能要求收稿——语义上等价于原型的 INJ_MUST_DRAFT_ROUNDS。
|
|
||||||
StaticDelegateHopNote::PlanClarification {
|
|
||||||
original_delegation_id,
|
|
||||||
rounds_used,
|
|
||||||
rounds_limit,
|
|
||||||
} if rounds_used >= rounds_limit => format!(
|
|
||||||
"\n\n这是对已认领委派 {original_delegation_id} 的澄清续跑,不是返工轮。已用澄清轮次 {rounds_used}/{rounds_limit},澄清预算已用尽:本轮不得再输出 AGC_NEEDS_USER_INPUT_V1 信封,剩余空白按默认建议补齐并标 default_pending,立即提交 GDD。"
|
|
||||||
),
|
|
||||||
// 轮号必须和 planning_coordinator 出卡时的期望一致:那边用
|
|
||||||
// `validate_exact_plan_clarification_question(.., current_round + 1)`,
|
|
||||||
// current_round 就是本 delivery 的谱系轮次,也就是这里的 rounds_used。
|
|
||||||
StaticDelegateHopNote::PlanClarification {
|
|
||||||
original_delegation_id,
|
|
||||||
rounds_used,
|
|
||||||
rounds_limit,
|
|
||||||
} => format!(
|
|
||||||
"\n\n这是对已认领委派 {original_delegation_id} 的澄清续跑,不是返工轮,不消耗返工深度。已用澄清轮次 {rounds_used}/{rounds_limit}。仍有会实质改变结果的空白且预算未用尽时,可以继续以 AGC_NEEDS_USER_INPUT_V1 信封退出:questions 恰好一题,header 写成「第{next_round}轮·当前要决定:<主题>」,轮号必须是 {next_round},主题写这一轮真正要定的那件事。预算已用尽,或剩余空白能由默认建议覆盖且不影响首个可玩闭环时,立即提交 GDD。",
|
|
||||||
next_round = rounds_used.saturating_add(1),
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1523,122 +1475,3 @@ pub(crate) fn observe_agent_runtime_agent_spawn_isolated(
|
|||||||
.map(|value| redact_agent_runtime_project_paths(root, &value, 3_600)),
|
.map(|value| redact_agent_runtime_project_paths(root, &value, 3_600)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
/// 委派 task 末尾那句话是两条链路的合同,不能共用一份文案。
|
|
||||||
///
|
|
||||||
/// 上半条钉做游戏链路:`design-foundation` / `art-director` / `art-asset-plan`
|
|
||||||
/// 的角色提示词把「任务正文明确标识这是带 repairOfDelegationId 的唯一返工轮」
|
|
||||||
/// 当作 `replaceExisting=true` 的唯一授权信号,改一个字就会让返工轮拿不到许可。
|
|
||||||
///
|
|
||||||
/// 下半条钉立项策划链路:澄清续跑不是返工轮,套用返工文案等于告诉策划子 Agent
|
|
||||||
/// 「你只剩这一轮」——这正是生产上 4 次澄清续跑之后无一走到第 2 轮的原因。
|
|
||||||
/// 同时钉住轮号:`planning_coordinator` 出卡时按 `rounds_used + 1` 校验 header,
|
|
||||||
/// 这里写进 task 的必须是同一个数,否则第 2 轮信封会当场被拒。
|
|
||||||
/// 用户修订轮同样不能套返工文案。
|
|
||||||
///
|
|
||||||
/// 「唯一返工轮」防的是 runaway agent,而这一跳由用户在审批卡上亲手点出来——人本身
|
|
||||||
/// 就是循环边界,`static_delegate_lineage_counters` 早就把 depth/round 原样继承了。
|
|
||||||
/// 套用返工文案就是告诉策划子 Agent「用户只能改这一次」,和澄清跳当初那个假天花板
|
|
||||||
/// 是同一个错误。原型对应的是软阈值 16 次、超过只提示不拒绝。
|
|
||||||
#[test]
|
|
||||||
fn user_revision_hop_note_is_not_the_repair_round_note() {
|
|
||||||
let revision = render_static_delegate_task_contract(
|
|
||||||
"任务",
|
|
||||||
"project-supervisor",
|
|
||||||
"run-1",
|
|
||||||
"delegation-new",
|
|
||||||
&["交付 game/fast_gdd.md".to_string()],
|
|
||||||
&["game/fast_gdd.md".to_string()],
|
|
||||||
StaticDelegateHopNote::UserRevision {
|
|
||||||
original_delegation_id: "delegation-old",
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.expect("render user revision hop note");
|
|
||||||
assert!(
|
|
||||||
!revision.contains("唯一返工轮"),
|
|
||||||
"用户修订轮不得复用返工文案,否则子 Agent 以为用户只能改这一次:{revision}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
revision.contains("不消耗返工深度"),
|
|
||||||
"必须写明它不吃返工额度:{revision}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
revision.contains("不是最后一轮"),
|
|
||||||
"必须写明用户还能再改,否则子 Agent 会把多条意见攒到一轮改完:{revision}"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn plan_clarification_hop_note_is_not_the_repair_round_note() {
|
|
||||||
let repair = render_static_delegate_task_contract(
|
|
||||||
"任务",
|
|
||||||
"project-supervisor",
|
|
||||||
"run-1",
|
|
||||||
"delegation-new",
|
|
||||||
&["交付产物".to_string()],
|
|
||||||
&["assets/art-spec.png".to_string()],
|
|
||||||
StaticDelegateHopNote::Repair {
|
|
||||||
original_delegation_id: "delegation-old",
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.expect("render repair");
|
|
||||||
assert!(
|
|
||||||
repair.contains("这是对已认领委派 delegation-old 的唯一返工轮。"),
|
|
||||||
"返工轮文案是做游戏链路 replaceExisting 的授权信号,必须逐字保留:{repair}"
|
|
||||||
);
|
|
||||||
|
|
||||||
let clarification = render_static_delegate_task_contract(
|
|
||||||
"任务",
|
|
||||||
"project-supervisor",
|
|
||||||
"run-1",
|
|
||||||
"delegation-new",
|
|
||||||
&["交付 game/fast_gdd.md".to_string()],
|
|
||||||
&["game/fast_gdd.md".to_string()],
|
|
||||||
StaticDelegateHopNote::PlanClarification {
|
|
||||||
original_delegation_id: "delegation-old",
|
|
||||||
rounds_used: 1,
|
|
||||||
rounds_limit: 3,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.expect("render clarification");
|
|
||||||
assert!(
|
|
||||||
!clarification.contains("唯一返工轮"),
|
|
||||||
"澄清续跑不得复用返工文案,否则策划子 Agent 以为只剩这一轮:{clarification}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
clarification.contains("已用澄清轮次 1/3"),
|
|
||||||
"澄清续跑必须写明已用轮次与上限:{clarification}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
clarification.contains("第2轮·当前要决定:"),
|
|
||||||
"task 里的轮号必须等于 planning_coordinator 校验 header 时用的 rounds_used + 1:{clarification}"
|
|
||||||
);
|
|
||||||
|
|
||||||
let exhausted = render_static_delegate_task_contract(
|
|
||||||
"任务",
|
|
||||||
"project-supervisor",
|
|
||||||
"run-1",
|
|
||||||
"delegation-new",
|
|
||||||
&["交付 game/fast_gdd.md".to_string()],
|
|
||||||
&["game/fast_gdd.md".to_string()],
|
|
||||||
StaticDelegateHopNote::PlanClarification {
|
|
||||||
original_delegation_id: "delegation-old",
|
|
||||||
rounds_used: 3,
|
|
||||||
rounds_limit: 3,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.expect("render exhausted clarification");
|
|
||||||
assert!(
|
|
||||||
exhausted.contains("澄清预算已用尽"),
|
|
||||||
"预算用尽时必须要求收稿,出卡侧会直接拒掉第四张卡:{exhausted}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
!exhausted.contains("第4轮·当前要决定:"),
|
|
||||||
"预算用尽时不得再给出下一轮 header,那是一张永远递不上去的卡:{exhausted}"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -10,18 +10,6 @@ pub(in crate::agent) fn agent_role_project_path_mutation_block(
|
|||||||
if autonomous_relaxed_run_at(root, agent_id, run_id).unwrap_or(false) {
|
if autonomous_relaxed_run_at(root, agent_id, run_id).unwrap_or(false) {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
if is_agent_planning_storage_path(path) || is_plan_fast_gdd_projection_path(path) {
|
|
||||||
return Some(AgentRuntimeToolObservation {
|
|
||||||
tool: tool.to_string(),
|
|
||||||
status: "blocked".to_string(),
|
|
||||||
summary: if is_agent_planning_storage_path(path) {
|
|
||||||
"`.agent/planning/**` 只能由立项策划 Runtime 专用存储层写入".to_string()
|
|
||||||
} else {
|
|
||||||
"`game/fast_gdd.md` 只能由立项策划 Runtime renderer 写入".to_string()
|
|
||||||
},
|
|
||||||
detail: Some(format!("agentId={agent_id} · runId={run_id} · path={path}")),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
match autonomous_owner_artifact_validation_available_for_run_at(root, agent_id, run_id) {
|
match autonomous_owner_artifact_validation_available_for_run_at(root, agent_id, run_id) {
|
||||||
Ok(true) => {
|
Ok(true) => {
|
||||||
let allowed = autonomous_manifest_owner_artifact_paths(agent_id);
|
let allowed = autonomous_manifest_owner_artifact_paths(agent_id);
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user