Auto-merge upstream openclaw/openclaw

Author: friuns2

CHANGELOG.md

@@ -9,6 +9,7 @@ Docs: https://docs.openclaw.ai
 - Docs/showcase: add a scannable hero, complete section jump links, and a responsive video grid for community examples. (#48493) Thanks @jchopard69.
 - Agents/local models: add `agents.defaults.localModelMode: "lean"` to drop heavyweight default tools like `browser`, `cron`, and `message`, reducing prompt size for weaker local-model setups without changing the normal path. Thanks @ImLukeF.
 - QA/Matrix: split Matrix live QA into a source-linked `qa-matrix` runner and keep repo-private `qa-*` surfaces out of packaged and published builds. (#66723) Thanks @gumadeiras.
+- Control UI/Overview: add a Model Auth status card showing OAuth token health and provider rate-limit pressure at a glance, with attention callouts when OAuth tokens are expiring or expired. Backed by a new `models.authStatus` gateway method that strips credentials and caches for 60s. (#66211) Thanks @omarshahine.
 
 ### Fixes
 
@@ -43,6 +44,7 @@ Docs: https://docs.openclaw.ai
 - Telegram/native commands: keep Telegram command-sync cache process-local so gateway restarts re-register the menu instead of trusting stale on-disk sync state after Telegram cleared commands out-of-band. (#66730) Thanks @nightq.
 - Audio/self-hosted STT: restore `models.providers.*.request.allowPrivateNetwork` for audio transcription so private or LAN speech-to-text endpoints stop tripping SSRF blocks after the v2026.4.14 regression. (#66692) Thanks @jhsmith409.
 - QQBot/cron: guard against undefined `event.content` in `parseFaceTags` and `filterInternalMarkers` so cron-triggered agent turns with no content payload no longer crash with `TypeError: Cannot read properties of undefined (reading 'startsWith')`. (#66302) Thanks @xinmotlanthua.
+- CLI/plugins: stop `--dangerously-force-unsafe-install` plugin installs from falling back to hook-pack installs after security scan failures, while still preserving non-security fallback behavior for real hook packs. (#58909) Thanks @hxy91819.
 
 ## 2026.4.14
 
@@ -1041,6 +1043,8 @@ Docs: https://docs.openclaw.ai
 - ACPX/runtime: repair `queue owner unavailable` session recovery by replacing dead named sessions and resuming the backend session when ACPX exposes a stable session id, so the first ACP prompt no longer inherits a dead handle. (#58669) Thanks @neeravmakwana
 - ACPX/runtime: retry dead-session queue-owner repair without `--resume-session` when the reported ACPX session id is stale, so recovery still creates a fresh named session instead of failing session init. Thanks @obviyus.
 - Tools/web_search (Kimi): replay native Moonshot `$web_search` arguments verbatim, disable thinking for `kimi-k2.5`, and add Moonshot region/model setup prompts so bundled Kimi web search works again. (#59356) Thanks @Innocent-children.
+- Auth/OpenAI Codex: persist plugin-refreshed OAuth credentials to `auth-profiles.json` before returning them, so rotated Codex refresh tokens survive restart and stop falling into `refresh_token_reused` loops. (#53082)
+- Discord/gateway: hand reconnect ownership back to Carbon, keep runtime status aligned with close/reconnect state, and force-stop sockets that open without reaching READY so Discord monitors recover promptly instead of waiting on stale health timeouts. (#59019) Thanks @obviyus
 
 ## 2026.3.31
 

CONTRIBUTING.md

@@ -80,6 +80,9 @@ Welcome to the lobster tank! 🦞
 - **Sliverp** - Chinese Channel: QQ, WeChat, Wecom, Dingtalk, Feishu
   - GitHub: [@sliverp](https://github.com/sliverp) · X: [@sliver01234](https://x.com/sliver01234)
 
+- **Mason Huang** - Stability, Security, Speed
+  - GitHub: [@hxy91819](https://github.com/hxy91819) · X: [@chenjingtalk](https://x.com/chenjingtalk)
+
 ## How to Contribute
 
 1. **Bugs & small fixes** → Open a PR!

extensions/qa-matrix/src/runners/contract/scenario-catalog.ts

@@ -39,9 +39,12 @@ export type MatrixQaScenarioDefinition = LiveTransportScenarioDefinition<MatrixQ
   topology?: MatrixQaTopologySpec;
 };
 
+export const MATRIX_QA_BLOCK_ROOM_KEY = "block";
 export const MATRIX_QA_DRIVER_DM_ROOM_KEY = "driver-dm";
 export const MATRIX_QA_DRIVER_DM_SHARED_ROOM_KEY = "driver-dm-shared";
+export const MATRIX_QA_HOMESERVER_ROOM_KEY = "homeserver";
 export const MATRIX_QA_MEMBERSHIP_ROOM_KEY = "membership";
+export const MATRIX_QA_RESTART_ROOM_KEY = "restart";
 export const MATRIX_QA_SECONDARY_ROOM_KEY = "secondary";
 
 function buildMatrixQaDmTopology(
@@ -104,12 +107,30 @@ const MATRIX_QA_SECONDARY_ROOM_TOPOLOGY = buildMatrixQaSingleGroupTopology({
   requireMention: true,
 });
 
+const MATRIX_QA_BLOCK_ROOM_TOPOLOGY = buildMatrixQaSingleGroupTopology({
+  key: MATRIX_QA_BLOCK_ROOM_KEY,
+  name: "Matrix QA Block Streaming Room",
+  requireMention: true,
+});
+
 const MATRIX_QA_MEMBERSHIP_ROOM_TOPOLOGY = buildMatrixQaSingleGroupTopology({
   key: MATRIX_QA_MEMBERSHIP_ROOM_KEY,
   name: "Matrix QA Membership Room",
   requireMention: true,
 });
 
+const MATRIX_QA_RESTART_ROOM_TOPOLOGY = buildMatrixQaSingleGroupTopology({
+  key: MATRIX_QA_RESTART_ROOM_KEY,
+  name: "Matrix QA Restart Room",
+  requireMention: true,
+});
+
+const MATRIX_QA_HOMESERVER_ROOM_TOPOLOGY = buildMatrixQaSingleGroupTopology({
+  key: MATRIX_QA_HOMESERVER_ROOM_KEY,
+  name: "Matrix QA Homeserver Restart Room",
+  requireMention: true,
+});
+
 export const MATRIX_QA_SCENARIOS: MatrixQaScenarioDefinition[] = [
   {
     id: "matrix-thread-follow-up",
@@ -149,7 +170,20 @@ export const MATRIX_QA_SCENARIOS: MatrixQaScenarioDefinition[] = [
     id: "matrix-room-block-streaming",
     timeoutMs: 45_000,
     title: "Matrix block streaming preserves completed quiet preview blocks",
+    topology: MATRIX_QA_BLOCK_ROOM_TOPOLOGY,
     configOverrides: {
+      agentDefaults: {
+        blockStreamingChunk: {
+          breakPreference: "newline",
+          maxChars: 48,
+          minChars: 1,
+        },
+        blockStreamingCoalesce: {
+          idleMs: 0,
+          maxChars: 48,
+          minChars: 1,
+        },
+      },
       blockStreaming: true,
       streaming: "quiet",
     },
@@ -228,6 +262,7 @@ export const MATRIX_QA_SCENARIOS: MatrixQaScenarioDefinition[] = [
     standardId: "restart-resume",
     timeoutMs: 60_000,
     title: "Matrix lane resumes cleanly after gateway restart",
+    topology: MATRIX_QA_RESTART_ROOM_TOPOLOGY,
   },
   {
     id: "matrix-room-membership-loss",
@@ -239,6 +274,7 @@ export const MATRIX_QA_SCENARIOS: MatrixQaScenarioDefinition[] = [
     id: "matrix-homeserver-restart-resume",
     timeoutMs: 75_000,
     title: "Matrix lane resumes after homeserver restart",
+    topology: MATRIX_QA_HOMESERVER_ROOM_TOPOLOGY,
   },
   {
     id: "matrix-mention-gating",

extensions/qa-matrix/src/runners/contract/scenario-runtime-room.ts

@@ -1,7 +1,10 @@
 import { randomUUID } from "node:crypto";
 import type { MatrixQaObservedEvent } from "../../substrate/events.js";
 import {
+  MATRIX_QA_BLOCK_ROOM_KEY,
+  MATRIX_QA_HOMESERVER_ROOM_KEY,
   MATRIX_QA_MEMBERSHIP_ROOM_KEY,
+  MATRIX_QA_RESTART_ROOM_KEY,
   resolveMatrixQaScenarioRoomId,
 } from "./scenario-catalog.js";
 import {
@@ -218,30 +221,51 @@ export async function runRoomThreadReplyOverrideScenario(context: MatrixQaScenar
 }
 
 export async function runObserverAllowlistOverrideScenario(context: MatrixQaScenarioContext) {
-  const result = await runTopLevelMentionScenario({
+  const { client, startSince } = await primeMatrixQaActorCursor({
     accessToken: context.observerAccessToken,
     actorId: "observer",
     baseUrl: context.baseUrl,
+    syncState: context.syncState,
+  });
+  const token = `MATRIX_QA_OBSERVER_ALLOWLIST_${randomUUID().slice(0, 8).toUpperCase()}`;
+  const body = buildMentionPrompt(context.sutUserId, token);
+  const driverEventId = await client.sendTextMessage({
+    body,
+    mentionUserIds: [context.sutUserId],
+    roomId: context.roomId,
+  });
+  const matched = await client.waitForRoomEvent({
     observedEvents: context.observedEvents,
+    predicate: (event) =>
+      event.roomId === context.roomId &&
+      event.sender === context.sutUserId &&
+      event.type === "m.room.message" &&
+      event.relatesTo === undefined &&
+      typeof event.body === "string" &&
+      event.body.trim().length > 0,
     roomId: context.roomId,
-    syncState: context.syncState,
-    sutUserId: context.sutUserId,
+    since: startSince,
     timeoutMs: context.timeoutMs,
-    tokenPrefix: "MATRIX_QA_OBSERVER_ALLOWLIST",
   });
-  assertTopLevelReplyArtifact("observer allowlist override reply", result.reply);
+  advanceMatrixQaActorCursor({
+    actorId: "observer",
+    syncState: context.syncState,
+    nextSince: matched.since,
+    startSince,
+  });
+  const reply = buildMatrixReplyArtifact(matched.event, token);
   return {
     artifacts: {
       actorUserId: context.observerUserId,
-      driverEventId: result.driverEventId,
-      reply: result.reply,
-      token: result.token,
-      triggerBody: result.body,
+      driverEventId,
+      reply,
+      token,
+      triggerBody: body,
     },
     details: [
       `trigger sender: ${context.observerUserId}`,
-      `driver event: ${result.driverEventId}`,
-      ...buildMatrixReplyDetails("reply", result.reply),
+      `driver event: ${driverEventId}`,
+      ...buildMatrixReplyDetails("reply", reply),
     ].join("\n"),
   } satisfies MatrixQaScenarioExecution;
 }
@@ -312,6 +336,7 @@ export async function runQuietStreamingPreviewScenario(context: MatrixQaScenario
 }
 
 export async function runBlockStreamingScenario(context: MatrixQaScenarioContext) {
+  const roomId = resolveMatrixQaScenarioRoomId(context, MATRIX_QA_BLOCK_ROOM_KEY);
   const { client, startSince } = await primeMatrixQaActorCursor({
     accessToken: context.driverAccessToken,
     actorId: "driver",
@@ -324,27 +349,28 @@ export async function runBlockStreamingScenario(context: MatrixQaScenarioContext
   const driverEventId = await client.sendTextMessage({
     body: triggerBody,
     mentionUserIds: [context.sutUserId],
-    roomId: context.roomId,
+    roomId,
   });
   const firstBlock = await client.waitForRoomEvent({
     observedEvents: context.observedEvents,
     predicate: (event) =>
-      event.roomId === context.roomId &&
+      event.roomId === roomId &&
       event.sender === context.sutUserId &&
       isMatrixQaMessageLikeKind(event.kind) &&
-      event.body === firstText,
-    roomId: context.roomId,
+      (event.body ?? "").includes(firstText) &&
+      !(event.body ?? "").includes(secondText),
+    roomId,
     since: startSince,
     timeoutMs: context.timeoutMs,
   });
   const secondBlock = await client.waitForRoomEvent({
     observedEvents: context.observedEvents,
     predicate: (event) =>
-      event.roomId === context.roomId &&
+      event.roomId === roomId &&
       event.sender === context.sutUserId &&
       isMatrixQaMessageLikeKind(event.kind) &&
-      event.body === secondText,
-    roomId: context.roomId,
+      (event.body ?? "").includes(secondText),
+    roomId,
     since: firstBlock.since,
     timeoutMs: context.timeoutMs,
   });
@@ -364,10 +390,12 @@ export async function runBlockStreamingScenario(context: MatrixQaScenarioContext
       blockEventIds: [firstBlock.event.eventId, secondBlock.event.eventId],
       driverEventId,
       reply: buildMatrixReplyArtifact(secondBlock.event, secondText),
+      roomId,
       token: secondText,
       triggerBody,
     },
     details: [
+      `room id: ${roomId}`,
       `driver event: ${driverEventId}`,
       `block one event: ${firstBlock.event.eventId}`,
       `block two event: ${secondBlock.event.eventId}`,
@@ -592,12 +620,13 @@ export async function runHomeserverRestartResumeScenario(context: MatrixQaScenar
   if (!context.interruptTransport) {
     throw new Error("Matrix homeserver restart scenario requires a transport interruption hook");
   }
+  const roomId = resolveMatrixQaScenarioRoomId(context, MATRIX_QA_HOMESERVER_ROOM_KEY);
   await context.interruptTransport();
   const resumed = await runDriverTopLevelMentionScenario({
     baseUrl: context.baseUrl,
     driverAccessToken: context.driverAccessToken,
     observedEvents: context.observedEvents,
-    roomId: context.roomId,
+    roomId,
     syncState: context.syncState,
     sutUserId: context.sutUserId,
     timeoutMs: context.timeoutMs,
@@ -608,10 +637,12 @@ export async function runHomeserverRestartResumeScenario(context: MatrixQaScenar
     artifacts: {
       driverEventId: resumed.driverEventId,
       reply: resumed.reply,
+      roomId,
       token: resumed.token,
       transportInterruption: "homeserver-restart",
     },
     details: [
+      `room id: ${roomId}`,
       "transport interruption: homeserver-restart",
       `driver event: ${resumed.driverEventId}`,
       ...buildMatrixReplyDetails("reply", resumed.reply),
@@ -623,12 +654,13 @@ export async function runRestartResumeScenario(context: MatrixQaScenarioContext)
   if (!context.restartGateway) {
     throw new Error("Matrix restart scenario requires a gateway restart callback");
   }
+  const roomId = resolveMatrixQaScenarioRoomId(context, MATRIX_QA_RESTART_ROOM_KEY);
   await context.restartGateway();
   const result = await runDriverTopLevelMentionScenario({
     baseUrl: context.baseUrl,
     driverAccessToken: context.driverAccessToken,
     observedEvents: context.observedEvents,
-    roomId: context.roomId,
+    roomId,
     syncState: context.syncState,
     sutUserId: context.sutUserId,
     timeoutMs: context.timeoutMs,
@@ -640,9 +672,11 @@ export async function runRestartResumeScenario(context: MatrixQaScenarioContext)
       driverEventId: result.driverEventId,
       reply: result.reply,
       restartSignal: "SIGUSR1",
+      roomId,
       token: result.token,
     },
     details: [
+      `room id: ${roomId}`,
       "restart signal: SIGUSR1",
       `post-restart driver event: ${result.driverEventId}`,
       ...buildMatrixReplyDetails("reply", result.reply),

extensions/qa-matrix/src/runners/contract/scenario-types.ts

@@ -26,6 +26,7 @@ export type MatrixQaScenarioArtifacts = {
   recoveredDriverEventId?: string;
   recoveredReply?: MatrixQaReplyArtifact;
   roomKey?: string;
+  roomId?: string;
   restartSignal?: string;
   rootEventId?: string;
   threadDriverEventId?: string;

extensions/qa-matrix/src/runners/contract/scenarios.test.ts

@@ -336,10 +336,7 @@ describe("matrix live qa scenarios", () => {
         eventId: "$sut-reply",
         sender: "@sut:matrix-qa.test",
         type: "m.room.message",
-        body: String(sendTextMessage.mock.calls[0]?.[0]?.body).replace(
-          "@sut:matrix-qa.test reply with only this exact marker: ",
-          "",
-        ),
+        body: "observer sender accepted",
       },
       since: "observer-sync-next",
     }));
@@ -380,6 +377,9 @@ describe("matrix live qa scenarios", () => {
       artifacts: {
         actorUserId: "@observer:matrix-qa.test",
         driverEventId: "$observer-allow-trigger",
+        reply: {
+          tokenMatched: false,
+        },
       },
     });
 
@@ -707,7 +707,21 @@ describe("matrix live qa scenarios", () => {
         topology: {
           defaultRoomId: "!main:matrix-qa.test",
           defaultRoomKey: "main",
-          rooms: [],
+          rooms: [
+            {
+              key: "block",
+              kind: "group",
+              memberRoles: ["driver", "observer", "sut"],
+              memberUserIds: [
+                "@driver:matrix-qa.test",
+                "@observer:matrix-qa.test",
+                "@sut:matrix-qa.test",
+              ],
+              name: "Block",
+              requireMention: true,
+              roomId: "!block:matrix-qa.test",
+            },
+          ],
         },
       }),
     ).resolves.toMatchObject({
@@ -720,7 +734,7 @@ describe("matrix live qa scenarios", () => {
     expect(sendTextMessage).toHaveBeenCalledWith({
       body: expect.stringContaining("Matrix block streaming QA check"),
       mentionUserIds: ["@sut:matrix-qa.test"],
-      roomId: "!main:matrix-qa.test",
+      roomId: "!block:matrix-qa.test",
     });
     expect(waitForRoomEvent).toHaveBeenNthCalledWith(
       2,