Auto-merge upstream openclaw/openclaw

Author: friuns2

CHANGELOG.md

@@ -29,6 +29,8 @@ Docs: https://docs.openclaw.ai
 - Outbound/delivery-queue: persist the originating outbound `session` context on queued delivery entries and replay it during recovery, so write-ahead-queued sends keep their original outbound media policy context after restart instead of evaluating against a missing session. (#66025) Thanks @eleqtrizit.
 - Auto-reply/queue: split collect-mode followup drains into contiguous groups by per-message authorization context (sender id, owner status, exec/bash-elevated overrides), so queued items from different senders or exec configs no longer execute under the last queued run's owner-only and exec-approval context. (#66024) Thanks @eleqtrizit.
 - Dreaming/memory-core: require a live queued Dreaming cron event before the heartbeat hook runs the sweep, so managed Dreaming no longer replays on later heartbeats after the scheduled run was already consumed. (#66139) Thanks @mbelinky.
+- Control UI/Dreaming: stop Imported Insights and Memory Palace from calling optional `memory-wiki` gateway methods when the plugin is off, and refresh config before wiki reloads so the Dreaming tab stops showing misleading unknown-method failures. (#66140) Thanks @mbelinky.
+- Agents/tools: only mark streamed unknown-tool retries as counted when a streamed message actually classifies an unavailable tool, and keep incomplete streamed tool names from resetting the retry streak before the final assistant message arrives. (#66145) Thanks @dutifulbob.
 
 ## 2026.4.12
 
@@ -270,6 +272,7 @@ Docs: https://docs.openclaw.ai
 - Daemon/launchd: keep `openclaw gateway stop` persistent without uninstalling the macOS LaunchAgent, re-enable it on explicit restart or repair, and harden launchd label handling. (#64447) Thanks @ngutman.
 - Plugins/context engines: preserve `plugins.slots.contextEngine` through normalization and keep explicitly selected workspace context-engine plugins enabled, so loader diagnostics and plugin activation stop dropping that slot selection. (#64192) Thanks @hclsys.
 - Heartbeat: stop top-level `interval:` and `prompt:` fields outside the `tasks:` block from bleeding into the last parsed heartbeat task. (#64488) Thanks @Rahulkumar070.
+- Slack/plugin commands: include plugin-registered slash commands in Slack native command registration when Slack native commands are enabled. (#64578) Thanks @rafaelreis-r.
 - Agents/OpenAI replay: preserve malformed function-call arguments in stored assistant history, avoid double-encoding preserved raw strings on replay, and coerce replayed string args back to objects at Anthropic and Google provider boundaries. (#61956) Thanks @100yenadmin.
 - Heartbeat/config: accept and honor `agents.defaults.heartbeat.timeoutSeconds` and per-agent heartbeat timeout overrides for heartbeat agent turns. (#64491) Thanks @cedillarack.
 - CLI/devices: make implicit `openclaw devices approve` selection preview-only and require approving the exact request ID, preventing latest-request races during device pairing. (#64160) Thanks @coygeek.

docs/.generated/plugin-sdk-api-baseline.sha256

@@ -1,2 +1,2 @@
-600f05b14825fa01eb9d63ab6cab5f33c74ff44a48cab5c65457ab08e5b0e91a  plugin-sdk-api-baseline.json
-99d649a86a30756b18b91686f3683e6e829c5e316e1370266ec4fee344bc55cb  plugin-sdk-api-baseline.jsonl
+42a93d8368fd40f6bbe3045ba89b84a28e1131c700d4e57580febd3e773b23a4  plugin-sdk-api-baseline.json
+515333c277b725abaccf4fd5ab8c5e58b2de39b26e1fe4738f31852fcf789c96  plugin-sdk-api-baseline.jsonl

extensions/slack/src/monitor/slash.ts

@@ -3,6 +3,7 @@ import { createChannelReplyPipeline } from "openclaw/plugin-sdk/channel-reply-pi
 import {
   resolveCommandAuthorizedFromAuthorizers,
   resolveNativeCommandSessionTargets,
+  listProviderPluginCommandSpecs,
 } from "openclaw/plugin-sdk/command-auth";
 import { type ChatCommandDefinition, type CommandArgs } from "openclaw/plugin-sdk/command-auth";
 import {
@@ -670,6 +671,17 @@ export async function registerSlackMonitorSlashCommands(params: {
       skillCommands,
       provider: "slack",
     });
+    const existingNativeNames = new Set(
+      nativeCommands.map((c) => normalizeLowercaseStringOrEmpty(c.name)).filter(Boolean),
+    );
+    for (const pluginCommand of listProviderPluginCommandSpecs("slack")) {
+      const normalizedName = normalizeLowercaseStringOrEmpty(pluginCommand.name);
+      if (!normalizedName || existingNativeNames.has(normalizedName)) {
+        continue;
+      }
+      existingNativeNames.add(normalizedName);
+      nativeCommands.push(pluginCommand);
+    }
   }
 
   if (nativeCommands.length > 0) {

src/agents/agent-command.live-model-switch.test.ts

@@ -4,6 +4,7 @@ import { LiveSessionModelSwitchError } from "./live-model-switch.js";
 const state = vi.hoisted(() => ({
   runWithModelFallbackMock: vi.fn(),
   runAgentAttemptMock: vi.fn(),
+  resolveEffectiveModelFallbacksMock: vi.fn().mockReturnValue(undefined),
   emitAgentEventMock: vi.fn(),
   registerAgentRunContextMock: vi.fn(),
   clearAgentRunContextMock: vi.fn(),
@@ -15,7 +16,7 @@ vi.mock("./model-fallback.js", () => ({
   runWithModelFallback: (params: unknown) => state.runWithModelFallbackMock(params),
 }));
 
-vi.mock("./command/attempt-execution.js", () => ({
+vi.mock("./command/attempt-execution.runtime.js", () => ({
   buildAcpResult: vi.fn(),
   createAcpVisibleTextAccumulator: vi.fn(),
   emitAcpAssistantDelta: vi.fn(),
@@ -29,7 +30,7 @@ vi.mock("./command/attempt-execution.js", () => ({
   sessionFileHasContent: vi.fn(async () => false),
 }));
 
-vi.mock("./command/delivery.js", () => ({
+vi.mock("./command/delivery.runtime.js", () => ({
   deliverAgentCommandResult: (...args: unknown[]) => state.deliverAgentCommandResultMock(...args),
 }));
 
@@ -47,7 +48,7 @@ vi.mock("./command/run-context.js", () => ({
   }),
 }));
 
-vi.mock("./command/session-store.js", () => ({
+vi.mock("./command/session-store.runtime.js", () => ({
   updateSessionStoreAfterAgentRun: (...args: unknown[]) =>
     state.updateSessionStoreAfterAgentRunMock(...args),
 }));
@@ -107,7 +108,7 @@ vi.mock("../cli/deps.js", () => ({
   createDefaultDeps: () => ({}),
 }));
 
-vi.mock("../config/config.js", () => ({
+vi.mock("../config/io.js", () => ({
   loadConfig: () => ({
     agents: {
       defaults: {
@@ -122,6 +123,9 @@ vi.mock("../config/config.js", () => ({
   readConfigFileSnapshotForWrite: async () => ({
     snapshot: { valid: false },
   }),
+}));
+
+vi.mock("../config/runtime-snapshot.js", () => ({
   setRuntimeConfigSnapshot: vi.fn(),
 }));
 
@@ -136,7 +140,7 @@ vi.mock("../config/sessions.js", () => ({
   ),
 }));
 
-vi.mock("../config/sessions/transcript.js", () => ({
+vi.mock("../config/sessions/transcript-resolve.runtime.js", () => ({
   resolveSessionTranscriptFile: async () => ({
     sessionFile: "/tmp/session.jsonl",
     sessionEntry: { sessionId: "session-1", updatedAt: Date.now() },
@@ -146,6 +150,7 @@ vi.mock("../config/sessions/transcript.js", () => ({
 vi.mock("../infra/agent-events.js", () => ({
   clearAgentRunContext: (...args: unknown[]) => state.clearAgentRunContextMock(...args),
   emitAgentEvent: (...args: unknown[]) => state.emitAgentEventMock(...args),
+  onAgentEvent: vi.fn(),
   registerAgentRunContext: (...args: unknown[]) => state.registerAgentRunContextMock(...args),
 }));
 
@@ -158,12 +163,18 @@ vi.mock("../infra/skills-remote.js", () => ({
 }));
 
 vi.mock("../logging/subsystem.js", () => ({
-  createSubsystemLogger: () => ({
-    info: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-    debug: vi.fn(),
-  }),
+  createSubsystemLogger: () => {
+    const logger = {
+      info: vi.fn(),
+      warn: vi.fn(),
+      error: vi.fn(),
+      debug: vi.fn(),
+      trace: vi.fn(),
+      raw: vi.fn(),
+      child: vi.fn(() => logger),
+    };
+    return logger;
+  },
 }));
 
 vi.mock("../routing/session-key.js", () => ({
@@ -198,12 +209,11 @@ vi.mock("../utils/message-channel.js", () => ({
   resolveMessageChannel: () => "test",
 }));
 
-const resolveEffectiveModelFallbacksMock = vi.fn().mockReturnValue(undefined);
 vi.mock("./agent-scope.js", () => ({
   listAgentIds: () => ["default"],
   resolveAgentConfig: () => undefined,
   resolveAgentDir: () => "/tmp/agent",
-  resolveEffectiveModelFallbacks: resolveEffectiveModelFallbacksMock,
+  resolveEffectiveModelFallbacks: state.resolveEffectiveModelFallbacksMock,
   resolveSessionAgentId: () => "default",
   resolveAgentSkillsFilter: () => undefined,
   resolveAgentWorkspaceDir: () => "/tmp/workspace",
@@ -468,7 +478,7 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
     });
     state.runAgentAttemptMock.mockResolvedValue(makeSuccessResult("openai", "gpt-5.4"));
 
-    resolveEffectiveModelFallbacksMock.mockClear();
+    state.resolveEffectiveModelFallbacksMock.mockClear();
 
     const agentCommand = await getAgentCommand();
     await agentCommand({
@@ -477,11 +487,11 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
       senderIsOwner: true,
     });
 
-    expect(resolveEffectiveModelFallbacksMock).toHaveBeenCalledTimes(2);
-    expect(resolveEffectiveModelFallbacksMock.mock.calls[0][0]).toMatchObject({
+    expect(state.resolveEffectiveModelFallbacksMock).toHaveBeenCalledTimes(2);
+    expect(state.resolveEffectiveModelFallbacksMock.mock.calls[0][0]).toMatchObject({
       hasSessionModelOverride: false,
     });
-    expect(resolveEffectiveModelFallbacksMock.mock.calls[1][0]).toMatchObject({
+    expect(state.resolveEffectiveModelFallbacksMock.mock.calls[1][0]).toMatchObject({
       hasSessionModelOverride: true,
     });
   });
@@ -508,7 +518,7 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
     });
     state.runAgentAttemptMock.mockResolvedValue(makeSuccessResult("anthropic", "claude"));
 
-    resolveEffectiveModelFallbacksMock.mockClear();
+    state.resolveEffectiveModelFallbacksMock.mockClear();
 
     const agentCommand = await getAgentCommand();
     await agentCommand({
@@ -517,11 +527,11 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
       senderIsOwner: true,
     });
 
-    expect(resolveEffectiveModelFallbacksMock).toHaveBeenCalledTimes(2);
-    expect(resolveEffectiveModelFallbacksMock.mock.calls[0][0]).toMatchObject({
+    expect(state.resolveEffectiveModelFallbacksMock).toHaveBeenCalledTimes(2);
+    expect(state.resolveEffectiveModelFallbacksMock.mock.calls[0][0]).toMatchObject({
       hasSessionModelOverride: false,
     });
-    expect(resolveEffectiveModelFallbacksMock.mock.calls[1][0]).toMatchObject({
+    expect(state.resolveEffectiveModelFallbacksMock.mock.calls[1][0]).toMatchObject({
       hasSessionModelOverride: false,
     });
   });
@@ -546,7 +556,7 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
     });
     state.runAgentAttemptMock.mockResolvedValue(makeSuccessResult("openai", "claude"));
 
-    resolveEffectiveModelFallbacksMock.mockClear();
+    state.resolveEffectiveModelFallbacksMock.mockClear();
 
     const agentCommand = await getAgentCommand();
     await agentCommand({
@@ -555,11 +565,11 @@ describe("agentCommand – LiveSessionModelSwitchError retry", () => {
       senderIsOwner: true,
     });
 
-    expect(resolveEffectiveModelFallbacksMock).toHaveBeenCalledTimes(2);
-    expect(resolveEffectiveModelFallbacksMock.mock.calls[0][0]).toMatchObject({
+    expect(state.resolveEffectiveModelFallbacksMock).toHaveBeenCalledTimes(2);
+    expect(state.resolveEffectiveModelFallbacksMock.mock.calls[0][0]).toMatchObject({
       hasSessionModelOverride: false,
     });
-    expect(resolveEffectiveModelFallbacksMock.mock.calls[1][0]).toMatchObject({
+    expect(state.resolveEffectiveModelFallbacksMock.mock.calls[1][0]).toMatchObject({
       hasSessionModelOverride: true,
     });
   });