dsh-plugin-weapp-gateway 0.8.10 → 0.8.12

package/README.md

@@ -4,6 +4,16 @@
 
 # dsh-plugin-weapp-gateway
 
+### v0.8.12 · 显示插件升级失败详情
+
+- 安装器返回结构化错误时提取可读信息，不再显示 `[object Object]`；错误序列化会省略凭据、令牌和堆栈字段。
+
+### v0.8.11 · 小程序 ClawBot 私聊接线控制
+
+- 在已配对的小程序控制通道中增加受限的 ClawBot 控制 RPC，复用 `dsh-wechat-remote` 自身的访问授权、状态冲突检查和本地凭据存储。
+- 支持读取状态、绑定流程、选择普通 DSH 会话、启停与移除本地绑定；微信凭据不传回小程序。
+- 新增 `wechat-clawbot-control-v1` 能力标记，客户端可对旧版网关明确降级。
+
 ### v0.8.9 · 插件在线更新
 
 - 打开「设置 → 移动设备」时自动检查 npm 最新版本，并可在面板中一键安装更新。

package/lib/client.js

@@ -578,7 +578,13 @@ window.__ModuleLoader__.load({
               setUpdateInfo({ ...result, currentVersion: result.latestVersion, updateAvailable: false })
               setUpdateNotice(`已安装 v${result.latestVersion}，需要重启 DSH 后生效。`)
             } else if (application === 'failed' || application === 'cancelled' || application === 'refused') {
-              setUpdateNotice(`安装未完成：${application}${result.installation?.error ? `（${result.installation.error}）` : ''}`)
+              const installError = result.installation?.error
+              const detail = result.installation?.errorMessage
+                || (typeof installError === 'string' ? installError : '')
+                || (typeof installError?.message === 'string' ? installError.message : '')
+                || (typeof installError?.code === 'string' ? installError.code : '')
+                || '请在 DSH 插件管理中查看安装详情。'
+              setUpdateNotice(`安装未完成：${application}（${detail}）`)
             } else {
               setUpdateInfo({ ...result, currentVersion: result.latestVersion, updateAvailable: false })
               setUpdateNotice(`已安装 v${result.latestVersion}。如界面尚未更新，请重启 DSH。`)

package/lib/dsh-host-adapter.mjs

@@ -325,6 +325,12 @@ export function createDshHostAdapter(typertGateway) {
     permissionPresets: {
       catalog: (_payload = {}, signal) => invoke('permissionPresets', 'catalog', {}, signal),
     },
+    // This endpoint intentionally forwards only the ClawBot control DTO. It
+    // stays behind the paired gateway and the ClawBot service's own access
+    // checks; it never exposes the channel credentials to the client.
+    clawbot: {
+      control: (request, signal) => invoke('wechatClawbot', 'control', request, signal),
+    },
     schedule: {
       async catalog(_payload = {}, signal) {
         return { items: requireArray(await invoke('schedule', 'catalog', {}, signal), 'schedule/catalog') }

package/lib/index.mjs

@@ -1369,8 +1369,93 @@ function parseAgentPreset(msg, requestType, required = false) {
   return { value: msg.agentPreset.trim() }
 }
 
+const CLAWBOT_ACTIONS = new Set([
+  'status', 'sessions', 'route', 'enabled', 'login.start', 'login.poll', 'login.cancel', 'disconnect',
+])
+
+function validClawbotId(value) {
+  return typeof value === 'string' && value.trim().length > 0 && value.length <= 256
+    && !/[\u0000-\u001f]/.test(value)
+}
+
+async function handleClawbotControl(api, msg) {
+  const type = 'clawbot-control'
+  const requestId = typeof msg.requestId === 'string' && msg.requestId.trim().length > 0
+    && msg.requestId.length <= 128 ? msg.requestId.trim() : null
+  const error = (code, message) => ({ kind: 'error', code, message, requestType: type, ...(requestId ? { requestId } : {}) })
+  if (!requestId) return error('bad-request', 'ClawBot control requires a requestId')
+  if (!CLAWBOT_ACTIONS.has(msg.action)) return error('bad-request', 'Unsupported ClawBot action')
+  if (typeof api.clawbot?.control !== 'function') {
+    return error('clawbot-unavailable', 'The gateway host adapter does not provide ClawBot control')
+  }
+
+  const request = { action: msg.action }
+  if (msg.expectedRevision !== undefined) {
+    if (!Number.isSafeInteger(msg.expectedRevision) || msg.expectedRevision < 0) {
+      return error('bad-request', 'expectedRevision must be a non-negative integer')
+    }
+    request.expectedRevision = msg.expectedRevision
+  }
+  if (msg.sessionId !== undefined) {
+    if (!validClawbotId(msg.sessionId)) return error('bad-request', 'sessionId is invalid')
+    request.sessionId = msg.sessionId.trim()
+  }
+  if (msg.loginId !== undefined) {
+    if (!validClawbotId(msg.loginId)) return error('bad-request', 'loginId is invalid')
+    request.loginId = msg.loginId.trim()
+  }
+  if (msg.enabled !== undefined) {
+    if (typeof msg.enabled !== 'boolean') return error('bad-request', 'enabled must be a boolean')
+    request.enabled = msg.enabled
+  }
+  if (msg.verifyCode !== undefined) {
+    if (typeof msg.verifyCode !== 'string' || msg.verifyCode.length > 128 || /[\u0000-\u001f]/.test(msg.verifyCode)) {
+      return error('bad-request', 'verifyCode is invalid')
+    }
+    request.verifyCode = msg.verifyCode
+  }
+  if (msg.abandonPending !== undefined) {
+    if (typeof msg.abandonPending !== 'boolean') return error('bad-request', 'abandonPending must be a boolean')
+    request.abandonPending = msg.abandonPending
+  }
+  if (['route', 'enabled'].includes(request.action) && !Number.isSafeInteger(request.expectedRevision)) {
+    return error('bad-request', 'This ClawBot action requires expectedRevision')
+  }
+  if (request.action === 'route' && !request.sessionId) return error('bad-request', 'route requires sessionId')
+  if (request.action === 'enabled' && typeof request.enabled !== 'boolean') return error('bad-request', 'enabled requires a boolean')
+  if (request.action === 'login.poll' && !request.loginId) return error('bad-request', 'login.poll requires loginId')
+  if (request.action === 'login.cancel' && !request.loginId) return error('bad-request', 'login.cancel requires loginId')
+  if (request.action === 'disconnect' && !Number.isSafeInteger(request.expectedRevision)) {
+    return error('bad-request', 'disconnect requires expectedRevision')
+  }
+
+  try {
+    const result = await api.clawbot.control(request)
+    if (!result || typeof result !== 'object' || Array.isArray(result)) {
+      return error('clawbot-unavailable', 'ClawBot returned an invalid response')
+    }
+    if (result.ok !== true) {
+      const failure = result.error
+      const code = typeof failure?.code === 'string' && /^[a-z0-9./_-]{1,80}$/i.test(failure.code)
+        ? failure.code : 'clawbot-operation-failed'
+      const message = typeof failure?.message === 'string' && failure.message.length <= 500
+        ? failure.message : 'ClawBot operation failed; refresh status before retrying.'
+      return error(code, message)
+    }
+    if (!result.value || typeof result.value !== 'object' || Array.isArray(result.value)) {
+      return error('clawbot-unavailable', 'ClawBot returned an invalid response')
+    }
+    return { kind: type, requestId, value: result.value }
+  } catch (cause) {
+    // Do not expose arbitrary host/plugin exception details over the mobile API.
+    log(`ClawBot control unavailable: ${cause?.code || 'unknown error'}`)
+    return error('clawbot-unavailable', 'ClawBot is unavailable. Update dsh-wechat-remote and check its component status.')
+  }
+}
+
 // Dispatch one mobile query frame; returns the wire frame to send back.
 async function handleQuery(api, host, agentDefaultModel, msg, pluginContext) {
+  if (msg.type === 'clawbot-control') return handleClawbotControl(api, msg)
   if (WORKSPACE_CHANGES_TYPES.has(msg.type)) return handleWorkspaceChanges(api, msg)
   if (PLUGIN_REQUEST_TYPES.has(msg.type)) return handlePluginQuery(api, msg, pluginContext)
   if (msg.type === 'session-agent-preset' || msg.type === 'select-agent-preset') {
@@ -3127,6 +3212,7 @@ const plugin = {
                        msg.type === 'command-options' || msg.type === 'command-select' || msg.type === 'select-model' ||
                        msg.type === 'permission-options' || msg.type === 'permission' || msg.type === 'context-usage' ||
                        msg.type === 'agent-presets' || msg.type === 'session-agent-preset' || msg.type === 'select-agent-preset' ||
+                       msg.type === 'clawbot-control' ||
                        msg.type === 'defaults' || msg.type === 'set-default' ||
                        msg.type === 'session-stats' || msg.type === 'default-model' ||
                        msg.type === 'save-default-model' || msg.type === 'fork' || msg.type === 'session-cancel' || msg.type === 'queue-update' ||
@@ -3136,10 +3222,12 @@ const plugin = {
                        msg.type === 'schedule-catalog' || msg.type === 'schedule-list' || msg.type === 'schedule-history' ||
                        msg.type === 'schedule-update' || msg.type === 'schedule-delete' ||
                        WORKSPACE_CHANGES_TYPES.has(msg.type) || PLUGIN_REQUEST_TYPES.has(msg.type)) {
-              if ((WORKSPACE_CHANGES_TYPES.has(msg.type) || PLUGIN_REQUEST_TYPES.has(msg.type)) && !ws.deviceId) {
+              if ((WORKSPACE_CHANGES_TYPES.has(msg.type) || PLUGIN_REQUEST_TYPES.has(msg.type) || msg.type === 'clawbot-control') && !ws.deviceId) {
                 sendFrame({ kind: 'error', code: 'authentication-required', requestType: msg.type,
                   ...(typeof msg.requestId === 'string' ? { requestId: msg.requestId } : {}),
-                  message: 'Plugin management requires a paired device' })
+                  message: msg.type === 'clawbot-control'
+                    ? 'ClawBot control requires a paired device'
+                    : 'Plugin management requires a paired device' })
                 return
               }
               if (msg.type === 'plugin-install' && pluginInstallOwners.has(msg.requestId)) {
@@ -3193,6 +3281,7 @@ const plugin = {
               'images',
               'session-create',
               'session-agent-preset',
+              'wechat-clawbot-control-v1',
               'commands',
               'tasks',
               'goals',

package/lib/plugin-updates.mjs

@@ -1,6 +1,37 @@
 export const PLUGIN_PACKAGE_NAME = 'dsh-plugin-weapp-gateway'
 const REGISTRY_LATEST_URL = `https://registry.npmjs.org/${PLUGIN_PACKAGE_NAME}/latest`
 
+function errorField(value) {
+  return typeof value === 'string' && value.trim() ? value.trim() : ''
+}
+
+export function formatPluginInstallError(error, depth = 0) {
+  if (typeof error === 'string') return error.trim().slice(0, 1000)
+  if (!error || typeof error !== 'object' || depth > 4) return ''
+
+  const code = errorField(error.code)
+  const message = errorField(error.message)
+    || errorField(error.errorMessage)
+    || errorField(error.detail)
+    || errorField(error.reason)
+    || errorField(error.description)
+  if (message) return `${code && code !== message ? `${code}: ` : ''}${message}`.slice(0, 1000)
+
+  for (const nested of [error.error, error.cause, error.details]) {
+    const detail = formatPluginInstallError(nested, depth + 1)
+    if (detail) return `${code && code !== detail ? `${code}: ` : ''}${detail}`.slice(0, 1000)
+  }
+
+  try {
+    const serialized = JSON.stringify(error, (key, value) => {
+      if (/stack|authorization|cookie|password|secret|token|credential|api.?key/i.test(key)) return undefined
+      return value
+    })
+    if (serialized && serialized !== '{}') return serialized.slice(0, 1000)
+  } catch { /* use a generic message for cyclic or non-serializable errors */ }
+  return code || 'The plugin manager did not provide an error message'
+}
+
 function parseVersion(value) {
   if (typeof value !== 'string') return null
   const match = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/.exec(value)
@@ -85,5 +116,12 @@ export async function installLatestPlugin({ api, currentVersion, fetchImpl = glo
     `${PLUGIN_PACKAGE_NAME}@${update.latestVersion}`,
     { requestId },
   )
-  return { ...update, installed: true, installation }
+  const errorMessage = formatPluginInstallError(installation?.error)
+  return {
+    ...update,
+    installed: true,
+    installation: errorMessage && installation && typeof installation === 'object'
+      ? { ...installation, errorMessage }
+      : installation,
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-weapp-gateway",
-  "version": "0.8.10",
+  "version": "0.8.12",
   "description": "Authenticated mobile gateway for dsh 0.1.7-rc.2 with Session V4 history, live permissions, inbox-based queue sync, plugin management (DSH 0.2.0 hosts), LAN and Cloudflare Tunnel access with public endpoint health checks, device pairing, per-session Agent preset selection, relay access for the WeChat mini-program, and the official speech-input bridge (speech-input-v1)",
   "main": "lib/index.mjs",
   "files": [