openclaw-xiaoyou 1.2.0 → 1.2.2

package/docs/SKILL.md

@@ -5,48 +5,48 @@ description: Use when users want to install, upgrade, uninstall, configure, or t
 
 # 小优 Channel 安装入口
 
-小优 channel 安装、升级、卸载统一使用远程脚本：
+小优 channel 安装、升级、卸载统一使用远程脚本�?
 
 ```bash
-https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38aec3ba/install-xiaoyou.sh
+https://d10.tfdl.net/public/2026-05-06/14dbf63d-d0aa-4b5d-bdd6-47eddb455f36/install-xiaoyou.sh
 ```
 
-不要把 OpenClaw 的底层安装命令拆散执行。除非远程脚本失败且需要排障，否则直接调用 `install-xiaoyou.sh`。
+不要�?OpenClaw 的底层安装命令拆散执行。除非远程脚本失败且需要排障，否则直接调用 `install-xiaoyou.sh`�?
 
-## 触发词
+## 触发�?
 
 - "安装小优" / "小优安装"
 - "小优接入" / "接入小优"
 - "配置 xiaoyou" / "xiaoyou 配置"
 - "升级小优" / "更新小优"
 - "卸载小优" / "移除小优"
-- "我想用小优" / "启用小优"
+- "我想用小�? / "启用小优"
 - "小优 channel" / "xiaoyou channel"
 
 ## 标准执行
 
-优先直接通过 `curl | bash` 执行远程脚本：
+优先直接通过 `curl | bash` 执行远程脚本�?
 
 ```bash
-curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38aec3ba/install-xiaoyou.sh | bash -s -- --ws-url ws://aiws-sim.haiersmarthomes.com:11055/xiaoyou/claw --token <AccessToken>
+curl -fsSL https://d10.tfdl.net/public/2026-05-06/14dbf63d-d0aa-4b5d-bdd6-47eddb455f36/install-xiaoyou.sh | bash -s -- --ws-url ws://aiws-sim.haiersmarthomes.com:11055/xiaoyou/claw --token <AccessToken>
 ```
 
 ### 参数说明
 
 | 参数 | 必填 | 说明 |
 |------|------|------|
-| `--ws-url <url>` | ✅ 首次安装 | 企业 WebSocket 服务地址，默认 `ws://aiws-sim.haiersmarthomes.com:11055/xiaoyou/claw` |
-| `--token <token>` | ✅ 首次安装 | 企业服务认证 Token |
-| `--version <ver>` | 否 | 指定 openclaw-xiaoyou 版本，默认 latest |
-| `--check-only` | 否 | 只输出计划，不执行真实改动 |
-| `uninstall` | 否 | 卸载小优 channel |
+| `--ws-url <url>` | �?首次安装 | 企业 WebSocket 服务地址，默�?`ws://aiws-sim.haiersmarthomes.com:11055/xiaoyou/claw` |
+| `--token <token>` | �?首次安装 | 企业服务认证 Token |
+| `--version <ver>` | �?| 指定 openclaw-xiaoyou 版本，默�?latest |
+| `--check-only` | �?| 只输出计划，不执行真实改�?|
+| `uninstall` | �?| 卸载小优 channel |
 
 ### 首次安装
 
-用户必须提供 `--ws-url` 和 `--token`：
+用户必须提供 `--ws-url` �?`--token`�?
 
 ```bash
-curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38aec3ba/install-xiaoyou.sh | bash -s -- --ws-url ws://aiws-sim.haiersmarthomes.com:11055/xiaoyou/claw --token my-enterprise-token
+curl -fsSL https://d10.tfdl.net/public/2026-05-06/14dbf63d-d0aa-4b5d-bdd6-47eddb455f36/install-xiaoyou.sh | bash -s -- --ws-url ws://aiws-sim.haiersmarthomes.com:11055/xiaoyou/claw --token my-enterprise-token
 ```
 
 ### 升级
@@ -54,30 +54,30 @@ curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38
 已安装后的升级可以不传参数，脚本会复用现有配置：
 
 ```bash
-curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38aec3ba/install-xiaoyou.sh | bash -s --
+curl -fsSL https://d10.tfdl.net/public/2026-05-06/14dbf63d-d0aa-4b5d-bdd6-47eddb455f36/install-xiaoyou.sh | bash -s --
 ```
 
-如果升级时传入 `--ws-url` 或 `--token`，会覆盖现有配置。
+如果升级时传�?`--ws-url` �?`--token`，会覆盖现有配置�?
 
 ### 指定版本
 
 ```bash
-curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38aec3ba/install-xiaoyou.sh | bash -s -- --version 1.0.2 --ws-url ws://aiws-sim.haiersmarthomes.com:11055/xiaoyou/claw --token my-token
+curl -fsSL https://d10.tfdl.net/public/2026-05-06/14dbf63d-d0aa-4b5d-bdd6-47eddb455f36/install-xiaoyou.sh | bash -s -- --version 1.0.2 --ws-url ws://aiws-sim.haiersmarthomes.com:11055/xiaoyou/claw --token my-token
 ```
 
 ## 卸载
 
 ```bash
-curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38aec3ba/install-xiaoyou.sh | bash -s -- uninstall
+curl -fsSL https://d10.tfdl.net/public/2026-05-06/14dbf63d-d0aa-4b5d-bdd6-47eddb455f36/install-xiaoyou.sh | bash -s -- uninstall
 ```
 
-卸载会删除 xiaoyou channel 配置、插件记录和扩展目录。
+卸载会删�?xiaoyou channel 配置、插件记录和扩展目录�?
 
 ## 预检
 
 ```bash
-curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38aec3ba/install-xiaoyou.sh | bash -s -- --check-only
-curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38aec3ba/install-xiaoyou.sh | bash -s -- uninstall --check-only
+curl -fsSL https://d10.tfdl.net/public/2026-05-06/14dbf63d-d0aa-4b5d-bdd6-47eddb455f36/install-xiaoyou.sh | bash -s -- --check-only
+curl -fsSL https://d10.tfdl.net/public/2026-05-06/14dbf63d-d0aa-4b5d-bdd6-47eddb455f36/install-xiaoyou.sh | bash -s -- uninstall --check-only
 ```
 
 ## 失败处理
@@ -89,22 +89,22 @@ curl -fsSL https://d10.tfdl.net/public/2026-05-06/e466d49d-4c5c-4fca-88dd-d69a38
 | 缺少 `--token` | 要求用户提供企业服务认证 Token |
 | 未检测到 OpenClaw | 提示用户先安装并启动 OpenClaw |
 | npm latest 查询失败 | 可让脚本继续幂等安装，或指定 `--version` |
-| wsUrl 格式不合法 | 地址必须以 `ws://` 或 `wss://` 开头 |
+| wsUrl 格式不合�?| 地址必须�?`ws://` �?`wss://` 开�?|
 
-## 脚本做了什么
+## 脚本做了什�?
 
-1. 检测 OpenClaw 是否已安装并运行
-2. 安装/升级 `openclaw-xiaoyou` 插件（`openclaw plugins install openclaw-xiaoyou@latest`）
-3. 写入 channel 配置到 `~/.openclaw/openclaw.json`：
+1. 检�?OpenClaw 是否已安装并运行
+2. 安装/升级 `openclaw-xiaoyou` 插件（`openclaw plugins install openclaw-xiaoyou@latest`�?
+3. 写入 channel 配置�?`~/.openclaw/openclaw.json`�?
    - `channels.xiaoyou.enabled = true`
    - `channels.xiaoyou.wsUrl = <用户提供的地址>`
-   - `channels.xiaoyou.authToken = <用户提供的 token>`
+   - `channels.xiaoyou.authToken = <用户提供�?token>`
    - `channels.xiaoyou.dmSecurity = open`
-4. 检查插件状态和 gateway 运行状态
+4. 检查插件状态和 gateway 运行状�?
 
 ## 完成定义
 
-- 脚本退出码为 0。
-- 日志显示安装、升级或卸载流程完成。
-- 安装场景下，`openclaw xiaoyou status` 显示 connected。
-- 企业服务端能收到来自 xiaoyou 插件的 WebSocket 连接。
+- 脚本退出码�?0�?
+- 日志显示安装、升级或卸载流程完成�?
+- 安装场景下，`openclaw xiaoyou status` 显示 connected�?
+- 企业服务端能收到来自 xiaoyou 插件�?WebSocket 连接�?

package/docs/install-xiaoyou.sh

@@ -323,24 +323,57 @@ install_or_upgrade() {
 patch_config() {
   [[ -n "$WS_URL" || -n "$TOKEN" ]] || return 0
 
-  log "写入 xiaoyou channel 配置"
-  run openclaw config set "channels.${CHANNEL_KEY}.enabled" true --strict-json
+  log "写入 xiaoyou channel 配置（直接修改配置文件）"
 
-  if [[ -n "$WS_URL" ]]; then
-    run openclaw config set "channels.${CHANNEL_KEY}.wsUrl" "$WS_URL"
-  fi
-  if [[ -n "$TOKEN" ]]; then
-    run openclaw config set "channels.${CHANNEL_KEY}.authToken" "$TOKEN"
-  fi
+  local config_file
+  config_file="$(openclaw_config_file)"
 
-  run openclaw config set "channels.${CHANNEL_KEY}.dmSecurity" open
-  run openclaw config set "channels.${CHANNEL_KEY}.reconnectIntervalMs" 3000 --strict-json
-  run openclaw config set "channels.${CHANNEL_KEY}.heartbeatIntervalMs" 30000 --strict-json
-  run openclaw config set "channels.${CHANNEL_KEY}.heartbeatTimeoutMs" 10000 --strict-json
+  if [[ ! -f "$config_file" ]]; then
+    die "配置文件不存在: $config_file"
+  fi
 
-  local config_file
-  config_file="$(capture_or_empty openclaw config file)"
-  log "已写入配置: ${config_file:-$(openclaw_config_file)}"
+  # 使用 python3 直接写入配置，绕过 openclaw config set 的 channel id 校验
+  python3 -c "
+import json, sys
+
+config_file = '$config_file'
+ws_url = '$WS_URL'
+token = '$TOKEN'
+
+try:
+    with open(config_file, 'r') as f:
+        cfg = json.load(f)
+except Exception as e:
+    print(f'[xiaoyou-install][error] 无法读取配置文件: {e}', file=sys.stderr)
+    sys.exit(1)
+
+# 确保 channels 对象存在
+cfg.setdefault('channels', {})
+
+# 写入 xiaoyou channel 配置
+xiaoyou = cfg['channels'].get('xiaoyou', {})
+xiaoyou['enabled'] = True
+if ws_url:
+    xiaoyou['wsUrl'] = ws_url
+if token:
+    xiaoyou['authToken'] = token
+xiaoyou.setdefault('dmSecurity', 'open')
+xiaoyou.setdefault('allowFrom', ['*'])
+xiaoyou.setdefault('reconnectIntervalMs', 3000)
+xiaoyou.setdefault('heartbeatIntervalMs', 30000)
+xiaoyou.setdefault('heartbeatTimeoutMs', 10000)
+cfg['channels']['xiaoyou'] = xiaoyou
+
+try:
+    with open(config_file, 'w') as f:
+        json.dump(cfg, f, indent=2, ensure_ascii=False)
+    print('[xiaoyou-install] 配置写入成功')
+except Exception as e:
+    print(f'[xiaoyou-install][error] 写入配置失败: {e}', file=sys.stderr)
+    sys.exit(1)
+" || die "写入配置失败"
+
+  log "已写入配置: $config_file"
 }
 
 # -----------------------------------------------------------------------------
@@ -375,11 +408,31 @@ xiayou_status() {
 
 xiayou_uninstall_plugin_only() {
   # 仅删除插件记录和文件，不删除配置（升级时用）
-  if command_exists openclaw; then
-    run_or_dry_run openclaw config unset "plugins.entries.${PLUGIN_NAME}" || true
-    run_or_dry_run openclaw config unset "plugins.installs.${PLUGIN_NAME}" || true
+  local config_file
+  config_file="$(openclaw_config_file)"
+
+  if [[ -f "$config_file" ]] && command_exists python3; then
+    python3 -c "
+import json
+config_file = '$config_file'
+with open(config_file, 'r') as f:
+    cfg = json.load(f)
+changed = False
+for key in ['xiaoyou', 'openclaw-xiaoyou']:
+    if cfg.get('plugins', {}).get('entries', {}).pop(key, None): changed = True
+    if cfg.get('plugins', {}).get('installs', {}).pop(key, None): changed = True
+    allow = cfg.get('plugins', {}).get('allow', [])
+    if key in allow:
+        allow.remove(key)
+        changed = True
+if changed:
+    with open(config_file, 'w') as f:
+        json.dump(cfg, f, indent=2, ensure_ascii=False)
+    print('[xiaoyou-install] 已清理插件注册记录')
+" || true
   fi
-  run_or_dry_run rm -rf "$HOME/.openclaw/extensions/${PLUGIN_NAME}" "$HOME"/.openclaw/extensions/.openclaw-* || true
+
+  run_or_dry_run rm -rf "$HOME/.openclaw/extensions/xiaoyou" "$HOME/.openclaw/extensions/openclaw-xiaoyou" "$HOME"/.openclaw/extensions/.openclaw-* || true
 }
 
 xiayou_uninstall() {
@@ -392,13 +445,29 @@ xiayou_uninstall() {
   fi
 
   log "开始卸载 xiaoyou channel"
-  if command_exists openclaw; then
-    run_or_dry_run openclaw config unset "channels.${CHANNEL_KEY}" || warn "删除 channels.${CHANNEL_KEY} 失败"
-    run_or_dry_run openclaw config unset "plugins.entries.${PLUGIN_NAME}" || warn "删除 plugins.entries 失败"
-    run_or_dry_run openclaw config unset "plugins.installs.${PLUGIN_NAME}" || warn "删除 plugins.installs 失败"
+
+  local config_file
+  config_file="$(openclaw_config_file)"
+
+  if [[ -f "$config_file" ]] && command_exists python3; then
+    run_or_dry_run python3 -c "
+import json
+config_file = '$config_file'
+with open(config_file, 'r') as f:
+    cfg = json.load(f)
+cfg.get('channels', {}).pop('xiaoyou', None)
+for key in ['xiaoyou', 'openclaw-xiaoyou']:
+    cfg.get('plugins', {}).get('entries', {}).pop(key, None)
+    cfg.get('plugins', {}).get('installs', {}).pop(key, None)
+    allow = cfg.get('plugins', {}).get('allow', [])
+    if key in allow: allow.remove(key)
+with open(config_file, 'w') as f:
+    json.dump(cfg, f, indent=2, ensure_ascii=False)
+print('[xiaoyou-install] 已清理所有 xiaoyou 配置')
+" || warn "清理配置失败"
   fi
 
-  run_or_dry_run rm -rf "$HOME/.openclaw/extensions/${PLUGIN_NAME}" "$HOME"/.openclaw/extensions/.openclaw-* || warn "删除插件文件失败"
+  run_or_dry_run rm -rf "$HOME/.openclaw/extensions/xiaoyou" "$HOME/.openclaw/extensions/openclaw-xiaoyou" "$HOME"/.openclaw/extensions/.openclaw-* || warn "删除插件文件失败"
 
   if [[ "$CHECK_ONLY" -eq 1 ]]; then
     phase_end "xiaoyou.uninstall" "planned" "check-only：已输出计划，未执行"
@@ -424,6 +493,13 @@ main() {
 
   install_or_upgrade
 
+  # 重启 gateway 让插件和配置生效
+  if [[ "$CHECK_ONLY" -eq 0 ]] && openclaw_gateway_running; then
+    log "重启 gateway 以加载插件和配置..."
+    run openclaw gateway restart || warn "gateway 重启失败，请手动执行: openclaw gateway restart"
+    sleep 5
+  fi
+
   log "完成。企业服务端应能收到来自 xiaoyou 插件的 WebSocket 连接。"
   phase_end "main.entry" "ok" "安装流程完成"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-xiaoyou",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "type": "module",
   "description": "Xiaoyou channel plugin for OpenClaw — connects enterprise services via persistent outbound WebSocket",
   "openclaw": {

package/setup-entry.ts

@@ -13,6 +13,6 @@ export default {
   description: "Bridge OpenClaw to enterprise services via WebSocket",
   setup: {
     resolveAccount: xiayouPlugin.config.resolveAccount,
-    inspectAccount: xiayouPlugin.config.inspectAccount,
+    isConfigured: xiayouPlugin.config.isConfigured,
   },
 };

package/src/channel.ts

@@ -128,24 +128,79 @@ export const xiayouPlugin = {
         account: resolved,
         logger,
         onMessage: async (msg) => {
-          const runtime = getRuntime();
-          if (!runtime) {
-            logger.error("[xiaoyou] runtime not available, cannot dispatch");
+          const rt = getRuntime();
+          if (!rt || !rt.channel) {
+            logger.error("[xiaoyou] runtime.channel not available, cannot dispatch");
             return;
           }
-          await runtime.inbound.dispatch({
-            channelId: "xiaoyou",
-            senderId: msg.senderId,
-            senderName: msg.senderName ?? msg.senderId,
-            conversationId: msg.conversationId,
+
+          const senderId = msg.senderId;
+          const senderName = msg.senderName ?? msg.senderId;
+          const conversationId = msg.conversationId;
+          const text = msg.text ?? "";
+          const accountId = account?.accountId || "default";
+
+          // 1. 路由
+          const route = rt.channel.routing.resolveAgentRoute({
+            cfg: getChannelConfig(cfg) || {},
+            channel: "xiaoyou",
+            accountId,
+            peer: { kind: "direct", id: senderId },
+          });
+
+          // 2. 格式化入站消息
+          const fromLabel = `${senderName} (${senderId})`;
+          const envelopeOptions = rt.channel.reply.resolveEnvelopeFormatOptions(cfg);
+          const body = rt.channel.reply.formatInboundEnvelope({
+            channel: "Xiaoyou",
+            from: fromLabel,
+            timestamp: Date.now(),
+            body: text,
             chatType: "direct",
-            text: msg.text ?? "",
-            attachments: msg.attachments?.map((a: any) => ({
-              kind: a.kind,
-              url: a.url,
-              mimeType: a.mimeType,
-            })),
-            metadata: msg.metadata,
+            sender: { name: senderName, id: senderId },
+            envelope: envelopeOptions,
+          });
+
+          // 3. 构建上下文
+          const inboundCtx = rt.channel.reply.finalizeInboundContext({
+            Body: body,
+            RawBody: text,
+            CommandBody: text,
+            From: conversationId,
+            To: conversationId,
+            SessionKey: route.sessionKey,
+            AccountId: accountId,
+            ChatType: "direct",
+            ConversationLabel: fromLabel,
+            SenderName: senderName,
+            SenderId: senderId,
+            Provider: "xiaoyou",
+            Surface: "xiaoyou",
+            MessageSid: `xiaoyou-${Date.now()}`,
+            Timestamp: Date.now(),
+          });
+
+          // 4. 分发并获取回复
+          await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+            ctx: inboundCtx,
+            cfg,
+            dispatcherOptions: {
+              responsePrefix: "",
+              deliver: async (payload: any) => {
+                const textToSend = payload.markdown || payload.text;
+                if (!textToSend) return;
+                if (_client && _client.isConnected()) {
+                  _client.sendReply({
+                    type: "reply",
+                    conversationId,
+                    messageId: `xiaoyou-${Date.now()}`,
+                    text: textToSend,
+                    timestamp: Date.now(),
+                  });
+                  logger.info(`[xiaoyou] reply sent to ${conversationId}`);
+                }
+              },
+            },
           });
         },
       });