Auto-merge upstream openclaw/openclaw

Author: friuns2

CHANGELOG.md

@@ -2,7 +2,15 @@
 
 Docs: https://docs.openclaw.ai
 
-## 2026.4.12
+## Unreleased
+
+### Changes
+
+### Fixes
+
+- Gateway/startup: defer scheduled services until sidecars finish, gate chat history and model listing during sidecar resume, and let Control UI retry startup-gated history loads so Sandbox wake resumes channels first. (#65365) Thanks @lml2468.
+
+## 2026.4.12-beta.1
 
 ### Changes
 
@@ -55,6 +63,7 @@ Docs: https://docs.openclaw.ai
 - WhatsApp: centralize per-account connection ownership so reconnects, login recovery, and outbound readiness stay attached to the live socket instead of drifting across monitor and login paths. (#65290) Thanks @mcaxtr and @vincentkoc.
 - iMessage: retry transient `watch.subscribe` startup failures before tearing down the monitor, and sanitize startup error logging so brief local transport stalls do not immediately bounce the channel or leak raw imsg RPC payloads into logs. (#65393) Thanks @vincentkoc.
 - CLI/audio providers: report env-authenticated providers as configured in `openclaw infer audio providers --json`, while keeping trusted workspace provider env lookup defaults stable during auth setup. (#65491)
+- Plugins/install: reinstall bundled runtime packages when the matching platform native optional child is missing, so packaged Windows installs can recover dependencies that were packed on another host OS.
 
 ## 2026.4.11
 

apps/android/app/build.gradle.kts

@@ -65,8 +65,8 @@ android {
         applicationId = "ai.openclaw.app"
         minSdk = 31
         targetSdk = 36
-        versionCode = 2026041101
-        versionName = "2026.4.12"
+        versionCode = 2026041201
+        versionName = "2026.4.12-beta.1"
         ndk {
             // Support all major ABIs — native libs are tiny (~47 KB per ABI)
             abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")

apps/macos/Sources/OpenClaw/Resources/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2026.4.12</string>
+    <string>2026.4.12-beta.1</string>
     <key>CFBundleVersion</key>
-    <string>2026041101</string>
+    <string>2026041201</string>
     <key>CFBundleIconFile</key>
     <string>OpenClaw</string>
     <key>CFBundleURLTypes</key>

extensions/active-memory/index.ts

@@ -1199,7 +1199,7 @@ async function readActiveMemorySearchDebug(
         continue;
       }
       const details = asRecord(message.details);
-      const debug = asRecord(details?.debug);
+      const debug = asRecord(details?.debug) ?? {};
       const warning = normalizeOptionalString(details?.warning);
       const action = normalizeOptionalString(details?.action);
       const error = normalizeOptionalString(details?.error);

extensions/memory-core/src/dreaming-phases.test.ts

@@ -497,14 +497,10 @@ describe("memory-core dreaming phases", () => {
     const readSpy = vi.spyOn(fs, "readFile");
     let transcriptReadCount = 0;
     try {
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
+      await withDreamingTestClock(async () => {
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 5);
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 6);
+      });
     } finally {
       transcriptReadCount = readSpy.mock.calls.filter(
         ([target]) => typeof target === "string" && target === transcriptPath,
@@ -779,10 +775,9 @@ describe("memory-core dreaming phases", () => {
     );
 
     try {
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
+      await withDreamingTestClock(async () => {
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 5);
+      });
 
       const resetPath = path.join(
         sessionsDir,
@@ -816,10 +811,9 @@ describe("memory-core dreaming phases", () => {
       await fs.utimes(transcriptPath, dayTwo, dayTwo);
       await fs.utimes(resetPath, dayTwo, dayTwo);
 
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
+      await withDreamingTestClock(async () => {
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 910);
+      });
     } finally {
       vi.unstubAllEnvs();
     }
@@ -985,18 +979,11 @@ describe("memory-core dreaming phases", () => {
     );
 
     try {
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
+      await withDreamingTestClock(async () => {
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 5);
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 6);
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 7);
+      });
     } finally {
       vi.unstubAllEnvs();
     }
@@ -1073,10 +1060,9 @@ describe("memory-core dreaming phases", () => {
     );
 
     try {
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
+      await withDreamingTestClock(async () => {
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 5);
+      });
 
       await fs.writeFile(
         transcriptPath,
@@ -1095,10 +1081,9 @@ describe("memory-core dreaming phases", () => {
       const dayTwo = new Date("2026-04-06T01:05:00.000Z");
       await fs.utimes(transcriptPath, dayTwo, dayTwo);
 
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
+      await withDreamingTestClock(async () => {
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 910);
+      });
     } finally {
       vi.unstubAllEnvs();
     }
@@ -1175,10 +1160,9 @@ describe("memory-core dreaming phases", () => {
     );
 
     try {
-      await beforeAgentReply(
-        { cleanedBody: "__openclaw_memory_core_light_sleep__" },
-        { trigger: "heartbeat", workspaceDir },
-      );
+      await withDreamingTestClock(async () => {
+        await triggerLightDreaming(beforeAgentReply, workspaceDir, 5);
+      });
     } finally {
       vi.unstubAllEnvs();
     }
@@ -1469,10 +1453,13 @@ describe("memory-core dreaming phases", () => {
     await withDreamingTestClock(async () => {
       await triggerLightDreaming(beforeAgentReply, workspaceDir, 5);
     });
-    await beforeAgentReply(
-      { cleanedBody: "__openclaw_memory_core_rem_sleep__" },
-      { trigger: "heartbeat", workspaceDir },
-    );
+    await withDreamingTestClock(async () => {
+      setDreamingTestTime(10);
+      await beforeAgentReply(
+        { cleanedBody: "__openclaw_memory_core_rem_sleep__" },
+        { trigger: "heartbeat", workspaceDir },
+      );
+    });
 
     const reinforced = await rankShortTermPromotionCandidates({
       workspaceDir,

extensions/openshell/src/backend.e2e.test.ts

@@ -52,7 +52,7 @@ async function runCommand(params: {
   args: string[];
   cwd?: string;
   env?: NodeJS.ProcessEnv;
-  stdin?: string | Buffer;
+  stdin?: string | Uint8Array;
   allowFailure?: boolean;
   timeoutMs?: number;
 }): Promise<ExecResult> {
@@ -117,7 +117,21 @@ async function commandAvailable(command: string): Promise<boolean> {
       allowFailure: true,
       timeoutMs: 20_000,
     });
-    return result.code === 0 || result.stdout.length > 0 || result.stderr.length > 0;
+    return result.code === 0;
+  } catch {
+    return false;
+  }
+}
+
+async function openshellGatewayAvailable(command: string): Promise<boolean> {
+  try {
+    const result = await runCommand({
+      command,
+      args: ["gateway", "start", "--help"],
+      allowFailure: true,
+      timeoutMs: 20_000,
+    });
+    return result.code === 0 && `${result.stdout}\n${result.stderr}`.includes("--name");
   } catch {
     return false;
   }
@@ -338,6 +352,9 @@ describe("openshell sandbox backend e2e", () => {
       if (!(await commandAvailable(OPENCLAW_OPENSHELL_COMMAND))) {
         return;
       }
+      if (!(await openshellGatewayAvailable(OPENCLAW_OPENSHELL_COMMAND))) {
+        return;
+      }
 
       const rootDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-openshell-e2e-"));
       const env = openshellEnv(rootDir);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw",
-  "version": "2026.4.12",
+  "version": "2026.4.12-beta.1",
   "description": "Multi-channel AI gateway with extensible messaging integrations",
   "keywords": [],
   "homepage": "https://github.com/openclaw/openclaw#readme",
@@ -1279,7 +1279,7 @@
     "test:docker:plugins": "bash scripts/e2e/plugins-docker.sh",
     "test:docker:qr": "bash scripts/e2e/qr-import-docker.sh",
     "test:e2e": "node scripts/run-vitest.mjs run --config test/vitest/vitest.e2e.config.ts",
-    "test:e2e:openshell": "OPENCLAW_E2E_OPENSHELL=1 node scripts/run-vitest.mjs run --config test/vitest/vitest.e2e.config.ts test/openshell-sandbox.e2e.test.ts",
+    "test:e2e:openshell": "OPENCLAW_E2E_OPENSHELL=1 node scripts/run-vitest.mjs run --config test/vitest/vitest.e2e.config.ts extensions/openshell/src/backend.e2e.test.ts",
     "test:extension": "node scripts/test-extension.mjs",
     "test:extensions": "node scripts/run-vitest.mjs run --config test/vitest/vitest.extensions.config.ts",
     "test:extensions:batch": "node scripts/test-extension-batch.mjs",

scripts/e2e/parallels-windows-smoke.sh

@@ -43,7 +43,8 @@ TIMEOUT_INSTALL_S=1200
 TIMEOUT_VERIFY_S=120
 TIMEOUT_ONBOARD_S=240
 TIMEOUT_ONBOARD_PHASE_S=$((TIMEOUT_ONBOARD_S + 60))
-TIMEOUT_GATEWAY_S=120
+# verify_gateway_reachable runs six 30s probes plus short retry sleeps.
+TIMEOUT_GATEWAY_S=240
 TIMEOUT_AGENT_S=180
 
 FRESH_MAIN_STATUS="skip"
@@ -1900,7 +1901,7 @@ try {
   Write-ProgressLog 'install.download-tgz'
   Invoke-Logged 'download current tgz' { curl.exe -fsSL $TgzUrl -o $tgz }
   Write-ProgressLog 'install.install-tgz'
-  Invoke-Logged 'npm install current tgz' { npm.cmd install -g $tgz --no-fund --no-audit }
+  Invoke-Logged 'npm install current tgz' { npm.cmd install -g $tgz --omit=dev --no-fund --no-audit }
   $openclaw = Join-Path $env:APPDATA 'npm\openclaw.cmd'
   Write-ProgressLog 'install.verify-version'
   Invoke-Logged 'openclaw --version' { & $openclaw --version }

scripts/postinstall-bundled-plugins.mjs

@@ -26,6 +26,54 @@ function dependencySentinelPath(depName) {
   return join("node_modules", ...depName.split("/"), "package.json");
 }
 
+const KNOWN_NATIVE_PLATFORMS = new Set([
+  "aix",
+  "android",
+  "darwin",
+  "freebsd",
+  "linux",
+  "openbsd",
+  "sunos",
+  "win32",
+]);
+const KNOWN_NATIVE_ARCHES = new Set(["arm", "arm64", "ia32", "ppc64", "riscv64", "s390x", "x64"]);
+
+function packageNameTokens(name) {
+  return name
+    .toLowerCase()
+    .split(/[/@._-]+/u)
+    .filter(Boolean);
+}
+
+function optionalDependencyTargetsRuntime(name, params = {}) {
+  const platform = params.platform ?? process.platform;
+  const arch = params.arch ?? process.arch;
+  const tokens = new Set(packageNameTokens(name));
+  const hasNativePlatformToken = [...tokens].some((token) => KNOWN_NATIVE_PLATFORMS.has(token));
+  const hasNativeArchToken = [...tokens].some((token) => KNOWN_NATIVE_ARCHES.has(token));
+  return hasNativePlatformToken && hasNativeArchToken && tokens.has(platform) && tokens.has(arch);
+}
+
+function runtimeDepNeedsInstall(params) {
+  const packageJsonPath = join(params.packageRoot, params.dep.sentinelPath);
+  if (!params.existsSync(packageJsonPath)) {
+    return true;
+  }
+
+  try {
+    const packageJson = params.readJson(packageJsonPath);
+    return Object.keys(packageJson.optionalDependencies ?? {}).some(
+      (childName) =>
+        optionalDependencyTargetsRuntime(childName, {
+          arch: params.arch,
+          platform: params.platform,
+        }) && !params.existsSync(join(params.packageRoot, dependencySentinelPath(childName))),
+    );
+  } catch {
+    return true;
+  }
+}
+
 function collectRuntimeDeps(packageJson) {
   return {
     ...packageJson.dependencies,
@@ -184,7 +232,16 @@ export function runBundledPluginPostinstall(params = {}) {
     params.runtimeDeps ??
     discoverBundledPluginRuntimeDeps({ extensionsDir, existsSync: pathExists });
   const missingSpecs = runtimeDeps
-    .filter((dep) => !pathExists(join(packageRoot, dep.sentinelPath)))
+    .filter((dep) =>
+      runtimeDepNeedsInstall({
+        dep,
+        existsSync: pathExists,
+        packageRoot,
+        arch: params.arch,
+        platform: params.platform,
+        readJson: params.readJson ?? readJson,
+      }),
+    )
     .map((dep) => `${dep.name}@${dep.version}`);
 
   if (missingSpecs.length === 0) {
@@ -201,7 +258,14 @@ export function runBundledPluginPostinstall(params = {}) {
         existsSync: pathExists,
         platform: params.platform,
         comSpec: params.comSpec,
-        npmArgs: ["install", "--omit=dev", "--no-save", "--package-lock=false", ...missingSpecs],
+        npmArgs: [
+          "install",
+          "--omit=dev",
+          "--no-save",
+          "--package-lock=false",
+          "--legacy-peer-deps",
+          ...missingSpecs,
+        ],
       });
     const result = spawn(npmRunner.command, npmRunner.args, {
       cwd: packageRoot,

src/agents/auth-profiles.markauthprofilefailure.test.ts

@@ -14,10 +14,9 @@ vi.mock("../plugins/provider-runtime.js", () => ({
 
 import {
   clearRuntimeAuthProfileStoreSnapshots,
-  calculateAuthProfileCooldownMs,
   ensureAuthProfileStore,
-  markAuthProfileFailure,
-} from "./auth-profiles.js";
+} from "./auth-profiles/store.js";
+import { calculateAuthProfileCooldownMs, markAuthProfileFailure } from "./auth-profiles/usage.js";
 
 type AuthProfileStore = ReturnType<typeof ensureAuthProfileStore>;