@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/lib/client.js
CHANGED
|
@@ -340,8 +340,9 @@ window.__ModuleLoader__.load({
|
|
|
340
340
|
zh: {
|
|
341
341
|
"settings.label": "IM助理", "settings.title": "IM助理", "settings.description": "管理各渠道账号。每个账号独立选择工作区、模型和权限,配置仅保存在本机。", "settings.viewProject": "GitHub", "settings.feedback": "问题反馈",
|
|
342
342
|
"settings.aria": "IM助理", "settings.selectAccountTitle": "选择一个账号", "settings.selectAccountDescription": "从左侧选择账号,查看并修改工作区、模型和权限配置。", "settings.noAccountsTitle": "还没有接入账号", "settings.noAccountsDescription": "请在左侧选择对应渠道,然后点击“添加账号”。", "settings.publicChatNotice": "未批准用户可以发起聊天,但不能批准工具调用。", "pending.notice": "有访问请求。批准后该用户才能驱动本机助手。", "action.approve": "批准", "action.deny": "拒绝", "loading": "加载中…",
|
|
343
|
+
"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。",
|
|
343
344
|
"account.workspace": "工作区", "account.currentWorkspace": "当前工作区", "account.selectWorkspace": "请选择工作区", "account.selectModel": "请选择模型", "account.selectPermission": "请选择权限", "account.privateAccess": "私聊准入", "account.privateApproved": "仅已批准用户", "account.privateAll": "允许所有私聊用户", "account.autoNameNote": "绑定成功后会自动生成账号名,无需手动填写。", "account.defaultName": "{channel}账号 {count}",
|
|
344
|
-
"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": "确定移除这个账号?本机保存的配置和凭据将一并删除。",
|
|
345
|
+
"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": "确定移除这个账号?本机保存的配置和凭据将一并删除。",
|
|
345
346
|
"action.addAccount": "添加账号", "action.generateQr": "生成二维码", "action.checkConnection": "检查连接", "action.reconnectAccount": "重新连接", "action.removeAccount": "移除接入", "status.saving": "保存中…", "status.saved": "已保存",
|
|
346
347
|
"channel.dingtalk": "钉钉", "channel.feishu": "飞书", "channel.lark": "Lark", "channel.weixin": "微信", "channel.wecom": "企业微信", "channel.qq": "QQ", "channel.telegram": "Telegram",
|
|
347
348
|
"field.dingtalk.clientId": "Client ID(原 AppKey)", "field.dingtalk.clientSecret": "Client Secret(原 AppSecret)",
|
|
@@ -351,7 +352,7 @@ window.__ModuleLoader__.load({
|
|
|
351
352
|
"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": "操作失败,请查看服务器日志。",
|
|
352
353
|
"composer.aria": "全局会话配置", "composer.project": "选择项目", "composer.projectAria": "项目", "composer.noWorkspaces": "暂无工作区", "composer.addWorkspace": "添加工作区…", "composer.permission": "权限", "composer.noModels": "暂无模型", "composer.workspacePath": "工作区路径", "action.cancel": "取消", "action.adding": "添加中…",
|
|
353
354
|
"permission.readOnly": "只读", "permission.workspaceWrite": "工作区写入", "permission.fullAccess": "完全访问",
|
|
354
|
-
"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": "频道",
|
|
355
|
+
"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": "频道",
|
|
355
356
|
"time.now": "刚刚", "time.minutes": "{count}分钟前", "time.hours": "{count}小时前", "time.days": "{count}天前",
|
|
356
357
|
"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助理 中批准你的访问。",
|
|
357
358
|
"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": "登录中",
|
|
@@ -359,8 +360,9 @@ window.__ModuleLoader__.load({
|
|
|
359
360
|
en: {
|
|
360
361
|
"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",
|
|
361
362
|
"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…",
|
|
363
|
+
"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.",
|
|
362
364
|
"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}",
|
|
363
|
-
"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.",
|
|
365
|
+
"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.",
|
|
364
366
|
"action.addAccount": "Add account", "action.generateQr": "Generate QR code", "action.checkConnection": "Check", "action.reconnectAccount": "Reconnect", "action.removeAccount": "Remove", "status.saving": "Saving…", "status.saved": "Saved",
|
|
365
367
|
"channel.dingtalk": "DingTalk", "channel.feishu": "Feishu", "channel.lark": "Lark", "channel.weixin": "WeChat", "channel.wecom": "WeCom", "channel.qq": "QQ", "channel.telegram": "Telegram",
|
|
366
368
|
"field.dingtalk.clientId": "Client ID (formerly AppKey)", "field.dingtalk.clientSecret": "Client Secret (formerly AppSecret)",
|
|
@@ -370,7 +372,7 @@ window.__ModuleLoader__.load({
|
|
|
370
372
|
"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.",
|
|
371
373
|
"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…",
|
|
372
374
|
"permission.readOnly": "Read Only", "permission.workspaceWrite": "Workspace Write", "permission.fullAccess": "Full access",
|
|
373
|
-
"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",
|
|
375
|
+
"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",
|
|
374
376
|
"time.now": "Just now", "time.minutes": "{count} min ago", "time.hours": "{count} hr ago", "time.days": "{count} days ago",
|
|
375
377
|
"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.",
|
|
376
378
|
"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",
|
|
@@ -380,7 +382,7 @@ window.__ModuleLoader__.load({
|
|
|
380
382
|
const h = React.createElement;
|
|
381
383
|
|
|
382
384
|
const CSS = `
|
|
383
|
-
.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:
|
|
385
|
+
.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)}
|
|
384
386
|
.ima-deco{display:flex;justify-content:center;align-items:flex-end;gap:10px;min-height:56px;margin:8px 0 14px}
|
|
385
387
|
.ima-bubble{font-size:12px;line-height:1.4;padding:6px 10px;border-radius:12px;max-width:220px;border:1px solid var(--ima-line)}
|
|
386
388
|
.ima-bubble.left{background:rgba(46,160,67,.14);color:#7ee787}
|
|
@@ -400,6 +402,7 @@ window.__ModuleLoader__.load({
|
|
|
400
402
|
.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))}
|
|
401
403
|
.ima-chip-menu.is-end{left:auto;right:0}
|
|
402
404
|
.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}
|
|
405
|
+
.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}
|
|
403
406
|
.ima-chip-row:hover,.ima-chip-row.is-on{background:var(--dsw-alias-interactive-bg-hover,rgba(127,127,127,.08))}
|
|
404
407
|
.ima-chip-row-main{display:inline-flex;align-items:center;gap:8px;min-width:0}
|
|
405
408
|
.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}
|
|
@@ -496,19 +499,21 @@ window.__ModuleLoader__.load({
|
|
|
496
499
|
.ima-radio small{display:block;color:var(--ima-muted);margin-top:2px}
|
|
497
500
|
.ima-ok{color:var(--ima-ok);font-size:14px;text-align:center;padding:24px 0}
|
|
498
501
|
.ima-modal .ima-error{color:var(--ima-danger)}
|
|
499
|
-
.ima-page.ima-account-page{container-type:inline-size;min-width:0;max-width:
|
|
500
|
-
.ima-account-shell{display:
|
|
501
|
-
.ima-platforms{padding:0;border
|
|
502
|
-
.ima-platform{border:
|
|
503
|
-
.ima-platform-head{display:flex;align-items:center;gap:10px;width:100%;min-height:
|
|
502
|
+
.ima-page.ima-account-page{container-type:inline-size;min-width:0;max-width:none;padding-bottom:40px}
|
|
503
|
+
.ima-account-shell{display:block;min-height:0;border:0;border-radius:0;overflow:visible;background:transparent}
|
|
504
|
+
.ima-platforms{display:flex;flex-direction:column;gap:12px;padding:0;border:0;background:transparent}
|
|
505
|
+
.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)}
|
|
506
|
+
.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}
|
|
504
507
|
.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)}
|
|
505
508
|
.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)}
|
|
506
509
|
.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)}
|
|
507
|
-
.ima-account-list{display:flex;flex-direction:column;gap:8px;padding:0 14px 14px}.ima-account-row{display:
|
|
510
|
+
.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)}
|
|
508
511
|
.ima-platform-head:focus-visible,.ima-platform-add:focus-visible,.ima-account-row:focus-visible{outline:2px solid var(--ima-accent);outline-offset:2px}
|
|
509
|
-
.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)
|
|
510
|
-
.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-
|
|
512
|
+
.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)}
|
|
513
|
+
.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}
|
|
514
|
+
.ima-inspector-status{color:var(--ima-muted);font-size:12px}.ima-inspector-status.ok{color:var(--ima-ok)}
|
|
511
515
|
.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}
|
|
516
|
+
.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%}
|
|
512
517
|
.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}
|
|
513
518
|
.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)}
|
|
514
519
|
.ima-save-note{min-height:18px;color:var(--ima-muted);font-size:11px}.ima-save-note.ok{color:var(--ima-ok)}
|
|
@@ -516,24 +521,10 @@ window.__ModuleLoader__.load({
|
|
|
516
521
|
.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)}
|
|
517
522
|
.ima-account-shell,.ima-account-shell *{box-sizing:border-box}
|
|
518
523
|
.ima-platforms{min-width:0}
|
|
519
|
-
.ima-platform-head{display:
|
|
520
|
-
.ima-platform-head
|
|
521
|
-
.ima-platform-
|
|
522
|
-
.ima-
|
|
523
|
-
.ima-platform-count{grid-column:1/3;grid-row:2;font-size:11px;white-space:normal;padding-right:80px}
|
|
524
|
-
.ima-platform-add{grid-column:1/4;grid-row:2;justify-self:end;min-height:28px;padding:0 8px;font-weight:500}
|
|
525
|
-
.ima-account-list{padding:0 8px 10px}
|
|
526
|
-
.ima-account-row{display:grid;grid-template-columns:7px minmax(0,1fr) 12px;gap:6px;min-height:60px;padding:10px 8px}
|
|
527
|
-
.ima-account-row>.ima-logo{display:none}
|
|
528
|
-
.ima-account-copy{grid-column:2;grid-row:1}
|
|
529
|
-
.ima-account-row>.ima-dot{grid-column:1;grid-row:1}
|
|
530
|
-
.ima-account-next{grid-column:3;grid-row:1;width:12px}
|
|
531
|
-
.ima-account-state{grid-column:2;grid-row:2;font-size:11px}
|
|
532
|
-
.ima-inspector{padding:18px 16px;overflow-wrap:anywhere}
|
|
533
|
-
.ima-switch-row{gap:10px}.ima-switch-copy{min-width:0}
|
|
534
|
-
@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}}
|
|
535
|
-
@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}}
|
|
536
|
-
@media(max-width:620px){.ima-account-settings{grid-template-columns:1fr}.ima-picker-field.wide{grid-column:auto}}
|
|
524
|
+
.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))}
|
|
525
|
+
@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}}
|
|
526
|
+
.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}
|
|
527
|
+
@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}}
|
|
537
528
|
@media (prefers-reduced-motion:reduce){.ima-switch i{transition:none}}
|
|
538
529
|
`;
|
|
539
530
|
|
|
@@ -547,6 +538,23 @@ window.__ModuleLoader__.load({
|
|
|
547
538
|
document.head.appendChild(styleEl);
|
|
548
539
|
};
|
|
549
540
|
|
|
541
|
+
let channelSessionIds = new Set();
|
|
542
|
+
let channelMembershipRevision = 0;
|
|
543
|
+
const channelMembershipListeners = new Set();
|
|
544
|
+
function updateChannelMembership(groups) {
|
|
545
|
+
const next = new Set(groups.flatMap(group => (group.sessions || []).map(session => session.sessionId)));
|
|
546
|
+
if (next.size === channelSessionIds.size && [...next].every(id => channelSessionIds.has(id))) return;
|
|
547
|
+
channelSessionIds = next;
|
|
548
|
+
channelMembershipRevision += 1;
|
|
549
|
+
for (const listener of channelMembershipListeners) listener();
|
|
550
|
+
}
|
|
551
|
+
const isChannelSession = (id) => String(id).startsWith("im:") || channelSessionIds.has(String(id));
|
|
552
|
+
const subscribeChannelMembership = (listener) => {
|
|
553
|
+
channelMembershipListeners.add(listener);
|
|
554
|
+
return () => channelMembershipListeners.delete(listener);
|
|
555
|
+
};
|
|
556
|
+
const channelMembershipSnapshot = () => channelMembershipRevision;
|
|
557
|
+
|
|
550
558
|
const api = (path, opts) => {
|
|
551
559
|
// 管理路由复用宿主登录 Cookie,不缓存账号状态或认证错误。
|
|
552
560
|
const request = Object.assign({}, opts || {}, { credentials: "same-origin", cache: "no-store" });
|
|
@@ -555,7 +563,10 @@ window.__ModuleLoader__.load({
|
|
|
555
563
|
request.headers = Object.assign({ "content-type": "application/json" }, request.headers || {}, { "x-dsh-im-connect-client": "1" });
|
|
556
564
|
if (request.body === undefined) request.body = "{}";
|
|
557
565
|
}
|
|
558
|
-
return fetch(API_BASE + path, request).then((r) => r.json())
|
|
566
|
+
return fetch(API_BASE + path, request).then((r) => r.json()).then((data) => {
|
|
567
|
+
if (data.ok && Array.isArray(data.groups)) updateChannelMembership(data.groups);
|
|
568
|
+
return data;
|
|
569
|
+
});
|
|
559
570
|
};
|
|
560
571
|
|
|
561
572
|
const storedAccountSelection = () => {
|
|
@@ -693,7 +704,7 @@ window.__ModuleLoader__.load({
|
|
|
693
704
|
};
|
|
694
705
|
const openListedSession = (id, hostOpen) => {
|
|
695
706
|
if (!id) return;
|
|
696
|
-
if (
|
|
707
|
+
if (isChannelSession(id)) {
|
|
697
708
|
api("/sessions/ensure", {
|
|
698
709
|
method: "POST",
|
|
699
710
|
headers: { "content-type": "application/json" },
|
|
@@ -713,7 +724,7 @@ window.__ModuleLoader__.load({
|
|
|
713
724
|
};
|
|
714
725
|
let channelSkin = "native";
|
|
715
726
|
|
|
716
|
-
function BindModal({ ch, onClose, onConnected, catalog, permissions, workspaces, defaults, createWorkspace, pickDirectory, modelT, permissionT, t = fallbackT }) {
|
|
727
|
+
function BindModal({ ch, onClose, onConnected, catalog, permissions, agentPresets, workspaces, defaults, createWorkspace, pickDirectory, modelT, permissionT, t = fallbackT }) {
|
|
717
728
|
const hasQr = ch.kind === "qr" || ch.kind === "qr-or-credentials";
|
|
718
729
|
const hasManual = ch.kind === "credentials" || ch.kind === "qr-or-credentials";
|
|
719
730
|
const [tab, setTab] = useState(hasQr ? "qr" : "manual");
|
|
@@ -730,6 +741,7 @@ window.__ModuleLoader__.load({
|
|
|
730
741
|
reasoningEffort: defaults && defaults.assistant && defaults.assistant.reasoningEffort || "",
|
|
731
742
|
permission: defaults && defaults.permission || "",
|
|
732
743
|
privateAccess: "approved",
|
|
744
|
+
agentPreset: defaults && defaults.agentPreset || "standard",
|
|
733
745
|
}));
|
|
734
746
|
const alive = useRef(true);
|
|
735
747
|
|
|
@@ -854,6 +866,7 @@ window.__ModuleLoader__.load({
|
|
|
854
866
|
onChange: (patch) => setSettings((current) => ({ ...current, ...patch })),
|
|
855
867
|
catalog,
|
|
856
868
|
permissions,
|
|
869
|
+
agentPresets,
|
|
857
870
|
workspaces,
|
|
858
871
|
createWorkspace,
|
|
859
872
|
pickDirectory,
|
|
@@ -862,6 +875,7 @@ window.__ModuleLoader__.load({
|
|
|
862
875
|
showAutoNameNote: true,
|
|
863
876
|
t,
|
|
864
877
|
}),
|
|
878
|
+
h(CommandPermissionSettings, { value: settings.commandPermissions, onSave: commandPermissions => setSettings(current => ({ ...current, commandPermissions })), t }),
|
|
865
879
|
),
|
|
866
880
|
tab === "qr" && hasQr && (
|
|
867
881
|
status === "success"
|
|
@@ -1039,6 +1053,7 @@ window.__ModuleLoader__.load({
|
|
|
1039
1053
|
type: "button",
|
|
1040
1054
|
className: "ima-chip-row" + (props.active ? " is-on" : "") + (props.kv ? " is-kv" : ""),
|
|
1041
1055
|
role: "menuitem",
|
|
1056
|
+
title: props.hint || undefined,
|
|
1042
1057
|
onClick: props.onClick,
|
|
1043
1058
|
},
|
|
1044
1059
|
h("span", { className: "ima-chip-row-main" },
|
|
@@ -1125,15 +1140,15 @@ window.__ModuleLoader__.load({
|
|
|
1125
1140
|
};
|
|
1126
1141
|
const onAddWorkspace = () => {
|
|
1127
1142
|
setOpen("");
|
|
1128
|
-
|
|
1129
|
-
Promise.resolve(props.pickDirectory()).then((picked) => picked && addWorkspace(picked)).catch(() => {
|
|
1130
|
-
setAdding(true);
|
|
1131
|
-
setAddPath("");
|
|
1132
|
-
});
|
|
1133
|
-
return;
|
|
1134
|
-
}
|
|
1143
|
+
setHint("");
|
|
1135
1144
|
setAdding(true);
|
|
1136
1145
|
setAddPath("");
|
|
1146
|
+
if (typeof props.pickDirectory === "function") {
|
|
1147
|
+
// Web 宿主可能返回空路径;始终保留可见的手动输入入口。
|
|
1148
|
+
return Promise.resolve().then(() => props.pickDirectory()).then(picked => {
|
|
1149
|
+
if (typeof picked === "string" && picked.trim()) return addWorkspace(picked);
|
|
1150
|
+
}).catch(() => { setAdding(true); });
|
|
1151
|
+
}
|
|
1137
1152
|
};
|
|
1138
1153
|
const selectPermission = (next) => {
|
|
1139
1154
|
setOpen("");
|
|
@@ -1157,7 +1172,7 @@ window.__ModuleLoader__.load({
|
|
|
1157
1172
|
icon: h(FolderIcon),
|
|
1158
1173
|
label: (workspace && (workspace.title || workspace.path)) || cwd || t("account.selectWorkspace"),
|
|
1159
1174
|
ariaLabel: props.workspaceLabel || t("account.workspace"),
|
|
1160
|
-
className: "ima-account-picker",
|
|
1175
|
+
className: "ima-account-picker ima-workspace-picker",
|
|
1161
1176
|
},
|
|
1162
1177
|
items.length === 0 && h("div", { className: "ima-chip-empty" }, t("composer.noWorkspaces")),
|
|
1163
1178
|
...items.map((item) => h(ChipRow, {
|
|
@@ -1171,6 +1186,26 @@ window.__ModuleLoader__.load({
|
|
|
1171
1186
|
h("div", { className: "ima-chip-split" }),
|
|
1172
1187
|
h(ChipRow, { icon: h(PlusIcon), label: t("composer.addWorkspace"), onClick: onAddWorkspace }),
|
|
1173
1188
|
), true),
|
|
1189
|
+
adding && h("div", { className: "ima-chip-dialog" },
|
|
1190
|
+
h("strong", null, t("composer.addWorkspace")),
|
|
1191
|
+
h("input", { autoFocus: true, value: addPath, placeholder: t("composer.workspacePath"), "aria-label": t("composer.workspacePath"), onChange: (event) => setAddPath(event.target.value) }),
|
|
1192
|
+
h("div", { className: "ima-chip-dialog-actions" },
|
|
1193
|
+
h("button", { className: "ima-btn", onClick: () => { setAdding(false); setAddPath(""); } }, t("action.cancel")),
|
|
1194
|
+
h("button", { className: "ima-btn primary", disabled: addBusy || !addPath.trim(), onClick: () => addWorkspace(addPath) }, addBusy ? t("action.adding") : t("action.confirm")),
|
|
1195
|
+
),
|
|
1196
|
+
),
|
|
1197
|
+
field("agentPreset", t("account.agentPreset"), h(ChipMenu, {
|
|
1198
|
+
open: open === "agentPreset",
|
|
1199
|
+
onToggle: next => setOpen(next ? "agentPreset" : ""),
|
|
1200
|
+
label: ((props.agentPresets || []).find(item => item.id === value.agentPreset) || {}).name || value.agentPreset || "standard",
|
|
1201
|
+
ariaLabel: t("account.agentPreset"), className: "ima-account-picker",
|
|
1202
|
+
},
|
|
1203
|
+
...(props.agentPresets || []).map(item => h(ChipRow, {
|
|
1204
|
+
key: item.id, label: item.name || item.id, hint: item.broken ? t("account.presetUnavailable") : item.description,
|
|
1205
|
+
active: item.id === value.agentPreset,
|
|
1206
|
+
onClick: () => { if (!item.broken) { update({ agentPreset: item.id }); setOpen(""); } },
|
|
1207
|
+
})),
|
|
1208
|
+
)),
|
|
1174
1209
|
field("model", modelT("menu.model"), h(ChipMenu, {
|
|
1175
1210
|
open: open === "model",
|
|
1176
1211
|
onToggle: (next) => { setOpen(next ? "model" : ""); if (next) setModelPane("root"); },
|
|
@@ -1236,16 +1271,9 @@ window.__ModuleLoader__.load({
|
|
|
1236
1271
|
},
|
|
1237
1272
|
h(ChipRow, { icon: h(ShieldIcon), label: t("account.privateApproved"), active: privateAccess === "approved", onClick: () => { update({ privateAccess: "approved" }); setOpen(""); } }),
|
|
1238
1273
|
h(ChipRow, { icon: h(ShieldIcon), label: t("account.privateAll"), active: privateAccess === "all", onClick: () => { update({ privateAccess: "all" }); setOpen(""); } }),
|
|
1239
|
-
)
|
|
1274
|
+
)),
|
|
1275
|
+
h("div", { className: "ima-picker-note" }, t("account.presetNote")),
|
|
1240
1276
|
privateAccess === "all" && h("div", { className: "ima-picker-note warning" }, t("settings.publicChatNotice")),
|
|
1241
|
-
adding && h("div", { className: "ima-chip-dialog" },
|
|
1242
|
-
h("strong", null, t("composer.addWorkspace")),
|
|
1243
|
-
h("input", { value: addPath, placeholder: t("composer.workspacePath"), "aria-label": t("composer.workspacePath"), onChange: (event) => setAddPath(event.target.value) }),
|
|
1244
|
-
h("div", { className: "ima-chip-dialog-actions" },
|
|
1245
|
-
h("button", { className: "ima-btn", onClick: () => { setAdding(false); setAddPath(""); } }, t("action.cancel")),
|
|
1246
|
-
h("button", { className: "ima-btn primary", disabled: addBusy || !addPath.trim(), onClick: () => addWorkspace(addPath) }, addBusy ? t("action.adding") : t("action.confirm")),
|
|
1247
|
-
),
|
|
1248
|
-
),
|
|
1249
1277
|
hint && h("div", { className: "ima-picker-note" }, hint),
|
|
1250
1278
|
props.showAutoNameNote && h("div", { className: "ima-picker-note" }, t("account.autoNameNote")),
|
|
1251
1279
|
h(RiskConfirmation, {
|
|
@@ -1267,7 +1295,21 @@ window.__ModuleLoader__.load({
|
|
|
1267
1295
|
);
|
|
1268
1296
|
}
|
|
1269
1297
|
|
|
1270
|
-
|
|
1298
|
+
// 与账号配置共用下拉组件,私聊与群聊分别保存。
|
|
1299
|
+
function CommandPermissionSettings({ value, onSave, t }) {
|
|
1300
|
+
const [open, setOpen] = useState("");
|
|
1301
|
+
const policy = value || { dm: { enabled: true, users: [] }, group: { enabled: true, users: [] } };
|
|
1302
|
+
return h("div", { className: "ima-command-permissions ima-account-settings" },
|
|
1303
|
+
...["dm", "group"].map(kind => h("div", { key: kind, className: "ima-picker-field" },
|
|
1304
|
+
h("span", { className: "ima-picker-label" }, t("command." + kind)),
|
|
1305
|
+
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" },
|
|
1306
|
+
...[true, false].map(enabled => h(ChipRow, { key: String(enabled), label: t(enabled ? "command.enabled" : "command.disabled"), active: policy[kind].enabled === enabled, onClick: () => {
|
|
1307
|
+
setOpen("");
|
|
1308
|
+
return onSave({ dm: { enabled: policy.dm.enabled, users: [] }, group: { enabled: policy.group.enabled, users: [] }, [kind]: { enabled, users: [] } });
|
|
1309
|
+
} }))))));
|
|
1310
|
+
}
|
|
1311
|
+
|
|
1312
|
+
function AccountInspector({ account, catalog, permissions, agentPresets, workspaces, createWorkspace, pickDirectory, modelT, permissionT, t, onAction, onSave }) {
|
|
1271
1313
|
const [draft, setDraft] = useState(account);
|
|
1272
1314
|
const [note, setNote] = useState("");
|
|
1273
1315
|
const saveSeq = useRef(0);
|
|
@@ -1275,7 +1317,7 @@ window.__ModuleLoader__.load({
|
|
|
1275
1317
|
saveSeq.current += 1;
|
|
1276
1318
|
setDraft(account);
|
|
1277
1319
|
setNote("");
|
|
1278
|
-
}, [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]);
|
|
1320
|
+
}, [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]);
|
|
1279
1321
|
const save = (patch) => {
|
|
1280
1322
|
const seq = ++saveSeq.current;
|
|
1281
1323
|
const next = { ...draft, ...patch };
|
|
@@ -1289,6 +1331,8 @@ window.__ModuleLoader__.load({
|
|
|
1289
1331
|
reasoningEffort: next.assistant.reasoningEffort || null,
|
|
1290
1332
|
permission: next.permission,
|
|
1291
1333
|
privateAccess: next.privateAccess,
|
|
1334
|
+
agentPreset: next.agentPreset,
|
|
1335
|
+
commandPermissions: next.commandPermissions,
|
|
1292
1336
|
}).then((ok) => {
|
|
1293
1337
|
if (seq === saveSeq.current) setNote(ok ? "status.saved" : "error.save");
|
|
1294
1338
|
return ok;
|
|
@@ -1309,8 +1353,10 @@ window.__ModuleLoader__.load({
|
|
|
1309
1353
|
h("div", { className: "ima-inspector-head" },
|
|
1310
1354
|
h(Logo, { id: account.platform }),
|
|
1311
1355
|
h("div", { className: "ima-inspector-head-copy" },
|
|
1356
|
+
h("div", { className: "ima-inspector-title-row" },
|
|
1312
1357
|
h("h3", { className: "ima-inspector-title" }, accountLabel(account, t)),
|
|
1313
1358
|
h("div", { className: account.connected ? "ima-inspector-status ok" : "ima-inspector-status" }, "● " + (account.connected ? t("account.statusRunning") : (serverText(account.status, t) || t("account.statusNotConnected")))),
|
|
1359
|
+
),
|
|
1314
1360
|
h("div", { className: "ima-account-id" }, account.id),
|
|
1315
1361
|
),
|
|
1316
1362
|
),
|
|
@@ -1320,19 +1366,17 @@ window.__ModuleLoader__.load({
|
|
|
1320
1366
|
onChange: applySettings,
|
|
1321
1367
|
catalog,
|
|
1322
1368
|
permissions,
|
|
1369
|
+
agentPresets,
|
|
1323
1370
|
workspaces,
|
|
1324
1371
|
createWorkspace,
|
|
1325
1372
|
pickDirectory,
|
|
1326
1373
|
modelT,
|
|
1327
1374
|
permissionT,
|
|
1328
|
-
compact:
|
|
1375
|
+
compact: false,
|
|
1329
1376
|
workspaceLabel: t("account.currentWorkspace"),
|
|
1330
1377
|
t,
|
|
1331
1378
|
}),
|
|
1332
|
-
h(
|
|
1333
|
-
h("div", { className: "ima-switch-copy" }, h("strong", null, t("account.receive")), h("small", null, t("account.receiveDescription"))),
|
|
1334
|
-
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")),
|
|
1335
|
-
),
|
|
1379
|
+
h(CommandPermissionSettings, { value: draft.commandPermissions, onSave: commandPermissions => save({ commandPermissions }), t }),
|
|
1336
1380
|
h("div", { className: note === "status.saved" ? "ima-save-note ok" : "ima-save-note" }, note && t(note)),
|
|
1337
1381
|
h("div", { className: "ima-inspector-actions" },
|
|
1338
1382
|
h("button", { className: "ima-btn", onClick: () => onAction(account.id, "check") }, t("action.checkConnection")),
|
|
@@ -1358,6 +1402,7 @@ window.__ModuleLoader__.load({
|
|
|
1358
1402
|
const [busy, setBusy] = useState({});
|
|
1359
1403
|
const [editing, setEditing] = useState(null);
|
|
1360
1404
|
const [selected, setSelected] = useState(storedAccountSelection);
|
|
1405
|
+
const [settingsAccount, setSettingsAccount] = useState(null);
|
|
1361
1406
|
const [expanded, setExpanded] = useState({ weixin: true });
|
|
1362
1407
|
const [catalog, setCatalog] = useState({ providers: [], permissions: [], assistant: null, cwd: "", permission: "" });
|
|
1363
1408
|
const workspaces = props.useWorkspaces ? (props.useWorkspaces((state) => state && state.items || []) || []) : [];
|
|
@@ -1390,7 +1435,7 @@ window.__ModuleLoader__.load({
|
|
|
1390
1435
|
ensureStyle();
|
|
1391
1436
|
refresh();
|
|
1392
1437
|
api("/assistant").then((data) => {
|
|
1393
|
-
if (data.ok) setCatalog({ providers: data.providers || [], permissions: data.permissions || [], assistant: data.assistant || null, cwd: data.cwd || "", permission: data.permission || "" });
|
|
1438
|
+
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 || "" });
|
|
1394
1439
|
}).catch(() => undefined);
|
|
1395
1440
|
}, [refresh]);
|
|
1396
1441
|
useEffect(() => { const timer = setInterval(refresh, 4000); return () => clearInterval(timer); }, [refresh]);
|
|
@@ -1421,7 +1466,7 @@ window.__ModuleLoader__.load({
|
|
|
1421
1466
|
};
|
|
1422
1467
|
const saveAccount = (id, body) => onAction(id, "settings", body);
|
|
1423
1468
|
const allAccounts = (channels || []).flatMap((channel) => channel.accounts || []);
|
|
1424
|
-
const selectedAccount = allAccounts.find((item) => item.id ===
|
|
1469
|
+
const selectedAccount = allAccounts.find((item) => item.id === settingsAccount);
|
|
1425
1470
|
|
|
1426
1471
|
return h("section", { className: "ima-page ima-account-page", "aria-label": t("settings.aria") },
|
|
1427
1472
|
h("header", { className: "ima-head" },
|
|
@@ -1453,38 +1498,36 @@ window.__ModuleLoader__.load({
|
|
|
1453
1498
|
const canExpand = (ch.accounts || []).length > 0;
|
|
1454
1499
|
const open = canExpand && Boolean(expanded[ch.id]);
|
|
1455
1500
|
const toggleExpanded = canExpand ? () => setExpanded({ ...expanded, [ch.id]: !open }) : undefined;
|
|
1456
|
-
const channelStatus = ch.total === 0
|
|
1457
|
-
? { label: t("account.countZero"), tone: "muted" }
|
|
1458
|
-
: ch.online === ch.total
|
|
1459
|
-
? { label: t("account.countOnline", { online: ch.online, total: ch.total }), tone: "online" }
|
|
1460
|
-
: ch.online === 0
|
|
1461
|
-
? { label: t("account.countOffline", { total: ch.total }), tone: "offline" }
|
|
1462
|
-
: { label: t("account.countOnline", { online: ch.online, total: ch.total }), tone: "partial" };
|
|
1463
1501
|
return h("div", { key: ch.id, className: "ima-platform" + (open ? " open" : "") + (canExpand ? "" : " empty") },
|
|
1464
1502
|
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 },
|
|
1465
1503
|
h(Logo, { id: ch.id }),
|
|
1466
1504
|
h("span", { className: "ima-platform-title" }, channelLabel(ch, t)),
|
|
1467
|
-
h("span", { className: "ima-platform-count "
|
|
1505
|
+
h("span", { className: "ima-platform-count" }, t("account.count", { count: ch.total })),
|
|
1468
1506
|
h("button", { className: "ima-platform-add", type: "button", onClick: (e) => { e.stopPropagation(); setEditing(ch.id); } }, "+ " + t("action.addAccount")),
|
|
1469
1507
|
h("span", { className: canExpand ? "ima-platform-caret" : "ima-platform-caret empty", "aria-hidden": "true" }, canExpand && h(IconChevron)),
|
|
1470
1508
|
),
|
|
1471
1509
|
open && h("div", { className: "ima-account-list" },
|
|
1472
|
-
...(ch.accounts || []).map((account) => h("
|
|
1473
|
-
h("span", { className:
|
|
1474
|
-
h(
|
|
1475
|
-
h("
|
|
1476
|
-
|
|
1477
|
-
|
|
1510
|
+
...(ch.accounts || []).map((account) => h("div", { key: account.id, className: "ima-account-row" },
|
|
1511
|
+
h("span", { className: "ima-account-copy" }, h("span", { className: "ima-account-name" }, accountLabel(account, t))),
|
|
1512
|
+
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")),
|
|
1513
|
+
h("div", { className: "ima-account-receive", title: t("account.receiveDescription") },
|
|
1514
|
+
h("span", null, t("account.receive")),
|
|
1515
|
+
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"))),
|
|
1516
|
+
h("button", { type: "button", className: "ima-btn ima-account-settings-button", onClick: () => { selectAccount(account.id); setSettingsAccount(account.id); } }, t("action.settings")),
|
|
1478
1517
|
)),
|
|
1479
1518
|
),
|
|
1480
1519
|
);
|
|
1481
1520
|
}),
|
|
1482
1521
|
),
|
|
1483
|
-
|
|
1484
|
-
|
|
1522
|
+
),
|
|
1523
|
+
selectedAccount && h("div", { className: "ima-mask", onClick: () => setSettingsAccount(null), onKeyDown: e => { if (e.key === "Escape") { e.stopPropagation(); setSettingsAccount(null); } } },
|
|
1524
|
+
h("div", { className: "ima-modal ima-account-modal", role: "dialog", "aria-modal": true, "aria-label": accountLabel(selectedAccount, t), onClick: e => e.stopPropagation() },
|
|
1525
|
+
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) }, "×")),
|
|
1526
|
+
h(AccountInspector, {
|
|
1485
1527
|
account: selectedAccount,
|
|
1486
1528
|
catalog: catalog.providers,
|
|
1487
1529
|
permissions: catalog.permissions,
|
|
1530
|
+
agentPresets: catalog.agentPresets,
|
|
1488
1531
|
workspaces,
|
|
1489
1532
|
createWorkspace: props.createWorkspace,
|
|
1490
1533
|
pickDirectory: props.pickDirectory,
|
|
@@ -1493,18 +1536,14 @@ window.__ModuleLoader__.load({
|
|
|
1493
1536
|
t,
|
|
1494
1537
|
onAction,
|
|
1495
1538
|
onSave: saveAccount,
|
|
1496
|
-
|
|
1497
|
-
|
|
1498
|
-
|
|
1499
|
-
h("h3", { className: "ima-inspector-empty-title" }, allAccounts.length ? t("settings.selectAccountTitle") : t("settings.noAccountsTitle")),
|
|
1500
|
-
h("p", { className: "ima-inspector-empty-description" }, allAccounts.length ? t("settings.selectAccountDescription") : t("settings.noAccountsDescription")),
|
|
1501
|
-
),
|
|
1502
|
-
),
|
|
1503
|
-
),
|
|
1539
|
+
}),
|
|
1540
|
+
),
|
|
1541
|
+
),
|
|
1504
1542
|
editing && h(BindModal, {
|
|
1505
1543
|
ch: (channels || []).find((item) => item.id === editing) || { id: editing, label: editing, kind: "qr", fields: [] },
|
|
1506
1544
|
catalog: catalog.providers,
|
|
1507
1545
|
permissions: catalog.permissions,
|
|
1546
|
+
agentPresets: catalog.agentPresets,
|
|
1508
1547
|
workspaces,
|
|
1509
1548
|
createWorkspace: props.createWorkspace,
|
|
1510
1549
|
pickDirectory: props.pickDirectory,
|
|
@@ -1798,19 +1837,27 @@ window.__ModuleLoader__.load({
|
|
|
1798
1837
|
body: JSON.stringify(Object.assign({ sessionId: sess.sessionId }, extra || {})),
|
|
1799
1838
|
}).then((data) => { if (data.ok) syncList(data.groups); }).catch(() => undefined);
|
|
1800
1839
|
if (action === "rename" && typeof acts.renameSession === "function") {
|
|
1801
|
-
Promise.resolve(acts.renameSession(sess.sessionId, (extra && extra.title) || title)).then(afterHost).catch(
|
|
1840
|
+
Promise.resolve(acts.renameSession(sess.sessionId, (extra && extra.title) || title)).then(afterHost).catch((error) => console.warn("[dsh-im-connect] 重命名失败", error));
|
|
1802
1841
|
return;
|
|
1803
1842
|
}
|
|
1804
1843
|
if (action === "archive") {
|
|
1844
|
+
const cleanupMissing = async error => {
|
|
1845
|
+
console.warn("[dsh-im-connect] archive failed", error);
|
|
1846
|
+
try {
|
|
1847
|
+
const data = await api("/sessions/cleanup-missing", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ sessionId: sess.sessionId }) });
|
|
1848
|
+
if (data.ok) { syncList(data.groups); return; }
|
|
1849
|
+
} catch (cleanupError) { console.warn("[dsh-im-connect] cleanup failed", cleanupError); }
|
|
1850
|
+
window.alert(t("rail.archiveFailed"));
|
|
1851
|
+
};
|
|
1805
1852
|
if (typeof acts.archiveSession === "function") {
|
|
1806
|
-
Promise.resolve(acts.archiveSession(sess.sessionId)).then(afterHost).catch(
|
|
1853
|
+
Promise.resolve().then(() => acts.archiveSession(sess.sessionId)).then(afterHost).catch(cleanupMissing);
|
|
1807
1854
|
} else {
|
|
1808
|
-
|
|
1855
|
+
void cleanupMissing(new Error("Host archive unavailable"));
|
|
1809
1856
|
}
|
|
1810
1857
|
return;
|
|
1811
1858
|
}
|
|
1812
1859
|
if ((action === "delete" || action === "remove") && typeof acts.deleteSession === "function") {
|
|
1813
|
-
Promise.resolve(acts.deleteSession(sess.sessionId)).then(() => afterHost()).catch(() =>
|
|
1860
|
+
Promise.resolve(acts.deleteSession(sess.sessionId)).then(() => afterHost()).catch((error) => console.warn("[dsh-im-connect] 删除失败", error));
|
|
1814
1861
|
return;
|
|
1815
1862
|
}
|
|
1816
1863
|
if (action === "fork" && typeof acts.forkSession === "function") {
|
|
@@ -1954,7 +2001,13 @@ window.__ModuleLoader__.load({
|
|
|
1954
2001
|
}, [openMenu]);
|
|
1955
2002
|
const needle = query.trim().toLowerCase();
|
|
1956
2003
|
const visibleGroups = groups.map((g) => {
|
|
1957
|
-
const sessions = (g.sessions || []).
|
|
2004
|
+
const sessions = (g.sessions || []).map((sess) => {
|
|
2005
|
+
const host = props.sessionById && props.sessionById[sess.sessionId];
|
|
2006
|
+
// 手动标题及来源未知的旧名称,交给后端可靠标题事件同步。
|
|
2007
|
+
if (sess.titleSource === "user" || (!sess.titleSource && typeof sess.title === "string" && sess.title.trim())) return sess;
|
|
2008
|
+
return host && typeof host.title === "string" && host.title.trim()
|
|
2009
|
+
? Object.assign({}, sess, { title: host.title }) : sess;
|
|
2010
|
+
}).filter((sess) => !archived.has(sess.sessionId));
|
|
1958
2011
|
if (!needle) return Object.assign({}, g, { sessions });
|
|
1959
2012
|
const nameHit = String(channelLabel(g, t)).toLowerCase().includes(needle);
|
|
1960
2013
|
return Object.assign({}, g, { sessions: nameHit ? sessions : sessions.filter((sess) => String(sess.title || sess.chatId || "").toLowerCase().includes(needle)) });
|
|
@@ -2031,7 +2084,7 @@ window.__ModuleLoader__.load({
|
|
|
2031
2084
|
if (!item) return false;
|
|
2032
2085
|
if (item.blank) return false;
|
|
2033
2086
|
if (item.origin === "im" || item.origin === "subagent") return false;
|
|
2034
|
-
return !
|
|
2087
|
+
return !isChannelSession(item.id || "");
|
|
2035
2088
|
}
|
|
2036
2089
|
|
|
2037
2090
|
function TaskList(props) {
|
|
@@ -2040,6 +2093,7 @@ window.__ModuleLoader__.load({
|
|
|
2040
2093
|
}
|
|
2041
2094
|
|
|
2042
2095
|
function TaskListWithSessions(props) {
|
|
2096
|
+
useSyncExternalStore(subscribeChannelMembership, channelMembershipSnapshot, channelMembershipSnapshot);
|
|
2043
2097
|
const t = props.t || fallbackT;
|
|
2044
2098
|
const snap = props.useSessions((state) => state || { ids: [], byId: {}, current: null });
|
|
2045
2099
|
const workspaces = typeof props.useWorkspaces === "function"
|
|
@@ -2100,12 +2154,13 @@ window.__ModuleLoader__.load({
|
|
|
2100
2154
|
const key = keepIm ? "im" : "task";
|
|
2101
2155
|
if (src && typeof src === "object") {
|
|
2102
2156
|
const hit = imSessionFilterCache.get(src);
|
|
2103
|
-
if (hit && hit[key]) return hit[key];
|
|
2157
|
+
if (hit && hit.revision === channelMembershipRevision && hit[key]) return hit[key];
|
|
2104
2158
|
}
|
|
2105
|
-
const ids = (src.ids || []).filter((id) =>
|
|
2159
|
+
const ids = (src.ids || []).filter((id) => isChannelSession(id) === keepIm);
|
|
2106
2160
|
const result = cacheFilteredSessions(src, ids);
|
|
2107
2161
|
if (src && typeof src === "object") {
|
|
2108
|
-
const
|
|
2162
|
+
const previous = imSessionFilterCache.get(src);
|
|
2163
|
+
const bucket = previous && previous.revision === channelMembershipRevision ? previous : { revision: channelMembershipRevision };
|
|
2109
2164
|
bucket[key] = result;
|
|
2110
2165
|
imSessionFilterCache.set(src, bucket);
|
|
2111
2166
|
}
|
|
@@ -2176,6 +2231,7 @@ window.__ModuleLoader__.load({
|
|
|
2176
2231
|
}
|
|
2177
2232
|
|
|
2178
2233
|
function SessionSwitcher(props) {
|
|
2234
|
+
const membershipRevision = useSyncExternalStore(subscribeChannelMembership, channelMembershipSnapshot, channelMembershipSnapshot);
|
|
2179
2235
|
const t = props.t || fallbackT;
|
|
2180
2236
|
const officialT = props.officialT || t;
|
|
2181
2237
|
const Official = props.officialTree;
|
|
@@ -2195,11 +2251,11 @@ window.__ModuleLoader__.load({
|
|
|
2195
2251
|
const useTaskSessions = useCallback((selector, eq) => {
|
|
2196
2252
|
if (typeof rawUseSessions !== "function") return selector({ ids: [], byId: {}, current: null });
|
|
2197
2253
|
return rawUseSessions((state) => selector(applyRegistryFilters(filterTaskSessions(state), nativeTabs)), eq);
|
|
2198
|
-
}, [rawUseSessions, nativeTabs]);
|
|
2254
|
+
}, [rawUseSessions, nativeTabs, membershipRevision]);
|
|
2199
2255
|
const useChannelSessions = useCallback((selector, eq) => {
|
|
2200
2256
|
if (typeof rawUseSessions !== "function") return selector({ ids: [], byId: {}, current: null });
|
|
2201
2257
|
return rawUseSessions((state) => selector(filterChannelSessions(state)), eq);
|
|
2202
|
-
}, [rawUseSessions]);
|
|
2258
|
+
}, [rawUseSessions, membershipRevision]);
|
|
2203
2259
|
useEffect(() => { ensureStyle(); }, []);
|
|
2204
2260
|
useEffect(() => { try { localStorage.setItem(TAB_KEY, tab); } catch { /* ignore */ } }, [tab]);
|
|
2205
2261
|
const previousCurrentId = useRef(currentId);
|
|
@@ -2212,11 +2268,12 @@ window.__ModuleLoader__.load({
|
|
|
2212
2268
|
}
|
|
2213
2269
|
const previous = previousCurrentId.current;
|
|
2214
2270
|
previousCurrentId.current = currentId;
|
|
2215
|
-
if (typeof currentId !== "string" || currentId === ""
|
|
2216
|
-
if (currentId
|
|
2271
|
+
if (typeof currentId !== "string" || currentId === "") return;
|
|
2272
|
+
if (currentId === previous && !isChannelSession(currentId)) return;
|
|
2273
|
+
if (isChannelSession(currentId)) setTab("channels");
|
|
2217
2274
|
const matched = extraTabs.find((item) => item.matchSession && item.matchSession(currentId));
|
|
2218
2275
|
if (matched && matched.id !== "schedule") setTab(matched.id);
|
|
2219
|
-
}, [currentId, extraTabs]);
|
|
2276
|
+
}, [currentId, extraTabs, membershipRevision]);
|
|
2220
2277
|
const openSession = (id) => openListedSession(id, props.openSession || props.open);
|
|
2221
2278
|
const officialProps = Object.assign({}, props, { useSessions: useTaskSessions, t: officialT });
|
|
2222
2279
|
const channelRail = h(ChannelRail, {
|
|
@@ -2302,6 +2359,15 @@ window.__ModuleLoader__.load({
|
|
|
2302
2359
|
|
|
2303
2360
|
function apply(ctx) {
|
|
2304
2361
|
ensureStyle();
|
|
2362
|
+
ctx.effect(() => {
|
|
2363
|
+
let active = true;
|
|
2364
|
+
const refresh = () => fetch(API_BASE + "/channels", { credentials: "same-origin", cache: "no-store" })
|
|
2365
|
+
.then(response => response.json()).then(data => { if (active && data.ok && Array.isArray(data.groups)) updateChannelMembership(data.groups); })
|
|
2366
|
+
.catch(error => { if (active) console.warn("[dsh-im-connect] 无法刷新渠道会话归属", error); });
|
|
2367
|
+
refresh();
|
|
2368
|
+
const timer = setInterval(refresh, 4000);
|
|
2369
|
+
return () => { active = false; clearInterval(timer); };
|
|
2370
|
+
}, "im-connect: channel membership");
|
|
2305
2371
|
ctx.effect(() => ctx.locale.register(IM_LOCALE_NS, IM_LOCALES), "im-connect: dictionaries");
|
|
2306
2372
|
const t = ctx.locale.bind(IM_LOCALE_NS);
|
|
2307
2373
|
ctx.effect(() => observePluginUpdate({
|
|
@@ -2407,7 +2473,7 @@ window.__ModuleLoader__.load({
|
|
|
2407
2473
|
id: "channels",
|
|
2408
2474
|
label: t("rail.channels"),
|
|
2409
2475
|
order: 20,
|
|
2410
|
-
matchSession:
|
|
2476
|
+
matchSession: isChannelSession,
|
|
2411
2477
|
render: (props) => h(LocalizedChannelRail, Object.assign({}, props, {
|
|
2412
2478
|
skin: "native",
|
|
2413
2479
|
openSession: (id) => openListedSession(id, props.openSession || props.open),
|
|
@@ -2416,7 +2482,9 @@ window.__ModuleLoader__.load({
|
|
|
2416
2482
|
});
|
|
2417
2483
|
};
|
|
2418
2484
|
refreshInsertedTab();
|
|
2419
|
-
|
|
2485
|
+
const stopLocale = subscribeLocale(refreshInsertedTab);
|
|
2486
|
+
const stopMembership = subscribeChannelMembership(refreshInsertedTab);
|
|
2487
|
+
stopInsertedTabLocale = () => { stopLocale(); stopMembership(); };
|
|
2420
2488
|
return true;
|
|
2421
2489
|
};
|
|
2422
2490
|
const sync = () => {
|