Auto-merge upstream openclaw/openclaw

Author: friuns2

CHANGELOG.md

@@ -8,6 +8,7 @@ Docs: https://docs.openclaw.ai
 
 - Providers/Anthropic: skip `service_tier` injection for OAuth-authenticated stream wrapper requests so Claude OAuth requests stop failing with HTTP 401. (#60356) thanks @openperf.
 - Agents/exec: preserve explicit `host=node` routing under elevated defaults when `tools.exec.host=auto`, and fail loud on invalid elevated cross-host overrides. (#61739) Thanks @obviyus.
+- Docs/i18n: remove the zh-CN homepage redirect override so Mintlify can resolve the localized Chinese homepage without self-redirecting `/zh-CN/index`.
 ## 2026.4.5
 
 ### Breaking

docs/channels/slack.md

@@ -26,12 +26,13 @@ Status: production-ready for DMs + channels via Slack app integrations. Default
 <Tabs>
   <Tab title="Socket Mode (default)">
     <Steps>
-      <Step title="Create Slack app and tokens">
-        In Slack app settings:
+      <Step title="Create a new Slack app">
+        In Slack app settings press the **[Create New App](https://api.slack.com/apps/new)** button:
 
-        - enable **Socket Mode**
-        - create **App Token** (`xapp-...`) with `connections:write`
-        - install app and copy **Bot Token** (`xoxb-...`)
+        - choose **from a manifest** and select a workspace for your app
+        - paste the [example manifest](#manifest-and-scope-checklist) from below and continue to create
+        - generate an **App-Level Token** (`xapp-...`) with `connections:write`
+        - install app and copy the **Bot Token** (`xoxb-...`) shown
       </Step>
 
       <Step title="Configure OpenClaw">
@@ -58,19 +59,6 @@ SLACK_BOT_TOKEN=xoxb-...
 
       </Step>
 
-      <Step title="Subscribe app events">
-        Subscribe bot events for:
-
-        - `app_mention`
-        - `message.channels`, `message.groups`, `message.im`, `message.mpim`
-        - `reaction_added`, `reaction_removed`
-        - `member_joined_channel`, `member_left_channel`
-        - `channel_rename`
-        - `pin_added`, `pin_removed`
-
-        Also enable App Home **Messages Tab** for DMs.
-      </Step>
-
       <Step title="Start gateway">
 
 ```bash
@@ -84,15 +72,17 @@ openclaw gateway
 
   <Tab title="HTTP Request URLs">
     <Steps>
-      <Step title="Configure Slack app for HTTP">
+      <Step title="Create a new Slack app">
+        In Slack app settings press the **[Create New App](https://api.slack.com/apps/new)** button:
 
-        - set mode to HTTP (`channels.slack.mode="http"`)
-        - copy Slack **Signing Secret**
-        - set Event Subscriptions + Interactivity + Slash command Request URL to the same webhook path (default `/slack/events`)
+        - choose **from a manifest** and select a workspace for your app
+        - paste the [example manifest](#manifest-and-scope-checklist) and update the URLs before create
+        - save the **Signing Secret** for request verification
+        - install app and copy the **Bot Token** (`xoxb-...`) shown
 
       </Step>
 
-      <Step title="Configure OpenClaw HTTP mode">
+      <Step title="Configure OpenClaw">
 
 ```json5
 {
@@ -108,12 +98,20 @@ openclaw gateway
 }
 ```
 
+        <Note>
+        Use unique webhook paths for multi-account HTTP
+
+        Give each account a distinct `webhookPath` (default `/slack/events`) so registrations do not collide.
+        </Note>
+
       </Step>
 
-      <Step title="Use unique webhook paths for multi-account HTTP">
-        Per-account HTTP mode is supported.
+      <Step title="Start gateway">
+
+```bash
+openclaw gateway
+```
 
-        Give each account a distinct `webhookPath` so registrations do not collide.
       </Step>
     </Steps>
 

docs/docs.json

@@ -124,14 +124,6 @@
       "source": "/context",
       "destination": "/concepts/context"
     },
-    {
-      "source": "/zh-CN",
-      "destination": "/zh-CN/index"
-    },
-    {
-      "source": "/zh-CN/",
-      "destination": "/zh-CN/index"
-    },
     {
       "source": "/compaction",
       "destination": "/concepts/compaction"

extensions/mattermost/channel-plugin-api.ts

@@ -0,0 +1,3 @@
+// Keep bundled channel entry imports narrow so bootstrap/discovery paths do
+// not drag the broader Mattermost helper surfaces into lightweight plugin loads.
+export { mattermostPlugin } from "./src/channel.js";

extensions/mattermost/index.ts

@@ -18,7 +18,7 @@ export default defineBundledChannelEntry({
   description: "Mattermost channel plugin",
   importMetaUrl: import.meta.url,
   plugin: {
-    specifier: "./src/channel.js",
+    specifier: "./channel-plugin-api.js",
     exportName: "mattermostPlugin",
   },
   runtime: {

extensions/mattermost/setup-entry.ts

@@ -3,7 +3,7 @@ import { defineBundledChannelSetupEntry } from "openclaw/plugin-sdk/channel-entr
 export default defineBundledChannelSetupEntry({
   importMetaUrl: import.meta.url,
   plugin: {
-    specifier: "./src/channel.js",
+    specifier: "./channel-plugin-api.js",
     exportName: "mattermostPlugin",
   },
 });

src/auto-reply/reply/commands-gating.test.ts

@@ -22,7 +22,9 @@ const getConfigOverridesMock = vi.hoisted(() => vi.fn(() => ({})));
 const getConfigValueAtPathMock = vi.hoisted(() => vi.fn());
 const parseConfigPathMock = vi.hoisted(() => vi.fn());
 const setConfigValueAtPathMock = vi.hoisted(() => vi.fn());
-const resolveConfigWriteDeniedTextMock = vi.hoisted(() => vi.fn(() => undefined));
+const resolveConfigWriteDeniedTextMock = vi.hoisted(() =>
+  vi.fn<(...args: never[]) => string | null>(() => null),
+);
 const isInternalMessageChannelMock = vi.hoisted(() => vi.fn(() => false));
 
 vi.mock("../../agents/agent-scope.js", () => ({

src/auto-reply/reply/commands-subagents-control.runtime.ts

@@ -1,6 +1,7 @@
 export {
   killAllControlledSubagentRuns,
   killControlledSubagentRun,
+  listControlledSubagentRuns,
   sendControlledSubagentMessage,
   steerControlledSubagentRun,
 } from "../../agents/subagent-control.js";

src/auto-reply/reply/commands-subagents-focus.test.ts

@@ -1,8 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { OpenClawConfig } from "../../config/config.js";
+import type { SessionEntry } from "../../config/sessions/types.js";
 import type { SessionBindingRecord } from "../../infra/outbound/session-binding-service.js";
 import { handleSubagentsFocusAction } from "./commands-subagents/action-focus.js";
 import { handleSubagentsUnfocusAction } from "./commands-subagents/action-unfocus.js";
+import type { HandleCommandsParams } from "./commands-types.js";
+import type { InlineDirectives } from "./directive-handling.js";
 
 const THREAD_CHANNEL = "thread-chat";
 const ROOM_CHANNEL = "room-chat";
@@ -150,45 +153,91 @@ function createSessionBindingCapabilities() {
   };
 }
 
+function buildCommandParams(params?: {
+  cfg?: OpenClawConfig;
+  chatType?: string;
+  senderId?: string;
+  sessionEntry?: SessionEntry;
+}): HandleCommandsParams {
+  const directives: InlineDirectives = {
+    cleaned: "",
+    hasThinkDirective: false,
+    hasVerboseDirective: false,
+    hasFastDirective: false,
+    hasReasoningDirective: false,
+    hasElevatedDirective: false,
+    hasExecDirective: false,
+    hasExecOptions: false,
+    invalidExecHost: false,
+    invalidExecSecurity: false,
+    invalidExecAsk: false,
+    invalidExecNode: false,
+    hasStatusDirective: false,
+    hasModelDirective: false,
+    hasQueueDirective: false,
+    queueReset: false,
+    hasQueueOptions: false,
+  };
+  return {
+    cfg: params?.cfg ?? baseCfg,
+    ctx: {
+      ChatType: params?.chatType ?? "group",
+    },
+    command: {
+      surface: "whatsapp",
+      channel: "whatsapp",
+      ownerList: [],
+      senderIsOwner: true,
+      isAuthorizedSender: true,
+      senderId: params?.senderId ?? "user-1",
+      rawBodyNormalized: "",
+      commandBodyNormalized: "",
+    },
+    directives,
+    elevated: { enabled: false, allowed: false, failures: [] },
+    sessionEntry: params?.sessionEntry,
+    sessionKey: "agent:main:main",
+    workspaceDir: "/tmp/openclaw-subagents-focus",
+    defaultGroupActivation: () => "mention",
+    resolvedVerboseLevel: "off",
+    resolvedReasoningLevel: "off",
+    resolveDefaultThinkingLevel: async () => undefined,
+    provider: "whatsapp",
+    model: "test-model",
+    contextTokens: 0,
+    isGroup: true,
+  };
+}
+
 function buildFocusContext(params?: {
   cfg?: OpenClawConfig;
   chatType?: string;
   senderId?: string;
   token?: string;
 }) {
   return {
-    params: {
-      cfg: params?.cfg ?? baseCfg,
-      ctx: {
-        ChatType: params?.chatType ?? "group",
-      },
-      command: {
-        senderId: params?.senderId ?? "user-1",
-      },
-    },
+    params: buildCommandParams({
+      cfg: params?.cfg,
+      chatType: params?.chatType,
+      senderId: params?.senderId,
+    }),
     handledPrefix: "/focus",
     requesterKey: "agent:main:main",
     runs: [],
     restTokens: [params?.token ?? "codex-acp"],
-  } as Parameters<typeof handleSubagentsFocusAction>[0];
+  } satisfies Parameters<typeof handleSubagentsFocusAction>[0];
 }
 
 function buildUnfocusContext(params?: { senderId?: string }) {
   return {
-    params: {
-      cfg: baseCfg,
-      ctx: {
-        ChatType: "group",
-      },
-      command: {
-        senderId: params?.senderId ?? "user-1",
-      },
-    },
+    params: buildCommandParams({
+      senderId: params?.senderId,
+    }),
     handledPrefix: "/unfocus",
     requesterKey: "agent:main:main",
     runs: [],
     restTokens: [],
-  } as Parameters<typeof handleSubagentsUnfocusAction>[0];
+  } satisfies Parameters<typeof handleSubagentsUnfocusAction>[0];
 }
 
 describe("focus actions", () => {

src/auto-reply/reply/commands-subagents-spawn-action.test.ts

@@ -1,7 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { SpawnSubagentResult } from "../../agents/subagent-spawn.js";
 import type { OpenClawConfig } from "../../config/config.js";
+import type { SessionEntry } from "../../config/sessions/types.js";
 import { handleSubagentsSpawnAction } from "./commands-subagents/action-spawn.js";
+import type { HandleCommandsParams } from "./commands-types.js";
+import type { InlineDirectives } from "./directive-handling.js";
 
 const spawnSubagentDirectMock = vi.hoisted(() => vi.fn());
 
@@ -35,30 +38,68 @@ function buildContext(params?: {
   requesterKey?: string;
   restTokens?: string[];
   commandTo?: string | undefined;
-  context?: Record<string, unknown>;
-  sessionEntry?: Record<string, unknown> | undefined;
+  context?: Partial<HandleCommandsParams["ctx"]>;
+  sessionEntry?: SessionEntry | undefined;
 }) {
+  const directives: InlineDirectives = {
+    cleaned: "",
+    hasThinkDirective: false,
+    hasVerboseDirective: false,
+    hasFastDirective: false,
+    hasReasoningDirective: false,
+    hasElevatedDirective: false,
+    hasExecDirective: false,
+    hasExecOptions: false,
+    invalidExecHost: false,
+    invalidExecSecurity: false,
+    invalidExecAsk: false,
+    invalidExecNode: false,
+    hasStatusDirective: false,
+    hasModelDirective: false,
+    hasQueueDirective: false,
+    queueReset: false,
+    hasQueueOptions: false,
+  };
+  const ctx = {
+    OriginatingChannel: "whatsapp",
+    OriginatingTo: "channel:origin",
+    AccountId: "default",
+    MessageThreadId: "thread-1",
+    ...params?.context,
+  };
   return {
     params: {
       cfg: params?.cfg ?? baseCfg,
+      ctx,
       command: {
+        surface: "whatsapp",
         channel: "whatsapp",
+        ownerList: [],
+        senderIsOwner: true,
+        isAuthorizedSender: true,
+        rawBodyNormalized: "",
+        commandBodyNormalized: "",
         to: params?.commandTo ?? "channel:command",
       },
-      ctx: {
-        OriginatingChannel: "whatsapp",
-        OriginatingTo: "channel:origin",
-        AccountId: "default",
-        MessageThreadId: "thread-1",
-        ...params?.context,
-      },
+      directives,
+      elevated: { enabled: false, allowed: false, failures: [] },
+      sessionKey: "agent:main:main",
+      workspaceDir: "/tmp/openclaw-subagents-spawn",
+      defaultGroupActivation: () => "mention",
+      resolvedVerboseLevel: "off",
+      resolvedReasoningLevel: "off",
+      resolveDefaultThinkingLevel: async () => undefined,
+      provider: "whatsapp",
+      model: "test-model",
+      contextTokens: 0,
+      isGroup: true,
       ...(params?.sessionEntry ? { sessionEntry: params.sessionEntry } : {}),
     },
     handledPrefix: "/subagents",
     requesterKey: params?.requesterKey ?? "agent:main:main",
     runs: [],
     restTokens: params?.restTokens ?? ["beta", "do", "the", "thing"],
-  } as Parameters<typeof handleSubagentsSpawnAction>[0];
+  } satisfies Parameters<typeof handleSubagentsSpawnAction>[0];
 }
 
 describe("subagents spawn action", () => {
@@ -152,6 +193,8 @@ describe("subagents spawn action", () => {
     await handleSubagentsSpawnAction(
       buildContext({
         sessionEntry: {
+          sessionId: "session-1",
+          updatedAt: Date.now(),
           groupId: "group-1",
           groupChannel: "#group-channel",
           space: "workspace-1",