From 35af46dd94fb69cfe55cda6067c8d6cefb9a0efb Mon Sep 17 00:00:00 2001 From: kdletters <61648117+kdletters@users.noreply.github.com> Date: Fri, 2 Oct 2026 13:56:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Direct=20=E5=9B=9E=E5=90=88=E5=9C=A8=20begi?= =?UTF-8?q?n=20=E4=B9=8B=E5=90=8E=E8=A1=A5=E5=88=86=E6=AE=B5=20trace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增 direct_turn_trace：按 stage 写应用日志，定位回合在 begin 与执行器之间停在哪一步 覆盖 session-ready / run-analytics-accepted / goal-analytics-accepted / system-prompt-ready / executor-dispatch 仅在 cfg(not(test)) 生效，不污染用例与本机 AppData --- .../src-tauri/src/agent/direct_runtime/mod.rs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs index f5059ed82..35ef1db4d 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs @@ -4294,6 +4294,24 @@ pub(crate) fn check_direct_turn_preconditions( .map_err(|detail| DirectTurnError::InputRejected { detail })?; Ok(()) } +/// Direct 回合在 `direct_execution::begin` 之后的分段 trace。 +/// +/// 起因：2026-10-02 连续四轮回合都停在 `begin` 之后——账本 `phase=working`、 +/// `nextSequence=0`、`active={}`、没有任何错误 sidecar、stderr 无 panic、连 +/// `agent.direct_codex.*` 都没有。窗口就夹在 `begin` 与执行器调用之间，需要知道 +/// 具体停在哪一步。测试态不写，避免污染本机 AppData。 +#[cfg(not(test))] +fn direct_turn_trace(stage: &str) { + let _ = crate::append_application_log( + "info".to_string(), + "direct-turn".to_string(), + format!("agent.direct_turn.trace stage={stage}"), + ); +} + +#[cfg(test)] +fn direct_turn_trace(_stage: &str) {} + pub(crate) async fn run_direct_game_creator_turn_at_with_creation_type_and_emitter( root: &Path, prompt: &str, @@ -4401,6 +4419,7 @@ async fn run_direct_game_creator_turn_inner( })?; let execution_session = execution_guard.session(); execution_session.set_analytics_capture(capture.clone()); + direct_turn_trace("session-ready"); let started = execution_session .newly_accepted .then(std::time::Instant::now); @@ -4411,6 +4430,7 @@ async fn run_direct_game_creator_turn_inner( } } } + direct_turn_trace("run-analytics-accepted"); // 在 guard 仍存活时冻结整体结果，避免 Drop 的中断收尾覆盖真实失败原因。 let result: Result = async { if let Some(report) = super::direct_delivery::terminal_report(&execution_session) { @@ -4444,6 +4464,7 @@ async fn run_direct_game_creator_turn_inner( ); } } + direct_turn_trace("goal-analytics-accepted"); emit_direct_game_creator_progress(root, "codex.turn", "陶泥儿正在处理这条消息"); if let Some(emitter) = turn_emitter { emitter.emit("running", Some("preparing")); @@ -4460,6 +4481,7 @@ async fn run_direct_game_creator_turn_inner( DirectTurnError::turn_failed(DirectCodexFailureStage::CodeGeneration, error) }, )?; + direct_turn_trace("system-prompt-ready"); // 三维请求：把"自选三维技术栈、解除 Phaser 固定约束"的合同放在系统提示最前， // 避免被长度上限截断，也不阻断任何工具。 let engine_contract = direct_engine_three_dimensional_contract(root, prompt); @@ -4471,6 +4493,7 @@ async fn run_direct_game_creator_turn_inner( None => base_system_prompt, }; let reply = if let Some(emitter) = turn_emitter { + direct_turn_trace("executor-dispatch"); let client_turn_id = emitter.turn_id().to_string(); let emitter = emitter.clone(); let mut observer = |observation: DirectCodexTurnObservation| { From 50925d96eb34ea3a0639fe19b081df0147c60ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= Date: Fri, 2 Oct 2026 13:46:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=9F=E4=B8=80=20AGC=20launcher=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E9=A1=B5=E5=BA=95=E9=83=A8=E8=A2=AB=E8=A3=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - styles.css：新增页面高度契约，.launcher-main 改纵向 flex 列、页面根节点 flex: 1 1 auto，帮助页自带滚动 - src/view/home/index.tsx：首页根节点去掉 h-screen 与 h-[calc(100vh-32px)]，改用外壳分配高度的钩子类 - src/view/template-library/index.tsx：模板库去掉 JS 量父级高度与内联 height，改用外壳分配高度的钩子类 - decision-log.md、pitfalls.md：记录页面高度契约与自绘标题栏里自己算 100vh 的排障口径 Co-authored-by: Junie --- apps/ai-game-creator-shell/src/styles.css | 27 ++++++++++++++ .../src/view/home/index.tsx | 6 +-- .../src/view/template-library/index.tsx | 37 ++----------------- .../shared-memory/decision-log.md | 8 ++++ docs/project-memory/shared-memory/pitfalls.md | 7 ++++ 5 files changed, 47 insertions(+), 38 deletions(-) diff --git a/apps/ai-game-creator-shell/src/styles.css b/apps/ai-game-creator-shell/src/styles.css index 86fb836d4..74d8e5e41 100644 --- a/apps/ai-game-creator-shell/src/styles.css +++ b/apps/ai-game-creator-shell/src/styles.css @@ -1332,6 +1332,19 @@ textarea { overflow: hidden; } +/* + * 页面高度契约：`.launcher-main` 是纵向 flex 列，页面根节点自己 `flex: 1 1 auto` 吃掉 + * 舞台剩余高度（有横幅时自动少掉横幅那一份），页面内部的 `height: 100%`、内层滚动容器 + * 才有确定高度可用。 + * + * 页面根节点上不要再写 `100vh` / `100dvh` / `calc(100vh - 32px)`：整窗高度含自绘标题栏， + * 比真实舞台高一个标题栏（窗口 100vh=800、舞台 750），底部会被裁掉，横幅也会被重复扣一次。 + * 窗口外壳用 `height: 100%` 覆盖这里的 `100dvh`，让页面贴合 `.window-chrome__content` + * 的真实舞台；没有窗口外壳时 `100dvh` 才是正确值。 + */ +.launcher-main:has(.launcher-home-page), +.launcher-main:has(.launcher-help-page), +.launcher-main:has(.launcher-template-library), .launcher-main:has(.launcher-projects-page) { display: flex; flex-direction: column; @@ -1340,6 +1353,20 @@ textarea { padding-bottom: 0; } +.launcher-main > .launcher-home-page, +.launcher-main > .launcher-help-page, +.launcher-main > .launcher-template-library { + flex: 1 1 auto; + height: auto; + min-height: 0; +} + +/* 帮助页没有内层滚动容器：占满剩余高度后自己滚动，底部留出与外壳一致的呼吸位。 */ +.launcher-main > .launcher-help-page { + overflow-y: auto; + padding-bottom: 42px; +} + .launcher-page header { display: flex; align-items: flex-end; diff --git a/apps/ai-game-creator-shell/src/view/home/index.tsx b/apps/ai-game-creator-shell/src/view/home/index.tsx index 79fbbc52a..64307288d 100644 --- a/apps/ai-game-creator-shell/src/view/home/index.tsx +++ b/apps/ai-game-creator-shell/src/view/home/index.tsx @@ -209,11 +209,7 @@ export default function HomeView({ } return ( -
+
(null); const viewportRef = useRef(null); - const sectionRef = useRef(null); - const [sectionHeight, setSectionHeight] = useState(null); const [viewportSize, setViewportSize] = useState({ width: 0, height: 0 }); const showEmptyLibrary = status === 'ready' && templates.length === 0; @@ -162,35 +160,10 @@ export default function TemplateLibraryView({ const showGrid = status === 'ready' && visibleTemplates.length > 0; /** - * 页面高度按**父级实测高度**定，不用百分比也不用 100vh。 - * - * 外壳样式 `.launcher-main > .platform-theme { height: 100% }` 特异性高于 Tailwind - * 工具类，而它的百分比在 `.launcher-shell { min-height: 100vh }` 这条链上是不定高， - * 页面会退化成内容高度（虚拟网格视口高度 0、卡片区空白）；`100vh` 又比真实舞台高 - * 一个标题栏（窗口 100vh=800、舞台 750），底部会被裁掉。这里直接量父级。 + * 页面高度不再自己量：`.launcher-main:has(.launcher-template-library)` 把外壳改成纵向 + * flex 列，`flex: 1 1 auto` 让这一页拿到确定高度（有横幅时自动少掉横幅那一份）， + * 下面的网格视口才能用 `flex-1` 量出真实尺寸。 */ - useEffect(() => { - const section = sectionRef.current; - const parent = section?.parentElement; - if (!section || !parent) { - return; - } - const apply = () => { - const height = Math.round(parent.getBoundingClientRect().height); - if (height > 0) { - setSectionHeight((current) => (current === height ? current : height)); - } - }; - apply(); - if (typeof ResizeObserver === 'undefined') { - window.addEventListener('resize', apply); - return () => window.removeEventListener('resize', apply); - } - const observer = new ResizeObserver(apply); - observer.observe(parent); - return () => observer.disconnect(); - }, []); - useEffect(() => { const element = viewportRef.current; if (!element) { @@ -279,9 +252,7 @@ export default function TemplateLibraryView({ return (
diff --git a/docs/project-memory/shared-memory/decision-log.md b/docs/project-memory/shared-memory/decision-log.md index e1c5c9503..8b51f9a89 100644 --- a/docs/project-memory/shared-memory/decision-log.md +++ b/docs/project-memory/shared-memory/decision-log.md @@ -1,5 +1,13 @@ # 决策记录 +## 2026-10-02 launcher 页面高度契约：外壳分高度，页面不再自己算窗口高度 + +- 背景：PR #228（`6d2c275d3`）只给项目页补了「外壳纵向 flex + 页面 `flex: 1 1 auto`」的高度修复；其余页面仍各自算高度——帮助页没写高度也没有内层滚动容器，内容一长就被外壳 `overflow: hidden` 裁掉且无法滚动；首页用 `h-screen` / `h-[calc(100vh-32px)]`，模板库用 JS 量父级高度写内联 `height`。 +- 决策：把 #228 的修复提升为 `apps/ai-game-creator-shell/src/styles.css` 里的通用契约——`.launcher-main:has(<页面钩子>)` 改纵向 flex 列（`height: 100dvh`，窗口外壳 `height: 100%` 命中时贴合真实舞台；`min-height: 0`、`padding-bottom: 0`），`.launcher-main > <页面根节点>` 统一 `flex: 1 1 auto; height: auto; min-height: 0`；帮助页额外 `overflow-y: auto; padding-bottom: 42px`（它没有内层滚动容器）。契约钩子：`launcher-home-page`、`launcher-help-page`、`launcher-template-library`、`launcher-projects-page`。 +- 边界：页面根节点不再写 `100vh` / `100dvh` / `calc(100vh - Npx)`；横幅（`.launcher-promo`）是外壳里的真实行，有横幅就靠 flex 自动少一份，不手算偏移。工作台页（`.game-project-workbench`）在窗口外壳里已有等价契约（`.window-chrome__content ...` 那几条），移动端媒体查询里遗留的 `100dvh` / `calc(100dvh - 32px)` 由外层 `flex: 1 1 auto` 收缩兜住，本次不动。 +- 影响范围：`apps/ai-game-creator-shell/src/styles.css`、`src/view/home/index.tsx`、`src/view/template-library/index.tsx`。 +- 验证：Chromium 真机量测（1440x800 / 1440x560 / 390x844 / 390x560，带与不带横幅）——首页 / 模板库 / 项目页改动前后高度一致，帮助页从「被裁 112~150px 且无可滚动祖先」变为正好等于 `.window-chrome__content` 高度并可滚动到底；`npm run typecheck`、`npm run check:encoding`、`git diff --check`、`eslint` 通过。 + ## 2026-10-01 游戏广场评分展示边界 - 用户确认广场卡片增加一位小数的 10 分制平均分与评分人数，无有效评价显示“暂无评分”；保留现有排序、筛选、卡片打开详情及返回上下文。 diff --git a/docs/project-memory/shared-memory/pitfalls.md b/docs/project-memory/shared-memory/pitfalls.md index 833613fbe..5387fd6f0 100644 --- a/docs/project-memory/shared-memory/pitfalls.md +++ b/docs/project-memory/shared-memory/pitfalls.md @@ -2,6 +2,13 @@ 这里只记录对当前开发仍有用的症状、根因、排查方法和风险边界。同一事实保留一个当前口径；退役对象的专属过程与单轮测试结果由 Git 历史追溯。遇到旧路径或版本时，以现行代码和专题文档为准。 +## 2026-10-02 AGC 页面在自绘标题栏外壳里自己算 `100vh`：底部被裁而且没得滚 + +- **现象**：帮助页（使用指南 / 联系客服 / 更新日志）在矮窗口里底部卡片看不到，把窗口拉高才出现；外壳 `.launcher-main { overflow: hidden }` 之下没有任何可滚动祖先，页面既滚不动也裁得干净。首页在通知横幅出现时用 `h-[calc(100vh-32px)]`，同样把窗口高度当成了舞台高度。 +- **原因**：AGC 桌面外壳是自绘标题栏（`--window-chrome-height`；窗口 100vh=800 时舞台只有 750），页面根节点写 `100vh` / `100dvh` / `calc(100vh - Npx)` 就比真实舞台高一整个标题栏，差额被外壳裁掉；横幅是 `.launcher-main` 里的真实行，再写 `-32px` 等于重复扣一次。帮助页还没有内层滚动容器，连「内容超高就在内部滚动」这条兜底也不存在。 +- **处理（现行口径）**：页面高度只由外壳分配——`apps/ai-game-creator-shell/src/styles.css` 里 `.launcher-main:has(<页面钩子>)` 是纵向 flex 列（`height: 100dvh`，窗口外壳命中 `height: 100%` 时贴合真实舞台），`.launcher-main > <页面根节点>` 统一 `flex: 1 1 auto; height: auto; min-height: 0`，帮助页这类没有内层滚动容器的再加 `overflow-y: auto`。页面根节点一律不再写 `100vh` / `100dvh` / `calc(100vh - Npx)`；有横幅就靠 flex 自动少一份，不要手算偏移。 +- **验证**：真机判据是 Vite + Chromium 量页面根节点是否正好等于 `.window-chrome__content` 的高度（1440x800 / 1440x560 / 390x844 / 390x560，带与不带横幅），帮助页应可滚动到底。 + ## 2026-10-02 固定试玩误判祖先的指针穿透样式 - `pointer-events:none` 不会强制禁用整棵子树；后代显式 `auto` 可以恢复命中。控件探针只检查目标的计算样式，继承未覆盖的 `none` 仍拒绝；可见性、遮挡、disabled 与 inert 保留各自检查。 From 863148e11c1e338c4bd18a5545ef81a3d484febe Mon Sep 17 00:00:00 2001 From: kdletters <61648117+kdletters@users.noreply.github.com> Date: Fri, 2 Oct 2026 14:01:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Claude=20Code=20Direct=20=E5=9B=9E=E5=90=88?= =?UTF-8?q?=E8=A1=A5=E5=88=86=E6=AE=B5=20trace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - claude_code_cli：cc Direct 回合在执行器入口、MCP loopback 就绪、sidecar 启动、sidecar 返回、解析 stream 前各写一条 agent.direct_turn.trace - direct_runtime：direct_turn_trace 提升为 pub(crate)，让 Claude Code 执行器复用同一份分段留痕 --- .../src-tauri/src/agent/claude_code_cli.rs | 5 +++++ .../src-tauri/src/agent/direct_runtime/mod.rs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs index 827b06682..9f5b91221 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs @@ -732,7 +732,9 @@ pub(crate) async fn direct_game_creator_claude_code_chat_at( client_turn_id: Option<&str>, observer: Option<&mut (dyn FnMut(DirectCodexTurnObservation) + Send)>, ) -> Result { + direct_turn_trace("claude-executor-enter"); let (mcp_url, mcp_token) = start_external_mcp_loopback(root, llm.web_search_enabled).await?; + direct_turn_trace("claude-mcp-loopback-ready"); let _mcp_guard = ExternalMcpStopGuard; let home = crate::project::resolve_local_project_path(root, ".agent/runtime/claude-code/home")?; std::fs::create_dir_all(&home) @@ -742,6 +744,7 @@ pub(crate) async fn direct_game_creator_claude_code_chat_at( .lock() .ok() .and_then(|sessions| sessions.get(&session_key).cloned()); + direct_turn_trace("claude-sidecar-start"); let payload = serde_json::json!({ "type": "turn", "id": client_turn_id.unwrap_or("claude-direct-turn"), @@ -769,6 +772,7 @@ pub(crate) async fn direct_game_creator_claude_code_chat_at( client_turn_id, ) .await?; + direct_turn_trace("claude-sidecar-done"); if let Some(session_id) = sidecar .result .get("session_id") @@ -785,6 +789,7 @@ pub(crate) async fn direct_game_creator_claude_code_chat_at( .filter_map(|event| serde_json::to_string(&event).ok()) .collect::>(); stream.push(String::new()); + direct_turn_trace("claude-parse-start"); parse_direct_stream_result(stream.join("\n").as_bytes(), observer) } diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs index 35ef1db4d..92d673ebb 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs @@ -4301,7 +4301,7 @@ pub(crate) fn check_direct_turn_preconditions( /// `agent.direct_codex.*` 都没有。窗口就夹在 `begin` 与执行器调用之间，需要知道 /// 具体停在哪一步。测试态不写，避免污染本机 AppData。 #[cfg(not(test))] -fn direct_turn_trace(stage: &str) { +pub(crate) fn direct_turn_trace(stage: &str) { let _ = crate::append_application_log( "info".to_string(), "direct-turn".to_string(), @@ -4310,7 +4310,7 @@ fn direct_turn_trace(stage: &str) { } #[cfg(test)] -fn direct_turn_trace(_stage: &str) {} +pub(crate) fn direct_turn_trace(_stage: &str) {} pub(crate) async fn run_direct_game_creator_turn_at_with_creation_type_and_emitter( root: &Path, From 72165c3891156bd4542c8273bddf908e03b61bc3 Mon Sep 17 00:00:00 2001 From: kdletters <61648117+kdletters@users.noreply.github.com> Date: Fri, 2 Oct 2026 14:34:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Direct=20=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E7=95=99=E7=97=95=E7=9A=84=E7=BC=96=E8=AF=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - direct_runtime：分段 trace 改用 crate 级 app_log!，crate::append_application_log 在宿主并不存在 - thread_manager::dispatch：兜底收口与 panic hook 同样改用 app_log! - thread_manager::dispatch：补上 emitter 取用 turn_id 后的 clone，修掉借用已移动值 --- .../src-tauri/src/agent/direct_runtime/mod.rs | 6 +--- .../src/agent/thread_manager/dispatch.rs | 36 ++++++++----------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs index 92d673ebb..831b3d823 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/direct_runtime/mod.rs @@ -4302,11 +4302,7 @@ pub(crate) fn check_direct_turn_preconditions( /// 具体停在哪一步。测试态不写，避免污染本机 AppData。 #[cfg(not(test))] pub(crate) fn direct_turn_trace(stage: &str) { - let _ = crate::append_application_log( - "info".to_string(), - "direct-turn".to_string(), - format!("agent.direct_turn.trace stage={stage}"), - ); + app_log!("agent.direct_turn.trace stage={stage}"); } #[cfg(test)] diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/thread_manager/dispatch.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/thread_manager/dispatch.rs index be5bc35cb..f8be8982e 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/thread_manager/dispatch.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/thread_manager/dispatch.rs @@ -104,17 +104,13 @@ impl Drop for TurnReservation { ), }; let _ = record_direct_codex_failure(Path::new(&self.thread_id), &failure, None); - let _ = crate::append_application_log( - "error".to_string(), - "direct-turn".to_string(), - format!( - "agent.direct_turn.host_dropped threadId={} turnToken={} userItemId={} panicking={}", - self.thread_id, - self.token, - self.user_item_id.as_deref().unwrap_or("-"), - // true = 这一轮是被 panic 带走的；false = future 被丢弃或取消。 - std::thread::panicking() - ), + app_log!( + "agent.direct_turn.host_dropped threadId={} turnToken={} userItemId={} panicking={}", + self.thread_id, + self.token, + self.user_item_id.as_deref().unwrap_or("-"), + // true = 这一轮是被 panic 带走的；false = future 被丢弃或取消。 + std::thread::panicking() ); } // 占用的释放就是"这个项目腾出了跑回合的位置"：踢一脚，队里排着的消息不必等下一次用户动作。 @@ -152,16 +148,12 @@ fn ensure_direct_turn_panic_hook() { }) .unwrap_or_else(|| "未知位置".to_string()); #[cfg(not(test))] - let _ = crate::append_application_log( - "error".to_string(), - "direct-turn".to_string(), - format!( - "agent.direct_turn.panic threadId={} turnToken={} location={} payload={}", - thread_id, - token, - location, - info.payload_as_str().unwrap_or("未知 panic 负载") - ), + app_log!( + "agent.direct_turn.panic threadId={} turnToken={} location={} payload={}", + thread_id, + token, + location, + info.payload_as_str().unwrap_or("未知 panic 负载") ); #[cfg(test)] let _ = (thread_id, token, location); @@ -241,7 +233,7 @@ async fn run_dispatched_direct_turn( // 未通过验收、历史注入失败）都靠它把失败说明挂回自己那一轮。 crate::agent::codex_app_server::emit_direct_thread_user_item(&root, &canonical_user_item); let capture = crate::analytics::gui::capture_writer_context(); - let emitter = DirectGameCreatorTurnUpdateEmitter::new(&root, turn_id); + let emitter = DirectGameCreatorTurnUpdateEmitter::new(&root, turn_id.clone()); // 回合体 panic 不能落到 `TurnReservation` 的 Drop 兜底：那会把这一轮收成"说不出原因"的 // `HostDropped`，症状正是用户看到的「本轮执行已中断，请重试」，而项目侧诊断与应用日志 // **一行都不会有**（真实案例：2026-10-02 连续两轮）。这里把 panic 转成分类失败， From 5dc595db5801ccbf04f29b65053f25f432e289ec Mon Sep 17 00:00:00 2001 From: kdletters <61648117+kdletters@users.noreply.github.com> Date: Fri, 2 Oct 2026 14:34:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?Claude=20Code=20Direct=20=E5=9B=9E=E5=90=88?= =?UTF-8?q?=E8=A1=A5=20sidecar=20=E9=9D=99=E9=BB=98=E4=B8=8E=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=94=B6=E5=8F=A3=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - claude_code_cli：sidecar stdout 静默 30 秒就写一条 agent.direct_codex.claude_sidecar_idle，记录已静默秒数 - claude_code_cli：超时收口先杀 sidecar 进程树，再给 stderr 一个 5 秒排空窗口，避免回合永远不肯收口 - claude_code_cli：超时详情过滤掉宿主主动断流后 sidecar 自己抛的 EPIPE 收尾噪声 - claude_code_cli：sidecar 返回 error 事件时同样杀进程树，不再留下孤儿 Claude Code 进程 --- .../src-tauri/src/agent/claude_code_cli.rs | 54 +++++++++++++++---- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs b/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs index 9f5b91221..cb7d67b89 100644 --- a/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs +++ b/apps/ai-game-creator-shell/src-tauri/src/agent/claude_code_cli.rs @@ -17,6 +17,18 @@ const CLAUDE_NODE_ENV: &str = "GENARRATIVE_CLAUDE_NODE"; const CLAUDE_CODE_OUTPUT_MAX_BYTES: usize = 8 * 1024 * 1024; const CLAUDE_CODE_PROMPT_MAX_BYTES: usize = 4 * 1024 * 1024; const CLAUDE_CODE_MODEL_MAX_CHARS: usize = 200; +/// 超时收口时给 sidecar stderr 的排空窗口。 +/// +/// sidecar 自己还活着时 stderr 永远等不到 EOF（Claude Code CLI 正在网关侧重试）， +/// 没有上限就会让超时分支自己挂住：这一轮既写不出终态，也留不下任何诊断 +/// （2026-10-02 实测：回合 4 分钟不结束、应用日志一行不写）。 +const CLAUDE_CODE_STDERR_DRAIN_TIMEOUT: Duration = Duration::from_secs(5); +/// sidecar stdout 静默多久就写一条"还没收到事件"的应用日志。 +/// +/// Claude Code CLI 在网关侧失败时会自己退避重试，这段时间**一行事件都没有**； +/// 不留痕的话用户与离线诊断只能看到一个卡住的回合（真实案例：ECONNRESET 重试， +/// 每轮 ~60 秒，共 10 轮）。 +const CLAUDE_CODE_EVENT_IDLE_LOG_TIMEOUT: Duration = Duration::from_secs(30); struct ActiveClaudeCodeTurn { client_turn_id: String, @@ -216,11 +228,26 @@ async fn run_sidecar_turn( let mut lines = BufReader::new(stdout).lines(); let mut events = Vec::new(); let mut terminal = None; - while let Some(line) = lines - .next_line() - .await - .map_err(|error| format!("读取 Claude Agent SDK sidecar 输出失败：{error}"))? - { + let mut idle_rounds = 0_u64; + loop { + let line = + match tokio::time::timeout(CLAUDE_CODE_EVENT_IDLE_LOG_TIMEOUT, lines.next_line()) + .await + { + Ok(Ok(Some(line))) => line, + Ok(Ok(None)) => break, + Ok(Err(error)) => { + return Err(format!("读取 Claude Agent SDK sidecar 输出失败：{error}")); + } + Err(_) => { + idle_rounds += 1; + app_log!( + "agent.direct_codex.claude_sidecar_idle idleSeconds={}", + CLAUDE_CODE_EVENT_IDLE_LOG_TIMEOUT.as_secs() * idle_rounds + ); + continue; + } + }; if line.trim().is_empty() { continue; } @@ -237,6 +264,7 @@ async fn run_sidecar_turn( break; } Some("error") => { + kill_claude_code_process_tree(pid); return Err(value .get("message") .and_then(serde_json::Value::as_str) @@ -260,13 +288,19 @@ async fn run_sidecar_turn( { Ok(result) => result?, Err(_) => { - let detail = stderr_task - .await - .ok() - .and_then(Result::ok) - .and_then(|bytes| String::from_utf8(bytes).ok()) + // 先杀进程树：不杀的话 sidecar（连同它守护的 Claude Code CLI）会一直活着， + // stderr 等不到 EOF，这一轮就永远出不了终态。 + kill_claude_code_process_tree(pid); + let stderr_detail = + match tokio::time::timeout(CLAUDE_CODE_STDERR_DRAIN_TIMEOUT, stderr_task).await { + Ok(Ok(Ok(bytes))) => String::from_utf8(bytes).ok(), + _ => None, + } .map(|value| value.trim().chars().take(512).collect::()) .filter(|value| !value.is_empty()) + // 断开 stdout 之后 sidecar 自己会抛 EPIPE；那是收尾噪声，不是失败原因。 + .filter(|value| !value.contains("EPIPE")); + let detail = stderr_detail .map(|value| format!("：{value}")) .unwrap_or_default(); return Err(format!("Claude Agent SDK sidecar 回合超时{detail}"));