From 971738bbfa9368c3333e9f25a121f2d5be8218f4 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 9 May 2026 18:03:23 +0100
Subject: [PATCH] fix(release): stabilize beta release harness

---
 scripts/docker/install-sh-e2e/run.sh            |  2 +-
 scripts/e2e/lib/fixtures/config.mjs             |  1 +
 scripts/e2e/lib/upgrade-survivor/assertions.mjs | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/docker/install-sh-e2e/run.sh b/scripts/docker/install-sh-e2e/run.sh
index 4a1b06b72c0..9c572d67dcb 100755
--- a/scripts/docker/install-sh-e2e/run.sh
+++ b/scripts/docker/install-sh-e2e/run.sh
@@ -606,7 +606,7 @@ run_profile() {
     agent_model="$(set_agent_model "$profile" \
       "openai/gpt-5.5" \
       "openai/gpt-5.4-mini")"
-    openclaw --profile "$profile" config set models.providers.openai '{"baseUrl":"https://api.openai.com/v1","models":[],"agentRuntime":{"id":"pi"}}' --strict-json >/dev/null
+    openclaw --profile "$profile" config set models.providers.openai '{"baseUrl":"https://api.openai.com/v1","models":[],"timeoutSeconds":300,"agentRuntime":{"id":"pi"}}' --strict-json >/dev/null
     image_model="$(set_image_model "$profile" \
       "openai/gpt-5.4-image-2")"
   else
diff --git a/scripts/e2e/lib/fixtures/config.mjs b/scripts/e2e/lib/fixtures/config.mjs
index f9993a6196e..ffac8a56d74 100644
--- a/scripts/e2e/lib/fixtures/config.mjs
+++ b/scripts/e2e/lib/fixtures/config.mjs
@@ -97,6 +97,7 @@ function writeOpenWebUiConfig([openaiApiKey]) {
       value: (process.env.OPENAI_BASE_URL || "https://api.openai.com/v1").trim(),
     },
     { path: "models.providers.openai.models", value: [] },
+    { path: "models.providers.openai.timeoutSeconds", value: 300 },
     { path: "models.providers.openai.agentRuntime", value: { id: "pi" } },
     { path: "gateway.controlUi.enabled", value: false },
     { path: "gateway.mode", value: "local" },
diff --git a/scripts/e2e/lib/upgrade-survivor/assertions.mjs b/scripts/e2e/lib/upgrade-survivor/assertions.mjs
index 2e2c1d7fa3d..1a3824f307a 100644
--- a/scripts/e2e/lib/upgrade-survivor/assertions.mjs
+++ b/scripts/e2e/lib/upgrade-survivor/assertions.mjs
@@ -435,9 +435,13 @@ function assertConfiguredPluginInstalls() {
   const records = index.installRecords ?? {};
   const matrix = records.matrix;
   const bundledMatrix = (index.plugins ?? []).find((plugin) => plugin?.pluginId === "matrix");
-  assert(!matrix, "internal matrix plugin should not be installed externally");
-  assert(bundledMatrix, "configured bundled matrix plugin is missing from the plugin index");
-  assert(bundledMatrix.enabled !== false, "configured bundled matrix plugin is disabled");
+  if (matrix) {
+    assertExternalPluginInstall(records, "matrix", "@openclaw/matrix");
+  } else if (bundledMatrix) {
+    assert(bundledMatrix.enabled !== false, "configured bundled matrix plugin is disabled");
+  } else {
+    assert(false, "configured matrix plugin is missing from the plugin index");
+  }
   const brave = (index.plugins ?? []).find((plugin) => plugin?.pluginId === "brave");
   assert(brave, "configured external brave plugin is missing from the plugin index");
   assert(brave.enabled !== false, "configured external brave plugin is disabled");