Auto-merge upstream openclaw/openclaw

Author: friuns2

CHANGELOG.md

@@ -90,6 +90,7 @@ Docs: https://docs.openclaw.ai
 - iMessage (imsg): strip an accidental protobuf length-delimited UTF-8 field wrapper from inbound `text` and `reply_to_text` when it fully consumes the field, fixing leading garbage before the real message. (#63868) Thanks @neeravmakwana.
 - Gateway/pairing: fail closed for paired device records that have no device tokens, and reject pairing approvals whose requested scopes do not match the requested device roles.
 - ACP/gateway chat: classify lifecycle errors before forwarding them to ACP clients so refusals use ACP's refusal stop reason while transient backend errors continue to finish as normal turns.
+- Agents/BTW: strip replayed tool blocks, hidden reasoning, and malformed image payloads from `/btw` side-question context so Bedrock no-tools side questions keep working after tool-use turns. (#64225) Thanks @ngutman.
 - Commands/btw: keep tool-less side questions from sending injected empty `tools` arrays on strict OpenAI-compatible providers, so `/btw` continues working after prior tool-call history. (#64219) Thanks @ngutman.
 - Agents/Bedrock: let `/btw` side questions use `auth: "aws-sdk"` without a static API key so Bedrock IAM and instance-role sessions stop failing before the side question runs. (#64218) Thanks @SnowSky1.
 

extensions/browser/src/browser/client-fetch.ts

@@ -1,3 +1,4 @@
+import { fetchWithSsrFGuard } from "openclaw/plugin-sdk/ssrf-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/text-runtime";
 import { formatCliCommand } from "../cli/command-format.js";
@@ -183,8 +184,17 @@ async function fetchHttpJson<T>(
   }
 
   const t = setTimeout(() => ctrl.abort(new Error("timed out")), timeoutMs);
+  let release: (() => Promise<void>) | undefined;
   try {
-    const res = await fetch(url, { ...init, signal: ctrl.signal });
+    const guarded = await fetchWithSsrFGuard({
+      url,
+      init,
+      signal: ctrl.signal,
+      policy: { allowPrivateNetwork: true },
+      auditContext: "browser-control-client",
+    });
+    release = guarded.release;
+    const res = guarded.response;
     if (!res.ok) {
       if (isRateLimitStatus(res.status)) {
         // Do not reflect upstream response text into the error surface (log/agent injection risk)
@@ -199,6 +209,7 @@ async function fetchHttpJson<T>(
     return (await res.json()) as T;
   } finally {
     clearTimeout(t);
+    await release?.();
     if (upstreamSignal && upstreamAbortListener) {
       upstreamSignal.removeEventListener("abort", upstreamAbortListener);
     }

extensions/nostr/src/nostr-profile-http.test.ts

@@ -90,10 +90,12 @@ function createMockResponse(): ServerResponse & {
   _getData: () => string;
   _getStatusCode: () => number;
 } {
-  const res = new ServerResponse({} as IncomingMessage);
-
   let data = "";
   let statusCode = 200;
+  const res = Object.assign(new ServerResponse({} as IncomingMessage), {
+    _getData: () => data,
+    _getStatusCode: () => statusCode,
+  });
 
   res.write = function (chunk: unknown) {
     data += String(chunk);
@@ -114,9 +116,6 @@ function createMockResponse(): ServerResponse & {
     },
   });
 
-  res._getData = () => data;
-  res._getStatusCode = () => statusCode;
-
   return res;
 }
 

extensions/tlon/src/monitor/index.ts

@@ -566,12 +566,10 @@ export async function monitorTlonProvider(opts: MonitorTlonOpts = {}): Promise<v
               metadata?: { model?: string };
               model?: string;
             };
-            const extRoute = route;
             const defaultModel = cfg.agents?.defaults?.model;
             const modelInfo =
               extPayload.metadata?.model ||
               extPayload.model ||
-              extRoute.model ||
               (typeof defaultModel === "string" ? defaultModel : defaultModel?.primary);
             replyText = `${replyText}\n\n_[Generated by ${formatModelName(modelInfo)}]_`;
           }

scripts/test-projects.mjs

@@ -6,8 +6,8 @@ import {
   buildFullSuiteVitestRunPlans,
   createVitestRunSpecs,
   parseTestProjectsArgs,
+  resolveParallelFullSuiteConcurrency,
   resolveChangedTargetArgs,
-  shouldUseLocalFullSuiteParallelByDefault,
   writeVitestIncludeFile,
 } from "./test-projects.test-support.mjs";
 import {
@@ -116,29 +116,17 @@ function runVitestSpec(spec) {
   });
 }
 
-function parsePositiveInt(value) {
-  const parsed = Number.parseInt(value ?? "", 10);
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
-}
-
-function resolveParallelFullSuiteConcurrency(specCount, env) {
-  const override = parsePositiveInt(env.OPENCLAW_TEST_PROJECTS_PARALLEL);
-  if (override !== null) {
-    return Math.min(override, specCount);
-  }
-  if (env.OPENCLAW_TEST_PROJECTS_SERIAL === "1") {
-    return 1;
+function applyDefaultParallelVitestWorkerBudget(specs, env) {
+  if (env.OPENCLAW_VITEST_MAX_WORKERS || env.OPENCLAW_TEST_WORKERS) {
+    return specs;
   }
-  if (env.CI === "true" || env.GITHUB_ACTIONS === "true") {
-    return 1;
-  }
-  if (
-    env.OPENCLAW_TEST_PROJECTS_LEAF_SHARDS !== "1" &&
-    !shouldUseLocalFullSuiteParallelByDefault(env)
-  ) {
-    return 1;
-  }
-  return 1;
+  return specs.map((spec) => ({
+    ...spec,
+    env: {
+      ...spec.env,
+      OPENCLAW_VITEST_MAX_WORKERS: "2",
+    },
+  }));
 }
 
 function orderFullSuiteSpecsForParallelRun(specs) {
@@ -218,7 +206,10 @@ async function main() {
   if (isFullSuiteRun) {
     const concurrency = resolveParallelFullSuiteConcurrency(runSpecs.length, process.env);
     if (concurrency > 1) {
-      const parallelSpecs = orderFullSuiteSpecsForParallelRun(runSpecs);
+      const parallelSpecs = applyDefaultParallelVitestWorkerBudget(
+        orderFullSuiteSpecsForParallelRun(runSpecs),
+        process.env,
+      );
       console.error(
         `[test] running ${parallelSpecs.length} Vitest shards with parallelism ${concurrency}`,
       );

scripts/test-projects.test-support.mjs

@@ -649,6 +649,37 @@ export function shouldUseLocalFullSuiteParallelByDefault(env = process.env) {
   );
 }
 
+function parsePositiveInt(value) {
+  const parsed = Number.parseInt(value ?? "", 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
+}
+
+export function resolveParallelFullSuiteConcurrency(specCount, env = process.env) {
+  const override = parsePositiveInt(env.OPENCLAW_TEST_PROJECTS_PARALLEL);
+  if (override !== null) {
+    return Math.min(override, specCount);
+  }
+  if (env.OPENCLAW_TEST_PROJECTS_SERIAL === "1") {
+    return 1;
+  }
+  if (env.CI === "true" || env.GITHUB_ACTIONS === "true") {
+    return 1;
+  }
+  const workerBudget = parsePositiveInt(
+    env.OPENCLAW_VITEST_MAX_WORKERS ?? env.OPENCLAW_TEST_WORKERS,
+  );
+  if (workerBudget !== null && workerBudget <= 1) {
+    return 1;
+  }
+  if (
+    env.OPENCLAW_TEST_PROJECTS_LEAF_SHARDS !== "1" &&
+    !shouldUseLocalFullSuiteParallelByDefault(env)
+  ) {
+    return 1;
+  }
+  return Math.min(10, specCount);
+}
+
 export function createVitestRunSpecs(args, params = {}) {
   const cwd = params.cwd ?? process.cwd();
   const plans = buildVitestRunPlans(args, cwd);