@michengai/dsh-im-connect 0.1.39 → 0.1.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/CHANGELOG.zh-CN.md +18 -0
- package/README.en.md +27 -7
- package/README.md +29 -9
- package/client.js +168 -100
- package/lib/channels/dingtalk.d.ts.map +1 -1
- package/lib/channels/dingtalk.js +4 -2
- package/lib/channels/dingtalk.js.map +1 -1
- package/lib/client.js +168 -100
- package/lib/engine/chat-commands.d.ts +30 -0
- package/lib/engine/chat-commands.d.ts.map +1 -0
- package/lib/engine/chat-commands.js +451 -0
- package/lib/engine/chat-commands.js.map +1 -0
- package/lib/engine/command-locale.d.ts +6 -0
- package/lib/engine/command-locale.d.ts.map +1 -0
- package/lib/engine/command-locale.js +21 -0
- package/lib/engine/command-locale.js.map +1 -0
- package/lib/engine/command-messages.d.ts +214 -0
- package/lib/engine/command-messages.d.ts.map +1 -0
- package/lib/engine/command-messages.js +214 -0
- package/lib/engine/command-messages.js.map +1 -0
- package/lib/engine/command-permissions.d.ts +15 -0
- package/lib/engine/command-permissions.d.ts.map +1 -0
- package/lib/engine/command-permissions.js +39 -0
- package/lib/engine/command-permissions.js.map +1 -0
- package/lib/engine/command-replies.d.ts +12 -0
- package/lib/engine/command-replies.d.ts.map +1 -0
- package/lib/engine/command-replies.js +36 -0
- package/lib/engine/command-replies.js.map +1 -0
- package/lib/engine/gateway.d.ts +6 -1
- package/lib/engine/gateway.d.ts.map +1 -1
- package/lib/engine/gateway.js +70 -33
- package/lib/engine/gateway.js.map +1 -1
- package/lib/engine/merge.d.ts +2 -0
- package/lib/engine/merge.d.ts.map +1 -1
- package/lib/engine/merge.js +2 -0
- package/lib/engine/merge.js.map +1 -1
- package/lib/engine/router.d.ts +19 -5
- package/lib/engine/router.d.ts.map +1 -1
- package/lib/engine/router.js +231 -61
- package/lib/engine/router.js.map +1 -1
- package/lib/engine/session-id.d.ts +7 -0
- package/lib/engine/session-id.d.ts.map +1 -1
- package/lib/engine/session-id.js.map +1 -1
- package/lib/engine/session-store.d.ts +6 -0
- package/lib/engine/session-store.d.ts.map +1 -1
- package/lib/engine/session-store.js +58 -1
- package/lib/engine/session-store.js.map +1 -1
- package/lib/engine/session-title.d.ts +8 -0
- package/lib/engine/session-title.d.ts.map +1 -0
- package/lib/engine/session-title.js +30 -0
- package/lib/engine/session-title.js.map +1 -0
- package/lib/manager.d.ts +7 -0
- package/lib/manager.d.ts.map +1 -1
- package/lib/manager.js +57 -9
- package/lib/manager.js.map +1 -1
- package/package.json +1 -1
- package/src/channels/dingtalk.ts +4 -2
- package/src/engine/chat-commands.ts +404 -0
- package/src/engine/command-locale.ts +20 -0
- package/src/engine/command-messages.ts +297 -0
- package/src/engine/command-permissions.ts +35 -0
- package/src/engine/command-replies.ts +37 -0
- package/src/engine/gateway.ts +59 -33
- package/src/engine/merge.ts +4 -0
- package/src/engine/router.ts +205 -60
- package/src/engine/session-id.ts +7 -0
- package/src/engine/session-store.ts +50 -1
- package/src/engine/session-title.ts +25 -0
- package/src/manager.ts +56 -10
package/client.js
CHANGED
|
@@ -46,8 +46,9 @@ window.__ModuleLoader__.load({
|
|
|
46
46
|
zh: {
|
|
47
47
|
"settings.label": "IM助理", "settings.title": "IM助理", "settings.description": "管理各渠道账号。每个账号独立选择工作区、模型和权限,配置仅保存在本机。", "settings.viewProject": "GitHub", "settings.feedback": "问题反馈",
|
|
48
48
|
"settings.aria": "IM助理", "settings.selectAccountTitle": "选择一个账号", "settings.selectAccountDescription": "从左侧选择账号,查看并修改工作区、模型和权限配置。", "settings.noAccountsTitle": "还没有接入账号", "settings.noAccountsDescription": "请在左侧选择对应渠道,然后点击“添加账号”。", "settings.publicChatNotice": "未批准用户可以发起聊天,但不能批准工具调用。", "pending.notice": "有访问请求。批准后该用户才能驱动本机助手。", "action.approve": "批准", "action.deny": "拒绝", "loading": "加载中…",
|
|
49
|
+
"account.agentPreset": "Agent 预设", "account.presetUnavailable": "预设不可用", "account.presetNote": "更改后使用新会话,旧会话保留。", "action.settings": "设置", "command.title": "命令权限", "command.note": "先按原有准入规则判断,再检查命令权限。关闭命令仍可正常对话、处理附件和回答审批。", "command.dm": "私聊命令", "command.group": "群聊命令", "command.enabled": "可以执行命令", "command.disabled": "仅正常对话", "command.user": "平台用户 ID", "command.add": "添加用户例外", "command.remove": "移除", "command.save": "保存命令权限", "command.invalid": "请填写有效且不重复的用户 ID。",
|
|
49
50
|
"account.workspace": "工作区", "account.currentWorkspace": "当前工作区", "account.selectWorkspace": "请选择工作区", "account.selectModel": "请选择模型", "account.selectPermission": "请选择权限", "account.privateAccess": "私聊准入", "account.privateApproved": "仅已批准用户", "account.privateAll": "允许所有私聊用户", "account.autoNameNote": "绑定成功后会自动生成账号名,无需手动填写。", "account.defaultName": "{channel}账号 {count}",
|
|
50
|
-
"account.countZero": "0 个账号", "account.countOnline": "{online} / {total} 在线", "account.countOffline": "{total} / {total} 离线", "account.statusProcessing": "处理中…", "account.statusOnline": "在线", "account.statusOffline": "离线", "account.statusRunning": "运行正常", "account.statusNotConnected": "未连接", "account.receive": "接收消息", "account.receiveDescription": "关闭后保留账号配置,但不接收新消息", "account.removeConfirm": "确定移除这个账号?本机保存的配置和凭据将一并删除。",
|
|
51
|
+
"account.count": "{count} 个账号", "account.countZero": "0 个账号", "account.countOnline": "{online} / {total} 在线", "account.countOffline": "{total} / {total} 离线", "account.statusProcessing": "处理中…", "account.statusOnline": "在线", "account.statusOffline": "离线", "account.statusRunning": "运行正常", "account.statusNotConnected": "未连接", "account.receive": "接收消息", "account.receiveDescription": "关闭后保留账号配置,但不接收新消息", "account.removeConfirm": "确定移除这个账号?本机保存的配置和凭据将一并删除。",
|
|
51
52
|
"action.addAccount": "添加账号", "action.generateQr": "生成二维码", "action.checkConnection": "检查连接", "action.reconnectAccount": "重新连接", "action.removeAccount": "移除接入", "status.saving": "保存中…", "status.saved": "已保存",
|
|
52
53
|
"channel.dingtalk": "钉钉", "channel.feishu": "飞书", "channel.lark": "Lark", "channel.weixin": "微信", "channel.wecom": "企业微信", "channel.qq": "QQ", "channel.telegram": "Telegram",
|
|
53
54
|
"field.dingtalk.clientId": "Client ID(原 AppKey)", "field.dingtalk.clientSecret": "Client Secret(原 AppSecret)",
|
|
@@ -57,7 +58,7 @@ window.__ModuleLoader__.load({
|
|
|
57
58
|
"error.loadAssistant": "无法加载账号配置", "error.noModels": "当前 Host 还没有可用模型,请先在网页里配置提供商", "error.save": "保存失败", "error.chooseWorkspace": "请选择工作区目录", "error.workspaceUnavailable": "当前 Host 无法新增工作区", "error.addWorkspace": "新增工作区失败", "error.load": "加载失败", "error.connection": "无法连接本机 IM 助理接口", "error.request": "请求失败", "error.action": "操作失败", "error.qr": "无法生成二维码", "error.detailsInLog": "操作失败,请查看服务器日志。",
|
|
58
59
|
"composer.aria": "全局会话配置", "composer.project": "选择项目", "composer.projectAria": "项目", "composer.noWorkspaces": "暂无工作区", "composer.addWorkspace": "添加工作区…", "composer.permission": "权限", "composer.noModels": "暂无模型", "composer.workspacePath": "工作区路径", "action.cancel": "取消", "action.adding": "添加中…",
|
|
59
60
|
"permission.readOnly": "只读", "permission.workspaceWrite": "工作区写入", "permission.fullAccess": "完全访问",
|
|
60
|
-
"rail.workspace": "工作区", "rail.search": "搜索", "rail.searchPlaceholder": "搜索会话...", "rail.clearSearch": "清除搜索", "rail.filter": "筛选", "rail.group": "分组方式", "rail.byWorkspace": "按工作区", "rail.list": "单列表", "rail.sort": "排序方式", "rail.manual": "手动排序", "rail.recent": "最近更新", "rail.running": "运行中", "rail.idle": "空闲", "rail.renameAria": "重命名会话", "rail.rename": "重命名", "rail.fork": "分叉会话", "rail.archive": "归档会话", "rail.empty": "还没有频道会话。先在设置 → IM助理 里连接渠道,并给机器人发一条消息。", "rail.noTasks": "暂无网页任务", "rail.ungrouped": "未分组", "rail.tabsAria": "工作区分类", "rail.tasks": "任务", "rail.channels": "频道",
|
|
61
|
+
"rail.workspace": "工作区", "rail.search": "搜索", "rail.searchPlaceholder": "搜索会话...", "rail.clearSearch": "清除搜索", "rail.filter": "筛选", "rail.group": "分组方式", "rail.byWorkspace": "按工作区", "rail.list": "单列表", "rail.sort": "排序方式", "rail.manual": "手动排序", "rail.recent": "最近更新", "rail.running": "运行中", "rail.idle": "空闲", "rail.renameAria": "重命名会话", "rail.rename": "重命名", "rail.fork": "分叉会话", "rail.archive": "归档会话", "rail.archiveFailed": "归档失败,未移除会话。请稍后重试或检查宿主日志。", "rail.empty": "还没有频道会话。先在设置 → IM助理 里连接渠道,并给机器人发一条消息。", "rail.noTasks": "暂无网页任务", "rail.ungrouped": "未分组", "rail.tabsAria": "工作区分类", "rail.tasks": "任务", "rail.channels": "频道",
|
|
61
62
|
"time.now": "刚刚", "time.minutes": "{count}分钟前", "time.hours": "{count}小时前", "time.days": "{count}天前",
|
|
62
63
|
"server.unknownChannel": "未知渠道", "server.channelUnconfigured": "渠道未配置", "server.sessionMissing": "会话不存在", "server.accountMissing": "账号不存在", "server.accountConnectFailed": "账号连接失败,请查看本机日志", "server.accountReconnectFailed": "重新连接失败,请查看本机日志", "server.selectAccountSettings": "请选择提供商、模型、工作区或权限", "server.selectModel": "请选择提供商和模型", "server.selectWorkspace": "请选择工作区", "server.selectPermission": "请选择权限", "server.missingCredentials": "凭据不足,无法启动渠道", "server.qrUnsupported": "该渠道不支持扫码绑定", "server.qrExpired": "二维码已过期", "server.qrIncomplete": "扫码未完成", "server.accessDenied": "未授权:请管理员在设置 → IM助理 中批准你的访问。",
|
|
63
64
|
"status.disconnected": "已断开", "status.reconnectFailed": "重连失败", "status.connectingSocket": "连接中", "status.waitHandshake": "等待网关握手", "status.authenticating": "鉴权中", "status.reconnecting": "重连中", "status.connectionError": "连接错误", "status.connectionFailed": "连接失败", "status.streamConnected": "Stream 已连接", "status.stopped": "已停止", "status.longConnection": "长连接已建立", "status.polling": "轮询中", "status.notLoggedIn": "未登录", "status.waitQr": "等待扫码", "status.loggedIn": "已登录", "status.loggedInRecovered": "已登录(自动恢复)", "status.loggingIn": "登录中",
|
|
@@ -65,8 +66,9 @@ window.__ModuleLoader__.load({
|
|
|
65
66
|
en: {
|
|
66
67
|
"settings.label": "IM Assistant", "settings.title": "IM Assistant", "settings.description": "Manage accounts across channels. Each account has its own workspace, model, and permission settings, stored only on this machine.", "settings.viewProject": "GitHub", "settings.feedback": "Issues",
|
|
67
68
|
"settings.aria": "IM Assistant", "settings.selectAccountTitle": "Select an account", "settings.selectAccountDescription": "Choose an account on the left to view and edit its workspace, model, and permissions.", "settings.noAccountsTitle": "No accounts connected", "settings.noAccountsDescription": "Choose a channel on the left, then select Add account.", "settings.publicChatNotice": "Unapproved users can start chats, but they cannot approve tool calls.", "pending.notice": "There are access requests. Approve a user before they can control the local assistant.", "action.approve": "Approve", "action.deny": "Deny", "loading": "Loading…",
|
|
69
|
+
"account.agentPreset": "Agent preset", "account.presetUnavailable": "Preset unavailable", "account.presetNote": "Changes start a new session; previous sessions are kept.", "action.settings": "Settings", "command.title": "Command permissions", "command.note": "Existing access rules apply first. Disabling commands still allows conversations, attachments, and approval responses.", "command.dm": "DM commands", "command.group": "Group commands", "command.enabled": "Commands enabled", "command.disabled": "Conversation only", "command.user": "Platform user ID", "command.add": "Add user override", "command.remove": "Remove", "command.save": "Save command permissions", "command.invalid": "Enter valid, unique user IDs.",
|
|
68
70
|
"account.workspace": "Workspace", "account.currentWorkspace": "Current workspace", "account.selectWorkspace": "Select a workspace", "account.selectModel": "Select a model", "account.selectPermission": "Select a permission", "account.privateAccess": "Private chat access", "account.privateApproved": "Approved users only", "account.privateAll": "Allow all DM users", "account.autoNameNote": "The account name is generated automatically after setup.", "account.defaultName": "{channel} account {count}",
|
|
69
|
-
"account.countZero": "0 accounts", "account.countOnline": "{online} / {total} online", "account.countOffline": "{total} / {total} offline", "account.statusProcessing": "Processing…", "account.statusOnline": "Online", "account.statusOffline": "Offline", "account.statusRunning": "Running normally", "account.statusNotConnected": "Not connected", "account.receive": "Receive messages", "account.receiveDescription": "Turn this off to keep the account settings without receiving new messages", "account.removeConfirm": "Remove this account? Its saved settings and credentials will also be deleted.",
|
|
71
|
+
"account.count": "{count} accounts", "account.countZero": "0 accounts", "account.countOnline": "{online} / {total} online", "account.countOffline": "{total} / {total} offline", "account.statusProcessing": "Processing…", "account.statusOnline": "Online", "account.statusOffline": "Offline", "account.statusRunning": "Running normally", "account.statusNotConnected": "Not connected", "account.receive": "Receive messages", "account.receiveDescription": "Turn this off to keep the account settings without receiving new messages", "account.removeConfirm": "Remove this account? Its saved settings and credentials will also be deleted.",
|
|
70
72
|
"action.addAccount": "Add account", "action.generateQr": "Generate QR code", "action.checkConnection": "Check", "action.reconnectAccount": "Reconnect", "action.removeAccount": "Remove", "status.saving": "Saving…", "status.saved": "Saved",
|
|
71
73
|
"channel.dingtalk": "DingTalk", "channel.feishu": "Feishu", "channel.lark": "Lark", "channel.weixin": "WeChat", "channel.wecom": "WeCom", "channel.qq": "QQ", "channel.telegram": "Telegram",
|
|
72
74
|
"field.dingtalk.clientId": "Client ID (formerly AppKey)", "field.dingtalk.clientSecret": "Client Secret (formerly AppSecret)",
|
|
@@ -76,7 +78,7 @@ window.__ModuleLoader__.load({
|
|
|
76
78
|
"error.loadAssistant": "Could not load account settings", "error.noModels": "No models are available in the Host. Configure a provider in the web app first.", "error.save": "Could not save", "error.chooseWorkspace": "Choose a workspace directory", "error.workspaceUnavailable": "This Host cannot create workspaces", "error.addWorkspace": "Could not add workspace", "error.load": "Could not load", "error.connection": "Could not connect to the local IM Assistant API", "error.request": "Request failed", "error.action": "Action failed", "error.qr": "Could not generate a QR code", "error.detailsInLog": "The operation failed. Check the server logs for details.",
|
|
77
79
|
"composer.aria": "Global session settings", "composer.project": "Select project", "composer.projectAria": "Project", "composer.noWorkspaces": "No workspaces", "composer.addWorkspace": "Add workspace…", "composer.permission": "Permission", "composer.noModels": "No models", "composer.workspacePath": "Workspace path", "action.cancel": "Cancel", "action.adding": "Adding…",
|
|
78
80
|
"permission.readOnly": "Read Only", "permission.workspaceWrite": "Workspace Write", "permission.fullAccess": "Full access",
|
|
79
|
-
"rail.workspace": "Workspaces", "rail.search": "Search", "rail.searchPlaceholder": "Search sessions...", "rail.clearSearch": "Clear search", "rail.filter": "Filter", "rail.group": "Group by", "rail.byWorkspace": "By workspace", "rail.list": "Single list", "rail.sort": "Sort by", "rail.manual": "Manual", "rail.recent": "Recently updated", "rail.running": "Running", "rail.idle": "Idle", "rail.renameAria": "Rename session", "rail.rename": "Rename", "rail.fork": "Fork session", "rail.archive": "Archive session", "rail.empty": "No channel sessions yet. Connect a channel in Settings → IM Assistant, then send the bot a message.", "rail.noTasks": "No web tasks", "rail.ungrouped": "Ungrouped", "rail.tabsAria": "Workspace categories", "rail.tasks": "Tasks", "rail.channels": "Channels",
|
|
81
|
+
"rail.workspace": "Workspaces", "rail.search": "Search", "rail.searchPlaceholder": "Search sessions...", "rail.clearSearch": "Clear search", "rail.filter": "Filter", "rail.group": "Group by", "rail.byWorkspace": "By workspace", "rail.list": "Single list", "rail.sort": "Sort by", "rail.manual": "Manual", "rail.recent": "Recently updated", "rail.running": "Running", "rail.idle": "Idle", "rail.renameAria": "Rename session", "rail.rename": "Rename", "rail.fork": "Fork session", "rail.archive": "Archive session", "rail.archiveFailed": "Archive failed. The session was kept. Retry or check the Host logs.", "rail.empty": "No channel sessions yet. Connect a channel in Settings → IM Assistant, then send the bot a message.", "rail.noTasks": "No web tasks", "rail.ungrouped": "Ungrouped", "rail.tabsAria": "Workspace categories", "rail.tasks": "Tasks", "rail.channels": "Channels",
|
|
80
82
|
"time.now": "Just now", "time.minutes": "{count} min ago", "time.hours": "{count} hr ago", "time.days": "{count} days ago",
|
|
81
83
|
"server.unknownChannel": "Unknown channel", "server.channelUnconfigured": "Channel is not configured", "server.sessionMissing": "Session does not exist", "server.accountMissing": "Account does not exist", "server.accountConnectFailed": "Could not connect the account. Check the local logs.", "server.accountReconnectFailed": "Could not reconnect the account. Check the local logs.", "server.selectAccountSettings": "Select a provider, model, workspace, or permission setting", "server.selectModel": "Select a provider and model", "server.selectWorkspace": "Select a workspace", "server.selectPermission": "Select a permission", "server.missingCredentials": "The channel cannot start because credentials are missing", "server.qrUnsupported": "This channel does not support QR setup", "server.qrExpired": "QR code has expired", "server.qrIncomplete": "QR setup was not completed", "server.accessDenied": "Access denied: ask an administrator to approve you in Settings → IM Assistant.",
|
|
82
84
|
"status.disconnected": "Disconnected", "status.reconnectFailed": "Reconnect failed", "status.connectingSocket": "Connecting", "status.waitHandshake": "Waiting for gateway handshake", "status.authenticating": "Authenticating", "status.reconnecting": "Reconnecting", "status.connectionError": "Connection error", "status.connectionFailed": "Connection failed", "status.streamConnected": "Stream connected", "status.stopped": "Stopped", "status.longConnection": "Long connection established", "status.polling": "Polling", "status.notLoggedIn": "Not signed in", "status.waitQr": "Waiting for scan", "status.loggedIn": "Signed in", "status.loggedInRecovered": "Signed in (restored)", "status.loggingIn": "Signing in",
|
|
@@ -86,7 +88,7 @@ window.__ModuleLoader__.load({
|
|
|
86
88
|
const h = React.createElement;
|
|
87
89
|
|
|
88
90
|
const CSS = `
|
|
89
|
-
.ima-page{--ima-text:var(--dsw-alias-label-primary,var(--dsh-text,#e6edf3));--ima-muted:var(--dsw-alias-label-tertiary,var(--dsh-text-muted,#8b949e));--ima-line:var(--dsw-alias-border-l2,var(--dsh-border,rgba(255,255,255,.1)));--ima-card:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.04));--ima-card-hover:var(--dsw-alias-interactive-bg-hover,rgba(255,255,255,.06));--ima-ok:var(--dsw-alias-state-success-primary,#3fb950);--ima-warning:var(--dsw-alias-state-warning-primary,#d29922);--ima-danger:var(--dsw-alias-state-error-primary,#f85149);--ima-accent:var(--dsw-alias-brand-primary,#4b7cff);box-sizing:border-box;max-width:
|
|
91
|
+
.ima-page{--ima-text:var(--dsw-alias-label-primary,var(--dsh-text,#e6edf3));--ima-muted:var(--dsw-alias-label-tertiary,var(--dsh-text-muted,#8b949e));--ima-line:var(--dsw-alias-border-l2,var(--dsh-border,rgba(255,255,255,.1)));--ima-card:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.04));--ima-card-hover:var(--dsw-alias-interactive-bg-hover,rgba(255,255,255,.06));--ima-ok:var(--dsw-alias-state-success-primary,#3fb950);--ima-warning:var(--dsw-alias-state-warning-primary,#d29922);--ima-danger:var(--dsw-alias-state-error-primary,#f85149);--ima-accent:var(--dsw-alias-brand-primary,#4b7cff);box-sizing:border-box;max-width:none;width:100%;margin:0;padding:0 0 32px;color:var(--ima-text)}
|
|
90
92
|
.ima-deco{display:flex;justify-content:center;align-items:flex-end;gap:10px;min-height:56px;margin:8px 0 14px}
|
|
91
93
|
.ima-bubble{font-size:12px;line-height:1.4;padding:6px 10px;border-radius:12px;max-width:220px;border:1px solid var(--ima-line)}
|
|
92
94
|
.ima-bubble.left{background:rgba(46,160,67,.14);color:#7ee787}
|
|
@@ -106,6 +108,7 @@ window.__ModuleLoader__.load({
|
|
|
106
108
|
.ima-chip-menu{position:absolute;top:calc(100% + 6px);left:0;z-index:30;min-width:260px;max-height:280px;overflow:auto;padding:6px;border:1px solid var(--ima-line);border-radius:14px;background:var(--dsw-specific-menu,var(--dsw-alias-bg-layer-2,#fff));box-shadow:var(--dsw-shadow-lv3,0 16px 40px rgba(0,0,0,.18))}
|
|
107
109
|
.ima-chip-menu.is-end{left:auto;right:0}
|
|
108
110
|
.ima-chip-row{display:flex;align-items:center;justify-content:space-between;gap:12px;width:100%;padding:8px 10px;border:0;border-radius:10px;background:transparent;color:inherit;text-align:left;cursor:pointer;font-size:13px}
|
|
111
|
+
.ima-workspace-picker .ima-chip-row{display:grid;grid-template-columns:minmax(0,1fr) 16px;gap:4px 8px;position:relative;padding:10px 12px}.ima-workspace-picker .ima-chip-row-main{grid-column:1;min-width:0}.ima-workspace-picker .ima-chip-row-main>span:last-child{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ima-workspace-picker .ima-chip-row-main>svg{flex:none}.ima-workspace-picker .ima-chip-row-side{grid-column:1;min-width:0;padding-left:24px}.ima-workspace-picker .ima-chip-row-side>span{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ima-workspace-picker .ima-chip-tick{position:absolute;right:12px;top:16px}.ima-workspace-picker .ima-chip-row-side:empty{display:none}
|
|
109
112
|
.ima-chip-row:hover,.ima-chip-row.is-on{background:var(--dsw-alias-interactive-bg-hover,rgba(127,127,127,.08))}
|
|
110
113
|
.ima-chip-row-main{display:inline-flex;align-items:center;gap:8px;min-width:0}
|
|
111
114
|
.ima-chip-tick{width:6px;height:12px;border-right:1.6px solid var(--ima-accent);border-bottom:1.6px solid var(--ima-accent);transform:rotate(45deg) translateY(-2px);flex:none}
|
|
@@ -202,19 +205,21 @@ window.__ModuleLoader__.load({
|
|
|
202
205
|
.ima-radio small{display:block;color:var(--ima-muted);margin-top:2px}
|
|
203
206
|
.ima-ok{color:var(--ima-ok);font-size:14px;text-align:center;padding:24px 0}
|
|
204
207
|
.ima-modal .ima-error{color:var(--ima-danger)}
|
|
205
|
-
.ima-page.ima-account-page{container-type:inline-size;min-width:0;max-width:
|
|
206
|
-
.ima-account-shell{display:
|
|
207
|
-
.ima-platforms{padding:0;border
|
|
208
|
-
.ima-platform{border:
|
|
209
|
-
.ima-platform-head{display:flex;align-items:center;gap:10px;width:100%;min-height:
|
|
208
|
+
.ima-page.ima-account-page{container-type:inline-size;min-width:0;max-width:none;padding-bottom:40px}
|
|
209
|
+
.ima-account-shell{display:block;min-height:0;border:0;border-radius:0;overflow:visible;background:transparent}
|
|
210
|
+
.ima-platforms{display:flex;flex-direction:column;gap:12px;padding:0;border:0;background:transparent}
|
|
211
|
+
.ima-platform{border:1px solid color-mix(in srgb,var(--ima-text) 16%,transparent);border-radius:12px;margin:0;overflow:hidden;background:var(--dsw-alias-bg-layer-1,color-mix(in srgb,var(--ima-text) 4%,transparent))}.ima-platform.open{border-color:color-mix(in srgb,var(--ima-text) 24%,transparent)}
|
|
212
|
+
.ima-platform-head{display:flex;align-items:center;gap:10px;width:100%;min-height:56px;padding:10px 18px;border:0;border-radius:0;background:transparent;color:inherit;text-align:left;cursor:pointer}
|
|
210
213
|
.ima-platform:not(.open):not(.empty) .ima-platform-head:hover{background:var(--ima-card-hover)}.ima-platform.empty .ima-platform-head{cursor:default}.ima-platform-title{min-width:0;flex:1;font-size:14px;font-weight:650}.ima-platform-count{color:var(--ima-muted);font-size:12px;white-space:nowrap}.ima-platform-count.online{color:var(--ima-ok)}.ima-platform-count.offline,.ima-platform-count.partial{color:var(--ima-warning)}
|
|
211
214
|
.ima-platform-add{min-height:34px;padding:0 10px;border:1px solid var(--ima-line);border-radius:8px;background:transparent;color:var(--ima-text);font-size:12px;font-weight:600;cursor:pointer;white-space:nowrap}.ima-platform-add:hover{background:var(--ima-card-hover)}
|
|
212
215
|
.ima-platform-caret{display:grid;width:18px;height:18px;margin:0 1px;place-items:center;color:var(--ima-muted);transition:transform .15s ease}.ima-platform-caret.empty{visibility:hidden}.ima-platform.open .ima-platform-caret{transform:rotate(90deg)}
|
|
213
|
-
.ima-account-list{display:flex;flex-direction:column;gap:8px;padding:0 14px 14px}.ima-account-row{display:
|
|
216
|
+
.ima-account-list{display:flex;flex-direction:column;gap:8px;padding:0 14px 14px}.ima-account-row{display:grid;grid-template-columns:minmax(0,1fr) 64px 112px 64px;align-items:center;gap:16px;width:100%;min-height:60px;padding:10px 12px;border:0;border-radius:8px;background:color-mix(in srgb,var(--ima-text) 7%,transparent);color:inherit;text-align:left}.ima-account-row:hover{background:var(--ima-card-hover)}
|
|
214
217
|
.ima-platform-head:focus-visible,.ima-platform-add:focus-visible,.ima-account-row:focus-visible{outline:2px solid var(--ima-accent);outline-offset:2px}
|
|
215
|
-
.ima-account-row .ima-logo,.ima-account-row .ima-logo svg{width:38px;height:38px}.ima-account-row .ima-logo{border-radius:9px}.ima-account-copy{min-width:0;flex:1}.ima-account-name{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:13px;font-weight:600}.ima-account-id{display:block;margin-top:2px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--ima-muted);font-size:11px}.ima-account-state{font-size:12px;white-space:nowrap;color:var(--ima-muted)}.ima-account-state.online{color:var(--ima-ok)}.ima-account-state.offline{color:var(--ima-warning)}.ima-account-next{display:grid;width:16px;height:16px;place-items:center;color:var(--ima-text);opacity:.8}.ima-dot{width:7px;height:7px;border-radius:50%;background:var(--ima-warning);flex:none}.ima-dot.on{background:var(--ima-ok)
|
|
216
|
-
.ima-inspector{padding:22px 24px 26px;min-width:0}.ima-inspector-empty{display:grid;min-height:580px;padding:32px;place-items:center;text-align:center}.ima-inspector-empty-copy{max-width:300px}.ima-inspector-empty-title{margin:0;color:var(--ima-text);font-size:16px;font-weight:650;line-height:24px}.ima-inspector-empty-description{margin:8px 0 0;color:var(--ima-muted);font-size:13px;line-height:20px}.ima-inspector-head{display:flex;align-items:flex-start;gap:12px;padding-bottom:18px;border-bottom:1px solid var(--ima-line)}.ima-inspector-head-copy{min-width:0;flex:1}.ima-inspector-title{margin:1px 0 3px;font-size:17px;line-height:24px}.ima-inspector-
|
|
218
|
+
.ima-account-row .ima-logo,.ima-account-row .ima-logo svg{width:38px;height:38px}.ima-account-row .ima-logo{border-radius:9px}.ima-account-copy{min-width:0;flex:1}.ima-account-name{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:13px;font-weight:600}.ima-account-id{display:block;margin-top:2px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--ima-muted);font-size:11px}.ima-account-state{font-size:12px;white-space:nowrap;color:var(--ima-muted)}.ima-account-state.online{color:var(--ima-ok)}.ima-account-state.offline{color:var(--ima-warning)}.ima-account-next{display:grid;width:16px;height:16px;place-items:center;color:var(--ima-text);opacity:.8}.ima-dot{width:7px;height:7px;border-radius:50%;background:var(--ima-warning);flex:none}.ima-dot.on{background:var(--ima-ok)}
|
|
219
|
+
.ima-inspector{padding:22px 24px 26px;min-width:0}.ima-inspector-empty{display:grid;min-height:580px;padding:32px;place-items:center;text-align:center}.ima-inspector-empty-copy{max-width:300px}.ima-inspector-empty-title{margin:0;color:var(--ima-text);font-size:16px;font-weight:650;line-height:24px}.ima-inspector-empty-description{margin:8px 0 0;color:var(--ima-muted);font-size:13px;line-height:20px}.ima-inspector-head{display:flex;align-items:flex-start;gap:12px;padding-bottom:18px;border-bottom:1px solid var(--ima-line)}.ima-inspector-head-copy{min-width:0;flex:1}.ima-inspector-title{margin:1px 0 3px;font-size:17px;line-height:24px}.ima-inspector-title-row{display:flex;align-items:center;gap:12px;min-width:0}.ima-inspector-title-row .ima-inspector-title{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin:0}.ima-inspector-title-row .ima-inspector-status{flex:none;white-space:nowrap;font-size:11px}.ima-inspector-head-copy>.ima-account-id{margin-top:5px}
|
|
220
|
+
.ima-inspector-status{color:var(--ima-muted);font-size:12px}.ima-inspector-status.ok{color:var(--ima-ok)}
|
|
217
221
|
.ima-form{display:flex;flex-direction:column;gap:16px;padding-top:20px}.ima-control{display:flex;flex-direction:column;gap:7px}.ima-control>span{color:var(--ima-muted);font-size:12px;font-weight:550}.ima-control input,.ima-control select{box-sizing:border-box;width:100%;min-height:44px;padding:0 12px;border:1px solid var(--ima-line);border-radius:9px;background:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.04));color:var(--ima-text);font:13px inherit;outline:none}.ima-control input:focus,.ima-control select:focus{border-color:var(--ima-accent);box-shadow:0 0 0 2px color-mix(in srgb,var(--ima-accent) 18%,transparent)}.ima-control option{background:#202124;color:#f2f3f5}
|
|
222
|
+
.ima-command-permissions{min-width:0;margin:12px 0;padding:12px;border:1px solid var(--ima-line);border-radius:8px}.ima-command-scope{display:grid;gap:8px;margin:12px 0}.ima-command-scope label{display:flex;align-items:center;gap:12px;flex-wrap:wrap}.ima-command-user{display:flex;gap:8px;flex-wrap:wrap}.ima-command-user input{flex:1;min-width:120px}.ima-command-permissions select,.ima-command-permissions input{background:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.04));color:var(--ima-text);border:1px solid var(--ima-line);border-radius:6px;padding:6px;max-width:100%}
|
|
218
223
|
.ima-switch-row{display:flex;align-items:center;justify-content:space-between;min-height:48px;padding:0 2px}.ima-switch-copy strong{display:block;font-size:13px}.ima-switch-copy small{display:block;margin-top:2px;color:var(--ima-muted);font-size:11px}
|
|
219
224
|
.ima-inspector-actions{display:flex;flex-wrap:wrap;align-items:center;gap:8px;margin-top:6px;padding-top:18px;border-top:1px solid var(--ima-line)}.ima-inspector-actions .ima-btn{flex:none;min-width:0;min-height:36px;padding:0 8px;font-size:12px;white-space:nowrap}.ima-inspector-actions .danger{margin-left:auto;color:var(--ima-danger);border-color:color-mix(in srgb,var(--ima-danger) 35%,transparent)}
|
|
220
225
|
.ima-save-note{min-height:18px;color:var(--ima-muted);font-size:11px}.ima-save-note.ok{color:var(--ima-ok)}
|
|
@@ -222,24 +227,10 @@ window.__ModuleLoader__.load({
|
|
|
222
227
|
.ima-account-settings{display:grid;grid-template-columns:1fr 1fr;gap:12px}.ima-account-settings.compact{grid-template-columns:1fr}.ima-picker-field{display:flex;min-width:0;flex-direction:column;gap:7px}.ima-picker-field.wide{grid-column:1/-1}.ima-picker-label{color:var(--ima-muted);font-size:12px;font-weight:550}.ima-account-picker{width:100%}.ima-account-picker .ima-chip-btn{width:100%;height:auto;min-height:44px;justify-content:flex-start;padding:8px 12px;border:1px solid var(--ima-line);border-radius:9px;background:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.04));color:var(--ima-text);font-size:13px;text-align:left}.ima-account-picker .ima-chip-btn:hover,.ima-account-picker.is-open .ima-chip-btn{border-color:var(--ima-accent);background:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.04));box-shadow:0 0 0 2px color-mix(in srgb,var(--ima-accent) 18%,transparent)}.ima-account-picker .ima-chip-label{flex:1}.ima-account-picker .ima-chip-btn em{margin-left:auto}.ima-account-picker .ima-chip-menu{width:100%;min-width:100%;max-height:min(320px,calc(100vh - 120px))}.ima-account-picker.ima-model-select .ima-chip-btn{border-radius:9px}.ima-account-picker.ima-model-select .ima-chip-menu{width:max-content;min-width:min(100%,calc(100vw - 32px));left:auto;right:0}.ima-account-settings .ima-chip-dialog{grid-column:1/-1;margin-top:0}.ima-picker-note{grid-column:1/-1;color:var(--ima-muted);font-size:11px;line-height:1.5}.ima-picker-note.warning{color:var(--ima-warning)}
|
|
223
228
|
.ima-account-shell,.ima-account-shell *{box-sizing:border-box}
|
|
224
229
|
.ima-platforms{min-width:0}
|
|
225
|
-
.ima-platform-head{display:
|
|
226
|
-
.ima-platform-head
|
|
227
|
-
.ima-platform-
|
|
228
|
-
.ima-
|
|
229
|
-
.ima-platform-count{grid-column:1/3;grid-row:2;font-size:11px;white-space:normal;padding-right:80px}
|
|
230
|
-
.ima-platform-add{grid-column:1/4;grid-row:2;justify-self:end;min-height:28px;padding:0 8px;font-weight:500}
|
|
231
|
-
.ima-account-list{padding:0 8px 10px}
|
|
232
|
-
.ima-account-row{display:grid;grid-template-columns:7px minmax(0,1fr) 12px;gap:6px;min-height:60px;padding:10px 8px}
|
|
233
|
-
.ima-account-row>.ima-logo{display:none}
|
|
234
|
-
.ima-account-copy{grid-column:2;grid-row:1}
|
|
235
|
-
.ima-account-row>.ima-dot{grid-column:1;grid-row:1}
|
|
236
|
-
.ima-account-next{grid-column:3;grid-row:1;width:12px}
|
|
237
|
-
.ima-account-state{grid-column:2;grid-row:2;font-size:11px}
|
|
238
|
-
.ima-inspector{padding:18px 16px;overflow-wrap:anywhere}
|
|
239
|
-
.ima-switch-row{gap:10px}.ima-switch-copy{min-width:0}
|
|
240
|
-
@container(max-width:620px){.ima-inspector{padding:16px 12px}.ima-inspector-head{gap:8px}.ima-inspector-title{font-size:15px}.ima-platform-head{padding:10px 8px;gap:6px}.ima-platform-title{font-size:13px}.ima-inspector-empty{padding:16px;min-height:180px}}
|
|
241
|
-
@container(max-width:420px){.ima-title{font-size:22px}.ima-platform-count{grid-column:1/4;padding-right:0}.ima-platform-add{grid-row:3;justify-self:start}.ima-inspector{padding:12px 8px}.ima-inspector-head{flex-wrap:wrap}}
|
|
242
|
-
@media(max-width:620px){.ima-account-settings{grid-template-columns:1fr}.ima-picker-field.wide{grid-column:auto}}
|
|
230
|
+
.ima-account-shell{display:block;min-height:0}.ima-platforms{border-right:0}.ima-platform-head{min-height:56px}.ima-account-row{cursor:default}.ima-account-row .ima-account-settings-button{flex:none;min-width:64px}.ima-account-state{display:flex;align-items:center;gap:7px;margin-left:0}.ima-account-receive{display:flex;align-items:center;gap:8px;flex:none;font-size:12px;color:var(--ima-muted)}.ima-command-permissions{margin:0;padding:0;border:0}.ima-command-permissions .ima-switch-row{padding:14px 0;margin:0;border-bottom:1px solid var(--ima-line)}.ima-modal .ima-inspector{padding:0}.ima-modal{box-sizing:border-box;background:var(--dsw-alias-bg-layer-1,var(--dsw-alias-bg-layer-2));box-shadow:var(--dsw-elevation-prominent);border-radius:16px}.ima-mask{z-index:1000;backdrop-filter:var(--dsw-mask-blur,blur(2px))}
|
|
231
|
+
@media(max-width:620px){.ima-account-settings{grid-template-columns:1fr}.ima-picker-field.wide{grid-column:auto}.ima-platform-head{flex-wrap:wrap;gap:8px;padding:12px}.ima-platform-count{margin-left:auto}.ima-account-list{padding:0 12px 12px}.ima-account-row{flex-wrap:wrap;padding:12px}.ima-account-row>.ima-logo{display:none}.ima-account-copy{flex:1;min-width:100px}.ima-mask{padding:12px}.ima-modal.ima-account-modal{max-height:calc(100dvh - 24px);padding:18px}.ima-account-state{font-size:11px}}
|
|
232
|
+
.ima-platform-head>.ima-logo,.ima-platform-head>.ima-logo svg{width:24px;height:24px;flex:none}.ima-account-receive{justify-content:flex-end}.ima-account-settings-button{justify-self:end}.ima-platform-title{font-weight:600}.ima-account-name{font-weight:500}
|
|
233
|
+
@media(max-width:620px){.ima-account-list{padding:0 12px 12px}.ima-account-row{grid-template-columns:minmax(0,1fr) 64px;gap:10px 12px}.ima-account-copy{grid-column:1;grid-row:1}.ima-account-state{grid-column:1;grid-row:2}.ima-account-receive{grid-column:2;grid-row:1;justify-content:flex-end}.ima-account-receive>span{display:none}.ima-account-settings-button{grid-column:2;grid-row:2}.ima-platform-head{flex-wrap:nowrap}.ima-platform-title{flex:1}.ima-platform-count{font-size:11px}.ima-platform-add{padding:0 8px}}
|
|
243
234
|
@media (prefers-reduced-motion:reduce){.ima-switch i{transition:none}}
|
|
244
235
|
`;
|
|
245
236
|
|
|
@@ -253,6 +244,23 @@ window.__ModuleLoader__.load({
|
|
|
253
244
|
document.head.appendChild(styleEl);
|
|
254
245
|
};
|
|
255
246
|
|
|
247
|
+
let channelSessionIds = new Set();
|
|
248
|
+
let channelMembershipRevision = 0;
|
|
249
|
+
const channelMembershipListeners = new Set();
|
|
250
|
+
function updateChannelMembership(groups) {
|
|
251
|
+
const next = new Set(groups.flatMap(group => (group.sessions || []).map(session => session.sessionId)));
|
|
252
|
+
if (next.size === channelSessionIds.size && [...next].every(id => channelSessionIds.has(id))) return;
|
|
253
|
+
channelSessionIds = next;
|
|
254
|
+
channelMembershipRevision += 1;
|
|
255
|
+
for (const listener of channelMembershipListeners) listener();
|
|
256
|
+
}
|
|
257
|
+
const isChannelSession = (id) => String(id).startsWith("im:") || channelSessionIds.has(String(id));
|
|
258
|
+
const subscribeChannelMembership = (listener) => {
|
|
259
|
+
channelMembershipListeners.add(listener);
|
|
260
|
+
return () => channelMembershipListeners.delete(listener);
|
|
261
|
+
};
|
|
262
|
+
const channelMembershipSnapshot = () => channelMembershipRevision;
|
|
263
|
+
|
|
256
264
|
const api = (path, opts) => {
|
|
257
265
|
// 管理路由复用宿主登录 Cookie,不缓存账号状态或认证错误。
|
|
258
266
|
const request = Object.assign({}, opts || {}, { credentials: "same-origin", cache: "no-store" });
|
|
@@ -261,7 +269,10 @@ window.__ModuleLoader__.load({
|
|
|
261
269
|
request.headers = Object.assign({ "content-type": "application/json" }, request.headers || {}, { "x-dsh-im-connect-client": "1" });
|
|
262
270
|
if (request.body === undefined) request.body = "{}";
|
|
263
271
|
}
|
|
264
|
-
return fetch(API_BASE + path, request).then((r) => r.json())
|
|
272
|
+
return fetch(API_BASE + path, request).then((r) => r.json()).then((data) => {
|
|
273
|
+
if (data.ok && Array.isArray(data.groups)) updateChannelMembership(data.groups);
|
|
274
|
+
return data;
|
|
275
|
+
});
|
|
265
276
|
};
|
|
266
277
|
|
|
267
278
|
const storedAccountSelection = () => {
|
|
@@ -399,7 +410,7 @@ window.__ModuleLoader__.load({
|
|
|
399
410
|
};
|
|
400
411
|
const openListedSession = (id, hostOpen) => {
|
|
401
412
|
if (!id) return;
|
|
402
|
-
if (
|
|
413
|
+
if (isChannelSession(id)) {
|
|
403
414
|
api("/sessions/ensure", {
|
|
404
415
|
method: "POST",
|
|
405
416
|
headers: { "content-type": "application/json" },
|
|
@@ -419,7 +430,7 @@ window.__ModuleLoader__.load({
|
|
|
419
430
|
};
|
|
420
431
|
let channelSkin = "native";
|
|
421
432
|
|
|
422
|
-
function BindModal({ ch, onClose, onConnected, catalog, permissions, workspaces, defaults, createWorkspace, pickDirectory, modelT, permissionT, t = fallbackT }) {
|
|
433
|
+
function BindModal({ ch, onClose, onConnected, catalog, permissions, agentPresets, workspaces, defaults, createWorkspace, pickDirectory, modelT, permissionT, t = fallbackT }) {
|
|
423
434
|
const hasQr = ch.kind === "qr" || ch.kind === "qr-or-credentials";
|
|
424
435
|
const hasManual = ch.kind === "credentials" || ch.kind === "qr-or-credentials";
|
|
425
436
|
const [tab, setTab] = useState(hasQr ? "qr" : "manual");
|
|
@@ -436,6 +447,7 @@ window.__ModuleLoader__.load({
|
|
|
436
447
|
reasoningEffort: defaults && defaults.assistant && defaults.assistant.reasoningEffort || "",
|
|
437
448
|
permission: defaults && defaults.permission || "",
|
|
438
449
|
privateAccess: "approved",
|
|
450
|
+
agentPreset: defaults && defaults.agentPreset || "standard",
|
|
439
451
|
}));
|
|
440
452
|
const alive = useRef(true);
|
|
441
453
|
|
|
@@ -560,6 +572,7 @@ window.__ModuleLoader__.load({
|
|
|
560
572
|
onChange: (patch) => setSettings((current) => ({ ...current, ...patch })),
|
|
561
573
|
catalog,
|
|
562
574
|
permissions,
|
|
575
|
+
agentPresets,
|
|
563
576
|
workspaces,
|
|
564
577
|
createWorkspace,
|
|
565
578
|
pickDirectory,
|
|
@@ -568,6 +581,7 @@ window.__ModuleLoader__.load({
|
|
|
568
581
|
showAutoNameNote: true,
|
|
569
582
|
t,
|
|
570
583
|
}),
|
|
584
|
+
h(CommandPermissionSettings, { value: settings.commandPermissions, onSave: commandPermissions => setSettings(current => ({ ...current, commandPermissions })), t }),
|
|
571
585
|
),
|
|
572
586
|
tab === "qr" && hasQr && (
|
|
573
587
|
status === "success"
|
|
@@ -745,6 +759,7 @@ window.__ModuleLoader__.load({
|
|
|
745
759
|
type: "button",
|
|
746
760
|
className: "ima-chip-row" + (props.active ? " is-on" : "") + (props.kv ? " is-kv" : ""),
|
|
747
761
|
role: "menuitem",
|
|
762
|
+
title: props.hint || undefined,
|
|
748
763
|
onClick: props.onClick,
|
|
749
764
|
},
|
|
750
765
|
h("span", { className: "ima-chip-row-main" },
|
|
@@ -831,15 +846,15 @@ window.__ModuleLoader__.load({
|
|
|
831
846
|
};
|
|
832
847
|
const onAddWorkspace = () => {
|
|
833
848
|
setOpen("");
|
|
834
|
-
|
|
835
|
-
Promise.resolve(props.pickDirectory()).then((picked) => picked && addWorkspace(picked)).catch(() => {
|
|
836
|
-
setAdding(true);
|
|
837
|
-
setAddPath("");
|
|
838
|
-
});
|
|
839
|
-
return;
|
|
840
|
-
}
|
|
849
|
+
setHint("");
|
|
841
850
|
setAdding(true);
|
|
842
851
|
setAddPath("");
|
|
852
|
+
if (typeof props.pickDirectory === "function") {
|
|
853
|
+
// Web 宿主可能返回空路径;始终保留可见的手动输入入口。
|
|
854
|
+
return Promise.resolve().then(() => props.pickDirectory()).then(picked => {
|
|
855
|
+
if (typeof picked === "string" && picked.trim()) return addWorkspace(picked);
|
|
856
|
+
}).catch(() => { setAdding(true); });
|
|
857
|
+
}
|
|
843
858
|
};
|
|
844
859
|
const selectPermission = (next) => {
|
|
845
860
|
setOpen("");
|
|
@@ -863,7 +878,7 @@ window.__ModuleLoader__.load({
|
|
|
863
878
|
icon: h(FolderIcon),
|
|
864
879
|
label: (workspace && (workspace.title || workspace.path)) || cwd || t("account.selectWorkspace"),
|
|
865
880
|
ariaLabel: props.workspaceLabel || t("account.workspace"),
|
|
866
|
-
className: "ima-account-picker",
|
|
881
|
+
className: "ima-account-picker ima-workspace-picker",
|
|
867
882
|
},
|
|
868
883
|
items.length === 0 && h("div", { className: "ima-chip-empty" }, t("composer.noWorkspaces")),
|
|
869
884
|
...items.map((item) => h(ChipRow, {
|
|
@@ -877,6 +892,26 @@ window.__ModuleLoader__.load({
|
|
|
877
892
|
h("div", { className: "ima-chip-split" }),
|
|
878
893
|
h(ChipRow, { icon: h(PlusIcon), label: t("composer.addWorkspace"), onClick: onAddWorkspace }),
|
|
879
894
|
), true),
|
|
895
|
+
adding && h("div", { className: "ima-chip-dialog" },
|
|
896
|
+
h("strong", null, t("composer.addWorkspace")),
|
|
897
|
+
h("input", { autoFocus: true, value: addPath, placeholder: t("composer.workspacePath"), "aria-label": t("composer.workspacePath"), onChange: (event) => setAddPath(event.target.value) }),
|
|
898
|
+
h("div", { className: "ima-chip-dialog-actions" },
|
|
899
|
+
h("button", { className: "ima-btn", onClick: () => { setAdding(false); setAddPath(""); } }, t("action.cancel")),
|
|
900
|
+
h("button", { className: "ima-btn primary", disabled: addBusy || !addPath.trim(), onClick: () => addWorkspace(addPath) }, addBusy ? t("action.adding") : t("action.confirm")),
|
|
901
|
+
),
|
|
902
|
+
),
|
|
903
|
+
field("agentPreset", t("account.agentPreset"), h(ChipMenu, {
|
|
904
|
+
open: open === "agentPreset",
|
|
905
|
+
onToggle: next => setOpen(next ? "agentPreset" : ""),
|
|
906
|
+
label: ((props.agentPresets || []).find(item => item.id === value.agentPreset) || {}).name || value.agentPreset || "standard",
|
|
907
|
+
ariaLabel: t("account.agentPreset"), className: "ima-account-picker",
|
|
908
|
+
},
|
|
909
|
+
...(props.agentPresets || []).map(item => h(ChipRow, {
|
|
910
|
+
key: item.id, label: item.name || item.id, hint: item.broken ? t("account.presetUnavailable") : item.description,
|
|
911
|
+
active: item.id === value.agentPreset,
|
|
912
|
+
onClick: () => { if (!item.broken) { update({ agentPreset: item.id }); setOpen(""); } },
|
|
913
|
+
})),
|
|
914
|
+
)),
|
|
880
915
|
field("model", modelT("menu.model"), h(ChipMenu, {
|
|
881
916
|
open: open === "model",
|
|
882
917
|
onToggle: (next) => { setOpen(next ? "model" : ""); if (next) setModelPane("root"); },
|
|
@@ -942,16 +977,9 @@ window.__ModuleLoader__.load({
|
|
|
942
977
|
},
|
|
943
978
|
h(ChipRow, { icon: h(ShieldIcon), label: t("account.privateApproved"), active: privateAccess === "approved", onClick: () => { update({ privateAccess: "approved" }); setOpen(""); } }),
|
|
944
979
|
h(ChipRow, { icon: h(ShieldIcon), label: t("account.privateAll"), active: privateAccess === "all", onClick: () => { update({ privateAccess: "all" }); setOpen(""); } }),
|
|
945
|
-
)
|
|
980
|
+
)),
|
|
981
|
+
h("div", { className: "ima-picker-note" }, t("account.presetNote")),
|
|
946
982
|
privateAccess === "all" && h("div", { className: "ima-picker-note warning" }, t("settings.publicChatNotice")),
|
|
947
|
-
adding && h("div", { className: "ima-chip-dialog" },
|
|
948
|
-
h("strong", null, t("composer.addWorkspace")),
|
|
949
|
-
h("input", { value: addPath, placeholder: t("composer.workspacePath"), "aria-label": t("composer.workspacePath"), onChange: (event) => setAddPath(event.target.value) }),
|
|
950
|
-
h("div", { className: "ima-chip-dialog-actions" },
|
|
951
|
-
h("button", { className: "ima-btn", onClick: () => { setAdding(false); setAddPath(""); } }, t("action.cancel")),
|
|
952
|
-
h("button", { className: "ima-btn primary", disabled: addBusy || !addPath.trim(), onClick: () => addWorkspace(addPath) }, addBusy ? t("action.adding") : t("action.confirm")),
|
|
953
|
-
),
|
|
954
|
-
),
|
|
955
983
|
hint && h("div", { className: "ima-picker-note" }, hint),
|
|
956
984
|
props.showAutoNameNote && h("div", { className: "ima-picker-note" }, t("account.autoNameNote")),
|
|
957
985
|
h(RiskConfirmation, {
|
|
@@ -973,7 +1001,21 @@ window.__ModuleLoader__.load({
|
|
|
973
1001
|
);
|
|
974
1002
|
}
|
|
975
1003
|
|
|
976
|
-
|
|
1004
|
+
// 与账号配置共用下拉组件,私聊与群聊分别保存。
|
|
1005
|
+
function CommandPermissionSettings({ value, onSave, t }) {
|
|
1006
|
+
const [open, setOpen] = useState("");
|
|
1007
|
+
const policy = value || { dm: { enabled: true, users: [] }, group: { enabled: true, users: [] } };
|
|
1008
|
+
return h("div", { className: "ima-command-permissions ima-account-settings" },
|
|
1009
|
+
...["dm", "group"].map(kind => h("div", { key: kind, className: "ima-picker-field" },
|
|
1010
|
+
h("span", { className: "ima-picker-label" }, t("command." + kind)),
|
|
1011
|
+
h(ChipMenu, { open: open === kind, onToggle: next => setOpen(next ? kind : ""), label: t(policy[kind].enabled ? "command.enabled" : "command.disabled"), ariaLabel: t("command." + kind), className: "ima-account-picker" },
|
|
1012
|
+
...[true, false].map(enabled => h(ChipRow, { key: String(enabled), label: t(enabled ? "command.enabled" : "command.disabled"), active: policy[kind].enabled === enabled, onClick: () => {
|
|
1013
|
+
setOpen("");
|
|
1014
|
+
return onSave({ dm: { enabled: policy.dm.enabled, users: [] }, group: { enabled: policy.group.enabled, users: [] }, [kind]: { enabled, users: [] } });
|
|
1015
|
+
} }))))));
|
|
1016
|
+
}
|
|
1017
|
+
|
|
1018
|
+
function AccountInspector({ account, catalog, permissions, agentPresets, workspaces, createWorkspace, pickDirectory, modelT, permissionT, t, onAction, onSave }) {
|
|
977
1019
|
const [draft, setDraft] = useState(account);
|
|
978
1020
|
const [note, setNote] = useState("");
|
|
979
1021
|
const saveSeq = useRef(0);
|
|
@@ -981,7 +1023,7 @@ window.__ModuleLoader__.load({
|
|
|
981
1023
|
saveSeq.current += 1;
|
|
982
1024
|
setDraft(account);
|
|
983
1025
|
setNote("");
|
|
984
|
-
}, [account.id, account.cwd, account.permission, account.privateAccess, account.receiveEnabled, account.assistant && account.assistant.provider, account.assistant && account.assistant.model, account.assistant && account.assistant.reasoningEffort]);
|
|
1026
|
+
}, [account.id, account.cwd, account.permission, account.agentPreset, account.privateAccess, JSON.stringify(account.commandPermissions), account.receiveEnabled, account.assistant && account.assistant.provider, account.assistant && account.assistant.model, account.assistant && account.assistant.reasoningEffort]);
|
|
985
1027
|
const save = (patch) => {
|
|
986
1028
|
const seq = ++saveSeq.current;
|
|
987
1029
|
const next = { ...draft, ...patch };
|
|
@@ -995,6 +1037,8 @@ window.__ModuleLoader__.load({
|
|
|
995
1037
|
reasoningEffort: next.assistant.reasoningEffort || null,
|
|
996
1038
|
permission: next.permission,
|
|
997
1039
|
privateAccess: next.privateAccess,
|
|
1040
|
+
agentPreset: next.agentPreset,
|
|
1041
|
+
commandPermissions: next.commandPermissions,
|
|
998
1042
|
}).then((ok) => {
|
|
999
1043
|
if (seq === saveSeq.current) setNote(ok ? "status.saved" : "error.save");
|
|
1000
1044
|
return ok;
|
|
@@ -1015,8 +1059,10 @@ window.__ModuleLoader__.load({
|
|
|
1015
1059
|
h("div", { className: "ima-inspector-head" },
|
|
1016
1060
|
h(Logo, { id: account.platform }),
|
|
1017
1061
|
h("div", { className: "ima-inspector-head-copy" },
|
|
1062
|
+
h("div", { className: "ima-inspector-title-row" },
|
|
1018
1063
|
h("h3", { className: "ima-inspector-title" }, accountLabel(account, t)),
|
|
1019
1064
|
h("div", { className: account.connected ? "ima-inspector-status ok" : "ima-inspector-status" }, "● " + (account.connected ? t("account.statusRunning") : (serverText(account.status, t) || t("account.statusNotConnected")))),
|
|
1065
|
+
),
|
|
1020
1066
|
h("div", { className: "ima-account-id" }, account.id),
|
|
1021
1067
|
),
|
|
1022
1068
|
),
|
|
@@ -1026,19 +1072,17 @@ window.__ModuleLoader__.load({
|
|
|
1026
1072
|
onChange: applySettings,
|
|
1027
1073
|
catalog,
|
|
1028
1074
|
permissions,
|
|
1075
|
+
agentPresets,
|
|
1029
1076
|
workspaces,
|
|
1030
1077
|
createWorkspace,
|
|
1031
1078
|
pickDirectory,
|
|
1032
1079
|
modelT,
|
|
1033
1080
|
permissionT,
|
|
1034
|
-
compact:
|
|
1081
|
+
compact: false,
|
|
1035
1082
|
workspaceLabel: t("account.currentWorkspace"),
|
|
1036
1083
|
t,
|
|
1037
1084
|
}),
|
|
1038
|
-
h(
|
|
1039
|
-
h("div", { className: "ima-switch-copy" }, h("strong", null, t("account.receive")), h("small", null, t("account.receiveDescription"))),
|
|
1040
|
-
h("button", { type: "button", className: draft.receiveEnabled ? "ima-switch" : "ima-switch off", role: "switch", "aria-checked": Boolean(draft.receiveEnabled), "aria-label": t("account.receive"), onClick: () => onAction(account.id, "receive", { receiveEnabled: !draft.receiveEnabled }) }, h("i")),
|
|
1041
|
-
),
|
|
1085
|
+
h(CommandPermissionSettings, { value: draft.commandPermissions, onSave: commandPermissions => save({ commandPermissions }), t }),
|
|
1042
1086
|
h("div", { className: note === "status.saved" ? "ima-save-note ok" : "ima-save-note" }, note && t(note)),
|
|
1043
1087
|
h("div", { className: "ima-inspector-actions" },
|
|
1044
1088
|
h("button", { className: "ima-btn", onClick: () => onAction(account.id, "check") }, t("action.checkConnection")),
|
|
@@ -1064,6 +1108,7 @@ window.__ModuleLoader__.load({
|
|
|
1064
1108
|
const [busy, setBusy] = useState({});
|
|
1065
1109
|
const [editing, setEditing] = useState(null);
|
|
1066
1110
|
const [selected, setSelected] = useState(storedAccountSelection);
|
|
1111
|
+
const [settingsAccount, setSettingsAccount] = useState(null);
|
|
1067
1112
|
const [expanded, setExpanded] = useState({ weixin: true });
|
|
1068
1113
|
const [catalog, setCatalog] = useState({ providers: [], permissions: [], assistant: null, cwd: "", permission: "" });
|
|
1069
1114
|
const workspaces = props.useWorkspaces ? (props.useWorkspaces((state) => state && state.items || []) || []) : [];
|
|
@@ -1096,7 +1141,7 @@ window.__ModuleLoader__.load({
|
|
|
1096
1141
|
ensureStyle();
|
|
1097
1142
|
refresh();
|
|
1098
1143
|
api("/assistant").then((data) => {
|
|
1099
|
-
if (data.ok) setCatalog({ providers: data.providers || [], permissions: data.permissions || [], assistant: data.assistant || null, cwd: data.cwd || "", permission: data.permission || "" });
|
|
1144
|
+
if (data.ok) setCatalog({ providers: data.providers || [], permissions: data.permissions || [], agentPresets: data.agentPresets || [], agentPreset: data.agentPreset || "standard", assistant: data.assistant || null, cwd: data.cwd || "", permission: data.permission || "" });
|
|
1100
1145
|
}).catch(() => undefined);
|
|
1101
1146
|
}, [refresh]);
|
|
1102
1147
|
useEffect(() => { const timer = setInterval(refresh, 4000); return () => clearInterval(timer); }, [refresh]);
|
|
@@ -1127,7 +1172,7 @@ window.__ModuleLoader__.load({
|
|
|
1127
1172
|
};
|
|
1128
1173
|
const saveAccount = (id, body) => onAction(id, "settings", body);
|
|
1129
1174
|
const allAccounts = (channels || []).flatMap((channel) => channel.accounts || []);
|
|
1130
|
-
const selectedAccount = allAccounts.find((item) => item.id ===
|
|
1175
|
+
const selectedAccount = allAccounts.find((item) => item.id === settingsAccount);
|
|
1131
1176
|
|
|
1132
1177
|
return h("section", { className: "ima-page ima-account-page", "aria-label": t("settings.aria") },
|
|
1133
1178
|
h("header", { className: "ima-head" },
|
|
@@ -1159,38 +1204,36 @@ window.__ModuleLoader__.load({
|
|
|
1159
1204
|
const canExpand = (ch.accounts || []).length > 0;
|
|
1160
1205
|
const open = canExpand && Boolean(expanded[ch.id]);
|
|
1161
1206
|
const toggleExpanded = canExpand ? () => setExpanded({ ...expanded, [ch.id]: !open }) : undefined;
|
|
1162
|
-
const channelStatus = ch.total === 0
|
|
1163
|
-
? { label: t("account.countZero"), tone: "muted" }
|
|
1164
|
-
: ch.online === ch.total
|
|
1165
|
-
? { label: t("account.countOnline", { online: ch.online, total: ch.total }), tone: "online" }
|
|
1166
|
-
: ch.online === 0
|
|
1167
|
-
? { label: t("account.countOffline", { total: ch.total }), tone: "offline" }
|
|
1168
|
-
: { label: t("account.countOnline", { online: ch.online, total: ch.total }), tone: "partial" };
|
|
1169
1207
|
return h("div", { key: ch.id, className: "ima-platform" + (open ? " open" : "") + (canExpand ? "" : " empty") },
|
|
1170
1208
|
h("div", { className: "ima-platform-head", role: canExpand ? "button" : undefined, tabIndex: canExpand ? 0 : undefined, "aria-expanded": canExpand ? open : undefined, onClick: toggleExpanded, onKeyDown: canExpand ? (e) => { if (e.key === "Enter" || e.key === " ") { e.preventDefault(); toggleExpanded(); } } : undefined },
|
|
1171
1209
|
h(Logo, { id: ch.id }),
|
|
1172
1210
|
h("span", { className: "ima-platform-title" }, channelLabel(ch, t)),
|
|
1173
|
-
h("span", { className: "ima-platform-count "
|
|
1211
|
+
h("span", { className: "ima-platform-count" }, t("account.count", { count: ch.total })),
|
|
1174
1212
|
h("button", { className: "ima-platform-add", type: "button", onClick: (e) => { e.stopPropagation(); setEditing(ch.id); } }, "+ " + t("action.addAccount")),
|
|
1175
1213
|
h("span", { className: canExpand ? "ima-platform-caret" : "ima-platform-caret empty", "aria-hidden": "true" }, canExpand && h(IconChevron)),
|
|
1176
1214
|
),
|
|
1177
1215
|
open && h("div", { className: "ima-account-list" },
|
|
1178
|
-
...(ch.accounts || []).map((account) => h("
|
|
1179
|
-
h("span", { className:
|
|
1180
|
-
h(
|
|
1181
|
-
h("
|
|
1182
|
-
|
|
1183
|
-
|
|
1216
|
+
...(ch.accounts || []).map((account) => h("div", { key: account.id, className: "ima-account-row" },
|
|
1217
|
+
h("span", { className: "ima-account-copy" }, h("span", { className: "ima-account-name" }, accountLabel(account, t))),
|
|
1218
|
+
h("span", { className: busy[account.id] ? "ima-account-state" : account.connected ? "ima-account-state online" : "ima-account-state offline" }, h("span", { className: account.connected ? "ima-dot on" : "ima-dot", "aria-hidden": true }), busy[account.id] ? t("account.statusProcessing") : account.connected ? t("account.statusOnline") : t("account.statusOffline")),
|
|
1219
|
+
h("div", { className: "ima-account-receive", title: t("account.receiveDescription") },
|
|
1220
|
+
h("span", null, t("account.receive")),
|
|
1221
|
+
h("button", { type: "button", className: account.receiveEnabled ? "ima-switch" : "ima-switch off", role: "switch", "aria-checked": Boolean(account.receiveEnabled), "aria-label": accountLabel(account, t) + " · " + t("account.receive"), disabled: Boolean(busy[account.id]), onClick: () => onAction(account.id, "receive", { receiveEnabled: !account.receiveEnabled }) }, h("i"))),
|
|
1222
|
+
h("button", { type: "button", className: "ima-btn ima-account-settings-button", onClick: () => { selectAccount(account.id); setSettingsAccount(account.id); } }, t("action.settings")),
|
|
1184
1223
|
)),
|
|
1185
1224
|
),
|
|
1186
1225
|
);
|
|
1187
1226
|
}),
|
|
1188
1227
|
),
|
|
1189
|
-
|
|
1190
|
-
|
|
1228
|
+
),
|
|
1229
|
+
selectedAccount && h("div", { className: "ima-mask", onClick: () => setSettingsAccount(null), onKeyDown: e => { if (e.key === "Escape") { e.stopPropagation(); setSettingsAccount(null); } } },
|
|
1230
|
+
h("div", { className: "ima-modal ima-account-modal", role: "dialog", "aria-modal": true, "aria-label": accountLabel(selectedAccount, t), onClick: e => e.stopPropagation() },
|
|
1231
|
+
h("div", { className: "ima-modal-h" }, h("h2", null, t("action.settings")), h("button", { type: "button", className: "ima-x", "aria-label": t("bind.close"), autoFocus: true, onClick: () => setSettingsAccount(null) }, "×")),
|
|
1232
|
+
h(AccountInspector, {
|
|
1191
1233
|
account: selectedAccount,
|
|
1192
1234
|
catalog: catalog.providers,
|
|
1193
1235
|
permissions: catalog.permissions,
|
|
1236
|
+
agentPresets: catalog.agentPresets,
|
|
1194
1237
|
workspaces,
|
|
1195
1238
|
createWorkspace: props.createWorkspace,
|
|
1196
1239
|
pickDirectory: props.pickDirectory,
|
|
@@ -1199,18 +1242,14 @@ window.__ModuleLoader__.load({
|
|
|
1199
1242
|
t,
|
|
1200
1243
|
onAction,
|
|
1201
1244
|
onSave: saveAccount,
|
|
1202
|
-
|
|
1203
|
-
|
|
1204
|
-
|
|
1205
|
-
h("h3", { className: "ima-inspector-empty-title" }, allAccounts.length ? t("settings.selectAccountTitle") : t("settings.noAccountsTitle")),
|
|
1206
|
-
h("p", { className: "ima-inspector-empty-description" }, allAccounts.length ? t("settings.selectAccountDescription") : t("settings.noAccountsDescription")),
|
|
1207
|
-
),
|
|
1208
|
-
),
|
|
1209
|
-
),
|
|
1245
|
+
}),
|
|
1246
|
+
),
|
|
1247
|
+
),
|
|
1210
1248
|
editing && h(BindModal, {
|
|
1211
1249
|
ch: (channels || []).find((item) => item.id === editing) || { id: editing, label: editing, kind: "qr", fields: [] },
|
|
1212
1250
|
catalog: catalog.providers,
|
|
1213
1251
|
permissions: catalog.permissions,
|
|
1252
|
+
agentPresets: catalog.agentPresets,
|
|
1214
1253
|
workspaces,
|
|
1215
1254
|
createWorkspace: props.createWorkspace,
|
|
1216
1255
|
pickDirectory: props.pickDirectory,
|
|
@@ -1504,19 +1543,27 @@ window.__ModuleLoader__.load({
|
|
|
1504
1543
|
body: JSON.stringify(Object.assign({ sessionId: sess.sessionId }, extra || {})),
|
|
1505
1544
|
}).then((data) => { if (data.ok) syncList(data.groups); }).catch(() => undefined);
|
|
1506
1545
|
if (action === "rename" && typeof acts.renameSession === "function") {
|
|
1507
|
-
Promise.resolve(acts.renameSession(sess.sessionId, (extra && extra.title) || title)).then(afterHost).catch(
|
|
1546
|
+
Promise.resolve(acts.renameSession(sess.sessionId, (extra && extra.title) || title)).then(afterHost).catch((error) => console.warn("[dsh-im-connect] 重命名失败", error));
|
|
1508
1547
|
return;
|
|
1509
1548
|
}
|
|
1510
1549
|
if (action === "archive") {
|
|
1550
|
+
const cleanupMissing = async error => {
|
|
1551
|
+
console.warn("[dsh-im-connect] archive failed", error);
|
|
1552
|
+
try {
|
|
1553
|
+
const data = await api("/sessions/cleanup-missing", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ sessionId: sess.sessionId }) });
|
|
1554
|
+
if (data.ok) { syncList(data.groups); return; }
|
|
1555
|
+
} catch (cleanupError) { console.warn("[dsh-im-connect] cleanup failed", cleanupError); }
|
|
1556
|
+
window.alert(t("rail.archiveFailed"));
|
|
1557
|
+
};
|
|
1511
1558
|
if (typeof acts.archiveSession === "function") {
|
|
1512
|
-
Promise.resolve(acts.archiveSession(sess.sessionId)).then(afterHost).catch(
|
|
1559
|
+
Promise.resolve().then(() => acts.archiveSession(sess.sessionId)).then(afterHost).catch(cleanupMissing);
|
|
1513
1560
|
} else {
|
|
1514
|
-
|
|
1561
|
+
void cleanupMissing(new Error("Host archive unavailable"));
|
|
1515
1562
|
}
|
|
1516
1563
|
return;
|
|
1517
1564
|
}
|
|
1518
1565
|
if ((action === "delete" || action === "remove") && typeof acts.deleteSession === "function") {
|
|
1519
|
-
Promise.resolve(acts.deleteSession(sess.sessionId)).then(() => afterHost()).catch(() =>
|
|
1566
|
+
Promise.resolve(acts.deleteSession(sess.sessionId)).then(() => afterHost()).catch((error) => console.warn("[dsh-im-connect] 删除失败", error));
|
|
1520
1567
|
return;
|
|
1521
1568
|
}
|
|
1522
1569
|
if (action === "fork" && typeof acts.forkSession === "function") {
|
|
@@ -1660,7 +1707,13 @@ window.__ModuleLoader__.load({
|
|
|
1660
1707
|
}, [openMenu]);
|
|
1661
1708
|
const needle = query.trim().toLowerCase();
|
|
1662
1709
|
const visibleGroups = groups.map((g) => {
|
|
1663
|
-
const sessions = (g.sessions || []).
|
|
1710
|
+
const sessions = (g.sessions || []).map((sess) => {
|
|
1711
|
+
const host = props.sessionById && props.sessionById[sess.sessionId];
|
|
1712
|
+
// 手动标题及来源未知的旧名称,交给后端可靠标题事件同步。
|
|
1713
|
+
if (sess.titleSource === "user" || (!sess.titleSource && typeof sess.title === "string" && sess.title.trim())) return sess;
|
|
1714
|
+
return host && typeof host.title === "string" && host.title.trim()
|
|
1715
|
+
? Object.assign({}, sess, { title: host.title }) : sess;
|
|
1716
|
+
}).filter((sess) => !archived.has(sess.sessionId));
|
|
1664
1717
|
if (!needle) return Object.assign({}, g, { sessions });
|
|
1665
1718
|
const nameHit = String(channelLabel(g, t)).toLowerCase().includes(needle);
|
|
1666
1719
|
return Object.assign({}, g, { sessions: nameHit ? sessions : sessions.filter((sess) => String(sess.title || sess.chatId || "").toLowerCase().includes(needle)) });
|
|
@@ -1737,7 +1790,7 @@ window.__ModuleLoader__.load({
|
|
|
1737
1790
|
if (!item) return false;
|
|
1738
1791
|
if (item.blank) return false;
|
|
1739
1792
|
if (item.origin === "im" || item.origin === "subagent") return false;
|
|
1740
|
-
return !
|
|
1793
|
+
return !isChannelSession(item.id || "");
|
|
1741
1794
|
}
|
|
1742
1795
|
|
|
1743
1796
|
function TaskList(props) {
|
|
@@ -1746,6 +1799,7 @@ window.__ModuleLoader__.load({
|
|
|
1746
1799
|
}
|
|
1747
1800
|
|
|
1748
1801
|
function TaskListWithSessions(props) {
|
|
1802
|
+
useSyncExternalStore(subscribeChannelMembership, channelMembershipSnapshot, channelMembershipSnapshot);
|
|
1749
1803
|
const t = props.t || fallbackT;
|
|
1750
1804
|
const snap = props.useSessions((state) => state || { ids: [], byId: {}, current: null });
|
|
1751
1805
|
const workspaces = typeof props.useWorkspaces === "function"
|
|
@@ -1806,12 +1860,13 @@ window.__ModuleLoader__.load({
|
|
|
1806
1860
|
const key = keepIm ? "im" : "task";
|
|
1807
1861
|
if (src && typeof src === "object") {
|
|
1808
1862
|
const hit = imSessionFilterCache.get(src);
|
|
1809
|
-
if (hit && hit[key]) return hit[key];
|
|
1863
|
+
if (hit && hit.revision === channelMembershipRevision && hit[key]) return hit[key];
|
|
1810
1864
|
}
|
|
1811
|
-
const ids = (src.ids || []).filter((id) =>
|
|
1865
|
+
const ids = (src.ids || []).filter((id) => isChannelSession(id) === keepIm);
|
|
1812
1866
|
const result = cacheFilteredSessions(src, ids);
|
|
1813
1867
|
if (src && typeof src === "object") {
|
|
1814
|
-
const
|
|
1868
|
+
const previous = imSessionFilterCache.get(src);
|
|
1869
|
+
const bucket = previous && previous.revision === channelMembershipRevision ? previous : { revision: channelMembershipRevision };
|
|
1815
1870
|
bucket[key] = result;
|
|
1816
1871
|
imSessionFilterCache.set(src, bucket);
|
|
1817
1872
|
}
|
|
@@ -1882,6 +1937,7 @@ window.__ModuleLoader__.load({
|
|
|
1882
1937
|
}
|
|
1883
1938
|
|
|
1884
1939
|
function SessionSwitcher(props) {
|
|
1940
|
+
const membershipRevision = useSyncExternalStore(subscribeChannelMembership, channelMembershipSnapshot, channelMembershipSnapshot);
|
|
1885
1941
|
const t = props.t || fallbackT;
|
|
1886
1942
|
const officialT = props.officialT || t;
|
|
1887
1943
|
const Official = props.officialTree;
|
|
@@ -1901,11 +1957,11 @@ window.__ModuleLoader__.load({
|
|
|
1901
1957
|
const useTaskSessions = useCallback((selector, eq) => {
|
|
1902
1958
|
if (typeof rawUseSessions !== "function") return selector({ ids: [], byId: {}, current: null });
|
|
1903
1959
|
return rawUseSessions((state) => selector(applyRegistryFilters(filterTaskSessions(state), nativeTabs)), eq);
|
|
1904
|
-
}, [rawUseSessions, nativeTabs]);
|
|
1960
|
+
}, [rawUseSessions, nativeTabs, membershipRevision]);
|
|
1905
1961
|
const useChannelSessions = useCallback((selector, eq) => {
|
|
1906
1962
|
if (typeof rawUseSessions !== "function") return selector({ ids: [], byId: {}, current: null });
|
|
1907
1963
|
return rawUseSessions((state) => selector(filterChannelSessions(state)), eq);
|
|
1908
|
-
}, [rawUseSessions]);
|
|
1964
|
+
}, [rawUseSessions, membershipRevision]);
|
|
1909
1965
|
useEffect(() => { ensureStyle(); }, []);
|
|
1910
1966
|
useEffect(() => { try { localStorage.setItem(TAB_KEY, tab); } catch { /* ignore */ } }, [tab]);
|
|
1911
1967
|
const previousCurrentId = useRef(currentId);
|
|
@@ -1918,11 +1974,12 @@ window.__ModuleLoader__.load({
|
|
|
1918
1974
|
}
|
|
1919
1975
|
const previous = previousCurrentId.current;
|
|
1920
1976
|
previousCurrentId.current = currentId;
|
|
1921
|
-
if (typeof currentId !== "string" || currentId === ""
|
|
1922
|
-
if (currentId
|
|
1977
|
+
if (typeof currentId !== "string" || currentId === "") return;
|
|
1978
|
+
if (currentId === previous && !isChannelSession(currentId)) return;
|
|
1979
|
+
if (isChannelSession(currentId)) setTab("channels");
|
|
1923
1980
|
const matched = extraTabs.find((item) => item.matchSession && item.matchSession(currentId));
|
|
1924
1981
|
if (matched && matched.id !== "schedule") setTab(matched.id);
|
|
1925
|
-
}, [currentId, extraTabs]);
|
|
1982
|
+
}, [currentId, extraTabs, membershipRevision]);
|
|
1926
1983
|
const openSession = (id) => openListedSession(id, props.openSession || props.open);
|
|
1927
1984
|
const officialProps = Object.assign({}, props, { useSessions: useTaskSessions, t: officialT });
|
|
1928
1985
|
const channelRail = h(ChannelRail, {
|
|
@@ -2008,6 +2065,15 @@ window.__ModuleLoader__.load({
|
|
|
2008
2065
|
|
|
2009
2066
|
function apply(ctx) {
|
|
2010
2067
|
ensureStyle();
|
|
2068
|
+
ctx.effect(() => {
|
|
2069
|
+
let active = true;
|
|
2070
|
+
const refresh = () => fetch(API_BASE + "/channels", { credentials: "same-origin", cache: "no-store" })
|
|
2071
|
+
.then(response => response.json()).then(data => { if (active && data.ok && Array.isArray(data.groups)) updateChannelMembership(data.groups); })
|
|
2072
|
+
.catch(error => { if (active) console.warn("[dsh-im-connect] 无法刷新渠道会话归属", error); });
|
|
2073
|
+
refresh();
|
|
2074
|
+
const timer = setInterval(refresh, 4000);
|
|
2075
|
+
return () => { active = false; clearInterval(timer); };
|
|
2076
|
+
}, "im-connect: channel membership");
|
|
2011
2077
|
ctx.effect(() => ctx.locale.register(IM_LOCALE_NS, IM_LOCALES), "im-connect: dictionaries");
|
|
2012
2078
|
const t = ctx.locale.bind(IM_LOCALE_NS);
|
|
2013
2079
|
ctx.effect(() => observePluginUpdate({
|
|
@@ -2113,7 +2179,7 @@ window.__ModuleLoader__.load({
|
|
|
2113
2179
|
id: "channels",
|
|
2114
2180
|
label: t("rail.channels"),
|
|
2115
2181
|
order: 20,
|
|
2116
|
-
matchSession:
|
|
2182
|
+
matchSession: isChannelSession,
|
|
2117
2183
|
render: (props) => h(LocalizedChannelRail, Object.assign({}, props, {
|
|
2118
2184
|
skin: "native",
|
|
2119
2185
|
openSession: (id) => openListedSession(id, props.openSession || props.open),
|
|
@@ -2122,7 +2188,9 @@ window.__ModuleLoader__.load({
|
|
|
2122
2188
|
});
|
|
2123
2189
|
};
|
|
2124
2190
|
refreshInsertedTab();
|
|
2125
|
-
|
|
2191
|
+
const stopLocale = subscribeLocale(refreshInsertedTab);
|
|
2192
|
+
const stopMembership = subscribeChannelMembership(refreshInsertedTab);
|
|
2193
|
+
stopInsertedTabLocale = () => { stopLocale(); stopMembership(); };
|
|
2126
2194
|
return true;
|
|
2127
2195
|
};
|
|
2128
2196
|
const sync = () => {
|