@xmanrui/dsh-im 4.24.0 → 4.25.0

package/plugin-src/client/channels/weixin/index.js

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import { WeixinLogoGlyph } from '../../channel-logos.js';
 import { QrActionIcon } from '../../credential-binding.js';
-import { CollapsibleAccountSection } from '../shared/collapsible-account.js';
+import { AccountSettingsToggle, CollapsibleAccountSection } from '../shared/collapsible-account.js';
 import { h } from '../../i18n.js';
 import {
   WEIXIN_ENDPOINTS,
@@ -230,6 +230,13 @@ export function AccountCard({
   return h('article', { className: 'dxw-card dim-botCard', tabIndex: -1, 'data-bot-id': account.botId },
     h('div', { className: 'dxw-cardBody dim-botCardBody' },
       h(CollapsibleAccountSection, {
+        settings: h(BotSettingsButton, {
+          channel: 'weixin',
+          botId: account.botId,
+          botName: account.bot.name,
+          connected: account.connected,
+          accessPolicy: account.accessPolicy,
+        }),
         id: `dxw-settings-${account.botId.replace(/[^a-zA-Z0-9_-]/g, '-')}`,
         header: h('div', { className: 'dxw-accountTop dim-botCardTop' },
         h('div', { className: 'dxw-accountIdentity dim-botIdentity' },
@@ -249,13 +256,7 @@ export function AccountCard({
             lastCheckedAt: account.health.lastCheckedAt,
             formatCheckedTime: checkedTime,
           }),
-          h(BotSettingsButton, {
-            channel: 'weixin',
-            botId: account.botId,
-            botName: account.bot.name,
-            connected: account.connected,
-            accessPolicy: account.accessPolicy,
-          })))
+          h(AccountSettingsToggle)))
       },
         h(WorkspaceEditor, {
         workspace: account.workspace,

package/plugin-src/client/channels/whatsapp/index.js

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import { WhatsappLogoGlyph } from '../../channel-logos.js';
 import { QrActionIcon } from '../../credential-binding.js';
-import { CollapsibleAccountSection } from '../shared/collapsible-account.js';
+import { AccountSettingsToggle, CollapsibleAccountSection } from '../shared/collapsible-account.js';
 import { h } from '../../i18n.js';
 import { WorkspaceEditor } from '../../workspace-editor.js';
 import { ContextEnhancementEditor } from '../../context-enhancement.js';
@@ -208,6 +208,13 @@ export function WhatsappAccountCard({
   return h('article', { className: 'ddt-card dim-botCard', 'data-bot-id': account.botId },
     h('div', { className: 'ddt-cardBody dim-botCardBody' },
       h(CollapsibleAccountSection, {
+        settings: h(BotSettingsButton, {
+          channel: 'whatsapp',
+          botId: account.botId,
+          botName: account.bot.name,
+          connected: account.connected,
+          accessPolicy: account.accessPolicy,
+        }),
         id: `wsp-settings-${account.botId.replace(/[^a-zA-Z0-9_-]/g, '-')}`,
         header: h('div', { className: 'ddt-accountTop dim-botCardTop' },
         h('div', { className: 'ddt-accountIdentity dim-botIdentity' },
@@ -231,13 +238,7 @@ export function WhatsappAccountCard({
             lastCheckedAt: account.health.lastCheckedAt,
             formatCheckedTime: checkedTime,
           }),
-          h(BotSettingsButton, {
-            channel: 'whatsapp',
-            botId: account.botId,
-            botName: account.bot.name,
-            connected: account.connected,
-            accessPolicy: account.accessPolicy,
-          })))
+          h(AccountSettingsToggle)))
       },
         h(WorkspaceEditor, {
         workspace: account.workspace,

package/plugin-src/client/i18n.js

@@ -45,6 +45,8 @@ const EN = Object.freeze({
   'IM机器人设置': 'IM bot settings',
   'IM 面板加载失败': 'Could not load the IM panel',
   '更多机器人设置': 'More bot settings',
+  '更多设置': 'More settings',
+  '常用配置': 'Common settings',
   '机器人设置': 'Bot settings',
   '机器人设置页签': 'Bot settings tabs',
   '投递设置': 'Delivery settings',
@@ -130,6 +132,8 @@ const EN = Object.freeze({
   '已安装版本': 'Installed version',
   '目标 profile': 'Target profile',
   '目标版本': 'Target version',
+  '最新版本': 'Latest version',
+  '上次更新目标': 'Previous update target',
   '无法确认': 'Unknown',
   '发现新版本': 'Update available',
   '已是最新版本': 'Up to date',
@@ -143,6 +147,7 @@ const EN = Object.freeze({
   '更新已生效': 'Updated version is active',
   '更新失败': 'Update failed',
   '更新请求失败': 'Update request failed',
+  '暂时无法安装更新': 'Update installation is unavailable',
   '仅更新 DSH-IM。安装完成后需手动重启后台；本功能不会自动重启或主动刷新页面。': 'Only DSH-IM will be updated. Restart the backend manually after installation. This feature does not automatically restart it or initiate a page refresh.',
   '当前是源码或链接安装，只能检查版本；请手动更新源码，或迁移到 npm 安装。': 'This is a source or linked installation. You can check versions, but must update the source manually or migrate to an npm installation.',
   '无法确认当前 profile，请在对应的 Harness 环境中手动更新。': 'The current profile could not be identified. Update manually in the corresponding Harness environment.',
@@ -666,6 +671,22 @@ const EN = Object.freeze({
   'Gateway 长连接': 'Gateway persistent connection',
   ' Socket Mode 长连接': ' Socket Mode persistent connection',
   'Socket Mode 长连接': 'Socket Mode persistent connection',
+  ' CS API 长轮询': ' CS API long polling',
+  'CS API 长轮询': 'CS API long polling',
+  '接入 Matrix 机器人': 'Connect a Matrix bot',
+  '连接你的 Matrix homeserver': 'Connect your Matrix homeserver',
+  '填写 homeserver 地址，并提供访问令牌，或者用户 ID 与密码的组合。机器人只访问该 homeserver，不连接第三方服务器。':
+    'Enter the homeserver URL plus an access token, or a user id with a password. The bot only talks to that homeserver and never to third-party servers.',
+  'Homeserver 地址': 'Homeserver URL',
+  '访问令牌（与用户 ID、密码二选一）': 'Access token (or user id + password)',
+  '用户 ID（可选）': 'User id (optional)',
+  '密码（可选）': 'Password (optional)',
+  '访问令牌来自 Element 设置 → 帮助 → 编辑设置，或 homeserver 的登录接口；用户 ID 与密码方式会为本安装派生稳定设备会话。':
+    'The access token comes from Element settings → Help → Advanced settings, or from the homeserver login API; the user id and password flow derives a stable device session for this installation.',
+  '填写 homeserver 地址与访问令牌，或者用户 ID 与密码，即可让机器人以 CS API 长轮询接收消息并以富文本回复。':
+    'Enter the homeserver URL with an access token, or a user id with a password, and the bot receives messages over the CS API long poll and replies with rich text.',
+  '使用 homeserver 与凭据接入 Matrix 机器人': 'Connect a Matrix bot with the homeserver and credentials',
+  '访问令牌或用户 ID 与密码': 'access token or user id with password',
   '接入 Telegram 机器人': 'Connect a Telegram bot',
   '先通过 @BotFather 获取 Bot Token，再在这里完成接入。': 'Get a Bot Token from @BotFather, then connect it here.',
   '填写 @BotFather 生成的 Bot Token': 'Enter the Bot Token from @BotFather',

package/plugin-src/client/index.js

@@ -15,6 +15,7 @@ import {
   WhatsappLogoGlyph,
   IMessageLogoGlyph,
   EmailLogoGlyph,
+  MatrixLogoGlyph,
 } from './channel-logos.js';
 import { DINGTALK_RPC_CHANNEL } from './channels/dingtalk/api.js';
 import { DingtalkSettingsTab } from './channels/dingtalk/index.js';
@@ -54,6 +55,9 @@ import { IMessageSettingsTab } from './channels/imessage/index.js';
 import { EmailSettingsTab, useEmailChannelEnabled } from './channels/email/index.js';
 import { installIMessageStyles } from './channels/imessage/styles.js';
 import { installEmailStyles } from './channels/email/styles.js';
+import { MATRIX_RPC_CHANNEL } from './channels/matrix/api.js';
+import { MatrixSettingsTab } from './channels/matrix/index.js';
+import { installMatrixStyles } from './channels/matrix/styles.js';
 import { en, h, IM_LOCALE_NAMESPACE, setImTranslator, zh } from './i18n.js';
 import {
   HOST_LANGUAGE_RPC_CHANNEL,
@@ -107,6 +111,7 @@ const CHANNELS = Object.freeze([
   { id: 'wecomApp', label: '企业微信应用', note: '（实验功能）' },
   { id: 'imessage', label: 'iMessage', note: '（实验功能）' },
   { id: 'email', label: '邮箱', note: '（实验功能）' },
+  { id: 'matrix', label: 'Matrix', note: '（实验功能）' },
   { id: 'office', label: 'AI Office', note: '（实验功能）' },
 ]);
 
@@ -167,6 +172,11 @@ function EmailLogo() {
     h(EmailLogoGlyph));
 }
 
+function MatrixLogo() {
+  return h('span', { className: 'dim-logo dim-logoMatrix', 'aria-hidden': 'true' },
+    h(MatrixLogoGlyph));
+}
+
 function OfficeLogo() {
   return h('span', { className: 'dim-logo dim-logoOffice', 'aria-hidden': 'true' },
     h(OfficeLogoGlyph));
@@ -185,6 +195,7 @@ function ChannelLogo({ channel }) {
   if (channel === 'whatsapp') return h(WhatsappLogo);
   if (channel === 'imessage') return h(IMessageLogo);
   if (channel === 'email') return h(EmailLogo);
+  if (channel === 'matrix') return h(MatrixLogo);
   return h(OfficeLogo);
 }
 
@@ -210,6 +221,7 @@ export function IMSettingsTab({
   feishuRpcCall,
   imessageRpcCall,
   emailRpcCall,
+  matrixRpcCall,
   qqRpcCall,
   slackRpcCall,
   telegramRpcCall,
@@ -275,6 +287,7 @@ export function IMSettingsTab({
     globalSettingsRpcCall,
     imessageRpcCall,
     emailRpcCall,
+    matrixRpcCall,
   }, {
     location: browserLocation,
     onRecovery: reportLoopbackRecovery,
@@ -287,6 +300,7 @@ export function IMSettingsTab({
     globalSettingsRpcCall,
     imessageRpcCall,
     emailRpcCall,
+    matrixRpcCall,
     officeRpcCall,
     qqRpcCall,
     reportLoopbackRecovery,
@@ -427,6 +441,8 @@ export function IMSettingsTab({
                             ? h(IMessageSettingsTab, { rpcCall: rpcCalls.imessageRpcCall })
                           : active.id === 'email'
                             ? h(EmailSettingsTab, { rpcCall: rpcCalls.emailRpcCall })
+                          : active.id === 'matrix'
+                            ? h(MatrixSettingsTab, { rpcCall: rpcCalls.matrixRpcCall })
                           : h(OfficeSettingsTab, { rpcCall: rpcCalls.officeRpcCall }))),
     ),
   ));
@@ -466,6 +482,7 @@ export function apply(ctx) {
       installWhatsappStyles(),
       installIMessageStyles(),
       installEmailStyles(),
+      installMatrixStyles(),
       installOfficeStyles(),
       installImStyles(),
     ];
@@ -496,6 +513,8 @@ export function apply(ctx) {
     callManagementRpc(ctx.connection, IMESSAGE_RPC_CHANNEL, endpoint, payload, signal);
   const emailRpcCall = (endpoint, payload, signal) =>
     callManagementRpc(ctx.connection, EMAIL_RPC_CHANNEL, endpoint, payload, signal);
+  const matrixRpcCall = (endpoint, payload, signal) =>
+    callManagementRpc(ctx.connection, MATRIX_RPC_CHANNEL, endpoint, payload, signal);
   const slackRpcCall = (endpoint, payload, signal) =>
     callManagementRpc(ctx.connection, SLACK_RPC_CHANNEL, endpoint, payload, signal);
   const officeRpcCall = (endpoint, payload, signal) =>
@@ -526,6 +545,7 @@ export function apply(ctx) {
     imessageRpcCall,
     officeRpcCall,
     emailRpcCall,
+    matrixRpcCall,
     updateRpcCall,
     deliveryRpcCall,
     globalSettingsRpcCall,

package/plugin-src/client/session-channel-logos.js

@@ -2,7 +2,7 @@ import { parseSessionChannelTitle } from '../../src/channels/shared/session-chan
 import {
   WeixinLogoGlyph, FeishuLogoGlyph, DingtalkLogoGlyph, WecomLogoGlyph, QqLogoGlyph,
   SlackLogoGlyph, TelegramLogoGlyph, DiscordLogoGlyph, WhatsappLogoGlyph, OfficeLogoGlyph,
-  IMessageLogoGlyph,
+  IMessageLogoGlyph, MatrixLogoGlyph,
 } from './channel-logos.js';
 
 const GLYPHS = Object.freeze({
@@ -16,6 +16,7 @@ const GLYPHS = Object.freeze({
   discord: [DiscordLogoGlyph, '#5865f2'],
   whatsapp: [WhatsappLogoGlyph, '#25d366'],
   imessage: [IMessageLogoGlyph, '#3478f6'],
+  matrix: [MatrixLogoGlyph, '#1a8f6f'],
   office: [OfficeLogoGlyph, '#f97316'],
 });
 const CHANNEL_ATTR = 'data-dsh-im-session-channel';

package/plugin-src/client/styles.js

@@ -60,7 +60,9 @@ const CSS = String.raw`
 .dim-updateButton:hover:not(:disabled) { border-color: #aeb3bb; color: var(--dsw-alias-label-primary, #1f2329); background: var(--dsw-alias-interactive-bg-hover, #f7f8fa); }
 .dim-updateButton:focus-visible { outline: 2px solid var(--dsw-alias-state-business-primary, #3370ff); outline-offset: 2px; }
 .dim-updateButton:disabled { opacity: .55; cursor: default; }
-.dim-updateTrigger { white-space: nowrap; }
+.dim-updateAction { position: relative; display: inline-flex; flex: none; }
+.dim-updateTrigger { width: 30px; height: 30px; flex: none; padding: 0; }
+.dim-updateTrigger svg { display: block; }
 .dim-updateBackdrop { position: fixed; inset: 0; z-index: 1000; display: grid; place-items: center; padding: 24px; background: rgb(15 17 21 / 42%); }
 .dim-updateBackdrop, .dim-updateBackdrop * { box-sizing: border-box; }
 .dim-updateDialog { width: min(480px, 100%); max-height: calc(100vh - 48px); overflow-y: auto; border: 1px solid var(--dsw-alias-border-l2, #dfe1e5); border-radius: 16px; color: var(--dsw-alias-label-primary, #1f2329); background: var(--dsw-alias-bg-layer-3, #fff); box-shadow: 0 20px 70px rgb(0 0 0 / 20%); text-align: left; }
@@ -97,8 +99,8 @@ const CSS = String.raw`
 .dim-githubLink svg { display: block; }
 .dim-githubLink:hover { border-color: #aeb3bb; color: var(--dsw-alias-label-primary, #1f2329); background: var(--dsw-alias-interactive-bg-hover, #f7f8fa); }
 .dim-githubLink:focus-visible { outline: 2px solid color-mix(in srgb, var(--dim-blue) 70%, white); outline-offset: 2px; }
-.dim-githubTooltip { position: absolute; top: calc(100% + 8px); right: 0; z-index: 20; width: max-content; max-width: min(220px, 80vw); padding: 6px 9px; border: 1px solid var(--dsw-alias-border-l2, #dfe1e5); border-radius: 7px; color: var(--dsw-alias-label-primary, #1f2329); background: var(--dsw-alias-bg-layer-3, #fff); box-shadow: 0 8px 24px rgb(31 35 41 / 14%); font-size: 11px; line-height: 16px; font-weight: 500; white-space: nowrap; opacity: 0; visibility: hidden; transform: translateY(-3px); pointer-events: none; transition: opacity .15s ease, transform .15s ease, visibility .15s ease; }
-.dim-githubAction:hover .dim-githubTooltip, .dim-githubAction:focus-within .dim-githubTooltip { opacity: 1; visibility: visible; transform: translateY(0); }
+.dim-updateTooltip, .dim-githubTooltip { position: absolute; top: calc(100% + 8px); right: 0; z-index: 20; width: max-content; max-width: min(220px, 80vw); padding: 6px 9px; border: 1px solid var(--dsw-alias-border-l2, #dfe1e5); border-radius: 7px; color: var(--dsw-alias-label-primary, #1f2329); background: var(--dsw-alias-bg-layer-3, #fff); box-shadow: 0 8px 24px rgb(31 35 41 / 14%); font-size: 11px; line-height: 16px; font-weight: 500; white-space: nowrap; opacity: 0; visibility: hidden; transform: translateY(-3px); pointer-events: none; transition: opacity .15s ease, transform .15s ease, visibility .15s ease; }
+.dim-updateAction:hover .dim-updateTooltip, .dim-updateTrigger:focus-visible + .dim-updateTooltip, .dim-githubAction:hover .dim-githubTooltip, .dim-githubAction:focus-within .dim-githubTooltip { opacity: 1; visibility: visible; transform: translateY(0); }
 .dim-generalSettingsAction { position: relative; display: inline-flex; flex: none; }
 .dim-generalSettingsButton { width: 30px; height: 30px; display: grid; place-items: center; flex: none; padding: 0; border: 1px solid var(--dsw-alias-border-l2, #dfe1e5); border-radius: 8px; color: var(--dsw-alias-label-secondary, #646a73); background: var(--dsw-alias-bg-layer-1, #fff); cursor: pointer; transition: border-color .15s ease, color .15s ease, background .15s ease, box-shadow .15s ease; }
 .dim-generalSettingsButton svg { display: block; }
@@ -417,10 +419,15 @@ const CSS = String.raw`
 .dim-panel .dim-botCardBody { position: relative; min-width: 0; width: 100%; max-width: 100%; padding: 12px 8px; }
 .dim-collapsibleAccount { min-width: 0; display: flex; flex-direction: column; }
 .dim-collapsibleHead { min-width: 0; display: flex; align-items: center; gap: 4px; cursor: pointer; user-select: none; -webkit-user-select: none; }
-.dim-collapsibleHead:focus-visible { outline: 2px solid var(--dsw-alias-state-business-primary, #3370ff); outline-offset: 2px; border-radius: 8px; }
 .dim-collapsibleHeaderContent { min-width: 0; flex: 1 1 auto; display: flex; align-items: center; }
-.dim-collapsibleChevron { flex: 0 0 auto; display: inline-flex; align-items: center; justify-content: center; width: 9px; height: 9px; border-right: 1.6px solid var(--dsw-alias-label-tertiary, #8f959e); border-bottom: 1.6px solid var(--dsw-alias-label-tertiary, #8f959e); transform: rotate(-45deg); transition: transform .22s cubic-bezier(.4, 0, .2, 1); transform-origin: 50% 50%; }
-.dim-collapsibleAccount.is-open .dim-collapsibleChevron { transform: rotate(45deg); }
+/* Keep the original header footprint; center both icons with equal side space. */
+.dim-accountSettingsToggle { flex: none; width: 45px; height: 32px; display: inline-flex; gap: 5px; align-items: center; justify-content: center; padding: 0; border: 0; border-radius: 8px; color: var(--dsw-alias-state-business-primary, #3370ff); background: color-mix(in srgb, var(--dsw-alias-state-business-primary, #3370ff) 8%, var(--dsw-alias-bg-layer-1, #fff)); cursor: pointer; }
+.dim-accountSettingsToggle > svg { flex: none; display: block; }
+.dim-accountSettingsToggle:hover { background: color-mix(in srgb, var(--dsw-alias-state-business-primary, #3370ff) 14%, var(--dsw-alias-bg-layer-1, #fff)); }
+.dim-accountSettingsToggle:focus-visible { outline: 2px solid var(--dsw-alias-state-business-primary, #3370ff); outline-offset: 2px; }
+.dim-collapsibleChevron { width: 12px; height: 16px; transition: transform .22s cubic-bezier(.4, 0, .2, 1); transform-origin: 50% 50%; }
+.dim-accountSettingsToggle[aria-expanded="true"] .dim-collapsibleChevron { transform: rotate(180deg); }
+.dim-accountSettingsHeader { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin-top: 12px; padding-top: 8px; border-top: 1px solid var(--dsw-alias-border-l2, #e5e6eb); color: var(--dsw-alias-label-secondary, #646a73); font-size: 12px; }
 /* Animate height without measuring content; hide collapsed controls from focus and accessibility. */
 .dim-collapsibleBody { display: grid; grid-template-rows: 0fr; transition: grid-template-rows .22s cubic-bezier(.4, 0, .2, 1); }
 .dim-collapsibleAccount.is-open > .dim-collapsibleBody { grid-template-rows: 1fr; }
@@ -445,11 +452,10 @@ const CSS = String.raw`
 .dim-panel .dim-botCard .dim-healthDot[data-tone="warning"] { background: var(--dsw-alias-state-warn-primary, #d97706); }
 .dim-panel .dim-botCard .dim-healthDot[data-tone="error"] { background: var(--dsw-alias-state-error-primary, #d54941); }
 .dim-botSettingsAction { position: relative; flex: none; display: inline-flex; }
-.dim-botSettingsButton { width: 32px; height: 32px; display: grid; place-items: center; padding: 0; border: 0; border-radius: 8px; color: var(--dsw-alias-label-secondary, #646a73); background: transparent; cursor: pointer; transition: color .15s ease, background .15s ease; }
+.dim-botSettingsButton { min-height: 32px; display: inline-flex; align-items: center; gap: 6px; padding: 0 6px; border: 0; border-radius: 8px; color: var(--dsw-alias-state-business-primary, #3370ff); background: transparent; font: inherit; font-size: 12px; white-space: nowrap; cursor: pointer; transition: color .15s ease, background .15s ease; }
 .dim-botSettingsButton:hover { color: var(--dsw-alias-label-primary, #1f2329); background: var(--dsw-alias-interactive-bg-hover, #eef0f3); }
 .dim-botSettingsButton:focus-visible { outline: 2px solid var(--dsw-alias-state-business-primary, #3370ff); outline-offset: 2px; }
-.dim-botSettingsTooltip { position: absolute; top: calc(100% + 6px); right: 0; z-index: 30; width: max-content; padding: 6px 9px; border: 1px solid var(--dsw-alias-border-l2, #dfe1e5); border-radius: 7px; color: var(--dsw-alias-label-primary, #1f2329); background: var(--dsw-alias-bg-layer-3, #fff); box-shadow: 0 8px 24px rgb(31 35 41 / 14%); font-size: 11px; line-height: 16px; opacity: 0; visibility: hidden; transform: translateY(-3px); pointer-events: none; transition: opacity .15s ease, transform .15s ease, visibility .15s ease; }
-.dim-botSettingsAction:hover .dim-botSettingsTooltip, .dim-botSettingsAction:focus-within .dim-botSettingsTooltip { opacity: 1; visibility: visible; transform: translateY(0); }
+.dim-moreSettingsChevron { width: 6px; height: 6px; margin-right: 2px; border-right: 1.5px solid currentColor; border-bottom: 1.5px solid currentColor; transform: rotate(-45deg); }
 .dim-deliveryPage { min-width: 0; display: grid; }
 .dim-deliveryHeader { min-width: 0; display: flex; align-items: center; justify-content: space-between; gap: 16px; }
 .dim-botSettingsTabsBar { min-width: 0; margin-top: 10px; border-bottom: 1px solid var(--dsw-alias-border-l2, #dfe1e5); }

package/plugin-src/client/update-panel.js

@@ -3,7 +3,7 @@ import { createPortal } from 'react-dom';
 import validSemver from 'semver/functions/valid.js';
 import compareVersionsDescending from 'semver/functions/rcompare.js';
 
-import { h } from './i18n.js';
+import { h, localizeText } from './i18n.js';
 import { createPollScheduler } from './lifecycle.js';
 
 export const UPDATE_RPC_CHANNEL = '/dsh-im';
@@ -72,14 +72,17 @@ function summary(snapshot, action, error) {
   if (snapshot?.job?.state === 'restart-required' || snapshot?.blockedReason === 'pending-restart') {
     return '已安装，待手动重启';
   }
-  if (snapshot?.job?.state === 'completed') return '更新已生效';
-  if (snapshot?.job?.state === 'failed') return '更新失败';
-  if (snapshot?.job?.state === 'interrupted') return '上次更新已中断，请检查安装状态后重试。';
   if (error) return '更新请求失败';
+  if (!snapshot?.job?.recoverable) {
+    if (snapshot?.job?.state === 'failed') return '更新失败';
+    if (snapshot?.job?.state === 'interrupted') return '上次更新已中断，请检查安装状态后重试。';
+  }
+  if (snapshot?.blockedReason === 'no-update') return '当前版本无需更新';
+  if (snapshot?.blockedReason) return '暂时无法安装更新';
   if (snapshot?.canInstall) return '发现新版本';
   if (snapshot?.checkedAt && snapshot.latestVersion === snapshot.runningVersion) return '已是最新版本';
-  if (snapshot?.blockedReason === 'no-update') return '当前版本无需更新';
   if (snapshot?.checkedAt) return '已获取 npm 最新版本';
+  if (snapshot?.job?.state === 'completed') return '更新已生效';
   return '检查 npm 最新版本，不会自动安装。';
 }
 
@@ -102,7 +105,7 @@ function manualUpdateCommand(snapshot) {
   const targets = [
     snapshot.latestVersion,
     pendingRestart ? snapshot.installedVersion : null,
-    snapshot.job?.state !== 'completed' ? snapshot.job?.targetVersion : null,
+    snapshot.job?.state !== 'completed' && !snapshot.job?.recoverable ? snapshot.job?.targetVersion : null,
   ].filter(validVersion);
   // Keep a known target pinned, and never suggest downgrading an installed/running version.
   const version = targets.length
@@ -237,6 +240,7 @@ function UpdateDialog({ children, onClose }) {
 }
 
 export function UpdatePanel({ rpcCall, clientVersion, onStatus }) {
+  const tooltipId = React.useId();
   const [snapshot, setSnapshot] = React.useState(null);
   const [action, setAction] = React.useState('status');
   const [error, setError] = React.useState(null);
@@ -394,28 +398,44 @@ export function UpdatePanel({ rpcCall, clientVersion, onStatus }) {
   const blocked = BLOCKED_REASONS[snapshot?.blockedReason] ?? ERROR_MESSAGES[snapshot?.blockedReason];
   const canConfirm = snapshot?.canInstall && snapshot.checkId && !activeJob && !restartRequired;
   const versionsDiffer = snapshot && clientVersion && snapshot.runningVersion !== clientVersion;
-  const failedJob = ['failed', 'interrupted'].includes(snapshot?.job?.state);
+  const failedJob = ['failed', 'interrupted'].includes(snapshot?.job?.state) && !snapshot.job.recoverable;
   const jobMessage = snapshot?.job?.message;
-  const targetVersion = snapshot?.job?.targetVersion;
+  const targetVersion = activeJob || restartRequired ? snapshot?.job?.targetVersion : null;
+  const historicalTargetVersion = !activeJob && !restartRequired ? snapshot?.job?.targetVersion : null;
+  const latestVersion = !activeJob && !restartRequired && !error && snapshot?.checkedAt
+    ? snapshot.latestVersion : null;
   const manualCommand = manualUpdateCommand(snapshot);
   const buttonLabel = action === 'checking' ? '检查中…'
     : action === 'starting' || activeJob ? '正在更新…'
       : restartRequired ? '待手动重启'
         : snapshot?.canInstall ? '更新至'
           : '检查更新';
+  const buttonDescription = localizeText(buttonLabel) + (buttonLabel === '更新至' ? ` v${snapshot.latestVersion}` : '');
 
   return h(React.Fragment, null,
-    h('button', {
-      type: 'button',
-      className: 'dim-updateButton dim-updateTrigger',
-      disabled: busyAction,
-      'aria-haspopup': 'dialog',
-      onClick: () => {
-        setOpen(true);
-        if (restartRequired) void refreshStatus();
-        else if (!snapshot?.canInstall && !snapshot?.job) void check();
+    h('span', { className: 'dim-updateAction' },
+      h('button', {
+        type: 'button',
+        className: 'dim-updateButton dim-updateTrigger',
+        disabled: busyAction,
+        'aria-label': buttonDescription,
+        'aria-describedby': tooltipId,
+        'aria-haspopup': 'dialog',
+        onClick: () => {
+          setOpen(true);
+          if (restartRequired) void refreshStatus();
+          else if (!snapshot?.canInstall && !activeJob && !uncertainInstall) void check();
+        },
+      }, h('svg', {
+        width: 18, height: 18, viewBox: '0 0 24 24', fill: 'none',
+        stroke: 'currentColor', strokeWidth: 2.3, strokeLinecap: 'round', strokeLinejoin: 'round',
+        focusable: 'false', 'aria-hidden': 'true',
       },
-    }, buttonLabel, buttonLabel === '更新至' ? ` v${snapshot.latestVersion}` : null),
+      h('path', { d: 'M3 12a9 9 0 0 1 15.36-6.36L21 8' }),
+      h('path', { d: 'M21 3v5h-5' }),
+      h('path', { d: 'M21 12a9 9 0 0 1-15.36 6.36L3 16' }),
+      h('path', { d: 'M8 16H3v5' }))),
+      h('span', { id: tooltipId, className: 'dim-updateTooltip', role: 'tooltip' }, buttonDescription)),
     open ? h(UpdateDialog, { onClose: () => setOpen(false) },
       h('div', { className: 'dim-updateBody' },
         h('dl', { className: 'dim-updateVersions' },
@@ -425,6 +445,10 @@ export function UpdatePanel({ rpcCall, clientVersion, onStatus }) {
                 h('dt', null, '已安装版本'), h('dd', null, `v${snapshot.installedVersion}`)) : null,
           targetVersion ? h(React.Fragment, null,
             h('dt', null, '目标版本'), h('dd', null, `v${targetVersion}`)) : null,
+          latestVersion ? h(React.Fragment, null,
+            h('dt', null, '最新版本'), h('dd', null, `v${latestVersion}`)) : null,
+          historicalTargetVersion ? h(React.Fragment, null,
+            h('dt', null, '上次更新目标'), h('dd', null, `v${historicalTargetVersion}`)) : null,
           h('dt', null, '目标 profile'), h('dd', null, snapshot?.profileName ?? '无法确认')),
         h('div', {
           className: `dim-updateStatus${error || failedJob ? ' dim-updateStatusError' : ''}`,

package/plugin-src/host/channels/matrix/index.mjs

@@ -0,0 +1,31 @@
+import { createProductionController } from './production.mjs';
+import { createMatrixRpcHandler, installMatrixRpc, MATRIX_RPC_CHANNEL } from './rpc.mjs';
+import { installProductionChannel } from '../shared/startup.mjs';
+
+export const name = 'dsh-im-matrix-host';
+export const inject = ['connection', 'credentials', 'typertGateway'];
+
+export async function apply(ctx, config = {}) {
+  if (config?.controller) return installMatrixRpc(ctx, config.controller, config.rpcAuthority);
+  return installProductionChannel(ctx, config, {
+    channel: 'matrix',
+    rpcChannel: MATRIX_RPC_CHANNEL,
+    createProduction: () => createProductionController(ctx, config, config.internals ?? {}),
+    createHandler: controller => createMatrixRpcHandler(controller),
+  });
+}
+
+export function createMatrixHostPlugin(config) {
+  return Object.freeze({ name, inject, apply: (ctx) => apply(ctx, config) });
+}
+
+export { createProductionController } from './production.mjs';
+export {
+  MATRIX_ENDPOINTS,
+  MATRIX_RPC_CHANNEL,
+  MATRIX_RPC_ENDPOINTS,
+  createMatrixRpcHandler,
+  installMatrixRpc,
+} from './rpc.mjs';
+export { MatrixController } from '../../../../src/channels/matrix/matrix-controller.mjs';
+export { MatrixRuntime } from '../../../../src/channels/matrix/matrix-runtime.mjs';