@michengai/dsh-im-connect 0.1.37 → 0.1.39
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 +17 -1
- package/CHANGELOG.zh-CN.md +17 -1
- package/README.en.md +60 -65
- package/README.md +60 -65
- package/SECURITY.md +7 -2
- package/client.js +31 -298
- package/lib/channels/channel-image-download.d.ts +22 -0
- package/lib/channels/channel-image-download.d.ts.map +1 -0
- package/lib/channels/channel-image-download.js +179 -0
- package/lib/channels/channel-image-download.js.map +1 -0
- package/lib/channels/dingtalk-token-cache.d.ts +18 -0
- package/lib/channels/dingtalk-token-cache.d.ts.map +1 -0
- package/lib/channels/dingtalk-token-cache.js +48 -0
- package/lib/channels/dingtalk-token-cache.js.map +1 -0
- package/lib/channels/dingtalk.d.ts +17 -4
- package/lib/channels/dingtalk.d.ts.map +1 -1
- package/lib/channels/dingtalk.js +111 -18
- package/lib/channels/dingtalk.js.map +1 -1
- package/lib/channels/factory.d.ts.map +1 -1
- package/lib/channels/factory.js +6 -3
- package/lib/channels/factory.js.map +1 -1
- package/lib/channels/feishu.d.ts +30 -2
- package/lib/channels/feishu.d.ts.map +1 -1
- package/lib/channels/feishu.js +141 -26
- package/lib/channels/feishu.js.map +1 -1
- package/lib/channels/image-host-policy.d.ts +4 -0
- package/lib/channels/image-host-policy.d.ts.map +1 -0
- package/lib/channels/image-host-policy.js +24 -0
- package/lib/channels/image-host-policy.js.map +1 -0
- package/lib/channels/qq.d.ts +1 -0
- package/lib/channels/qq.d.ts.map +1 -1
- package/lib/channels/qq.js +89 -18
- package/lib/channels/qq.js.map +1 -1
- package/lib/channels/telegram.d.ts.map +1 -1
- package/lib/channels/telegram.js +121 -16
- package/lib/channels/telegram.js.map +1 -1
- package/lib/channels/wecom.d.ts +8 -2
- package/lib/channels/wecom.d.ts.map +1 -1
- package/lib/channels/wecom.js +60 -11
- package/lib/channels/wecom.js.map +1 -1
- package/lib/channels/weixin.d.ts.map +1 -1
- package/lib/channels/weixin.js +169 -17
- package/lib/channels/weixin.js.map +1 -1
- package/lib/client.js +31 -298
- package/lib/engine/gateway.d.ts +2 -0
- package/lib/engine/gateway.d.ts.map +1 -1
- package/lib/engine/gateway.js +48 -11
- package/lib/engine/gateway.js.map +1 -1
- package/lib/engine/image-input.d.ts +8 -0
- package/lib/engine/image-input.d.ts.map +1 -0
- package/lib/engine/image-input.js +31 -0
- package/lib/engine/image-input.js.map +1 -0
- package/lib/engine/router.d.ts.map +1 -1
- package/lib/engine/router.js +29 -19
- package/lib/engine/router.js.map +1 -1
- package/lib/manager.d.ts +0 -10
- package/lib/manager.d.ts.map +1 -1
- package/lib/manager.js +231 -203
- package/lib/manager.js.map +1 -1
- package/package.json +1 -1
- package/src/channels/channel-image-download.ts +154 -0
- package/src/channels/dingtalk-token-cache.ts +39 -0
- package/src/channels/dingtalk.ts +106 -27
- package/src/channels/factory.ts +6 -3
- package/src/channels/feishu.ts +126 -24
- package/src/channels/image-host-policy.ts +21 -0
- package/src/channels/qq.ts +80 -26
- package/src/channels/telegram.ts +105 -16
- package/src/channels/wecom.ts +57 -12
- package/src/channels/weixin.ts +124 -14
- package/src/engine/gateway.ts +35 -6
- package/src/engine/image-input.ts +26 -0
- package/src/engine/router.ts +28 -18
- package/src/manager.ts +116 -84
package/lib/client.js
CHANGED
|
@@ -306,7 +306,7 @@ window.__ModuleLoader__.load({
|
|
|
306
306
|
const { RiskConfirmation, IconListPenOutline16, IconRefreshOutline16, IconDownloadOutline16, IconCopyOutline16, IconCloseOutline16 } = require("@deepseek-ai/dsh-client-ui-primitives");
|
|
307
307
|
const EMPTY_EXTRA_TABS = [];
|
|
308
308
|
const inject = ["slots", "sessions", "workspaces", "locale"];
|
|
309
|
-
const API_BASE = "/dsh-im-connect
|
|
309
|
+
const API_BASE = "/api/dsh-im-connect";
|
|
310
310
|
const TAB_KEY = "dsh-im-connect.sidebar-tab";
|
|
311
311
|
const ACCOUNT_SELECTION_KEY = "dsh-im-connect.settings.selected-account";
|
|
312
312
|
const IM_LOCALE_NS = "im-connect";
|
|
@@ -389,13 +389,8 @@ window.__ModuleLoader__.load({
|
|
|
389
389
|
.ima-avatar{width:36px;height:36px;border-radius:50%;display:grid;place-items:center;border:2px solid #111}
|
|
390
390
|
.ima-avatar.bot{background:#123524;margin-right:-8px;z-index:1}
|
|
391
391
|
.ima-avatar.user{background:#3d3428}
|
|
392
|
-
.ima-head{display:flex;align-items:flex-start;justify-content:space-between;gap:16px;margin-bottom:12px}.ima-title{margin:0;font-size:
|
|
393
|
-
.ima-sub{margin:
|
|
394
|
-
.ima-composer-wrap{margin:0 0 16px}
|
|
395
|
-
.ima-composer{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));align-items:center;gap:4px;padding:4px 6px;border:1px solid var(--ima-line);border-radius:14px;background:var(--ima-card)}
|
|
396
|
-
.ima-composer-left,.ima-composer-right{display:contents}
|
|
397
|
-
.ima-composer .ima-chip{width:100%;min-width:0}
|
|
398
|
-
.ima-composer .ima-chip-btn{width:100%;justify-content:center}
|
|
392
|
+
.ima-head{display:flex;align-items:flex-start;justify-content:space-between;gap:16px;margin-bottom:12px}.ima-title{margin:0;font-size:24px;line-height:32px;font-weight:600;letter-spacing:-.4px;white-space:nowrap;text-align:left}
|
|
393
|
+
.ima-sub{margin:12px 0 0;max-width:42em;color:var(--ima-muted);font-size:14px;line-height:22px;text-align:left}
|
|
399
394
|
.ima-chip{position:relative;min-width:0;z-index:1}
|
|
400
395
|
.ima-chip.is-open{z-index:30}
|
|
401
396
|
.ima-chip-btn{display:inline-flex;align-items:center;gap:6px;min-height:28px;height:28px;padding:0 8px;border:0;border-radius:8px;background:transparent;color:var(--ima-muted);font-size:13px;font-weight:500;white-space:nowrap;cursor:pointer}
|
|
@@ -409,7 +404,6 @@ window.__ModuleLoader__.load({
|
|
|
409
404
|
.ima-chip-row-main{display:inline-flex;align-items:center;gap:8px;min-width:0}
|
|
410
405
|
.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}
|
|
411
406
|
.ima-chip-empty{padding:14px 12px;color:var(--ima-muted);font-size:12px;text-align:center}
|
|
412
|
-
.ima-composer-hint{margin-top:8px;color:var(--ima-muted);font-size:12px;text-align:center}
|
|
413
407
|
.ima-chip svg{flex:none}
|
|
414
408
|
.ima-chip-row.is-kv .ima-chip-row-main{flex:none}
|
|
415
409
|
.ima-chip-row-side{display:inline-flex;align-items:center;gap:8px;color:var(--ima-muted);font-size:12px;min-width:0}
|
|
@@ -417,9 +411,9 @@ window.__ModuleLoader__.load({
|
|
|
417
411
|
.ima-chip-split{height:1px;margin:6px 8px;background:var(--ima-line)}
|
|
418
412
|
.ima-chip-effort{color:var(--ima-muted);font-weight:500}
|
|
419
413
|
.ima-model-select .ima-chip-btn{border-radius:24px;gap:4px}
|
|
420
|
-
.ima-model-select .ima-chip-menu{width:min(240px,calc(100vw - 32px));
|
|
414
|
+
.ima-model-select .ima-chip-menu{width:max-content;min-width:min(240px,calc(100vw - 32px));max-width:calc(100vw - 32px);box-sizing:border-box;max-height:min(360px,calc(100vh - 96px));padding:4px;border-radius:12px;background:var(--dsw-specific-menu,var(--dsw-alias-bg-base,#fff))}
|
|
421
415
|
.ima-model-select .ima-chip-row{min-height:40px;padding:0 10px;font-size:14px}
|
|
422
|
-
.ima-model-select .ima-chip-row-side{font-size:13px;color:var(--dsw-alias-label-tertiary,var(--ima-muted))}
|
|
416
|
+
.ima-model-select .ima-chip-row-side>span{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ima-model-select .ima-chip-row-side{font-size:13px;color:var(--dsw-alias-label-tertiary,var(--ima-muted))}
|
|
423
417
|
.ima-model-group+.ima-model-group{margin-top:4px}
|
|
424
418
|
.ima-model-group-title{position:sticky;top:0;z-index:1;padding:5px 8px 3px;background:var(--dsw-specific-menu,var(--dsw-alias-bg-base,#fff));color:var(--dsw-alias-label-tertiary,var(--ima-muted));font-size:12px;font-weight:500;line-height:18px}
|
|
425
419
|
.ima-model-option{display:flex;width:100%;min-height:38px;align-items:center;gap:8px;padding:6px 8px;border:0;border-radius:10px;background:transparent;color:var(--dsw-alias-label-primary,var(--ima-text));text-align:left;cursor:pointer}
|
|
@@ -502,8 +496,8 @@ window.__ModuleLoader__.load({
|
|
|
502
496
|
.ima-radio small{display:block;color:var(--ima-muted);margin-top:2px}
|
|
503
497
|
.ima-ok{color:var(--ima-ok);font-size:14px;text-align:center;padding:24px 0}
|
|
504
498
|
.ima-modal .ima-error{color:var(--ima-danger)}
|
|
505
|
-
.ima-page.ima-account-page{max-width:1120px;padding-bottom:40px}
|
|
506
|
-
.ima-account-shell{display:grid;grid-template-columns:
|
|
499
|
+
.ima-page.ima-account-page{container-type:inline-size;min-width:0;max-width:1120px;padding-bottom:40px}
|
|
500
|
+
.ima-account-shell{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));min-height:650px;border:1px solid var(--ima-line);border-radius:16px;overflow:hidden;background:transparent}
|
|
507
501
|
.ima-platforms{padding:0;border-right:1px solid var(--ima-line);background:transparent}
|
|
508
502
|
.ima-platform{border:0;border-bottom:1px solid var(--ima-line);border-radius:0;margin:0;overflow:visible;background:transparent}.ima-platform:last-child{border-bottom:0}.ima-platform.open{background:transparent}
|
|
509
503
|
.ima-platform-head{display:flex;align-items:center;gap:10px;width:100%;min-height:64px;padding:10px 18px;border:0;border-radius:0;background:transparent;color:inherit;text-align:left;cursor:pointer}
|
|
@@ -519,14 +513,31 @@ window.__ModuleLoader__.load({
|
|
|
519
513
|
.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)}
|
|
520
514
|
.ima-save-note{min-height:18px;color:var(--ima-muted);font-size:11px}.ima-save-note.ok{color:var(--ima-ok)}
|
|
521
515
|
.ima-modal.ima-account-modal{width:min(560px,100%);max-height:min(760px,calc(100vh - 48px));overflow:auto}.ima-setup-section{margin:4px 0 14px;padding-bottom:14px;border-bottom:1px solid var(--ima-line)}
|
|
522
|
-
.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(100%,
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
516
|
+
.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
|
+
.ima-account-shell,.ima-account-shell *{box-sizing:border-box}
|
|
518
|
+
.ima-platforms{min-width:0}
|
|
519
|
+
.ima-platform-head{display:grid;grid-template-columns:24px minmax(0,1fr) 12px;gap:8px;padding:12px;min-height:76px}
|
|
520
|
+
.ima-platform-head>.ima-logo,.ima-platform-head>.ima-logo svg{width:24px;height:24px}
|
|
521
|
+
.ima-platform-title{grid-column:2;grid-row:1;overflow-wrap:anywhere}
|
|
522
|
+
.ima-platform-caret{grid-column:3;grid-row:1;width:12px;margin:0}
|
|
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}}
|
|
526
537
|
@media (prefers-reduced-motion:reduce){.ima-switch i{transition:none}}
|
|
527
538
|
`;
|
|
528
539
|
|
|
529
|
-
const TITLE_LINK_CSS = ".ima-title-row{display:flex;align-items:center;gap:8px;min-width:0}.ima-title-links{display:flex;align-items:center;gap:4px}.ima-title-link{display:inline-flex;align-items:center;gap:5px;min-height:28px;padding:0 8px;color:var(--dsw-alias-label-secondary);background:transparent;border:1px solid var(--dsw-alias-border-l2);border-radius:7px;font-size:12px;font-weight:500;line-height:18px;text-decoration:none;white-space:nowrap}.ima-title-link:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}.ima-title-link:focus-visible{outline:2px solid var(--dsw-alias-state-success-primary);outline-offset:2px}.ima-title-link svg{flex:none}@media(max-width:720px){.ima-title-row{flex-wrap:wrap}}";
|
|
540
|
+
const TITLE_LINK_CSS = ".ima-title-row{display:flex;align-items:center;gap:8px 12px;min-width:0;flex-wrap:wrap}.ima-title-links{display:flex;align-items:center;gap:4px;flex-wrap:wrap}.ima-title-link{display:inline-flex;align-items:center;gap:5px;min-height:28px;padding:0 8px;color:var(--dsw-alias-label-secondary);background:transparent;border:1px solid var(--dsw-alias-border-l2);border-radius:7px;font-size:12px;font-weight:500;line-height:18px;text-decoration:none;white-space:nowrap}.ima-title-link:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}.ima-title-link:focus-visible{outline:2px solid var(--dsw-alias-state-success-primary);outline-offset:2px}.ima-title-link svg{flex:none}@media(max-width:720px){.ima-title-row{flex-wrap:wrap}}";
|
|
530
541
|
|
|
531
542
|
let styleEl = null;
|
|
532
543
|
const ensureStyle = () => {
|
|
@@ -537,7 +548,8 @@ window.__ModuleLoader__.load({
|
|
|
537
548
|
};
|
|
538
549
|
|
|
539
550
|
const api = (path, opts) => {
|
|
540
|
-
|
|
551
|
+
// 管理路由复用宿主登录 Cookie,不缓存账号状态或认证错误。
|
|
552
|
+
const request = Object.assign({}, opts || {}, { credentials: "same-origin", cache: "no-store" });
|
|
541
553
|
const method = String(request.method || "GET").toUpperCase();
|
|
542
554
|
if (method !== "GET" && method !== "HEAD") {
|
|
543
555
|
request.headers = Object.assign({ "content-type": "application/json" }, request.headers || {}, { "x-dsh-im-connect-client": "1" });
|
|
@@ -1182,7 +1194,6 @@ window.__ModuleLoader__.load({
|
|
|
1182
1194
|
...group.models.map((item) => h(ModelChoiceRow, {
|
|
1183
1195
|
key: item.value,
|
|
1184
1196
|
label: item.label,
|
|
1185
|
-
description: item.description,
|
|
1186
1197
|
active: item.provider === provider && item.model === model,
|
|
1187
1198
|
onClick: () => {
|
|
1188
1199
|
const nextEffort = (item.reasoning && item.reasoning.defaultEffort) || "";
|
|
@@ -1256,284 +1267,6 @@ window.__ModuleLoader__.load({
|
|
|
1256
1267
|
);
|
|
1257
1268
|
}
|
|
1258
1269
|
|
|
1259
|
-
function ComposerBar(props) {
|
|
1260
|
-
const t = props.t || fallbackT;
|
|
1261
|
-
const items = typeof props.useWorkspaces === "function"
|
|
1262
|
-
? (props.useWorkspaces((state) => (state && state.items) || []) || [])
|
|
1263
|
-
: [];
|
|
1264
|
-
const [providers, setProviders] = useState([]);
|
|
1265
|
-
const [permissions, setPermissions] = useState([]);
|
|
1266
|
-
const [provider, setProvider] = useState("");
|
|
1267
|
-
const [model, setModel] = useState("");
|
|
1268
|
-
const [effort, setEffort] = useState("");
|
|
1269
|
-
const [cwd, setCwd] = useState("");
|
|
1270
|
-
const [permission, setPermission] = useState("");
|
|
1271
|
-
const [confirmingFullAccess, setConfirmingFullAccess] = useState(false);
|
|
1272
|
-
const [fullAccessAcknowledged, setFullAccessAcknowledged] = useState(false);
|
|
1273
|
-
const [open, setOpen] = useState("");
|
|
1274
|
-
const [modelPane, setModelPane] = useState("root");
|
|
1275
|
-
const [hint, setHint] = useState("");
|
|
1276
|
-
const [adding, setAdding] = useState(false);
|
|
1277
|
-
const [addPath, setAddPath] = useState("");
|
|
1278
|
-
const [addBusy, setAddBusy] = useState(false);
|
|
1279
|
-
|
|
1280
|
-
useEffect(() => {
|
|
1281
|
-
api("/assistant").then((data) => {
|
|
1282
|
-
if (!data.ok) { setHint(serverText(data.error, t) || t("error.loadAssistant")); return; }
|
|
1283
|
-
const list = data.providers || [];
|
|
1284
|
-
setProviders(list);
|
|
1285
|
-
setPermissions(data.permissions || []);
|
|
1286
|
-
const current = data.assistant || {};
|
|
1287
|
-
const nextProvider = current.provider || (list[0] && list[0].id) || "";
|
|
1288
|
-
const models = ((list.find((item) => item.id === nextProvider) || {}).models) || [];
|
|
1289
|
-
const nextModel = current.model || (models[0] && models[0].id) || "";
|
|
1290
|
-
const found = models.find((item) => item.id === nextModel) || models[0];
|
|
1291
|
-
setProvider(nextProvider);
|
|
1292
|
-
setModel(nextModel);
|
|
1293
|
-
setEffort(current.reasoningEffort || (found && found.reasoning && found.reasoning.defaultEffort) || "");
|
|
1294
|
-
setCwd(data.cwd || "");
|
|
1295
|
-
setPermission(data.permission || "");
|
|
1296
|
-
if (!list.length) setHint(t("error.noModels"));
|
|
1297
|
-
}).catch(() => setHint(t("error.loadAssistant")));
|
|
1298
|
-
}, []);
|
|
1299
|
-
|
|
1300
|
-
const save = (body) => {
|
|
1301
|
-
api("/assistant", {
|
|
1302
|
-
method: "POST",
|
|
1303
|
-
headers: { "content-type": "application/json" },
|
|
1304
|
-
body: JSON.stringify(body),
|
|
1305
|
-
}).then((data) => {
|
|
1306
|
-
if (!data.ok) setHint(serverText(data.error, t) || t("error.save"));
|
|
1307
|
-
else setHint("");
|
|
1308
|
-
}).catch(() => setHint(t("error.save")));
|
|
1309
|
-
};
|
|
1310
|
-
|
|
1311
|
-
const workspace = items.find((item) => item.path === cwd);
|
|
1312
|
-
const modelGroups = providers.map((item) => ({
|
|
1313
|
-
id: item.id,
|
|
1314
|
-
name: item.name || item.id,
|
|
1315
|
-
models: (item.models || []).map((entry) => ({
|
|
1316
|
-
value: item.id + "::" + entry.id,
|
|
1317
|
-
provider: item.id,
|
|
1318
|
-
providerName: item.name || item.id,
|
|
1319
|
-
model: entry.id,
|
|
1320
|
-
label: entry.name || entry.id,
|
|
1321
|
-
description: entry.description,
|
|
1322
|
-
reasoning: entry.reasoning,
|
|
1323
|
-
})),
|
|
1324
|
-
})).filter((item) => item.models.length > 0);
|
|
1325
|
-
const models = modelGroups.flatMap((item) => item.models);
|
|
1326
|
-
const currentModel = models.find((item) => item.provider === provider && item.model === model);
|
|
1327
|
-
const reasoning = currentModel && currentModel.reasoning;
|
|
1328
|
-
const effectiveEffort = effort || (reasoning && reasoning.defaultEffort) || "";
|
|
1329
|
-
const efforts = reasoning
|
|
1330
|
-
? [
|
|
1331
|
-
...(reasoning.defaultEffort ? [] : [{ id: "", name: props.modelT("effort.providerDefault") }]),
|
|
1332
|
-
...((reasoning.efforts || []).map((item) => ({ id: item.id, name: item.name || item.id, description: item.description }))),
|
|
1333
|
-
]
|
|
1334
|
-
: [];
|
|
1335
|
-
const effortLabel = reasoning
|
|
1336
|
-
? ((efforts.find((item) => item.id === effectiveEffort) || {}).name || effectiveEffort || props.modelT("effort.providerDefault"))
|
|
1337
|
-
: "";
|
|
1338
|
-
const permissionOptions = permissions.map((item) => ({
|
|
1339
|
-
...item,
|
|
1340
|
-
label: permissionLabel(item, t),
|
|
1341
|
-
}));
|
|
1342
|
-
const perm = permissionOptions.find((item) => item.value === permission) || { label: permission || t("composer.permission") };
|
|
1343
|
-
const modelFallback = props.modelT("trigger.fallback");
|
|
1344
|
-
|
|
1345
|
-
const addWorkspace = (path) => {
|
|
1346
|
-
const next = (path || "").trim();
|
|
1347
|
-
if (!next) { setHint(t("error.chooseWorkspace")); return Promise.resolve(); }
|
|
1348
|
-
if (typeof props.createWorkspace !== "function") { setHint(t("error.workspaceUnavailable")); return Promise.resolve(); }
|
|
1349
|
-
setAddBusy(true);
|
|
1350
|
-
return Promise.resolve(props.createWorkspace({ path: next })).then((created) => {
|
|
1351
|
-
const cwdPath = (created && (created.path || created.cwd)) || next;
|
|
1352
|
-
setCwd(cwdPath);
|
|
1353
|
-
save({ cwd: cwdPath });
|
|
1354
|
-
setAdding(false);
|
|
1355
|
-
setAddPath("");
|
|
1356
|
-
setOpen("");
|
|
1357
|
-
}).catch((error) => {
|
|
1358
|
-
setHint((error && error.message) || t("error.addWorkspace"));
|
|
1359
|
-
}).finally(() => setAddBusy(false));
|
|
1360
|
-
};
|
|
1361
|
-
|
|
1362
|
-
const selectPermission = (next) => {
|
|
1363
|
-
setOpen("");
|
|
1364
|
-
if (next === permission) return;
|
|
1365
|
-
if (next === "danger-full-access") {
|
|
1366
|
-
setFullAccessAcknowledged(false);
|
|
1367
|
-
setConfirmingFullAccess(true);
|
|
1368
|
-
return;
|
|
1369
|
-
}
|
|
1370
|
-
setPermission(next);
|
|
1371
|
-
save({ permission: next });
|
|
1372
|
-
};
|
|
1373
|
-
|
|
1374
|
-
const onAddWorkspace = () => {
|
|
1375
|
-
setOpen("");
|
|
1376
|
-
if (typeof props.pickDirectory === "function") {
|
|
1377
|
-
Promise.resolve(props.pickDirectory()).then((picked) => {
|
|
1378
|
-
if (!picked) return;
|
|
1379
|
-
return addWorkspace(picked);
|
|
1380
|
-
}).catch(() => {
|
|
1381
|
-
setAdding(true);
|
|
1382
|
-
setAddPath("");
|
|
1383
|
-
});
|
|
1384
|
-
return;
|
|
1385
|
-
}
|
|
1386
|
-
setAdding(true);
|
|
1387
|
-
setAddPath("");
|
|
1388
|
-
};
|
|
1389
|
-
|
|
1390
|
-
return h("div", { className: "ima-composer-wrap" },
|
|
1391
|
-
h("div", { className: "ima-composer", "aria-label": t("composer.aria") },
|
|
1392
|
-
h("div", { className: "ima-composer-left" },
|
|
1393
|
-
h(ChipMenu, {
|
|
1394
|
-
open: open === "ws",
|
|
1395
|
-
onToggle: (next) => setOpen(next ? "ws" : ""),
|
|
1396
|
-
icon: h(FolderIcon),
|
|
1397
|
-
label: (workspace && (workspace.title || workspace.path)) || cwd || t("composer.project"),
|
|
1398
|
-
ariaLabel: t("composer.projectAria"),
|
|
1399
|
-
},
|
|
1400
|
-
items.length === 0 && h("div", { className: "ima-chip-empty" }, t("composer.noWorkspaces")),
|
|
1401
|
-
...items.map((item) => h(ChipRow, {
|
|
1402
|
-
key: item.path,
|
|
1403
|
-
icon: h(FolderIcon),
|
|
1404
|
-
label: item.title || item.path,
|
|
1405
|
-
active: item.path === cwd,
|
|
1406
|
-
onClick: () => { setCwd(item.path); save({ cwd: item.path }); setOpen(""); },
|
|
1407
|
-
})),
|
|
1408
|
-
h("div", { className: "ima-chip-split" }),
|
|
1409
|
-
h(ChipRow, {
|
|
1410
|
-
icon: h(PlusIcon),
|
|
1411
|
-
label: t("composer.addWorkspace"),
|
|
1412
|
-
onClick: onAddWorkspace,
|
|
1413
|
-
}),
|
|
1414
|
-
),
|
|
1415
|
-
h(ChipMenu, {
|
|
1416
|
-
open: open === "perm",
|
|
1417
|
-
onToggle: (next) => setOpen(next ? "perm" : ""),
|
|
1418
|
-
icon: h(ShieldIcon),
|
|
1419
|
-
label: perm.label,
|
|
1420
|
-
ariaLabel: t("composer.permission"),
|
|
1421
|
-
},
|
|
1422
|
-
...permissionOptions.map((item) => h(ChipRow, {
|
|
1423
|
-
key: item.value,
|
|
1424
|
-
icon: h(ShieldIcon),
|
|
1425
|
-
label: item.label,
|
|
1426
|
-
active: item.value === permission,
|
|
1427
|
-
onClick: () => selectPermission(item.value),
|
|
1428
|
-
})),
|
|
1429
|
-
),
|
|
1430
|
-
),
|
|
1431
|
-
h("div", { className: "ima-composer-right" },
|
|
1432
|
-
h(ChipMenu, {
|
|
1433
|
-
open: open === "model",
|
|
1434
|
-
onToggle: (next) => {
|
|
1435
|
-
setOpen(next ? "model" : "");
|
|
1436
|
-
if (next) setModelPane("root");
|
|
1437
|
-
},
|
|
1438
|
-
align: "end",
|
|
1439
|
-
className: "ima-model-select",
|
|
1440
|
-
menuClassName: "ima-model-menu",
|
|
1441
|
-
menuAria: props.modelT("menu.aria"),
|
|
1442
|
-
label: (currentModel && currentModel.label) || modelFallback,
|
|
1443
|
-
suffix: effortLabel,
|
|
1444
|
-
ariaLabel: props.modelT("trigger.selectAria"),
|
|
1445
|
-
},
|
|
1446
|
-
modelPane === "root" && [
|
|
1447
|
-
h(ChipRow, {
|
|
1448
|
-
key: "model",
|
|
1449
|
-
kv: true,
|
|
1450
|
-
label: props.modelT("menu.model"),
|
|
1451
|
-
hint: (currentModel && currentModel.label) || modelFallback,
|
|
1452
|
-
chevron: true,
|
|
1453
|
-
onClick: () => setModelPane("model"),
|
|
1454
|
-
}),
|
|
1455
|
-
reasoning && h(ChipRow, {
|
|
1456
|
-
key: "effort",
|
|
1457
|
-
kv: true,
|
|
1458
|
-
label: props.modelT("menu.effort"),
|
|
1459
|
-
hint: effortLabel || props.modelT("effort.providerDefault"),
|
|
1460
|
-
chevron: true,
|
|
1461
|
-
onClick: () => setModelPane("effort"),
|
|
1462
|
-
}),
|
|
1463
|
-
],
|
|
1464
|
-
modelPane === "model" && (
|
|
1465
|
-
models.length === 0
|
|
1466
|
-
? h("div", { className: "ima-chip-empty" }, props.modelT("empty.models"))
|
|
1467
|
-
: modelGroups.map((group) => h("section", { key: group.id, className: "ima-model-group", role: "group", "aria-label": group.name },
|
|
1468
|
-
h("div", { className: "ima-model-group-title" }, group.name),
|
|
1469
|
-
...group.models.map((item) => h(ModelChoiceRow, {
|
|
1470
|
-
key: item.value,
|
|
1471
|
-
label: item.label,
|
|
1472
|
-
description: item.description,
|
|
1473
|
-
active: item.provider === provider && item.model === model,
|
|
1474
|
-
onClick: () => {
|
|
1475
|
-
const nextEffort = (item.reasoning && item.reasoning.defaultEffort) || "";
|
|
1476
|
-
setProvider(item.provider);
|
|
1477
|
-
setModel(item.model);
|
|
1478
|
-
setEffort(nextEffort);
|
|
1479
|
-
save({ provider: item.provider, model: item.model, reasoningEffort: nextEffort || null });
|
|
1480
|
-
setOpen("");
|
|
1481
|
-
},
|
|
1482
|
-
})),
|
|
1483
|
-
))
|
|
1484
|
-
),
|
|
1485
|
-
modelPane === "effort" && efforts.map((item) => h(ModelChoiceRow, {
|
|
1486
|
-
key: item.id,
|
|
1487
|
-
label: item.name,
|
|
1488
|
-
description: item.description,
|
|
1489
|
-
active: item.id === effectiveEffort,
|
|
1490
|
-
onClick: () => {
|
|
1491
|
-
setEffort(item.id);
|
|
1492
|
-
if (provider && model) save({ provider, model, reasoningEffort: item.id || null });
|
|
1493
|
-
setOpen("");
|
|
1494
|
-
},
|
|
1495
|
-
})),
|
|
1496
|
-
),
|
|
1497
|
-
),
|
|
1498
|
-
),
|
|
1499
|
-
adding && h("div", { className: "ima-chip-dialog" },
|
|
1500
|
-
h("strong", null, t("composer.addWorkspace")),
|
|
1501
|
-
h("input", {
|
|
1502
|
-
value: addPath,
|
|
1503
|
-
placeholder: t("composer.workspacePath"),
|
|
1504
|
-
"aria-label": t("composer.workspacePath"),
|
|
1505
|
-
onChange: (event) => setAddPath(event.target.value),
|
|
1506
|
-
}),
|
|
1507
|
-
h("div", { className: "ima-chip-dialog-actions" },
|
|
1508
|
-
h("button", { className: "ima-btn", onClick: () => { setAdding(false); setAddPath(""); } }, t("action.cancel")),
|
|
1509
|
-
h("button", {
|
|
1510
|
-
className: "ima-btn primary",
|
|
1511
|
-
disabled: addBusy || !addPath.trim(),
|
|
1512
|
-
onClick: () => addWorkspace(addPath),
|
|
1513
|
-
}, addBusy ? t("action.adding") : t("action.confirm")),
|
|
1514
|
-
),
|
|
1515
|
-
),
|
|
1516
|
-
hint && h("div", { className: "ima-composer-hint" }, hint),
|
|
1517
|
-
h(RiskConfirmation, {
|
|
1518
|
-
open: confirmingFullAccess,
|
|
1519
|
-
title: props.permissionT("confirm.title"),
|
|
1520
|
-
description: props.permissionT("confirm.description"),
|
|
1521
|
-
acknowledgeLabel: props.permissionT("confirm.acknowledge"),
|
|
1522
|
-
cancelLabel: props.permissionT("confirm.cancel"),
|
|
1523
|
-
confirmLabel: props.permissionT("confirm.enable"),
|
|
1524
|
-
acknowledged: fullAccessAcknowledged,
|
|
1525
|
-
onAcknowledgedChange: setFullAccessAcknowledged,
|
|
1526
|
-
onCancel: () => { setFullAccessAcknowledged(false); setConfirmingFullAccess(false); },
|
|
1527
|
-
onConfirm: () => {
|
|
1528
|
-
setPermission("danger-full-access");
|
|
1529
|
-
save({ permission: "danger-full-access" });
|
|
1530
|
-
setFullAccessAcknowledged(false);
|
|
1531
|
-
setConfirmingFullAccess(false);
|
|
1532
|
-
},
|
|
1533
|
-
}),
|
|
1534
|
-
);
|
|
1535
|
-
}
|
|
1536
|
-
|
|
1537
1270
|
function AccountInspector({ account, catalog, permissions, workspaces, createWorkspace, pickDirectory, modelT, permissionT, t, onAction, onSave }) {
|
|
1538
1271
|
const [draft, setDraft] = useState(account);
|
|
1539
1272
|
const [note, setNote] = useState("");
|
package/lib/engine/gateway.d.ts
CHANGED
|
@@ -28,6 +28,7 @@ export declare class ImEngine {
|
|
|
28
28
|
private readonly wrappedUserQuestionServices;
|
|
29
29
|
private legacyServiceTimer?;
|
|
30
30
|
private disposed;
|
|
31
|
+
private readonly inputScopes;
|
|
31
32
|
constructor(ctx: Context, store: SessionMapStore, seen: SeenStore, config: EngineConfig, log: (line: string) => void, onUnauthorized?: ((channelId: string, msg: ImMessage) => string) | undefined, resolveConfig?: (channelId: string) => EngineConfig, resolvePrivateAccess?: (channelId: string) => 'approved' | 'all');
|
|
32
33
|
renameSession(sessionId: string, title: string): boolean;
|
|
33
34
|
removeSession(sessionId: string): Promise<boolean>;
|
|
@@ -52,6 +53,7 @@ export declare class ImEngine {
|
|
|
52
53
|
private handleInbound;
|
|
53
54
|
private handleCommand;
|
|
54
55
|
private inject;
|
|
56
|
+
private cancelInputs;
|
|
55
57
|
private answerApproval;
|
|
56
58
|
private onApproval;
|
|
57
59
|
private onUserQuestions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/engine/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/engine/gateway.ts"],"names":[],"mappings":"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"}
|
package/lib/engine/gateway.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ImageInputError, imageInputFailure, imagePromptPart } from './image-input.js';
|
|
1
2
|
import { ApprovalBroker } from './approval.js';
|
|
2
3
|
import { SessionMerger } from './merge.js';
|
|
3
4
|
import { SessionRouter } from './router.js';
|
|
@@ -43,6 +44,7 @@ export class ImEngine {
|
|
|
43
44
|
wrappedUserQuestionServices = new WeakSet();
|
|
44
45
|
legacyServiceTimer;
|
|
45
46
|
disposed = false;
|
|
47
|
+
inputScopes = new Map();
|
|
46
48
|
constructor(ctx, store, seen, config, log, onUnauthorized, resolveConfig = () => config, resolvePrivateAccess = () => 'approved') {
|
|
47
49
|
this.ctx = ctx;
|
|
48
50
|
this.store = store;
|
|
@@ -115,14 +117,20 @@ export class ImEngine {
|
|
|
115
117
|
this.config.provider = provider;
|
|
116
118
|
this.config.model = model;
|
|
117
119
|
this.config.reasoningEffort = reasoningEffort;
|
|
120
|
+
for (const channelId of this.inputScopes.keys())
|
|
121
|
+
this.cancelInputs(channelId);
|
|
118
122
|
void this.router.disposeAll();
|
|
119
123
|
}
|
|
120
124
|
setCwd(cwd) {
|
|
121
125
|
this.config.cwd = cwd;
|
|
126
|
+
for (const channelId of this.inputScopes.keys())
|
|
127
|
+
this.cancelInputs(channelId);
|
|
122
128
|
void this.router.disposeAll();
|
|
123
129
|
}
|
|
124
130
|
setPermission(permission) {
|
|
125
131
|
this.config.permissionPreset = permission;
|
|
132
|
+
for (const channelId of this.inputScopes.keys())
|
|
133
|
+
this.cancelInputs(channelId);
|
|
126
134
|
void this.router.disposeAll();
|
|
127
135
|
}
|
|
128
136
|
attachMappedSessions() {
|
|
@@ -133,6 +141,7 @@ export class ImEngine {
|
|
|
133
141
|
channel.setMessageHandler((msg) => this.enqueue(channel.id, msg));
|
|
134
142
|
}
|
|
135
143
|
unregister(channelId) {
|
|
144
|
+
this.cancelInputs(channelId);
|
|
136
145
|
this.channels.delete(channelId);
|
|
137
146
|
}
|
|
138
147
|
addAllowed(channelId, userId) {
|
|
@@ -147,6 +156,7 @@ export class ImEngine {
|
|
|
147
156
|
set.add(id);
|
|
148
157
|
}
|
|
149
158
|
async reloadChannel(channelId, options = {}) {
|
|
159
|
+
this.cancelInputs(channelId);
|
|
150
160
|
for (const sessionId of this.router.sessionIdsForChannel(channelId)) {
|
|
151
161
|
this.cancelSessionInteractions(sessionId, new Error('账号配置已更新'));
|
|
152
162
|
}
|
|
@@ -160,6 +170,8 @@ export class ImEngine {
|
|
|
160
170
|
}
|
|
161
171
|
dispose() {
|
|
162
172
|
this.disposed = true;
|
|
173
|
+
for (const channelId of this.inputScopes.keys())
|
|
174
|
+
this.cancelInputs(channelId);
|
|
163
175
|
if (this.legacyServiceTimer)
|
|
164
176
|
clearTimeout(this.legacyServiceTimer);
|
|
165
177
|
for (const off of this.disposeEvents)
|
|
@@ -232,7 +244,7 @@ export class ImEngine {
|
|
|
232
244
|
const text = msg.text.trim();
|
|
233
245
|
const kind = msg.kind === 'group' ? 'group' : 'dm';
|
|
234
246
|
const binding = this.router.lookup(channelId, kind, msg.chatId);
|
|
235
|
-
if (text.startsWith('/')) {
|
|
247
|
+
if (text.startsWith('/') && !msg.media?.length) {
|
|
236
248
|
const command = text.split(/\s+/, 1)[0]?.toLowerCase();
|
|
237
249
|
if ((command === '/new' || command === '/clear')
|
|
238
250
|
&& binding
|
|
@@ -279,7 +291,7 @@ export class ImEngine {
|
|
|
279
291
|
const allowWords = ['批准', '同意', 'yes', 'y', 'allow'];
|
|
280
292
|
const denyWords = ['拒绝', '不同意', 'no', 'n', 'reject', 'deny'];
|
|
281
293
|
const verdict = allowWords.includes(text.toLowerCase()) ? true : denyWords.includes(text.toLowerCase()) ? false : undefined;
|
|
282
|
-
if (verdict !== undefined) {
|
|
294
|
+
if (verdict !== undefined && !msg.media?.length) {
|
|
283
295
|
if (!canAnswerToolApproval({ userAllowed: this.userAllowed(channelId, msg.userId), kind: msg.kind === 'group' ? 'group' : 'dm' })) {
|
|
284
296
|
if (binding && this.broker.has(binding.sessionId)) {
|
|
285
297
|
const hint = msg.kind === 'group'
|
|
@@ -311,7 +323,7 @@ export class ImEngine {
|
|
|
311
323
|
}
|
|
312
324
|
catch (error) {
|
|
313
325
|
this.log(`[${channelId}] 处理失败: ${error instanceof Error ? error.message : String(error)}`);
|
|
314
|
-
await channel.send(msg.chatId, '消息处理失败,请查看本机日志。').catch(() => undefined);
|
|
326
|
+
await channel.send(msg.chatId, msg.media?.some(media => media.kind === 'image') ? imageInputFailure(error) : '消息处理失败,请查看本机日志。').catch(() => undefined);
|
|
315
327
|
}
|
|
316
328
|
}
|
|
317
329
|
async handleCommand(channel, msg) {
|
|
@@ -335,6 +347,12 @@ export class ImEngine {
|
|
|
335
347
|
return `未知命令 ${cmd}。发送 /help 查看帮助。`;
|
|
336
348
|
}
|
|
337
349
|
async inject(channel, msg) {
|
|
350
|
+
if (this.disposed || this.channels.get(channel.id) !== channel)
|
|
351
|
+
return;
|
|
352
|
+
let scope = this.inputScopes.get(channel.id);
|
|
353
|
+
if (!scope)
|
|
354
|
+
this.inputScopes.set(channel.id, scope = new AbortController());
|
|
355
|
+
const { signal } = scope;
|
|
338
356
|
const kind = msg.kind === 'group' ? 'group' : 'dm';
|
|
339
357
|
const title = (msg.username || msg.text || msg.chatId).slice(0, 40);
|
|
340
358
|
const binding = await this.router.getOrCreate(channel.id, kind, msg.chatId, title);
|
|
@@ -342,25 +360,44 @@ export class ImEngine {
|
|
|
342
360
|
if (msg.text.trim())
|
|
343
361
|
content.push({ type: 'text', text: msg.text.trim() });
|
|
344
362
|
for (const media of msg.media ?? []) {
|
|
345
|
-
if (media.kind === '
|
|
363
|
+
if (media.kind === 'image')
|
|
364
|
+
content.push(await imagePromptPart(media));
|
|
365
|
+
else if (media.kind === 'voice-text' && media.text)
|
|
346
366
|
content.push({ type: 'text', text: `[语音] ${media.text}` });
|
|
347
367
|
else if (media.path)
|
|
348
368
|
content.push({ type: 'text', text: `[附件 ${media.name ?? media.kind}] ${media.path}` });
|
|
349
369
|
}
|
|
350
|
-
if (content.length === 0)
|
|
370
|
+
if (signal.aborted || content.length === 0)
|
|
351
371
|
return;
|
|
352
372
|
if (msg.userId)
|
|
353
373
|
this.sessionActors.set(binding.sessionId, msg.userId);
|
|
354
374
|
this.streams.reset(`${channel.id}:${msg.chatId}`);
|
|
355
375
|
await channel.sendAction?.(msg.chatId, 'typing').catch(() => undefined);
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
376
|
+
if (signal.aborted)
|
|
377
|
+
return;
|
|
378
|
+
if (content.some(part => part.type === 'image')) {
|
|
379
|
+
// Use Chat's public admission entry: session-local model selection, shared
|
|
380
|
+
// model-switch serialization, and durable attachment validation/storage.
|
|
381
|
+
// Optional lookup preserves text-only operation on older Hosts. Keep
|
|
382
|
+
// strict lookup so a pending or unloading provider is never invoked.
|
|
383
|
+
const controller = this.ctx.get('sessionController');
|
|
384
|
+
if (!controller?.prompt)
|
|
385
|
+
throw new ImageInputError('当前 Host 不支持 Chat 图片输入,请升级 DeepSeek Harness。');
|
|
386
|
+
await controller.prompt({ requestId: crypto.randomUUID(), sessionId: binding.sessionId, mode: 'queue', content }, signal);
|
|
387
|
+
}
|
|
388
|
+
else
|
|
389
|
+
this.router.followup(binding, {
|
|
390
|
+
id: crypto.randomUUID(),
|
|
391
|
+
role: 'user',
|
|
392
|
+
content,
|
|
393
|
+
source: { kind: 'user' },
|
|
394
|
+
});
|
|
362
395
|
this.log(`[${channel.id}] 已注入 ${binding.sessionId}`);
|
|
363
396
|
}
|
|
397
|
+
cancelInputs(channelId) {
|
|
398
|
+
this.inputScopes.get(channelId)?.abort();
|
|
399
|
+
this.inputScopes.delete(channelId);
|
|
400
|
+
}
|
|
364
401
|
async answerApproval(channelId, msg, allow) {
|
|
365
402
|
const binding = this.router.lookup(channelId, msg.kind === 'group' ? 'group' : 'dm', msg.chatId);
|
|
366
403
|
if (!binding)
|