Merge paired WeChat binding and compound unbinding workflow

electron/services/cloud-agent-operations.ts

@@ -60,6 +60,7 @@ function projectMutation(value: unknown): unknown {
     ...(source.worker && typeof source.worker === 'object' ? { worker: copy(source.worker, ['account_id', 'address']) } : {}),
     ...(source.wechat && typeof source.wechat === 'object' ? { wechat: copy(source.wechat, ['status', 'message']) } : {}),
     ...(source.disconnected === undefined ? {} : { disconnected: source.disconnected === true }),
+    ...(source.unbound === undefined ? {} : { unbound: source.unbound === true }),
   };
 }
 function projectWechat(value: unknown): unknown {
@@ -187,7 +188,7 @@ function projectSchedules(value: unknown): unknown { return { jobs: list(object(
 function validateChannelInput(operation: string, args: ObjectRecord): void {
   const channelOperations = new Set([
     'createChannelAccount', 'routeChannelAccount', 'enableChannelAccount', 'pauseChannelAccount',
-    'disconnectChannelAccount', 'channelAccountWechatBindStart', 'channelAccountWechatBindStatus',
+    'disconnectChannelAccount', 'unbindChannelAccount', 'channelAccountWechatBindStart', 'channelAccountWechatBindStatus',
     'channelAccountWechatBindVerification', 'channelAccountWechatBindAccount', 'channelAccountWechatUnbind',
     'channelAccountOperation',
     'createChannelBinding', 'switchChannelBindingAgent', 'enableChannelBinding', 'pauseChannelBinding',
@@ -211,6 +212,9 @@ function validateChannelInput(operation: string, args: ObjectRecord): void {
   if (operation === 'routeChannelAccount' && args.target_agent_slug !== null
     && (typeof args.target_agent_slug !== 'string' || !/^ml-[a-f0-9]{32}$/.test(args.target_agent_slug))) throw new Error('invalid_id');
   if (operation === 'routeChannelAccount' && args.target_agent_slug === null && args.enabled !== false) throw new Error('invalid_input');
+  if (operation === 'unbindChannelAccount' && (typeof args.channel_account_id !== 'string'
+    || typeof args.operation_id !== 'string' || !Number.isSafeInteger(args.expected_revision)
+    || Number(args.expected_revision) < 0)) throw new Error('invalid_input');
   if (operation === 'switchChannelBindingAgent' && (typeof args.target_agent_slug !== 'string' || !/^ml-[a-f0-9]{32}$/.test(args.target_agent_slug))) throw new Error('invalid_id');
   if (operation === 'wechatBindStart' && typeof args.force !== 'boolean') throw new Error('invalid_input');
   if (operation === 'channelAccountWechatBindStart' && typeof args.force !== 'boolean') throw new Error('invalid_input');
@@ -294,6 +298,7 @@ const operations: Record<keyof CloudAgentOperations, OperationSpec> = {
   enableChannelAccount: { method: 'POST', path: '/channel-accounts/:channel_account_id/enable', body: ['operation_id', 'expected_revision'], output: ['channel'], project: projectMutation },
   pauseChannelAccount: { method: 'POST', path: '/channel-accounts/:channel_account_id/pause', body: ['operation_id', 'expected_revision'], output: ['channel'], project: projectMutation },
   disconnectChannelAccount: { method: 'POST', path: '/channel-accounts/:channel_account_id/disconnect', body: ['operation_id', 'expected_revision'], output: ['channel', 'wechat', 'disconnected'], project: projectMutation },
+  unbindChannelAccount: { method: 'POST', path: '/channel-accounts/:channel_account_id/unbind', body: ['operation_id', 'expected_revision'], output: ['channel', 'wechat', 'disconnected', 'unbound'], project: projectMutation },
   channelAccountWechatBindStart: { method: 'POST', path: '/channel-accounts/:channel_account_id/wechat-bind/start', body: ['operation_id', 'force'], output: ['session_key', 'status', 'message', 'qrcode_url'], project: projectWechat },
   channelAccountWechatBindStatus: { method: 'GET', path: '/channel-accounts/:channel_account_id/wechat-bind/status', query: { session_key: 'session_key' }, output: ['session_key', 'status', 'message', 'qrcode_url'], project: projectWechat },
   channelAccountWechatBindVerification: { method: 'POST', path: '/channel-accounts/:channel_account_id/wechat-bind/verification', body: ['operation_id', 'session_key', 'verify_code'], output: ['session_key', 'status', 'message', 'qrcode_url'], project: projectWechat },

electron/services/cloud-agents.ts

@@ -55,6 +55,7 @@ const MESSAGES: Record<string, string> = {
   download_failed: '文件保存失败，请重试',
   channel_not_found: '微信渠道不存在或已解绑',
   channel_operation_conflict: '微信渠道正在处理其他操作，请稍后查看状态',
+  channel_operation_unconfirmed: '微信绑定的变更尚未确认，请查看待确认操作后重试',
   channel_request_invalid: '微信渠道请求无效，请刷新后重试',
   channel_rate_limited: '微信渠道操作过于频繁，请稍后重试',
   channel_conversation_not_found: '微信会话不存在或已关闭',
@@ -424,9 +425,20 @@ export class CloudAgentsModule {
     let plan;
     try { plan = operationPlan(value); }
     catch { throw new CloudAgentsError(422, 'invalid_input'); }
-    const invoke = async () => plan.project(await this.request(plan.path, plan.method, plan.body, plan.cloud === 'ws'));
+    const invoke = async () => {
+      const result = plan.project(await this.request(plan.path, plan.method, plan.body, plan.cloud === 'ws'));
+      if (plan.operation === 'unbindChannelAccount') {
+        const value = record(result), channel = record(value.channel);
+        if (value.unbound !== true || value.disconnected !== true || channel.id !== plan.input.channel_account_id
+          || channel.enabled !== false || channel.target_agent_slug !== null || channel.health !== 'login_required') {
+          // Keep the original operation in recovery until both routing and login are confirmed removed.
+          throw new CloudAgentsError(503, 'channel_operation_unconfirmed');
+        }
+      }
+      return result;
+    };
     const recoverable = ['submit', 'preview', 'resume', 'publish', 'createApplication', 'createKey', 'createKnowledge', 'processKnowledge', 'createSchedule', 'runSchedule', 'importKnowledgeAttachment', 'createChild',
-      'createChannelAccount', 'routeChannelAccount', 'enableChannelAccount', 'pauseChannelAccount', 'disconnectChannelAccount',
+      'createChannelAccount', 'routeChannelAccount', 'enableChannelAccount', 'pauseChannelAccount', 'disconnectChannelAccount', 'unbindChannelAccount',
       'channelAccountWechatBindStart', 'channelAccountWechatBindVerification', 'channelAccountWechatUnbind',
       'createChannelBinding', 'switchChannelBindingAgent', 'enableChannelBinding', 'pauseChannelBinding', 'disconnectChannelBinding',
       'wechatBindStart', 'wechatBindVerification', 'wechatUnbind',