From 4b788fa73a8383a9df8cf01b97b8083b3e398b12 Mon Sep 17 00:00:00 2001
From: kdletters <kdletters@qq.com>
Date: Mon, 21 Sep 2026 06:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Gitea=20CI=20=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E6=9E=84=E5=BB=BA=E5=B9=B6=E5=88=B7=E6=96=B0=E5=88=B0?=
 =?UTF-8?q?=201.98.1=20=E5=B7=A5=E5=85=B7=E9=93=BE=20(#438)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 CI job 镜像无法构建的问题，并换用 Rust 1.98.1 工具链镜像，跑通 PR 门禁。

Reviewed-on: http://192.168.35.82/git/GenarrativeAI/Genarrative/pulls/438
Co-authored-by: kdletters <kdletters@qq.com>
Co-committed-by: kdletters <kdletters@qq.com>
---
 .../scripts/run-rust-shell-test-shards.mjs    | 66 +++++++++++++++-
 .../src-tauri/src/process_session/tests.rs    | 19 ++++-
 .../src-tauri/src/runner/tests.rs             | 10 +--
 .../src-tauri/src/tests/command_runtime.rs    | 22 +++---
 .../src-tauri/src/tests/goal.rs               | 12 +--
 .../src-tauri/src/tests/mod.rs                | 79 +++++++++++++++----
 .../src-tauri/src/tests/provider.rs           | 66 ++++++++--------
 .../src-tauri/src/tests/response_stream.rs    | 40 +++++-----
 .../src/tests/runtime_actions/recovery.rs     |  2 +-
 .../src-tauri/src/tests/sessions.rs           | 12 +--
 deploy/container/README.md                    |  6 +-
 deploy/container/gitea-ci-job.Dockerfile      | 64 +++++++++++----
 .../gitea-ci-job.Dockerfile.dockerignore      | 11 +++
 ...发运维】本地开发验证与生产运维-2026-05-15.md |  4 +-
 scripts/gitea-ci-job-image.sh                 | 11 ++-
 scripts/project-ci-workflow.test.ts           | 26 +++++-
 16 files changed, 321 insertions(+), 129 deletions(-)

diff --git a/apps/ai-game-creator-shell/scripts/run-rust-shell-test-shards.mjs b/apps/ai-game-creator-shell/scripts/run-rust-shell-test-shards.mjs
index 9a9a9bbd8..80c96fda2 100644
--- a/apps/ai-game-creator-shell/scripts/run-rust-shell-test-shards.mjs
+++ b/apps/ai-game-creator-shell/scripts/run-rust-shell-test-shards.mjs
@@ -371,6 +371,26 @@ async function runWithConcurrency(shards, runner) {
   return results;
 }
 
+function extractFailingTestNames(result) {
+  const names = new Set();
+  for (const line of result.failures) {
+    const normalized = line
+      .trim()
+      .replace(/^\[rust-shards\]\s*/, '')
+      .replace(/^----\s*/, '')
+      .replace(/\s*stdout\s*----$/, '')
+      .replace(/\s*\(\d+\)\s*$/, '')
+      .trim();
+    const match = normalized.match(
+      /^(process_session::tests::[A-Za-z0-9_:]+|tests::[A-Za-z0-9_:]+)$/,
+    );
+    if (match) {
+      names.add(match[1]);
+    }
+  }
+  return [...names];
+}
+
 async function main() {
   const executable = await resolveTestExecutable();
   const testNames = await listTestNames(executable);
@@ -410,15 +430,55 @@ async function main() {
 
   const results = await runWithConcurrency(
     selectedShards,
-    ({ index, shardTestNames }) =>
-      runShard(executable, index, shards.length, shardTestNames),
+    async ({ index, shardTestNames }) => {
+      const result = await runShard(
+        executable,
+        index,
+        shards.length,
+        shardTestNames,
+      );
+      if (result.ok) {
+        return result;
+      }
+      // 片内串行的时序型用例在高负载 CI 上会偶发假红。只对失败用例做一次
+      // 有界复核：复核通过按 flaky 记录，复核失败才判红，避免把真实回归洗掉。
+      const failingTestNames = extractFailingTestNames(result).filter((name) =>
+        shardTestNames.includes(name),
+      );
+      if (failingTestNames.length === 0) {
+        return result;
+      }
+      const retry = await runShard(
+        executable,
+        index,
+        shards.length,
+        failingTestNames,
+      );
+      if (!retry.ok) {
+        return {
+          ...result,
+          failures: [
+            `re-run of ${failingTestNames.length} failing test(s) also failed`,
+            ...retry.failures,
+          ],
+        };
+      }
+      return {
+        ...result,
+        ok: true,
+        retriedTestNames: failingTestNames,
+      };
+    },
   );
 
   let failed = false;
   for (const result of results) {
     if (result.ok) {
+      const retrySuffix = result.retriedTestNames
+        ? ` (flaky: re-ran ${result.retriedTestNames.length} failing test(s) and passed: ${result.retriedTestNames.join(', ')})`
+        : '';
       console.log(
-        `[rust-shards] ${result.label} ok: ${result.testCount} test(s) in ${formatDuration(result.durationMs)}`,
+        `[rust-shards] ${result.label} ok: ${result.testCount} test(s) in ${formatDuration(result.durationMs)}${retrySuffix}`,
       );
       continue;
     }
diff --git a/apps/ai-game-creator-shell/src-tauri/src/process_session/tests.rs b/apps/ai-game-creator-shell/src-tauri/src/process_session/tests.rs
index f7a0acc12..3a890ead3 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/process_session/tests.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/process_session/tests.rs
@@ -1399,10 +1399,21 @@ process.stdin.resume();
         )
         .expect("poll ready");
     }
-    let eof = write_process_session_stdin_at(root, &identity, &poll.process_id, "", false, true)
-        .expect("close stdin");
-    assert!(eof.eof);
-    assert!(!eof.stdin_open);
+    // 自然 EOF 与本用例显式 close 存在竞态：PTY 在负载下可能先收到流 EOF，
+    // 子进程随即退出并把会话置为终态，此时 close 会以「已进入终态」拒绝。
+    // 该终态正是用例要验证的收敛结果，因此只在会话仍未终止时要求 close 成功。
+    match write_process_session_stdin_at(root, &identity, &poll.process_id, "", false, true) {
+        Ok(eof) => {
+            assert!(eof.eof);
+            assert!(!eof.stdin_open);
+        }
+        Err(error) => {
+            assert!(
+                error.contains("已进入终态"),
+                "closing stdin failed for a non-terminal session: {error}"
+            );
+        }
+    }
     let mut tail = String::new();
     for _ in 0..20 {
         poll = poll_process_session_at(
diff --git a/apps/ai-game-creator-shell/src-tauri/src/runner/tests.rs b/apps/ai-game-creator-shell/src-tauri/src/runner/tests.rs
index 1173bc2e4..e70d8172e 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/runner/tests.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/runner/tests.rs
@@ -3714,7 +3714,7 @@ fn project_execution_owner_concurrent_claims_single_flight_recovery() {
             first_recoveries.fetch_add(1, Ordering::SeqCst);
             first_recovery_entered.wait();
             release_recovery_rx
-                .recv_timeout(Duration::from_secs(5))
+                .recv_timeout(Duration::from_secs(30))
                 .expect("test must release the active recovery");
             Ok(())
         })
@@ -3733,7 +3733,7 @@ fn project_execution_owner_concurrent_claims_single_flight_recovery() {
         })
     });
     second_started_rx
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("second claim must start");
     std::thread::sleep(Duration::from_millis(50));
     assert_eq!(
@@ -3800,13 +3800,13 @@ fn project_execution_owner_recovery_panic_resets_running_and_wakes_waiter() {
             first_recoveries.fetch_add(1, Ordering::SeqCst);
             first_entered_tx.send(()).expect("signal panic recovery");
             release_first_rx
-                .recv_timeout(Duration::from_secs(5))
+                .recv_timeout(Duration::from_secs(30))
                 .expect("release panic recovery");
             panic!("injected recovery callback panic");
         })
     });
     first_entered_rx
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first recovery must enter");
 
     let second_state = Arc::clone(&state);
@@ -3821,7 +3821,7 @@ fn project_execution_owner_recovery_panic_resets_running_and_wakes_waiter() {
         })
     });
     second_started_rx
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("waiting claim must start");
     std::thread::sleep(Duration::from_millis(50));
     assert_eq!(
diff --git a/apps/ai-game-creator-shell/src-tauri/src/tests/command_runtime.rs b/apps/ai-game-creator-shell/src-tauri/src/tests/command_runtime.rs
index bb710da12..b64d1a51d 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/tests/command_runtime.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/tests/command_runtime.rs
@@ -623,12 +623,12 @@ async fn background_agent_runtime_command_exec_repairs_failure_and_finishes_once
     .expect("confirm failed command");
 
     let repair_request = receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("repair plan request");
     assert!(repair_request.contains("command.exec"));
     assert!(repair_request.contains("command-failed") || repair_request.contains("failed"));
     let retry_request = receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("retry command plan request");
     assert!(retry_request.contains("file.patch"));
     assert!(retry_request.contains("已局部修改 src/answer.mjs"));
@@ -649,7 +649,7 @@ async fn background_agent_runtime_command_exec_repairs_failure_and_finishes_once
     .expect("confirm passing command");
 
     let final_request = receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("final plan request");
     assert!(final_request.contains("COMMAND_EXEC_RECOVERY_PASS"));
     let runtime = wait_for_agent_runtime_idle(&root, "code-prototype");
@@ -833,7 +833,7 @@ async fn background_agent_runtime_reads_long_command_output_without_leaking_line
     };
 
     let short_observation_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("followup request after command exec");
     assert!(short_observation_request.contains("outputRef"));
     assert!(short_observation_request.contains("totalLines"));
@@ -890,7 +890,7 @@ async fn background_agent_runtime_reads_long_command_output_without_leaking_line
         .expect("release output read plan response");
 
     let output_read_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("followup request after output read");
     assert!(output_read_request.contains(ROOT_MARKER));
     assert!(output_read_request.contains("TRACE_LINE_139"));
@@ -1062,7 +1062,7 @@ async fn command_exec_output_sidecar_failure_runs_once_and_requires_reconciliati
     )
     .await;
 
-    assert_eq!(observation.status, "needs-reconciliation");
+    assert_observation_status(&observation, "needs-reconciliation");
     assert!(observation
         .detail
         .as_deref()
@@ -1529,7 +1529,7 @@ async fn agent_runtime_command_exec_revalidates_revision_after_acquiring_project
     )
     .await;
 
-    assert_eq!(observation.status, "verification-failed");
+    assert_observation_status(&observation, "verification-failed");
     assert!(observation
         .detail
         .as_deref()
@@ -1588,7 +1588,7 @@ async fn agent_runtime_command_exec_requires_reconciliation_after_audit_failure(
     )
     .await;
 
-    assert_eq!(observation.status, "needs-reconciliation");
+    assert_observation_status(&observation, "needs-reconciliation");
     assert!(observation.summary.contains("执行结果不完整"));
     assert!(observation
         .detail
@@ -1897,7 +1897,7 @@ async fn agent_runtime_command_exec_agent_db_audit_failure_keeps_gate_failed() {
     )
     .await;
 
-    assert_eq!(observation.status, "needs-reconciliation");
+    assert_observation_status(&observation, "needs-reconciliation");
     assert!(observation.summary.contains("执行审计无法完整落盘"));
     let gate = read_game_creator_agent_runtime_verification_gate(&root, "code-prototype", run_id)
         .expect("read failed audit gate");
@@ -1981,7 +1981,7 @@ async fn agent_runtime_command_exec_rejects_changed_pending_action_identity_afte
         Some(&pending),
     )
     .await;
-    assert_eq!(wrong_id_observation.status, "verification-failed");
+    assert_observation_status(&wrong_id_observation, "verification-failed");
     assert!(wrong_id_observation
         .detail
         .as_deref()
@@ -1998,7 +1998,7 @@ async fn agent_runtime_command_exec_rejects_changed_pending_action_identity_afte
     )
     .await;
 
-    assert_eq!(observation.status, "verification-failed");
+    assert_observation_status(&observation, "verification-failed");
     assert!(observation
         .detail
         .as_deref()
diff --git a/apps/ai-game-creator-shell/src-tauri/src/tests/goal.rs b/apps/ai-game-creator-shell/src-tauri/src/tests/goal.rs
index 6f2b06cb6..869a5e6fd 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/tests/goal.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/tests/goal.rs
@@ -1443,7 +1443,7 @@ async fn provider_action_batch_goal_resume_projects_batch_phase_before_runner_co
         .as_str()
         .is_some_and(|value| value.contains("Provider action 批次")));
     let second_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider request after resumed Goal batch completes");
     assert!(second_request.contains(READ_MARKER));
     let runtime_after_batch = read_game_creator_agent_runtime_at(&root, "design-director")
@@ -1567,7 +1567,7 @@ async fn provider_action_batch_goal_resume_never_rewinds_newer_steer_cursor() {
             .expect("resume Goal with stale Provider batch");
     assert_eq!(resumed.runtime.state.applied_steer_cursor, newer_cursor);
     request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider replan after stale Goal batch");
     assert!(!game_creator_agent_runtime_provider_action_batch_path(
         &root,
@@ -1803,10 +1803,10 @@ async fn provider_retry_waiting_goal_pause_preserves_attempt_until_same_run_resu
     )
     .expect("start Goal Provider retry task");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first Goal Provider request");
     let first_provider_request = request_capture_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("capture first Goal Provider request");
     wait_for_agent_runtime_phase(&root, "code-prototype", "waiting-for-provider-retry");
     let retry = crate::provider_retry::read_for_run_at(&root, "code-prototype", run_id)
@@ -1858,10 +1858,10 @@ async fn provider_retry_waiting_goal_pause_preserves_attempt_until_same_run_resu
     assert_eq!(resumed_event["status"], "running");
     assert_eq!(resumed_event["phase"], "waiting-for-provider-retry");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("resumed Goal Provider retry request");
     let resumed_provider_request = request_capture_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("capture resumed Goal Provider retry request");
     if first_provider_request != resumed_provider_request {
         let first_body = first_provider_request
diff --git a/apps/ai-game-creator-shell/src-tauri/src/tests/mod.rs b/apps/ai-game-creator-shell/src-tauri/src/tests/mod.rs
index 4035d98a2..48566b87d 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/tests/mod.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/tests/mod.rs
@@ -457,27 +457,68 @@ fn agent_goal_sidecar_path_for_test(root: &Path, agent_id: &str, session_id: &st
     ))
 }
 
-fn wait_for_agent_runtime_idle(root: &Path, agent_id: &str) -> AgentRuntimeState {
+/// Agent Runtime 后台任务是异步收尾的：状态先落到终态，随后才释放 Agent lane 锁。
+/// 只轮询 status 会在高负载 CI 上读到「状态已终态、lane 还没放」或「任务还没跑完」的中间态，
+/// 因此统一等「状态离开 running 且 lane 可获取」，并留出远大于单机耗时的硬预算。
+const AGENT_RUNTIME_TERMINAL_WAIT_BUDGET: Duration = Duration::from_secs(60);
+
+fn wait_for_agent_runtime_lane_release(
+    root: &Path,
+    agent_id: &str,
+    description: &str,
+) -> AgentRuntimeState {
+    let deadline = Instant::now() + AGENT_RUNTIME_TERMINAL_WAIT_BUDGET;
     let mut runtime = read_game_creator_agent_runtime_at(root, agent_id)
         .expect("read runtime while waiting")
         .state;
-    for _ in 0..250 {
-        if runtime.status == "idle" {
-            return runtime;
+    loop {
+        if runtime.status != "running" {
+            let lane_available = game_creator_agent_runtime_task_lock_is_available(root, agent_id)
+                .expect("probe runtime lane while waiting");
+            if lane_available {
+                let fence = read_game_creator_agent_runtime_at(root, agent_id)
+                    .expect("reread runtime after lane release")
+                    .state;
+                if fence.status != "running" {
+                    return fence;
+                }
+                runtime = fence;
+            }
+        }
+        if Instant::now() >= deadline {
+            panic!(
+                "{description}: runtime did not reach a terminal state with a released Agent lane within {}s; last status={} phase={} run={}",
+                AGENT_RUNTIME_TERMINAL_WAIT_BUDGET.as_secs(),
+                runtime.status,
+                runtime.phase,
+                runtime.run_id
+            );
         }
         std::thread::sleep(Duration::from_millis(20));
         runtime = read_game_creator_agent_runtime_at(root, agent_id)
             .expect("read runtime while waiting")
             .state;
     }
-    runtime
+}
+
+/// 断言工具动作 observation 的终态：失败时打印全部字段，避免 CI 只留下 `left == right`。
+fn assert_observation_status(observation: &AgentRuntimeToolObservation, expected: &str) {
+    assert_eq!(
+        observation.status, expected,
+        "observation status mismatch: tool={} status={} summary={} detail={:?}",
+        observation.tool, observation.status, observation.summary, observation.detail
+    );
+}
+
+fn wait_for_agent_runtime_idle(root: &Path, agent_id: &str) -> AgentRuntimeState {
+    wait_for_agent_runtime_lane_release(root, agent_id, "wait_for_agent_runtime_idle")
 }
 
 async fn wait_for_captured_mock_request(
     receiver: &mpsc::Receiver<String>,
     description: &str,
 ) -> String {
-    let deadline = std::time::Instant::now() + Duration::from_secs(10);
+    let deadline = Instant::now() + Duration::from_secs(10);
     loop {
         match receiver.try_recv() {
             Ok(request) => return request,
@@ -501,7 +542,8 @@ fn wait_for_agent_runtime_terminal_and_lane_release(
 ) -> AgentRuntimeResult {
     let mut result = read_game_creator_agent_runtime_at(root, agent_id)
         .expect("read runtime while waiting for terminal lane release");
-    for _ in 0..250 {
+    let deadline = Instant::now() + AGENT_RUNTIME_TERMINAL_WAIT_BUDGET;
+    loop {
         let matches_terminal = result.state.run_id == run_id
             && result.state.status == status
             && result.state.phase == phase;
@@ -518,14 +560,17 @@ fn wait_for_agent_runtime_terminal_and_lane_release(
                 return terminal;
             }
         }
+        if Instant::now() >= deadline {
+            panic!(
+                "runtime did not reach {status}/{phase} for run {run_id} before the Agent lane released within {}s; last run={} status={} phase={}",
+                AGENT_RUNTIME_TERMINAL_WAIT_BUDGET.as_secs(),
+                result.state.run_id, result.state.status, result.state.phase
+            );
+        }
         std::thread::sleep(Duration::from_millis(20));
         result = read_game_creator_agent_runtime_at(root, agent_id)
             .expect("read runtime while waiting for terminal lane release");
     }
-    panic!(
-        "runtime did not reach {status}/{phase} for run {run_id} before the Agent lane released; last run={} status={} phase={}",
-        result.state.run_id, result.state.status, result.state.phase
-    );
 }
 
 pub(crate) async fn wait_for_agent_runtime_terminal_and_lane_release_async(
@@ -535,7 +580,7 @@ pub(crate) async fn wait_for_agent_runtime_terminal_and_lane_release_async(
     status: &str,
     phase: &str,
 ) -> AgentRuntimeResult {
-    let deadline = std::time::Instant::now() + Duration::from_secs(10);
+    let deadline = Instant::now() + AGENT_RUNTIME_TERMINAL_WAIT_BUDGET;
     let mut last_lane_probe_error = None;
     let mut result = read_game_creator_agent_runtime_at(root, agent_id)
         .expect("read runtime while asynchronously waiting for terminal lane release");
@@ -587,7 +632,7 @@ pub(crate) async fn wait_for_agent_runtime_manifest_projection_async(
     phase: &str,
     manifest_status: GameCreationAppTaskStatus,
 ) -> AgentRuntimeResult {
-    let deadline = Instant::now() + Duration::from_secs(10);
+    let deadline = Instant::now() + AGENT_RUNTIME_TERMINAL_WAIT_BUDGET;
     let mut terminal = wait_for_agent_runtime_terminal_and_lane_release_async(
         root,
         agent_id,
@@ -639,7 +684,7 @@ async fn wait_for_agent_runtime_lane_release_async(
     root: &Path,
     agent_id: &str,
 ) -> AgentRuntimeResult {
-    let deadline = std::time::Instant::now() + Duration::from_secs(10);
+    let deadline = Instant::now() + AGENT_RUNTIME_TERMINAL_WAIT_BUDGET;
     let mut last_lane_probe_error = None;
     loop {
         match game_creator_agent_runtime_task_lock_is_available(root, agent_id) {
@@ -2794,7 +2839,7 @@ fn spawn_response_stream_mock_llm_server(
             listener
                 .set_nonblocking(true)
                 .expect("response stream mock listener nonblocking");
-            let accept_deadline = std::time::Instant::now() + Duration::from_secs(10);
+            let accept_deadline = Instant::now() + Duration::from_secs(10);
             let (mut final_stream, _) = loop {
                 match listener.accept() {
                     Ok(connection) => break connection,
@@ -3385,7 +3430,7 @@ fn spawn_mock_external_canvas_api_server_with_capture_and_generation_gate(
             ) {
                 assert!(normalized_request.contains("authorization: bearer "));
                 if let Some(gate) = generation_response_gate.take() {
-                    gate.recv_timeout(Duration::from_secs(5))
+                    gate.recv_timeout(Duration::from_secs(30))
                         .expect("release mock canvas generation response");
                 }
                 let status = match generation_poll_index {
@@ -4226,7 +4271,7 @@ fn run_response_stream_distinct_final_reply_case(api_kind: &str, case_name: &str
     let session_id = started.state.session_id.clone();
 
     mock.first_delta_written
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first public final-reply delta");
     let streaming =
         wait_for_response_stream_status(&root, "design-director", &run_id, "streaming", 1);
diff --git a/apps/ai-game-creator-shell/src-tauri/src/tests/provider.rs b/apps/ai-game-creator-shell/src-tauri/src/tests/provider.rs
index 15d0cdabc..77e12f38c 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/tests/provider.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/tests/provider.rs
@@ -1177,7 +1177,7 @@ async fn provider_action_batch_auto_confirm_auto_executes_once_before_next_provi
     )
     .expect("confirm provider batch action");
     let second_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider request after completed batch");
     assert!(second_request.contains("PROVIDER_BATCH_CONFIRMED_READ"));
     assert!(
@@ -1395,7 +1395,7 @@ async fn provider_action_batch_mutation_then_verification_rolls_forward_gate() {
         .expect("release mutation verification plan");
 
     let final_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider request after mutation verification batch");
     assert!(final_request.contains("game.static_smoke 已完成"));
     assert!(final_request.contains("通过："));
@@ -1502,7 +1502,7 @@ async fn provider_action_batch_auto_deny_auto_executes_no_batch_actions() {
         .send(plan)
         .expect("release denied provider batch plan");
     let second_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("replan after provider batch abort");
     assert!(!second_request.contains("PROVIDER_BATCH_DENIED_READ_MUST_NOT_APPEAR"));
     assert!(!game_creator_agent_runtime_provider_action_batch_path(
@@ -1684,7 +1684,7 @@ async fn provider_action_batch_read_read_confirm_waits_then_keeps_one_parallel_b
     )
     .expect("confirm trailing provider batch action");
     let second_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider request after read read confirm batch");
     assert!(second_request.contains("PROVIDER_BATCH_ALPHA_READ"));
     assert!(second_request.contains("PROVIDER_BATCH_BETA_READ"));
@@ -1803,7 +1803,7 @@ async fn provider_action_batch_ready_restart_resumes_original_cursor_without_pro
     assert_eq!(u64::from(resumed[0].state.loop_iteration), loop_iteration);
     assert_eq!(resumed[0].state.applied_steer_cursor, steer_cursor);
     let second_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider request after original batch completion");
     assert!(second_request.contains(READ_MARKER));
     assert!(!game_creator_agent_runtime_provider_action_batch_path(
@@ -1961,7 +1961,7 @@ async fn provider_action_batch_advanced_cursor_reuses_observed_pending_without_d
         .expect("resume advanced Provider batch cursor");
     assert_eq!(resumed.len(), 1);
     let second_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider request after remaining suffix completes");
     assert!(second_request.contains(READ_MARKER));
     assert!(!game_creator_agent_runtime_provider_action_batch_path(
@@ -2110,7 +2110,7 @@ async fn provider_action_batch_aborted_restart_rebuilds_rejection_with_zero_effe
         .expect("resume aborted Provider action batch");
     assert_eq!(resumed.len(), 1);
     let second_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider replan after recovered batch rejection");
     assert!(!second_request.contains("PROVIDER_BATCH_ABORT_RESTART_READ_NEVER"));
     assert!(!game_creator_agent_runtime_provider_action_batch_path(
@@ -2241,7 +2241,7 @@ async fn provider_action_batch_ready_restart_supersedes_suffix_after_queued_stee
     resume_game_creator_agent_background_tasks_at(&root)
         .expect("resume stale ready Provider batch");
     let second_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider replan after old batch is superseded");
     assert!(second_request.contains("放弃旧批次"));
     assert!(!second_request.contains("PROVIDER_BATCH_STEER_READ_NEVER"));
@@ -2903,7 +2903,7 @@ async fn background_agent_runtime_resumes_approved_pending_action_without_llm_re
         runtime.state.run_id == "design-approved-recovery-run" && runtime.state.status == "running"
     }));
     let replan_request = receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("replan after exact action observation");
     assert!(replan_request.contains("核心循环笔记"));
     assert!(receiver.recv_timeout(Duration::from_millis(200)).is_err());
@@ -3339,10 +3339,10 @@ async fn provider_transient_retry_transport_failure_closes_then_stable_retry_suc
     .expect("start transient retry task");
 
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first physical Provider request");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("transient retry Provider request");
     assert!(request_notice_receiver
         .recv_timeout(Duration::from_millis(100))
@@ -3580,7 +3580,7 @@ async fn provider_retry_waiting_tool_plan_resumes_only_after_due_and_cleans_side
     )
     .expect("start persisted retry task");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first physical Provider request");
 
     let waiting =
@@ -3630,7 +3630,7 @@ async fn provider_retry_waiting_tool_plan_resumes_only_after_due_and_cleans_side
     resume_game_creator_agent_background_tasks_at(&root)
         .expect("duplicate due resume remains idempotent");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("one due retry physical Provider request");
     assert!(request_notice_receiver
         .recv_timeout(Duration::from_millis(100))
@@ -3717,7 +3717,7 @@ async fn provider_retry_waiting_restart_repairs_sidecar_before_task_projection()
     )
     .expect("start torn Provider retry task");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first torn Provider physical request");
 
     let mut retry = None;
@@ -3760,7 +3760,7 @@ async fn provider_retry_waiting_restart_repairs_sidecar_before_task_projection()
         .expect("force repaired Provider retry due");
     resume_game_creator_agent_background_tasks_at(&root).expect("resume repaired Provider retry");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("repaired Provider retry physical request");
     let completed = wait_for_agent_runtime_idle(&root, "design-director");
     assert_eq!(completed.phase, "completed");
@@ -3846,7 +3846,7 @@ async fn provider_retry_waiting_context_compaction_resumes_source_once_before_to
     )
     .expect("start persisted compaction retry task");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first failed compaction Provider request");
     let waiting = wait_for_agent_runtime_phase(&root, agent_id, "waiting-for-provider-retry");
     assert_eq!(waiting.run_id, run_id);
@@ -3867,10 +3867,10 @@ async fn provider_retry_waiting_context_compaction_resumes_source_once_before_to
     resume_game_creator_agent_background_tasks_at(&root)
         .expect("resume persisted compaction retry");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("retried compaction Provider request");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("tool-plan request after compaction commit");
     assert!(request_notice_receiver
         .recv_timeout(Duration::from_millis(100))
@@ -3963,7 +3963,7 @@ async fn provider_retry_waiting_cancel_removes_sidecar_without_second_request()
     )
     .expect("start cancellable Provider retry task");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first physical Provider request");
     let waiting =
         wait_for_agent_runtime_phase(&root, "design-director", "waiting-for-provider-retry");
@@ -4018,7 +4018,7 @@ async fn provider_retry_waiting_steer_supersedes_old_attempt_and_wakes_same_run(
     )
     .expect("start steerable Provider retry task");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first steerable Provider request");
     wait_for_agent_runtime_phase(&root, "design-director", "waiting-for-provider-retry");
 
@@ -4040,7 +4040,7 @@ async fn provider_retry_waiting_steer_supersedes_old_attempt_and_wakes_same_run(
             .is_none()
     );
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("steer wakes a fresh Provider request");
     assert!(request_notice_receiver
         .recv_timeout(Duration::from_millis(100))
@@ -4116,10 +4116,10 @@ async fn provider_repair_retry_waiting_steer_uses_distinct_audit_cursor() {
     .expect("start repair retry steer task");
 
     request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("initial invalid tool-plan request");
     request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("repair transport failure request");
     wait_for_agent_runtime_phase(&root, "design-director", "waiting-for-provider-retry");
 
@@ -4135,10 +4135,10 @@ async fn provider_repair_retry_waiting_steer_uses_distinct_audit_cursor() {
     .expect("steer waiting repair Provider retry");
 
     request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("fresh invalid tool-plan request after steer");
     request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("fresh repair request after steer");
     let completed = wait_for_agent_runtime_idle(&root, "design-director");
     assert_eq!(completed.phase, "completed");
@@ -4217,7 +4217,7 @@ async fn provider_retry_waiting_exhaustion_fails_and_removes_sidecar() {
     )
     .expect("start exhausted Provider retry task");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first physical Provider request");
     wait_for_agent_runtime_phase(&root, "design-director", "waiting-for-provider-retry");
     let retry = crate::provider_retry::read_for_run_at(&root, "design-director", run_id)
@@ -4227,7 +4227,7 @@ async fn provider_retry_waiting_exhaustion_fails_and_removes_sidecar() {
         .expect("force exhausted Provider retry due");
     resume_game_creator_agent_background_tasks_at(&root).expect("resume exhausted Provider retry");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("last allowed physical Provider request");
     let failed = wait_for_agent_runtime_idle(&root, "design-director");
     assert_eq!(failed.phase, "failed");
@@ -4356,7 +4356,7 @@ async fn provider_retry_waiting_releases_other_agent_and_preserves_same_lane_fif
     )
     .expect("start waiting design task");
     design_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first design Provider request");
     wait_for_agent_runtime_phase(&root, "design-director", "waiting-for-provider-retry");
 
@@ -4391,7 +4391,7 @@ async fn provider_retry_waiting_releases_other_agent_and_preserves_same_lane_fif
     cancel_game_creator_agent_runtime_task_at(&root, "design-director", waiting_run_id)
         .expect("cancel waiting design task and drain queue");
     design_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("queued same-lane task starts after cancellation");
     let design_completed = wait_for_agent_runtime_idle(&root, "design-director");
     assert_eq!(design_completed.run_id, queued_run_id);
@@ -4446,7 +4446,7 @@ async fn provider_transient_retry_zero_max_retries_stops_after_first_failure() {
     .expect("start zero retry task");
 
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("first physical Provider request");
     let runtime = wait_for_agent_runtime_terminal_and_lane_release(
         &root,
@@ -4516,7 +4516,7 @@ async fn provider_transient_retry_provider_error_is_not_retried() {
     .expect("start non-transient Provider error task");
 
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("Provider error request");
     let runtime = wait_for_agent_runtime_idle(&root, "design-director");
     assert_eq!(runtime.phase, "failed");
@@ -5138,7 +5138,7 @@ async fn provider_transient_retry_backoff_is_exponential_and_capped_at_thirty_se
     .expect("start exponential backoff task");
     for _ in 0..4 {
         request_notice_receiver
-            .recv_timeout(Duration::from_secs(5))
+            .recv_timeout(Duration::from_secs(30))
             .expect("exponential backoff physical Provider request");
     }
     let runtime = wait_for_agent_runtime_idle(&root, "design-director");
@@ -5725,7 +5725,7 @@ async fn background_agent_runtime_reuses_terminal_image_inspect_receipt_without_
 
     resume_game_creator_agent_background_tasks_at(&root).expect("resume image inspect recovery");
     let request = receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("replan from existing image observation");
     assert!(request.contains(conclusion));
     assert!(!request.contains("\"type\":\"input_image\""));
diff --git a/apps/ai-game-creator-shell/src-tauri/src/tests/response_stream.rs b/apps/ai-game-creator-shell/src-tauri/src/tests/response_stream.rs
index 9f1410fe2..ccb92dcac 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/tests/response_stream.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/tests/response_stream.rs
@@ -514,7 +514,7 @@ async fn response_stream_private_process_output_is_never_published_or_committed_
     });
 
     mock.first_delta_written
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("private Provider first raw delta");
     let streaming =
         wait_for_response_stream_status(&root, "code-prototype", run_id, "streaming", 0);
@@ -659,7 +659,7 @@ async fn response_stream_final_disconnect_with_retry_disabled_fails_without_comm
     .expect("start final stream single-attempt task");
 
     mock.first_delta_written
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("final stream request reached disconnect boundary");
     let finalization_lock = acquire_project_write_lock(
         &root,
@@ -2675,7 +2675,7 @@ async fn background_finalization_replans_same_run_after_cross_agent_revision_dri
         .expect("release stale final reply response");
 
     let replanned_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("same run replanning request");
     assert!(replanned_request.contains(run_id));
     assert!(replanned_request.contains(&session_id));
@@ -2693,7 +2693,7 @@ async fn background_finalization_replans_same_run_after_cross_agent_revision_dri
     assert!(verified_request.contains("project.verify"));
     assert!(verified_request.contains("AGENT_RUNTIME_CURRENT_REVISION_OK"));
     let current_final_reply_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("current final reply request");
     assert!(current_final_reply_request.contains(run_id));
 
@@ -2828,7 +2828,7 @@ async fn read_only_background_finalization_replans_when_reply_revision_becomes_s
         .expect("release stale read-only final reply");
 
     let replanned_request = request_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("read-only same-run replanning request");
     assert!(replanned_request.contains(run_id));
     assert!(replanned_request.contains(&session_id));
@@ -3106,7 +3106,7 @@ async fn provider_retry_waiting_final_reply_restart_commits_once() {
 
     for _ in 0..2 {
         request_notice_receiver
-            .recv_timeout(Duration::from_secs(5))
+            .recv_timeout(Duration::from_secs(30))
             .expect("expected physical Provider request");
     }
     let mut retry = None;
@@ -3143,7 +3143,7 @@ async fn provider_retry_waiting_final_reply_restart_commits_once() {
         .is_err());
 
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("final reply Provider retry must wake at its durable deadline");
     server_handle
         .join()
@@ -3151,7 +3151,7 @@ async fn provider_retry_waiting_final_reply_restart_commits_once() {
     let captured_requests = (0..3)
         .map(|_| {
             request_capture_receiver
-                .recv_timeout(Duration::from_secs(5))
+                .recv_timeout(Duration::from_secs(30))
                 .expect("captured Provider request")
         })
         .collect::<Vec<_>>();
@@ -3388,14 +3388,14 @@ async fn provider_retry_waiting_final_reply_compaction_resumes_without_new_tool_
     .expect("start final compaction retry task");
 
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("initial tool-plan request");
     let updated_config = load_game_creator_app_config().expect("load final compaction config");
     let updated_llm = resolve_game_creator_llm_config_for_agent(&updated_config, agent_id);
     assert!(updated_llm.stream);
     assert_eq!(updated_llm.auto_compact_token_limit, 8_000);
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("failed final-reply context compaction request");
     let mut retry = None;
     for _ in 0..250 {
@@ -3427,10 +3427,10 @@ async fn provider_retry_waiting_final_reply_compaction_resumes_without_new_tool_
         .is_err());
 
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("retried final-reply context compaction request");
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("final reply request after recovered compaction");
     server_handle
         .join()
@@ -3438,7 +3438,7 @@ async fn provider_retry_waiting_final_reply_compaction_resumes_without_new_tool_
     let captured_requests = (0..4)
         .map(|_| {
             request_capture_receiver
-                .recv_timeout(Duration::from_secs(5))
+                .recv_timeout(Duration::from_secs(30))
                 .expect("captured final compaction Provider request")
         })
         .collect::<Vec<_>>();
@@ -3687,7 +3687,7 @@ async fn provider_handoff_final_reply_restart_replays_success_without_network_re
 
     for _ in 0..3 {
         request_notice_receiver
-            .recv_timeout(Duration::from_secs(5))
+            .recv_timeout(Duration::from_secs(30))
             .expect("expected Provider request before final reply handoff stop");
     }
     let handoff = wait_for_provider_handoff_test_stop(&root, agent_id, run_id);
@@ -3747,7 +3747,7 @@ async fn provider_handoff_final_reply_restart_replays_success_without_network_re
     let captured_requests = (0..3)
         .map(|_| {
             request_capture_receiver
-                .recv_timeout(Duration::from_secs(5))
+                .recv_timeout(Duration::from_secs(30))
                 .expect("captured Provider request before handoff replay")
         })
         .collect::<Vec<_>>();
@@ -3922,7 +3922,7 @@ async fn project_execution_owner_cross_boot_replays_same_run_provider_handoff_to
 
     for _ in 0..3 {
         request_notice_receiver
-            .recv_timeout(Duration::from_secs(5))
+            .recv_timeout(Duration::from_secs(30))
             .expect("Provider request before simulated old Runner exit");
     }
     let handoff = wait_for_provider_handoff_test_stop(&root, agent_id, run_id);
@@ -3930,7 +3930,7 @@ async fn project_execution_owner_cross_boot_replays_same_run_provider_handoff_to
     let captured_requests = (0..3)
         .map(|_| {
             request_capture_receiver
-                .recv_timeout(Duration::from_secs(5))
+                .recv_timeout(Duration::from_secs(30))
                 .expect("captured Provider request before ownership transfer")
         })
         .collect::<Vec<_>>();
@@ -4116,7 +4116,7 @@ async fn provider_handoff_final_reply_compaction_restart_only_requests_final_rep
 
     for _ in 0..3 {
         request_notice_receiver
-            .recv_timeout(Duration::from_secs(5))
+            .recv_timeout(Duration::from_secs(30))
             .expect("expected Provider request before compaction handoff stop");
     }
     let handoff = wait_for_provider_handoff_test_stop(&root, agent_id, run_id);
@@ -4156,7 +4156,7 @@ async fn provider_handoff_final_reply_compaction_restart_only_requests_final_rep
         .expect("resume final compaction Provider handoff");
     assert_eq!(resumed.len(), 1);
     request_notice_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("only necessary final reply request after compaction handoff replay");
     server_handle
         .join()
@@ -4164,7 +4164,7 @@ async fn provider_handoff_final_reply_compaction_restart_only_requests_final_rep
     let captured_requests = (0..4)
         .map(|_| {
             request_capture_receiver
-                .recv_timeout(Duration::from_secs(5))
+                .recv_timeout(Duration::from_secs(30))
                 .expect("captured final compaction handoff Provider request")
         })
         .collect::<Vec<_>>();
diff --git a/apps/ai-game-creator-shell/src-tauri/src/tests/runtime_actions/recovery.rs b/apps/ai-game-creator-shell/src-tauri/src/tests/runtime_actions/recovery.rs
index 7e976b66b..6674c034e 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/tests/runtime_actions/recovery.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/tests/runtime_actions/recovery.rs
@@ -1830,7 +1830,7 @@ async fn background_agent_runtime_repairs_terminal_receipt_through_reconciliatio
 
     resume_game_creator_agent_background_tasks_at(&root).expect("resume receipt repair");
     let request = receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("replan after receipt repair");
     assert!(request.contains("已读取项目文件摘要，恢复时不得重放"));
     let runtime = wait_for_agent_runtime_terminal_and_lane_release(
diff --git a/apps/ai-game-creator-shell/src-tauri/src/tests/sessions.rs b/apps/ai-game-creator-shell/src-tauri/src/tests/sessions.rs
index d0fe90c57..7ebba5ce9 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/tests/sessions.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/tests/sessions.rs
@@ -1651,13 +1651,13 @@ fn agent_conversation_session_fork_is_linearizable_with_default_session_enqueue(
             || {
                 lane_ready_sender.send(()).expect("signal lane acquired");
                 lane_release_receiver
-                    .recv_timeout(Duration::from_secs(5))
+                    .recv_timeout(Duration::from_secs(30))
                     .expect("release runtime enqueue");
             },
         )
     });
     lane_ready_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("runtime acquired session lane");
 
     let (fork_sender, fork_receiver) = mpsc::channel();
@@ -1687,7 +1687,7 @@ fn agent_conversation_session_fork_is_linearizable_with_default_session_enqueue(
         Some("fork-linearizable-run")
     );
     let fork_error = fork_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("receive blocked fork")
         .expect_err("queued runtime must block fork");
     fork_thread.join().expect("join fork thread");
@@ -1825,13 +1825,13 @@ fn agent_conversation_session_list_hides_uncommitted_fork_file() {
                     .send(())
                     .expect("signal fork file written");
                 hook_release_receiver
-                    .recv_timeout(Duration::from_secs(5))
+                    .recv_timeout(Duration::from_secs(30))
                     .expect("release catalog write");
             },
         )
     });
     hook_ready_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("fork reached catalog write hook");
 
     let (list_sender, list_receiver) = mpsc::channel();
@@ -1854,7 +1854,7 @@ fn agent_conversation_session_list_hides_uncommitted_fork_file() {
         .expect("join fork thread")
         .expect("commit fork");
     let listed = list_receiver
-        .recv_timeout(Duration::from_secs(5))
+        .recv_timeout(Duration::from_secs(30))
         .expect("receive committed session list")
         .expect("list committed sessions");
     list_thread.join().expect("join list thread");
diff --git a/deploy/container/README.md b/deploy/container/README.md
index f888c1add..e5901466d 100644
--- a/deploy/container/README.md
+++ b/deploy/container/README.md
@@ -68,18 +68,18 @@ Jenkins 分支预览构建固定从宿主 `/data/jenkins/preview-secrets/.env.lo
 
 ### Gitea CI 预构建 Job 镜像
 
-`.gitea/workflows/project-ci.yml` 的四个 job 统一使用 `deploy/container/gitea-ci-job.Dockerfile` 构建的 `genarrative-ci` 环境。镜像固定 Ubuntu job base digest `sha256:58ea92624c7c09582e05594d95488331045053d3a3f34cf09649f2a32313a614` 和 Rust stage digest `sha256:93ce27a88655056a51dbdd8f5f2d7ddc071c7b0070fb288a37b5a285fc83971e`；Node `22.23.1` 发行包在解压前执行 SHA-256 校验，Google Linux 主签名指纹固定为 `EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796`，Chrome 固定为 `150.0.7871.181-1`。镜像预装 Rust `1.98.1`、`rustfmt`、Chrome、`bwrap`、`rg`、`ffmpeg`、`clang/lld` 和 Tauri / 后端系统依赖，并设置 `RUSTUP_AUTO_INSTALL=0`；仓库工具链变更时必须先重建镜像，不允许 job 现场下载补齐。
+`.gitea/workflows/project-ci.yml` 的四个 job 统一使用 `deploy/container/gitea-ci-job.Dockerfile` 构建的 `genarrative-ci` 环境。镜像固定 Ubuntu job base digest `sha256:58ea92624c7c09582e05594d95488331045053d3a3f34cf09649f2a32313a614` 和 Rust stage digest `sha256:93ce27a88655056a51dbdd8f5f2d7ddc071c7b0070fb288a37b5a285fc83971e`；Node `22.23.1` 发行包在解压前执行 SHA-256 校验，Google Linux 主签名指纹固定为 `EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796`，Chrome 固定为 `153.0.8010.52-1`。镜像预装 Rust `1.98.1`、`rustfmt`、Chrome、`bwrap`、`rg`、`ffmpeg`、`clang/lld` 和 Tauri / 后端系统依赖，并设置 `RUSTUP_AUTO_INSTALL=0`；仓库工具链变更时必须先重建镜像，不允许 job 现场下载补齐。
 
 构建、校验和装入 runner 内层 Docker：
 
 ```bash
 bash scripts/gitea-ci-job-image.sh build
 bash scripts/gitea-ci-job-image.sh verify
-bash scripts/gitea-ci-job-image.sh export /仓库外受控路径/genarrative-gitea-project-ci-20260920.1.tar.zst
+bash scripts/gitea-ci-job-image.sh export /仓库外受控路径/genarrative-gitea-project-ci-20260920.2.tar.zst
 bash scripts/gitea-ci-job-image.sh load-runner
 ```
 
-默认构建 tag 为 `genarrative/gitea-project-ci:20260920.1`。脚本通过 NUL 分隔白名单 tar 流只发送 Dockerfile、checkout 脚本、根 workspace 的唯一 npm lock 与全部 workspace manifest，以及 server-rs、桌面壳和 AI 游戏创作壳的 Cargo manifests/lock；不会把业务源码、素材或本地私密文件发送给 Docker daemon。新镜像显式安装并精确校验 `npm 10.9.7`，不依赖 Node 发行包隐含的 npm 版本；除固定工具链外，还按一份 npm workspace lock 与三份 Cargo lock 预热下载缓存。npm 只执行一次忽略 lifecycle scripts 的 workspace `npm ci`，三个 `cargo fetch --locked` 最多执行 5 次整命令级有界重试，再分别以断网 `cargo fetch --locked` 验证缓存闭合，镜像不包含 `node_modules` 或 Cargo `target`。`build` 完成后会自动运行环境校验，`load-runner` 还会比对宿主和 runner 内层的完整 Image ID，并在内层执行 bwrap 与 Chrome headless canary。workspace lock 或 manifest 变化落地后必须按下述顺序重建并装载镜像；过渡期旧固定镜像缺少 `GENARRATIVE_GITEA_CI_NPM_VERSION` 时，校验只输出 `npm_version=partial` 和 Actions warning，继续由当前 job 的根 `npm ci` 验证唯一 lock，不能据此宣称 npm 版本或新依赖缓存已经闭合。执行这些命令不要求必须使用 root，但执行账号必须有权访问宿主 Docker API 并管理 runner 容器；没有该权限时交给 runner 运维人员执行。
+默认构建 tag 为 `genarrative/gitea-project-ci:20260920.2`。脚本通过 NUL 分隔白名单 tar 流只发送 Dockerfile、checkout 脚本、根 workspace 的唯一 npm lock 与全部 workspace manifest，以及 server-rs、桌面壳和 AI 游戏创作壳的 Cargo manifests/lock，外加 AI 游戏创作壳本地路径依赖的三个编辑器 bridge crate 源树；不会把业务源码、素材或本地私密文件发送给 Docker daemon。新镜像显式安装并精确校验 `npm 10.9.7`，不依赖 Node 发行包隐含的 npm 版本；除固定工具链外，还按一份 npm workspace lock 与三份 Cargo lock 预热下载缓存。npm 只执行一次忽略 lifecycle scripts 的 workspace `npm ci`（最多 5 次整命令级有界重试，处理 registry ECONNRESET），三个 `cargo fetch --locked` 最多执行 5 次整命令级有界重试，再分别以断网 `cargo fetch --locked` 验证缓存闭合，镜像不包含 `node_modules` 或 Cargo `target`。`build` 完成后会自动运行环境校验，`load-runner` 还会比对宿主和 runner 内层的完整 Image ID，并在内层执行 bwrap 与 Chrome headless canary。workspace lock 或 manifest 变化落地后必须按下述顺序重建并装载镜像；过渡期旧固定镜像缺少 `GENARRATIVE_GITEA_CI_NPM_VERSION` 时，校验只输出 `npm_version=partial` 和 Actions warning，继续由当前 job 的根 `npm ci` 验证唯一 lock，不能据此宣称 npm 版本或新依赖缓存已经闭合。执行这些命令不要求必须使用 root，但执行账号必须有权访问宿主 Docker API 并管理 runner 容器；没有该权限时交给 runner 运维人员执行。
 
 runner 配置保留原 `ubuntu-latest` 映射，`genarrative-ci` 继续映射到经 `build / verify / load-runner` 验证并写入配置的完整 Image ID。内层 Docker 数据必须持久化，`force_pull` 保持 `false`；该精确 Image ID 在内层不存在时 job 应直接失败，不回退到浮动 tag 或现场拉取。四个 job 使用镜像内 `genarrative-gitea-checkout` 直接从当前 Gitea 拉取事件 commit，带 5 次有界重试，不再运行时下载 GitHub checkout action；随后以 `GENARRATIVE_GITEA_CI_CHECK_RUNTIME=1` 执行 `scripts/check-gitea-ci-job-image.sh`，同时校验工具链、一份 npm workspace 缓存锁、三份 Cargo 缓存锁、bwrap 和 Chrome headless。锁不匹配时校验会输出 `partial` 和醒目的 Actions warning，提示在可信分支落地后刷新镜像。各 job 仍各自运行一次干净的根 `npm ci`，以唯一 workspace lock 校验全部 App/package/tool 依赖并隔离 PR 依赖；统一通过 `scripts/ci-npm-ci-with-retry.sh` 最多执行 3 次整命令级有界重试，并使用镜像内 npm cache 和 `prefer-offline`。锁文件新增依赖时允许经受控网络补齐，本阶段不启用共享 Actions cache。
 
diff --git a/deploy/container/gitea-ci-job.Dockerfile b/deploy/container/gitea-ci-job.Dockerfile
index 4ffd55805..ec94382f6 100644
--- a/deploy/container/gitea-ci-job.Dockerfile
+++ b/deploy/container/gitea-ci-job.Dockerfile
@@ -16,6 +16,9 @@ ENV CARGO_HTTP_MULTIPLEXING=false \
 COPY server-rs /tmp/genarrative-cargo-cache/server-rs
 COPY apps/desktop-shell/src-tauri /tmp/genarrative-cargo-cache/desktop-shell
 COPY apps/ai-game-creator-shell/src-tauri /tmp/genarrative-cargo-cache/apps/ai-game-creator-shell/src-tauri
+COPY plugins/agc-cocos-editor/native/cocos-editor-bridge /tmp/genarrative-cargo-cache/plugins/agc-cocos-editor/native/cocos-editor-bridge
+COPY plugins/agc-unity-editor/native/unity-editor-bridge /tmp/genarrative-cargo-cache/plugins/agc-unity-editor/native/unity-editor-bridge
+COPY plugins/agc-godot-editor/native/godot-editor-bridge /tmp/genarrative-cargo-cache/plugins/agc-godot-editor/native/godot-editor-bridge
 
 RUN find /tmp/genarrative-cargo-cache -name Cargo.toml -exec dirname {} \; \
         | while IFS= read -r crate_dir; do \
@@ -57,12 +60,12 @@ FROM ${RUNNER_IMAGE}
 ARG NODE_VERSION=22.23.1
 ARG NODE_LINUX_X64_SHA256=9749e988f437343b7fa832c69ded82a312e41a03116d766797ac14f6f9eee578
 ARG NPM_VERSION=10.9.7
-ARG GOOGLE_CHROME_VERSION=150.0.7871.181-1
+ARG GOOGLE_CHROME_VERSION=153.0.8010.52-1
 ARG GOOGLE_LINUX_SIGNING_KEY_FINGERPRINT=EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796
 
 LABEL org.opencontainers.image.title="Genarrative Gitea CI job image" \
     org.opencontainers.image.description="Ubuntu 24.04 CI image with fixed toolchains and prewarmed npm/Cargo caches" \
-    org.opencontainers.image.version="2026.09.20.1"
+    org.opencontainers.image.version="2026.09.20.2"
 
 RUN test "$(dpkg --print-architecture)" = "amd64" \
     && find /etc/apt/sources.list.d -maxdepth 1 -type f \
@@ -120,12 +123,8 @@ RUN node_archive="node-v${NODE_VERSION}-linux-x64.tar.xz" \
         --strip-components=1 \
         --directory /usr/local/lib/genarrative-node \
     && rm -f "${node_archive}" \
-    && ln -sfn /usr/local/lib/genarrative-node/bin/node /usr/local/bin/node \
-    && ln -sfn /usr/local/lib/genarrative-node/bin/npm /usr/local/bin/npm \
     && ln -sfn /usr/local/lib/genarrative-node/bin/npx /usr/local/bin/npx \
-    && ln -sfn /usr/local/lib/genarrative-node/bin/corepack /usr/local/bin/corepack \
-    && npm install --global "npm@${NPM_VERSION}" --no-audit --no-fund \
-    && test "$(npm --version)" = "${NPM_VERSION}"
+    && ln -sfn /usr/local/lib/genarrative-node/bin/corepack /usr/local/bin/corepack
 
 COPY --from=rust-dependency-cache /usr/local/cargo /usr/local/cargo
 COPY --from=rust-dependency-cache /usr/local/rustup /usr/local/rustup
@@ -150,6 +149,8 @@ COPY apps/desktop-shell/src-tauri/Cargo.lock /usr/local/share/genarrative-ci/loc
 COPY apps/ai-game-creator-shell/src-tauri/Cargo.lock /usr/local/share/genarrative-ci/locks/ai-game-creator-shell.Cargo.lock
 COPY deploy/container/gitea-ci-checkout.sh /usr/local/bin/genarrative-gitea-checkout
 
+# npm registry 偶发 ECONNRESET，镜像预热也需要整命令级有界重试；
+# 失败重试复用同一 npm cache，不会重复下载已完成的包。
 RUN test -n "${NPM_LOCK_SHA256}" \
     && test -n "${SERVER_RUST_LOCK_SHA256}" \
     && test -n "${DESKTOP_RUST_LOCK_SHA256}" \
@@ -171,12 +172,23 @@ RUN test -n "${NPM_LOCK_SHA256}" \
         /usr/local/share/genarrative-ci/locks/ai-game-creator-shell.Cargo.lock \
         | sha256sum --check --strict \
     && chmod 0755 /usr/local/bin/genarrative-gitea-checkout \
-    && npm ci \
-        --ignore-scripts \
-        --no-audit \
-        --no-fund \
-        --prefer-offline \
-        --prefix /usr/local/share/genarrative-ci/npm \
+    && npm_ci_with_retry() { \
+        for attempt in 1 2 3 4 5; do \
+            if npm ci \
+                --ignore-scripts \
+                --no-audit \
+                --no-fund \
+                --prefer-offline \
+                --prefix /usr/local/share/genarrative-ci/npm; then \
+                return 0; \
+            fi; \
+            if [ "${attempt}" -eq 5 ]; then \
+                return 1; \
+            fi; \
+            sleep "$((attempt * 5))"; \
+        done; \
+      } \
+    && npm_ci_with_retry \
     && rm -rf \
         /usr/local/share/genarrative-ci/npm/node_modules \
         /usr/local/share/genarrative-ci/npm/apps/*/node_modules \
@@ -184,6 +196,30 @@ RUN test -n "${NPM_LOCK_SHA256}" \
         /usr/local/share/genarrative-ci/npm/tools/*/node_modules \
     && npm cache verify
 
+# 依赖预热会在 workspace 内解析出 Node 发行包自带的 npm（例如 10.9.8），
+# 并通过 PATH 里的 node_modules/.bin 影子化固定版本，因此全局固定版本在预热之后安装。
+# 基础 runner 镜像把 /opt/acttoolcache/node/24.18.0/x64/bin 放在 PATH 最前，会影子化固定 Node / npm；
+# 而 command.exec 只信任 /usr/local/bin 等系统目录，Node 必须在那里可见。
+# 因此固定工具链写成绝对路径 wrapper，并用同一组链接覆盖 base 镜像残留的 toolcache bin，
+# 避免 shell 是否登录改变解析结果，同时保证 command.exec 能找到受信任 node。
+RUN npm install --global --prefix /usr/local/lib/genarrative-node \
+        --no-audit --no-fund "npm@${NPM_VERSION}" \
+    && test "$(/usr/local/lib/genarrative-node/bin/node /usr/local/lib/genarrative-node/lib/node_modules/npm/bin/npm-cli.js --version)" = "${NPM_VERSION}" \
+    && ln -sfn /usr/local/lib/genarrative-node/bin/node /usr/local/bin/node \
+    && rm -f /usr/local/bin/npm \
+    && printf '%s\n' '#!/bin/sh' \
+        'exec /usr/local/lib/genarrative-node/bin/node /usr/local/lib/genarrative-node/lib/node_modules/npm/bin/npm-cli.js "$@"' \
+        > /usr/local/bin/npm \
+    && chmod 0755 /usr/local/bin/npm \
+    && rm -rf /opt/acttoolcache/node/24.18.0/x64/bin \
+    && mkdir -p /opt/acttoolcache/node/24.18.0/x64/bin \
+    && ln -sfn /usr/local/lib/genarrative-node/bin/node /opt/acttoolcache/node/24.18.0/x64/bin/node \
+    && ln -sfn /usr/local/bin/npm /opt/acttoolcache/node/24.18.0/x64/bin/npm \
+    && ln -sfn /usr/local/lib/genarrative-node/bin/npx /opt/acttoolcache/node/24.18.0/x64/bin/npx \
+    && test "$(readlink -f "$(command -v node)")" = "/usr/local/lib/genarrative-node/bin/node" \
+    && test "$(node --version)" = "v${NODE_VERSION}" \
+    && test "$(npm --version)" = "${NPM_VERSION}"
+
 RUN install -m 0755 /usr/local/cargo/bin/rustup /usr/local/bin/rustup \
     && for command_name in cargo cargo-fmt rustc rustdoc rustfmt; do \
         ln -sfn rustup "/usr/local/bin/${command_name}"; \
@@ -208,7 +244,7 @@ ENV CARGO_HOME=/usr/local/cargo \
 
 ARG IMAGE_REVISION=uncommitted
 LABEL org.opencontainers.image.vendor="GenarrativeAI" \
-    org.opencontainers.image.version="2026.09.20.1" \
+    org.opencontainers.image.version="2026.09.20.2" \
     org.opencontainers.image.source="https://git.genarrative.world/GenarrativeAI/Genarrative" \
     org.opencontainers.image.revision="${IMAGE_REVISION}" \
     org.opencontainers.image.base.name="docker.gitea.com/runner-images:ubuntu-latest@sha256:58ea92624c7c09582e05594d95488331045053d3a3f34cf09649f2a32313a614" \
diff --git a/deploy/container/gitea-ci-job.Dockerfile.dockerignore b/deploy/container/gitea-ci-job.Dockerfile.dockerignore
index 8b373d682..43bc93a4c 100644
--- a/deploy/container/gitea-ci-job.Dockerfile.dockerignore
+++ b/deploy/container/gitea-ci-job.Dockerfile.dockerignore
@@ -38,3 +38,14 @@
 !tools/
 !tools/spine-json-export-validator/
 !tools/spine-json-export-validator/package.json
+!plugins/
+!plugins/agc-cocos-editor/
+!plugins/agc-cocos-editor/native/
+!plugins/agc-cocos-editor/native/cocos-editor-bridge/
+!plugins/agc-unity-editor/
+!plugins/agc-unity-editor/native/
+!plugins/agc-unity-editor/native/unity-editor-bridge/
+!plugins/agc-godot-editor/
+!plugins/agc-godot-editor/native/
+!plugins/agc-godot-editor/native/godot-editor-bridge/
+!plugins/agc-*-editor/native/*-editor-bridge/**
diff --git a/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md b/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md
index f8af79922..cd0a026f1 100644
--- a/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md
+++ b/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md
@@ -303,14 +303,14 @@ PR checkout 必须保留完整 Git 历史，并把 PR base SHA 传给 `SPACETIME
 
 当前 `genarrative-station` 使用 Gitea `1.26.4` 和基于 Gitea Runner `2.0.0-dind-rootless` 的固定 digest 修补镜像。Runner 2.0.0 会先把 `systempaths=unconfined` 解析为空 `MaskedPaths` / `ReadonlyPaths`，再被 `mergo.WithOverride` 当成 empty value 丢失；站点修补只在 merge 后保留这两个显式空 slice，不改其它 runner 行为。真实 job inspect 必须看到 `MaskedPaths=[]`、`ReadonlyPaths=[]`、`SecurityOpt=[seccomp=unconfined]`、`Privileged=false`、无 CapAdd 且 `Binds=[]`。外层 runner 以 `rootless` 用户运行，`privileged=false`、不增加 `CAP_SYS_ADMIN`，只映射 `/dev/net/tun`，内部 Docker 只监听私有 Unix socket；runner 配置保持 `docker_host: "-"`、`valid_volumes: []`、`bind_workdir: false` 和 `force_pull: false`，防止内部 Docker socket 或宿主 bind mount 进入 job。job 只连接 `gitea-actions` internal network：`genarrative-station` 由只转发 `/git` 到 Gitea 的内部 gateway 解析，公网依赖只经拒绝私网、保留地址和 metadata 的 80/443 egress proxy；绕过 proxy 的公网和 Postgres/Redis 数据网都必须不可达。完整 bwrap canary 需要 rootless DinD 外层的 rootlesskit AppArmor/userns 边界，以及内层 job 的 namespace/proc 挂载支持；相关 `seccomp/systempaths` 放宽只允许存在于这个无宿主 socket 的 rootless DinD 内层，禁止复制回控制宿主 rootful Docker 的 runner。
 
-CI job 镜像由 `deploy/container/gitea-ci-job.Dockerfile` 定义：Ubuntu job base 固定为 `sha256:58ea92624c7c09582e05594d95488331045053d3a3f34cf09649f2a32313a614`，Rust stage 固定为 `sha256:93ce27a88655056a51dbdd8f5f2d7ddc071c7b0070fb288a37b5a285fc83971e`，Node `22.23.1` 发行包执行 SHA-256 校验，Google Linux 主签名指纹固定，Chrome 固定为 `150.0.7871.181-1`。构建脚本以 NUL 分隔白名单 tar 流发送 Dockerfile、checkout 脚本、根 lock、全部 workspace manifests，以及 server-rs、桌面壳和 AI 游戏创作壳 Cargo manifests/lock。镜像按唯一根 npm workspace 锁、server-rs 锁、桌面壳锁和 AI 游戏创作壳 Cargo 锁预热四份下载缓存，不包含 `node_modules` 或 Cargo `target`；三个 `cargo fetch --locked` 在 Cargo 自身重试之外再执行最多 5 次整命令级有界重试，处理 registry index 握手失败，最终仍分别以断网 `cargo fetch --locked` 关闭验证。CI 镜像定义或根 lock/workspace manifests 变化后必须重建并发布新的固定 Image ID；不得继续沿用旧镜像 digest。runner 标签保留 `ubuntu-latest`，并将 `genarrative-ci` 映射到当前已验证的完整 Image ID。内层 Docker 数据必须持久化；`force_pull: false` 表示只使用已装载的精确内容，Image ID 缺失时 job 必须失败关闭，不得回退浮动 tag 或临时连 registry。
+CI job 镜像由 `deploy/container/gitea-ci-job.Dockerfile` 定义：Ubuntu job base 固定为 `sha256:58ea92624c7c09582e05594d95488331045053d3a3f34cf09649f2a32313a614`，Rust stage 固定为 `sha256:93ce27a88655056a51dbdd8f5f2d7ddc071c7b0070fb288a37b5a285fc83971e`，Node `22.23.1` 发行包执行 SHA-256 校验，Google Linux 主签名指纹固定，Chrome 固定为 `153.0.8010.52-1`。构建脚本以 NUL 分隔白名单 tar 流发送 Dockerfile、checkout 脚本、根 lock、全部 workspace manifests，以及 server-rs、桌面壳和 AI 游戏创作壳 Cargo manifests/lock，外加 AI 游戏创作壳本地路径依赖的三个编辑器 bridge crate 源树；镜像预热阶段的根 npm `ci` 与三个 `cargo fetch --locked` 都执行最多 5 次整命令级有界重试，分别处理 registry ECONNRESET 与 registry index 握手失败。镜像按唯一根 npm workspace 锁、server-rs 锁、桌面壳锁和 AI 游戏创作壳 Cargo 锁预热四份下载缓存，不包含 `node_modules` 或 Cargo `target`；三个 `cargo fetch --locked` 在 Cargo 自身重试之外再执行最多 5 次整命令级有界重试，处理 registry index 握手失败，最终仍分别以断网 `cargo fetch --locked` 关闭验证。CI 镜像定义或根 lock/workspace manifests 变化后必须重建并发布新的固定 Image ID；不得继续沿用旧镜像 digest。runner 标签保留 `ubuntu-latest`，并将 `genarrative-ci` 映射到当前已验证的完整 Image ID。内层 Docker 数据必须持久化；`force_pull: false` 表示只使用已装载的精确内容，Image ID 缺失时 job 必须失败关闭，不得回退浮动 tag 或临时连 registry。
 
 镜像更新命令：
 
 ```bash
 bash scripts/gitea-ci-job-image.sh build
 bash scripts/gitea-ci-job-image.sh verify
-bash scripts/gitea-ci-job-image.sh export /仓库外受控路径/genarrative-gitea-project-ci-20260920.1.tar.zst
+bash scripts/gitea-ci-job-image.sh export /仓库外受控路径/genarrative-gitea-project-ci-20260920.2.tar.zst
 bash scripts/gitea-ci-job-image.sh load-runner
 ```
 
diff --git a/scripts/gitea-ci-job-image.sh b/scripts/gitea-ci-job-image.sh
index 494af67e5..e9e06c8db 100644
--- a/scripts/gitea-ci-job-image.sh
+++ b/scripts/gitea-ci-job-image.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
 dockerfile_context_path="deploy/container/gitea-ci-job.Dockerfile"
-image_tag="${GENARRATIVE_GITEA_CI_IMAGE_TAG:-genarrative/gitea-project-ci:20260920.1}"
+image_tag="${GENARRATIVE_GITEA_CI_IMAGE_TAG:-genarrative/gitea-project-ci:20260920.2}"
 runner_container="${GENARRATIVE_GITEA_RUNNER_CONTAINER:-gitea-runner}"
 
 write_build_context_file_list() {
@@ -29,7 +29,10 @@ write_build_context_file_list() {
     server-rs/Cargo.lock \
     apps/desktop-shell/src-tauri/Cargo.toml \
     apps/desktop-shell/src-tauri/Cargo.lock
-  find server-rs/crates -name Cargo.toml -print0 | sort -z
+  find server-rs/crates plugins/agc-*-editor/native/*-editor-bridge \
+    \( -name Cargo.toml -o -path 'plugins/agc-*-editor/native/*-editor-bridge/*' \) \
+    -type f -print0 \
+    | sort -z
 }
 
 usage() {
@@ -87,7 +90,9 @@ case "${command_name}" in
           server-rs/Cargo.lock \
           apps/desktop-shell/src-tauri/Cargo.toml \
           apps/desktop-shell/src-tauri/Cargo.lock
-        find server-rs/crates -name Cargo.toml -print0 \
+        find server-rs/crates plugins/agc-*-editor/native/*-editor-bridge \
+          \( -name Cargo.toml -o -path 'plugins/agc-*-editor/native/*-editor-bridge/*' \) \
+          -type f -print0 \
           | sort -z \
           | xargs -0 -r sha256sum
       } \
diff --git a/scripts/project-ci-workflow.test.ts b/scripts/project-ci-workflow.test.ts
index 2f8b4a5ef..516fb6720 100644
--- a/scripts/project-ci-workflow.test.ts
+++ b/scripts/project-ci-workflow.test.ts
@@ -182,8 +182,16 @@ describe('project CI workflow', () => {
       /^ARG RUNNER_IMAGE=[^\s]+@sha256:[a-f0-9]{64}$/m,
     );
     expect(imageDockerfile).toContain('ARG NPM_VERSION=10.9.7');
+    // base runner 镜像把 /opt/acttoolcache 的 Node 放在 PATH 最前；固定 Node/npm
+    // 必须写成绝对路径 wrapper 并覆盖 toolcache bin，否则登录与否会解析到不同工具链。
     expect(imageDockerfile).toContain(
-      'npm install --global "npm@${NPM_VERSION}" --no-audit --no-fund',
+      'rm -rf /opt/acttoolcache/node/24.18.0/x64/bin',
+    );
+    expect(imageDockerfile).toContain(
+      'exec /usr/local/lib/genarrative-node/bin/node /usr/local/lib/genarrative-node/lib/node_modules/npm/bin/npm-cli.js "$@"',
+    );
+    expect(imageDockerfile).toContain(
+      'npm install --global --prefix /usr/local/lib/genarrative-node',
     );
     expect(imageDockerfile).toContain(
       'GENARRATIVE_GITEA_CI_NPM_VERSION=${NPM_VERSION}',
@@ -263,6 +271,22 @@ describe('project CI workflow', () => {
       expect(imageDockerignore).toContain(`!${path}`);
     }
 
+    // AGC 通过本地 path 依赖引用三个编辑器 bridge crate。镜像预热会对
+    // AGC manifest 执行 cargo fetch --locked，构建上下文与 dockerignore
+    // 必须同时放行这些 crate，否则镜像在 cargo fetch 阶段必然失败。
+    for (const bridgeDir of [
+      'plugins/agc-cocos-editor/native/cocos-editor-bridge',
+      'plugins/agc-unity-editor/native/unity-editor-bridge',
+      'plugins/agc-godot-editor/native/godot-editor-bridge',
+    ]) {
+      expect(imageBuildScript.split(bridgeDir)).toHaveLength(1);
+      expect(imageDockerignore).toContain(`!${bridgeDir}/`);
+      expect(imageDockerignore).toContain('**');
+      expect(imageDockerfile).toContain(
+        `COPY ${bridgeDir} /tmp/genarrative-cargo-cache/${bridgeDir}`,
+      );
+    }
+
     expect(imageBuildScript).toContain(
       '--build-arg "AGC_RUST_LOCK_SHA256=${agc_rust_lock_sha256}"',
     );