@openclaw-china/shared 2026.3.8-3 → 2026.3.9-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw-china/shared",
-  "version": "2026.3.8-3",
+  "version": "2026.3.9-1",
   "type": "module",
   "exports": {
     ".": "./src/index.ts"

package/src/cli/china-setup.test.ts

@@ -0,0 +1,180 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const cancelMock = vi.fn();
+const confirmMock = vi.fn();
+const introMock = vi.fn();
+const noteMock = vi.fn();
+const outroMock = vi.fn();
+const selectMock = vi.fn();
+const textMock = vi.fn();
+
+vi.mock("@clack/prompts", () => ({
+  cancel: (...args: unknown[]) => cancelMock(...args),
+  confirm: (...args: unknown[]) => confirmMock(...args),
+  intro: (...args: unknown[]) => introMock(...args),
+  isCancel: () => false,
+  note: (...args: unknown[]) => noteMock(...args),
+  outro: (...args: unknown[]) => outroMock(...args),
+  select: (...args: unknown[]) => selectMock(...args),
+  text: (...args: unknown[]) => textMock(...args),
+}));
+
+import { registerChinaSetupCli } from "./china-setup.js";
+
+type ActionHandler = () => void | Promise<void>;
+
+type LoggerLike = {
+  info?: (message: string) => void;
+  warn?: (message: string) => void;
+  error?: (message: string) => void;
+};
+
+type CommandNode = {
+  children: Map<string, CommandNode>;
+  actionHandler?: ActionHandler;
+  command: (name: string) => CommandNode;
+  description: (text: string) => CommandNode;
+  action: (handler: ActionHandler) => CommandNode;
+};
+
+type ConfigRoot = {
+  channels?: Record<string, Record<string, unknown>>;
+};
+
+const CLI_STATE_KEY = Symbol.for("@openclaw-china/china-cli-state");
+
+function createCommandNode(): CommandNode {
+  const node: CommandNode = {
+    children: new Map<string, CommandNode>(),
+    command(name: string): CommandNode {
+      const child = createCommandNode();
+      node.children.set(name, child);
+      return child;
+    },
+    description(): CommandNode {
+      return node;
+    },
+    action(handler: ActionHandler): CommandNode {
+      node.actionHandler = handler;
+      return node;
+    },
+  };
+  return node;
+}
+
+async function runSetup(initialConfig: ConfigRoot): Promise<{
+  writeConfigFile: ReturnType<typeof vi.fn>;
+}> {
+  let registrar:
+    | ((ctx: { program: unknown; config?: unknown; logger?: LoggerLike }) => void | Promise<void>)
+    | undefined;
+  const writeConfigFile = vi.fn(async (_cfg: ConfigRoot) => {});
+
+  registerChinaSetupCli(
+    {
+      runtime: {
+        config: {
+          writeConfigFile,
+        },
+      },
+      registerCli: (nextRegistrar) => {
+        registrar = nextRegistrar;
+      },
+    },
+    { channels: ["wecom"] }
+  );
+
+  const program = createCommandNode();
+  await registrar?.({
+    program,
+    config: initialConfig,
+    logger: {},
+  });
+
+  const setupCommand = program.children.get("china")?.children.get("setup");
+  expect(setupCommand?.actionHandler).toBeTypeOf("function");
+  await setupCommand?.actionHandler?.();
+
+  return { writeConfigFile };
+}
+
+describe("china setup wecom", () => {
+  const stdinDescriptor = Object.getOwnPropertyDescriptor(process.stdin, "isTTY");
+  const stdoutDescriptor = Object.getOwnPropertyDescriptor(process.stdout, "isTTY");
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    delete (globalThis as Record<PropertyKey, unknown>)[CLI_STATE_KEY];
+    Object.defineProperty(process.stdin, "isTTY", {
+      configurable: true,
+      value: true,
+    });
+    Object.defineProperty(process.stdout, "isTTY", {
+      configurable: true,
+      value: true,
+    });
+  });
+
+  afterEach(() => {
+    if (stdinDescriptor) {
+      Object.defineProperty(process.stdin, "isTTY", stdinDescriptor);
+    }
+    if (stdoutDescriptor) {
+      Object.defineProperty(process.stdout, "isTTY", stdoutDescriptor);
+    }
+  });
+
+  it("stores ws-only credentials for wecom setup", async () => {
+    selectMock.mockResolvedValueOnce("wecom");
+    textMock.mockResolvedValueOnce("bot-123").mockResolvedValueOnce("secret-456");
+    confirmMock.mockResolvedValueOnce(false);
+
+    const { writeConfigFile } = await runSetup({
+      channels: {
+        wecom: {
+          webhookPath: "/legacy-wecom",
+          token: "legacy-token",
+          encodingAESKey: "legacy-aes-key",
+        },
+      },
+    });
+
+    expect(writeConfigFile).toHaveBeenCalledTimes(1);
+    const savedConfig = writeConfigFile.mock.calls[0]?.[0] as ConfigRoot;
+    const wecomConfig = savedConfig.channels?.wecom;
+
+    expect(wecomConfig?.enabled).toBe(true);
+    expect(wecomConfig?.mode).toBe("ws");
+    expect(wecomConfig?.botId).toBe("bot-123");
+    expect(wecomConfig?.secret).toBe("secret-456");
+    expect(wecomConfig?.webhookPath).toBeUndefined();
+    expect(wecomConfig?.token).toBeUndefined();
+    expect(wecomConfig?.encodingAESKey).toBeUndefined();
+
+    const promptMessages = textMock.mock.calls.map((call) => {
+      const firstArg = call[0] as { message?: string } | undefined;
+      return firstArg?.message ?? "";
+    });
+    expect(promptMessages).toEqual(["WeCom botId（ws 长连接）", "WeCom secret（ws 长连接）"]);
+  });
+
+  it("marks wecom as configured when botId and secret already exist", async () => {
+    let selectOptions: Array<{ label?: string; value?: string }> = [];
+    selectMock.mockImplementationOnce(async (params: { options?: Array<{ label?: string; value?: string }> }) => {
+      selectOptions = params.options ?? [];
+      return "cancel";
+    });
+
+    const { writeConfigFile } = await runSetup({
+      channels: {
+        wecom: {
+          botId: "existing-bot",
+          secret: "existing-secret",
+        },
+      },
+    });
+
+    expect(writeConfigFile).not.toHaveBeenCalled();
+    expect(selectOptions.some((option) => option.label === "WeCom（企业微信-智能机器人）（已配置）")).toBe(true);
+  });
+});

package/src/cli/china-setup.ts

@@ -294,17 +294,25 @@ function getPreferredAccountConfig(channelCfg: ConfigRecord): ConfigRecord | und
   return undefined;
 }
 
-function hasTokenPair(channelCfg: ConfigRecord): boolean {
-  if (hasNonEmptyString(channelCfg.token) && hasNonEmptyString(channelCfg.encodingAESKey)) {
-    return true;
-  }
-  const accountCfg = getPreferredAccountConfig(channelCfg);
-  return Boolean(
-    accountCfg &&
-      hasNonEmptyString(accountCfg.token) &&
-      hasNonEmptyString(accountCfg.encodingAESKey)
-  );
-}
+function hasCredentialPair(channelCfg: ConfigRecord, firstKey: string, secondKey: string): boolean {
+  if (hasNonEmptyString(channelCfg[firstKey]) && hasNonEmptyString(channelCfg[secondKey])) {
+    return true;
+  }
+  const accountCfg = getPreferredAccountConfig(channelCfg);
+  return Boolean(
+    accountCfg &&
+      hasNonEmptyString(accountCfg[firstKey]) &&
+      hasNonEmptyString(accountCfg[secondKey])
+  );
+}
+
+function hasTokenPair(channelCfg: ConfigRecord): boolean {
+  return hasCredentialPair(channelCfg, "token", "encodingAESKey");
+}
+
+function hasWecomWsCredentialPair(channelCfg: ConfigRecord): boolean {
+  return hasCredentialPair(channelCfg, "botId", "secret");
+}
 
 function isChannelConfigured(cfg: ConfigRoot, channelId: ChannelId): boolean {
   const channelCfg = getChannelConfig(cfg, channelId);
@@ -313,14 +321,15 @@ function isChannelConfigured(cfg: ConfigRoot, channelId: ChannelId): boolean {
       return hasNonEmptyString(channelCfg.clientId) && hasNonEmptyString(channelCfg.clientSecret);
     case "feishu-china":
       return hasNonEmptyString(channelCfg.appId) && hasNonEmptyString(channelCfg.appSecret);
-    case "qqbot":
-      return hasNonEmptyString(channelCfg.appId) && hasNonEmptyString(channelCfg.clientSecret);
-    case "wecom":
-    case "wecom-app":
-      return hasTokenPair(channelCfg);
-    default:
-      return false;
-  }
+    case "qqbot":
+      return hasNonEmptyString(channelCfg.appId) && hasNonEmptyString(channelCfg.clientSecret);
+    case "wecom":
+      return hasWecomWsCredentialPair(channelCfg);
+    case "wecom-app":
+      return hasTokenPair(channelCfg);
+    default:
+      return false;
+  }
 }
 
 function withConfiguredSuffix(cfg: ConfigRoot, channelId: ChannelId): string {
@@ -500,32 +509,31 @@ async function configureFeishu(prompter: SetupPrompter, cfg: ConfigRoot): Promis
   });
 }
 
-async function configureWecom(prompter: SetupPrompter, cfg: ConfigRoot): Promise<ConfigRoot> {
-  section("配置 WeCom（企业微信-智能机器人）");
-  showGuideLink("wecom");
-  const existing = getChannelConfig(cfg, "wecom");
-
-  const webhookPath = await prompter.askText({
-    label: "Webhook 路径（需与企业微信后台配置一致，默认 /wecom）",
-    defaultValue: toTrimmedString(existing.webhookPath) ?? "/wecom",
-    required: true,
-  });
-  const token = await prompter.askSecret({
-    label: "WeCom token",
-    existingValue: toTrimmedString(existing.token),
-    required: true,
-  });
-  const encodingAESKey = await prompter.askSecret({
-    label: "WeCom encodingAESKey",
-    existingValue: toTrimmedString(existing.encodingAESKey),
-    required: true,
-  });
-  return mergeChannelConfig(cfg, "wecom", {
-    webhookPath,
-    token,
-    encodingAESKey,
-  });
-}
+async function configureWecom(prompter: SetupPrompter, cfg: ConfigRoot): Promise<ConfigRoot> {
+  section("配置 WeCom（企业微信-智能机器人）");
+  showGuideLink("wecom");
+  const existing = getChannelConfig(cfg, "wecom");
+  clackNote("当前向导仅提供 WeCom ws 长连接配置。", "提示");
+
+  const botId = await prompter.askText({
+    label: "WeCom botId（ws 长连接）",
+    defaultValue: toTrimmedString(existing.botId),
+    required: true,
+  });
+  const secret = await prompter.askSecret({
+    label: "WeCom secret（ws 长连接）",
+    existingValue: toTrimmedString(existing.secret),
+    required: true,
+  });
+  return mergeChannelConfig(cfg, "wecom", {
+    mode: "ws",
+    botId,
+    secret,
+    webhookPath: undefined,
+    token: undefined,
+    encodingAESKey: undefined,
+  });
+}
 
 async function configureWecomApp(prompter: SetupPrompter, cfg: ConfigRoot): Promise<ConfigRoot> {
   section("配置 WeCom App（自建应用-可接入微信）");
@@ -620,15 +628,15 @@ async function configureQQBot(prompter: SetupPrompter, cfg: ConfigRoot): Promise
     defaultValue: toTrimmedString(existing.appId),
     required: true,
   });
-  const clientSecret = await prompter.askSecret({
-    label: "QQBot clientSecret",
-    existingValue: toTrimmedString(existing.clientSecret),
-    required: true,
-  });
-  const asrEnabled = await prompter.askConfirm(
-    "启用 ASR（支持入站语音自动转文字）",
-    toBoolean(existingAsr.enabled, false)
-  );
+  const clientSecret = await prompter.askSecret({
+    label: "QQBot clientSecret",
+    existingValue: toTrimmedString(existing.clientSecret),
+    required: true,
+  });
+  const asrEnabled = await prompter.askConfirm(
+    "启用 ASR（支持入站语音自动转文字）",
+    toBoolean(existingAsr.enabled, false)
+  );
 
   const asr: ConfigRecord = {
     enabled: asrEnabled,
@@ -652,12 +660,12 @@ async function configureQQBot(prompter: SetupPrompter, cfg: ConfigRoot): Promise
     });
   }
 
-  return mergeChannelConfig(cfg, "qqbot", {
-    appId,
-    clientSecret,
-    asr,
-  });
-}
+  return mergeChannelConfig(cfg, "qqbot", {
+    appId,
+    clientSecret,
+    asr,
+  });
+}
 
 async function configureSingleChannel(
   channel: ChannelId,

package/src/cli/index.ts

@@ -1,2 +1,2 @@
-export * from "./china-setup.js";
-export * from "./install-hint.js";
+export * from "./china-setup.js";
+export * from "./install-hint.js";

package/src/cron/index.ts

@@ -1,19 +1,19 @@
-const CRON_HIDDEN_PROMPT = `
-When creating or updating a cron task, always store a fixed delivery target in the job itself.
-- Use the built-in cron tool (action=add/update). Do not run shell commands.
-- Must use sessionTarget="isolated" for reminder jobs.
-- payload.kind="agentTurn"
-- payload.message must be plain user-visible reminder text only.
-- You must encode runtime guardrails directly into payload.message so the cron run can follow them without extra context.
-- Runtime guardrails to encode in payload.message:
-  - return plain text only
-  - never call any tool
-  - never call the message tool
-  - never send manually; delivery is handled by cron delivery settings
-- Do not include tool directives, "NO_REPLY", or heartbeat markers in payload.message.
-- Job name is never a message target.
-- During cron run, must return plain text only and never call the message tool.
-- Use top-level delivery with announce mode:
+const CRON_HIDDEN_PROMPT = `
+When creating or updating a cron task, always store a fixed delivery target in the job itself.
+- Use the built-in cron tool (action=add/update). Do not run shell commands.
+- Must use sessionTarget="isolated" for reminder jobs.
+- payload.kind="agentTurn"
+- payload.message must be plain user-visible reminder text only.
+- You must encode runtime guardrails directly into payload.message so the cron run can follow them without extra context.
+- Runtime guardrails to encode in payload.message:
+  - return plain text only
+  - never call any tool
+  - never call the message tool
+  - never send manually; delivery is handled by cron delivery settings
+- Do not include tool directives, "NO_REPLY", or heartbeat markers in payload.message.
+- Job name is never a message target.
+- During cron run, must return plain text only and never call the message tool.
+- Use top-level delivery with announce mode:
   delivery.mode="announce"
   delivery.channel=<OriginatingChannel> (example: "qqbot")
   delivery.to=<OriginatingTo> (examples: "user:<openid>" / "group:<group_openid>")