mslxdff 0.1.203 → 0.1.207
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/README.md +3 -3
- package/bin/mslxdff.js +1 -1
- package/docs/cli_help_mini.md +146 -0
- package/package.json +38 -38
- package/plugins/README.md +14 -14
- package/plugins/prefer-model.mjs.example +14 -14
- package/src/anthropic/canonical-json.js +55 -0
- package/src/anthropic/count-tokens.js +61 -61
- package/src/anthropic/request-body.js +183 -126
- package/src/anthropic/request-shape.js +60 -0
- package/src/anthropic/session-id.js +58 -0
- package/src/anthropic/shared.js +18 -18
- package/src/anthropic/sse-aggregate.js +56 -56
- package/src/anthropic/tool-media.js +75 -0
- package/src/anthropic/translate.js +296 -287
- package/src/anthropic/web-search.js +361 -361
- package/src/api-kind.js +31 -31
- package/src/autostart.js +288 -288
- package/src/bench/probe.js +1 -1
- package/src/bench/runner.js +1 -1
- package/src/bench/via-probe.js +1 -1
- package/src/bench/via.js +144 -144
- package/src/bench/workbuddy-bench.js +1 -1
- package/src/chat/config.js +11 -11
- package/src/chat/cooling.js +81 -81
- package/src/chat/direct.js +58 -58
- package/src/chat/index.js +6 -6
- package/src/chat/spinner.js +38 -38
- package/src/chat/sse.js +69 -69
- package/src/chat/stats.js +247 -247
- package/src/chat/store.js +48 -48
- package/src/chat/tool-handlers.js +67 -67
- package/src/chat/tools.js +1 -1
- package/src/chat/upstream.js +59 -59
- package/src/chat-pipeline/auto-race.js +158 -158
- package/src/chat-pipeline/empty-turn.js +147 -147
- package/src/chat-pipeline/engine.js +17 -17
- package/src/chat-pipeline/index.js +8 -40
- package/src/chat-pipeline/serial-trial.js +279 -283
- package/src/chat-pipeline/terminal-verdict.js +132 -147
- package/src/chooser.js +54 -54
- package/src/claude-desktop/apply.js +101 -101
- package/src/claude-desktop/context1m.js +38 -38
- package/src/claude-desktop/doctor.js +146 -146
- package/src/claude-desktop/slots.js +152 -152
- package/src/cli/bootstrap.js +1 -1
- package/src/cli/commands/claude-desktop.js +284 -284
- package/src/cli/commands/daemon.js +231 -231
- package/src/cli/commands/model/list-live.js +22 -22
- package/src/cli/commands/model/list-providers.js +76 -76
- package/src/cli/commands/model/list-render.js +77 -77
- package/src/cli/commands/model/list-sort.js +52 -52
- package/src/cli/commands/model/list-tty.js +76 -76
- package/src/cli/commands/model/list.js +166 -166
- package/src/cli/commands/model/live-models.js +24 -24
- package/src/cli/commands/model/stats.js +43 -43
- package/src/cli/commands/model/status.js +47 -47
- package/src/cli/commands/model.js +51 -51
- package/src/cli/commands/provider/add.js +108 -108
- package/src/cli/commands/provider/allowlist.js +99 -99
- package/src/cli/commands/provider/cline-free.js +99 -99
- package/src/cli/commands/provider/cline-login.js +218 -218
- package/src/cli/commands/provider/cline-quota.js +65 -65
- package/src/cli/commands/provider/codearts-login.js +45 -45
- package/src/cli/commands/provider/config.js +119 -119
- package/src/cli/commands/provider/globalqwenwork-login.js +126 -126
- package/src/cli/commands/provider/keys-guard.js +50 -50
- package/src/cli/commands/provider/keys.js +161 -161
- package/src/cli/commands/provider/qoder-checkin.js +81 -81
- package/src/cli/commands/provider/qoder-login.js +102 -102
- package/src/cli/commands/provider/raccoon-login.js +180 -180
- package/src/cli/commands/provider/raccoon-password.js +162 -162
- package/src/cli/commands/provider/raccoon-quota.js +109 -109
- package/src/cli/commands/provider/traework-checkin.js +144 -144
- package/src/cli/commands/provider/traework-login.js +164 -164
- package/src/cli/commands/provider/workbuddy-login.js +153 -153
- package/src/cli/commands/provider/zcode-login.js +77 -77
- package/src/cli/commands/provider/zcode-quota.js +55 -55
- package/src/cli/commands/provider.js +1 -1
- package/src/cli/commands/stats.js +158 -149
- package/src/cli/commands/system.js +261 -261
- package/src/cli/commands/timezone.js +47 -47
- package/src/cli/commands/use-group.js +60 -60
- package/src/cli/commands/workbuddy.js +189 -189
- package/src/cli/format.js +141 -141
- package/src/cli/group-helpers.js +70 -70
- package/src/cli/help.js +80 -80
- package/src/cli/index.js +70 -70
- package/src/cli/interactive.js +121 -121
- package/src/cli/join-core.js +99 -99
- package/src/cli/join-wizard.js +175 -175
- package/src/cli/policy.js +136 -136
- package/src/cli/provider-row.js +126 -126
- package/src/cli/util.js +24 -24
- package/src/compat.js +53 -53
- package/src/events.js +38 -38
- package/src/free-lane.js +131 -131
- package/src/free-watcher.js +63 -63
- package/src/groups.js +262 -262
- package/src/logs.js +195 -195
- package/src/metrics.js +71 -62
- package/src/model-capabilities/context-lookup.js +65 -65
- package/src/model-capabilities/merge.js +142 -142
- package/src/model-trace.js +187 -187
- package/src/models.js +1 -1
- package/src/opencode-identity.js +72 -72
- package/src/peers.js +254 -254
- package/src/plugins.js +107 -107
- package/src/providers/AGENTS.md +49 -0
- package/src/providers/base.js +164 -164
- package/src/providers/classify.js +22 -22
- package/src/providers/cline/allowlist-sync.js +93 -93
- package/src/providers/cline/free-catalog.js +71 -71
- package/src/providers/cline/headers.js +37 -37
- package/src/providers/cline/index.js +130 -130
- package/src/providers/cline/models.js +150 -150
- package/src/providers/cline/usage.js +274 -274
- package/src/providers/codearts/auth-pool.js +148 -148
- package/src/providers/codearts/concurrency.js +34 -34
- package/src/providers/codearts/const.js +65 -65
- package/src/providers/codearts/dpop.js +95 -95
- package/src/providers/codearts/index.js +175 -175
- package/src/providers/codearts/login.js +214 -214
- package/src/providers/codearts/models.js +182 -182
- package/src/providers/codearts/sign.js +96 -96
- package/src/providers/codearts/sse.js +204 -204
- package/src/providers/codearts/stream.js +209 -209
- package/src/providers/codearts/sts.js +124 -124
- package/src/providers/codearts.js +1 -1
- package/src/providers/dispatcher.js +146 -146
- package/src/providers/generic.js +156 -156
- package/src/providers/globalqwenwork/account-store.js +141 -141
- package/src/providers/globalqwenwork/constants.js +73 -73
- package/src/providers/globalqwenwork/crypto.js +2 -2
- package/src/providers/globalqwenwork/http.js +2 -2
- package/src/providers/globalqwenwork/index.js +331 -331
- package/src/providers/globalqwenwork/payload.js +147 -147
- package/src/providers/globalqwenwork/rsa.js +2 -2
- package/src/providers/globalqwenwork/sse.js +2 -2
- package/src/providers/globalqwenwork/stream.js +2 -2
- package/src/providers/globalqwenwork.js +1 -1
- package/src/providers/globalworkbuddy/account-store.js +198 -198
- package/src/providers/globalworkbuddy/auth.js +97 -97
- package/src/providers/globalworkbuddy/catalog.js +138 -138
- package/src/providers/globalworkbuddy/constants.js +73 -73
- package/src/providers/globalworkbuddy/device-auth.js +120 -120
- package/src/providers/globalworkbuddy/errors.js +98 -98
- package/src/providers/globalworkbuddy/headers.js +89 -89
- package/src/providers/globalworkbuddy/models.js +96 -96
- package/src/providers/globalworkbuddy/payload.js +80 -80
- package/src/providers/index.js +5 -5
- package/src/providers/model-id.js +172 -172
- package/src/providers/opencode.js +19 -19
- package/src/providers/openrouter.js +31 -31
- package/src/providers/qoder/account-store.js +106 -106
- package/src/providers/qoder/aggregate.js +60 -60
- package/src/providers/qoder/baseprompt.json +591 -591
- package/src/providers/qoder/checkin.js +160 -160
- package/src/providers/qoder/constants.js +44 -44
- package/src/providers/qoder/encode.js +41 -41
- package/src/providers/qoder/fingerprint.js +38 -38
- package/src/providers/qoder/models.js +77 -77
- package/src/providers/qoder/oauth.js +84 -84
- package/src/providers/qoder/payload.js +162 -162
- package/src/providers/qoder/request.js +27 -27
- package/src/providers/qoder/session.js +134 -134
- package/src/providers/qoder/sticky.js +38 -38
- package/src/providers/qoder/stream.js +116 -116
- package/src/providers/qoder.js +1 -1
- package/src/providers/raccoon/account-store.js +216 -216
- package/src/providers/raccoon/auth.js +67 -67
- package/src/providers/raccoon/chat.js +228 -228
- package/src/providers/raccoon/const.js +180 -180
- package/src/providers/raccoon/credits.js +185 -185
- package/src/providers/raccoon/crypto.js +43 -43
- package/src/providers/raccoon/envelope.js +31 -31
- package/src/providers/raccoon/headers.js +45 -45
- package/src/providers/raccoon/index.js +216 -216
- package/src/providers/raccoon/login.js +279 -279
- package/src/providers/raccoon/models.js +160 -160
- package/src/providers/raccoon/password-login.js +102 -102
- package/src/providers/raccoon/qr-codewords.js +115 -115
- package/src/providers/raccoon/qr.js +236 -236
- package/src/providers/raccoon/sse.js +135 -135
- package/src/providers/responses-channel.js +120 -120
- package/src/providers/share-keys.js +53 -53
- package/src/providers/traework/account-store.js +234 -234
- package/src/providers/traework/chat.js +217 -217
- package/src/providers/traework/checkin.js +77 -77
- package/src/providers/traework/constants.js +41 -41
- package/src/providers/traework/errors.js +52 -52
- package/src/providers/traework/headers.js +79 -79
- package/src/providers/traework/index.js +132 -132
- package/src/providers/traework/market-identity.js +116 -116
- package/src/providers/traework/models.js +98 -98
- package/src/providers/traework/payload.js +86 -86
- package/src/providers/traework/sse.js +184 -184
- package/src/providers/traework/token.js +52 -52
- package/src/providers/traework.js +2 -2
- package/src/providers/workbuddy/account-store.js +186 -186
- package/src/providers/workbuddy/auth.js +158 -158
- package/src/providers/workbuddy/balance.js +86 -86
- package/src/providers/workbuddy/cat-travel.js +125 -125
- package/src/providers/workbuddy/checkin.js +75 -75
- package/src/providers/workbuddy/desktop-info.js +78 -78
- package/src/providers/workbuddy/growth-api.js +67 -67
- package/src/providers/workbuddy/growth-plans.js +63 -63
- package/src/providers/workbuddy/growth.js +181 -181
- package/src/providers/workbuddy/index.js +217 -217
- package/src/providers/workbuddy/models.js +126 -126
- package/src/providers/workbuddy/payload.js +141 -141
- package/src/providers/workbuddy/rotation-log.js +83 -83
- package/src/providers/workbuddy/sanitize-tools.js +61 -61
- package/src/providers/workbuddy/sdk-chat.js +26 -26
- package/src/providers/workbuddy-balance.js +78 -78
- package/src/providers/zcode/account-store.js +129 -129
- package/src/providers/zcode/auth.js +28 -28
- package/src/providers/zcode/chat.js +179 -179
- package/src/providers/zcode/const.js +54 -54
- package/src/providers/zcode/context-shape.js +162 -162
- package/src/providers/zcode/headers.js +93 -93
- package/src/providers/zcode/index.js +124 -124
- package/src/providers/zcode/models.js +65 -65
- package/src/providers/zcode/oauth.js +120 -120
- package/src/providers/zcode/quota.js +176 -176
- package/src/providers/zcode/sse.js +196 -196
- package/src/readline-compat.js +25 -25
- package/src/responses/translate.js +311 -311
- package/src/routes/AGENTS.md +37 -0
- package/src/routes/chat/broadband-handler.js +72 -72
- package/src/routes/chat/empty-turn-report.js +31 -31
- package/src/routes/chat/exhausted-handler.js +87 -87
- package/src/routes/chat/hedge-handler.js +130 -130
- package/src/routes/chat/index.js +1 -1
- package/src/routes/chat/local-handler.js +63 -63
- package/src/routes/chat/peer-handler.js +81 -81
- package/src/routes/chat.js +3 -3
- package/src/routes/fallback.js +88 -88
- package/src/routes/groups-relay.js +214 -214
- package/src/routes/groups.js +122 -122
- package/src/routes/helpers.js +93 -83
- package/src/routes/index.js +147 -147
- package/src/routes/messages-route.js +375 -365
- package/src/routes/peers.js +10 -2
- package/src/routes/relay-queue.js +181 -181
- package/src/routes/relay.js +60 -60
- package/src/routes/responses-route.js +213 -213
- package/src/routes/stream-body.js +84 -84
- package/src/routes/stream-hold.js +337 -337
- package/src/routes/stream-scan.js +366 -366
- package/src/routes.js +3 -3
- package/src/runtime/auto-update.js +113 -113
- package/src/runtime/broadband-stream.js +79 -79
- package/src/runtime/broadband.js +103 -103
- package/src/runtime/group-sync.js +81 -81
- package/src/runtime/keep-warm.js +120 -120
- package/src/runtime/lifecycle-forensics.js +116 -116
- package/src/runtime/lifecycle-log.js +87 -87
- package/src/runtime/log-stamp.js +73 -73
- package/src/runtime/proc-info.js +137 -137
- package/src/runtime/qoder-checkin.js +93 -93
- package/src/runtime/raccoon-checkin.js +126 -126
- package/src/runtime/server-lifecycle.js +189 -189
- package/src/runtime/traework-checkin.js +118 -118
- package/src/runtime/workbuddy-checkin.js +120 -120
- package/src/runtime/workbuddy-growth.js +133 -133
- package/src/state/facade.js +58 -58
- package/src/state/memory.js +162 -162
- package/src/state/merge.js +25 -25
- package/src/state/migrations/cline-unify.js +94 -94
- package/src/state/migrations.js +33 -33
- package/src/state/persist.js +42 -42
- package/src/state/provider-config.js +142 -142
- package/src/state/schemas/group.js +31 -31
- package/src/state/schemas/model.js +94 -94
- package/src/state/schemas/peer.js +31 -31
- package/src/state/schemas/port.js +10 -10
- package/src/state/schemas/provider.js +202 -202
- package/src/state/schemas/timezone.js +70 -70
- package/src/state/schemas/token.js +48 -48
- package/src/state/schemas/use-group.js +102 -102
- package/src/state/store.js +176 -176
- package/src/state.js +1 -1
- package/src/sync-claude-desktop.js +234 -234
- package/src/sync-claude.js +152 -152
- package/src/sync-codex.js +116 -116
- package/src/sync-workbuddy.js +158 -158
- package/src/talk-full-redact.js +129 -129
- package/src/talk-full.js +131 -131
- package/src/talk-log.js +257 -257
- package/src/text-tokens.js +52 -52
- package/src/thinking-effort.js +67 -67
- package/src/time.js +106 -106
- package/src/timeline.js +26 -26
- package/src/transport/index.js +1 -1
- package/src/upstream-engine/index.js +74 -74
- package/src/upstream-engine/mode.js +15 -15
- package/src/upstream-engine/sdk/attempt.js +221 -221
- package/src/upstream-engine/sdk/chat.js +28 -28
- package/src/upstream-engine/sdk/convert.js +192 -192
- package/src/upstream-engine/sdk/diagnose.js +62 -62
- package/src/upstream-engine/sdk/dispatch.js +55 -55
- package/src/upstream-engine/sdk/responses.js +176 -176
- package/src/upstream-engine/sdk/sse.js +166 -166
- package/src/upstream-responses.js +305 -305
- package/src/usage/cache-fields.js +58 -0
- package/src/usage/record.js +109 -106
- package/src/usage/report.js +209 -195
- package/src/v6pool/claim.js +157 -157
- package/src/v6pool/config.js +65 -65
- package/src/v6pool/detect.js +130 -130
- package/src/v6pool/index.js +152 -152
- package/src/v6pool/prefix.js +140 -140
- package/src/v6pool/probe.js +40 -40
- package/src/v6pool/report.js +104 -104
- package/src/v6pool/rotate.js +263 -263
- package/src/warp-pool/config.js +74 -74
- package/src/warp-pool/health.js +106 -106
- package/src/warp-pool/identity.js +141 -141
- package/src/warp-pool/index.js +358 -358
- package/src/warp-pool/keys.js +29 -29
- package/src/warp-pool/nodes.js +95 -95
- package/src/warp-pool/ports.js +160 -160
- package/src/warp-pool/register.js +113 -113
- package/src/warp-pool/report.js +232 -232
- package/src/warp-pool/revive.js +168 -168
- package/src/warp-pool/rotate.js +214 -214
- package/src/warp-pool/strategy.js +43 -43
- package/src/warp-pool/verdict.js +69 -69
- package/src/warp-pool/wireproxy.js +162 -162
|
@@ -1,147 +1,147 @@
|
|
|
1
|
-
// 空转(EMPTY_MODEL_RESPONSE:上游 200 但零正文零工具调用)重试策略:阶梯等待 + 抬额度 + 末次追问。
|
|
2
|
-
// 本模块只做「配置解析 + 载荷改写」的纯决策,不碰 HTTP 与下游响应;执行编排在 serial-trial.js。
|
|
3
|
-
// 拆出原因:serial-trial.js 承载串行换人/hedge/peer/broadband 编排,再加政策面即破 20KB 硬门。
|
|
4
|
-
import { extractRetryAfterSec } from "../routes/stream-scan.js"; // 限流窗口解析:与 relay 的「错误包络暂扣」同源,不复制第二份正则
|
|
5
|
-
|
|
6
|
-
// 空转重试阶梯(用户定:网络质量差 → 2s→8s→30s;末档对齐实测 retryAfterSeconds=30 的限流窗口)。
|
|
7
|
-
// MSLXDFF_EMPTY_TURN_RETRY_STEPS: JSON 数组(ms)。未设 = 用默认阶梯 [2000,8000,30000];显式 "[]" = 逃生阀,回旧式固定延迟。
|
|
8
|
-
// MSLXDFF_EMPTY_TURN_RETRIES: 重试上限。未设 = 阶梯档数(默认 3);0 = 关闭重试(空转直接换候选/终结)。
|
|
9
|
-
// 非法值(语法错/非正数)→ 每进程告警一次并按默认阶梯跑:绝不因配置手滑把重试整体关掉。
|
|
10
|
-
export const DEFAULT_EMPTY_TURN_STEPS = Object.freeze([2000, 8000, 30000]);
|
|
11
|
-
|
|
12
|
-
let stepsWarned = false;
|
|
13
|
-
function warnBadSteps(raw) {
|
|
14
|
-
if (stepsWarned) return;
|
|
15
|
-
stepsWarned = true;
|
|
16
|
-
try { console.warn(`[mslxdff] MSLXDFF_EMPTY_TURN_RETRY_STEPS 非法(${String(raw).slice(0, 60)}) → 改用默认阶梯 [${DEFAULT_EMPTY_TURN_STEPS.join(",")}]`); } catch {}
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
export function emptyRetryCfg() {
|
|
20
|
-
// 空串/纯空白 = 未设(.env 里 `MSLXDFF_EMPTY_TURN_RETRIES=` 是常见手滑,Number("")===0 会把整条恢复静默清零)
|
|
21
|
-
const rawMax = String(process.env.MSLXDFF_EMPTY_TURN_RETRIES ?? "").trim();
|
|
22
|
-
const r = rawMax === "" ? NaN : Number(rawMax);
|
|
23
|
-
const resolveMax = (fallback) => (Number.isInteger(r) && r >= 0 ? r : fallback);
|
|
24
|
-
const raw = process.env.MSLXDFF_EMPTY_TURN_RETRY_STEPS;
|
|
25
|
-
const s = raw == null ? "" : String(raw).trim();
|
|
26
|
-
// 逃生阀:显式空数组 → 旧式固定延迟(MSLXDFF_EMPTY_TURN_RETRY_DELAY_MS,默认 2s、最多 2 次)
|
|
27
|
-
if (s === "[]") {
|
|
28
|
-
const d = Number(process.env.MSLXDFF_EMPTY_TURN_RETRY_DELAY_MS);
|
|
29
|
-
return { max: resolveMax(2), delayMs: Number.isFinite(d) && d >= 0 ? d : 2000, steps: null };
|
|
30
|
-
}
|
|
31
|
-
let steps = DEFAULT_EMPTY_TURN_STEPS;
|
|
32
|
-
if (s !== "") {
|
|
33
|
-
let parsed = null;
|
|
34
|
-
try { parsed = JSON.parse(s); } catch { warnBadSteps(s); }
|
|
35
|
-
if (Array.isArray(parsed) && parsed.length && parsed.every((v) => Number.isFinite(Number(v)) && Number(v) > 0)) {
|
|
36
|
-
steps = parsed.map(Number);
|
|
37
|
-
} else if (parsed !== null) {
|
|
38
|
-
warnBadSteps(s); // 语法过了但形状不对(非数组/空数组元素/含非正数)
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
return { max: resolveMax(steps.length), steps };
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
// retryAfterSeconds 来自上游可控文本,不设顶就会被拿捏:`retryAfterSeconds: 3600` → 单档挂 1 小时;
|
|
45
|
-
// 且 ms 数超过 setTimeout 上限时 Node 会钳成 1ms 并告警 → 对刚限流的上游连开三枪,正是要防的事。
|
|
46
|
-
// 顶只约束「上游能 imposed 多少」;用户自己配的更大阶梯档照办(那是显式意愿),仅保留 setTimeout 硬安全顶。
|
|
47
|
-
const SET_TIMEOUT_CEILING_MS = 2_147_483_647;
|
|
48
|
-
export function emptyTurnMaxWaitMs() {
|
|
49
|
-
const v = Number(process.env.MSLXDFF_EMPTY_TURN_MAX_WAIT_MS);
|
|
50
|
-
return Number.isFinite(v) && v > 0 ? Math.min(v, SET_TIMEOUT_CEILING_MS) : 60_000;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
// 本次重试实际该等多久:按档取阶梯(超出档数循环复用),再按上游 retryAfterSeconds 抬到不低于该窗口。
|
|
54
|
-
// 限流没到点就重拉等于白烧一发(实测 2s 重拉撞 retryAfterSeconds=30 → 连 2/2 全灭,正是本次改动起因)。
|
|
55
|
-
export function computeNextDelay(stepIndex, steps, lastErr) {
|
|
56
|
-
const base = Number(process.env.MSLXDFF_EMPTY_TURN_RETRY_DELAY_MS);
|
|
57
|
-
let delayMs = Number.isFinite(base) && base >= 0 ? base : 2000;
|
|
58
|
-
if (Array.isArray(steps) && steps.length && Number.isInteger(stepIndex) && stepIndex >= 0) {
|
|
59
|
-
delayMs = steps[stepIndex % steps.length];
|
|
60
|
-
}
|
|
61
|
-
const after = extractRetryAfterSec(lastErr?.message || "");
|
|
62
|
-
if (after != null) delayMs = Math.max(delayMs, Math.min(after * 1000, emptyTurnMaxWaitMs()));
|
|
63
|
-
return Math.min(Math.round(delayMs), SET_TIMEOUT_CEILING_MS);
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
// 空转重试抬额度:思考型模型常把 max_tokens 全花在 reasoning 上(实测 8192 刷满 → 零正文
|
|
67
|
-
// finish_reason=length),同参重拉必然复现 → 重试前把额度翻倍抬到顶,给模型"想完还能说话"的空间。
|
|
68
|
-
// 只加不减、有顶;客户端没设额度时由调用方决定是否兜底发明一次(floor 参数,见 emptyTurnMinRaiseTo;floor=0 回旧口径不发明)。
|
|
69
|
-
// MSLXDFF_EMPTY_TURN_RAISE_TOKENS=0 关闭抬额;默认顶 16384。
|
|
70
|
-
export function emptyRaiseCap() {
|
|
71
|
-
const c = Number(process.env.MSLXDFF_EMPTY_TURN_RAISE_TOKENS);
|
|
72
|
-
return Number.isInteger(c) && c >= 0 ? c : 16384;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
// 空转重试抬额度(含兜底):现网三类空轮里最多的是「思考吃满 max_tokens、零正文」
|
|
76
|
-
// (events.log:reasoningChars 10290/22652、wroteFrames 1972/2573、finish=length)。客户端设过额度 → 翻倍抬到 cap;
|
|
77
|
-
// 客户端根本没设额度 → 同参重拉必然复现,故用 MIN_RAISE_TO 兜底发明一次上限(=0 关,回旧口径「不替它发明」)。
|
|
78
|
-
export function emptyTurnMinRaiseTo() {
|
|
79
|
-
const v = Number(process.env.MSLXDFF_EMPTY_TURN_MIN_RAISE_TO);
|
|
80
|
-
if (v === 0 || (Number.isFinite(v) && v < 0)) return 0;
|
|
81
|
-
return Number.isInteger(v) && v > 0 ? v : 16384;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
export function withRaisedMaxTokens(payload, cap, floor = 0) {
|
|
85
|
-
if (!payload || typeof payload !== "object") return payload;
|
|
86
|
-
for (const key of ["max_tokens", "max_completion_tokens"]) {
|
|
87
|
-
const cur = Number(payload[key]);
|
|
88
|
-
if (Number.isFinite(cur) && cur > 0) {
|
|
89
|
-
if (!cap || cur >= cap) return payload; // 已到顶:只剩同参重拉(赌偶发空轮)
|
|
90
|
-
return { ...payload, [key]: Math.min(cap, cur * 2) };
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
if (floor) return { ...payload, max_tokens: Math.min(floor, cap || floor) }; // 客户端没设额度:兜底发明一次
|
|
94
|
-
return payload;
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
// 首发输出额度托底:客户端"剩余上下文"算术算爆会把 max_tokens/max_completion_tokens 写成 1
|
|
98
|
-
// (实测 442 条消息 PI agent 会话 → 上游按 1 token 截断 finish=length、正文 0~5 字,循环停摆);
|
|
99
|
-
// 既有空转翻倍抬额 1→2→4 救不回来,且正文非零(2~5 字)进不了空转重试 → 首发前托平。
|
|
100
|
-
// 只托"存在且 <门槛"的值,不发明额度(发明归 emptyTurnMinRaiseTo)。
|
|
101
|
-
// MSLXDFF_EMPTY_TURN_MIN_TOKENS=0 关闭;MSLXDFF_EMPTY_TURN_TINY_MAX 改门槛。
|
|
102
|
-
export function outputFloorCfg() {
|
|
103
|
-
const rawMin = String(process.env.MSLXDFF_EMPTY_TURN_MIN_TOKENS ?? "").trim();
|
|
104
|
-
const min = rawMin === "" ? NaN : Number(rawMin);
|
|
105
|
-
const rawTiny = String(process.env.MSLXDFF_EMPTY_TURN_TINY_MAX ?? "").trim();
|
|
106
|
-
const tiny = rawTiny === "" ? NaN : Number(rawTiny);
|
|
107
|
-
return {
|
|
108
|
-
min: Number.isFinite(min) && min <= 0 ? 0 : (Number.isFinite(min) ? Math.floor(min) : 8192), // 0/负数=关(对齐 emptyTurnMinRaiseTo);非法/未设=8192
|
|
109
|
-
tiny: Number.isFinite(tiny) && tiny >= 0 ? Math.floor(tiny) : 64, // 非法/未设=64
|
|
110
|
-
};
|
|
111
|
-
}
|
|
112
|
-
export function withOutputFloor(payload) {
|
|
113
|
-
if (!payload || typeof payload !== "object") return payload;
|
|
114
|
-
const { min, tiny } = outputFloorCfg();
|
|
115
|
-
if (!min) return payload; // 0=关闭托底(空串=未设由 cfg 兜底成 8192)
|
|
116
|
-
let out = payload;
|
|
117
|
-
for (const key of ["max_tokens", "max_completion_tokens"]) {
|
|
118
|
-
if (payload[key] == null || payload[key] === "") continue; // 没设=原样,不发明
|
|
119
|
-
const cur = Number(payload[key]);
|
|
120
|
-
if (Number.isFinite(cur) && cur > 0 && cur < tiny) { const to = Math.max(Math.floor(cur), min); if (to > cur) out = { ...out, [key]: to }; } // >0 才算设过(0=上游默认值,抬了反降额——评审 P1);只加不减
|
|
121
|
-
}
|
|
122
|
-
return out;
|
|
123
|
-
}
|
|
124
|
-
// 空转追问:最后一次空转重试前追加一句 user 兜底(content 空轮大概率是模型“收尾犹豫”,
|
|
125
|
-
// 追问把它逼出一句“任务完成了”即可终结;前面重试仍原样重拉,防改写正常对话)。
|
|
126
|
-
// MSLXDFF_EMPTY_NUDGE=0 关闭;MSLXDFF_EMPTY_NUDGE_TEXT 改话术。
|
|
127
|
-
export function emptyNudgeCfg() {
|
|
128
|
-
const off = process.env.MSLXDFF_EMPTY_NUDGE;
|
|
129
|
-
if (off === "0" || String(off || "").toLowerCase() === "off" || String(off || "").toLowerCase() === "false") return { enabled: false, text: "" };
|
|
130
|
-
const custom = String(process.env.MSLXDFF_EMPTY_NUDGE_TEXT || "").trim();
|
|
131
|
-
return { enabled: true, text: custom || "如果你完成任务了,请简短的说:任务完成了。" };
|
|
132
|
-
}
|
|
133
|
-
export function withEmptyNudge(payload, text) {
|
|
134
|
-
const t = String(text || "").trim();
|
|
135
|
-
if (!t || !payload || !Array.isArray(payload.messages) || !payload.messages.length) return payload;
|
|
136
|
-
const last = payload.messages[payload.messages.length - 1];
|
|
137
|
-
if (last && last.role === "user" && String(last.content || "").includes(t)) return payload;
|
|
138
|
-
return { ...payload, messages: [...payload.messages, { role: "user", content: t }] };
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
// 请求级空轮等待预算:阶梯是「每发候选」独立算的,多候选串起来最坏 = N×(2+8+30),
|
|
142
|
-
// 客户端只是在等一个永远空白的回复。预算封顶「这一次请求最多白等多久」,超限直接收场。
|
|
143
|
-
// MSLXDFF_EMPTY_TURN_BUDGET_MS 覆盖(<=0 或未设 = 默认 45s:够装下一整个阶梯 + 一发换候选)。
|
|
144
|
-
export function emptyTurnBudgetMs() {
|
|
145
|
-
const v = Number(process.env.MSLXDFF_EMPTY_TURN_BUDGET_MS);
|
|
146
|
-
return Number.isFinite(v) && v > 0 ? v : 45_000;
|
|
147
|
-
}
|
|
1
|
+
// 空转(EMPTY_MODEL_RESPONSE:上游 200 但零正文零工具调用)重试策略:阶梯等待 + 抬额度 + 末次追问。
|
|
2
|
+
// 本模块只做「配置解析 + 载荷改写」的纯决策,不碰 HTTP 与下游响应;执行编排在 serial-trial.js。
|
|
3
|
+
// 拆出原因:serial-trial.js 承载串行换人/hedge/peer/broadband 编排,再加政策面即破 20KB 硬门。
|
|
4
|
+
import { extractRetryAfterSec } from "../routes/stream-scan.js"; // 限流窗口解析:与 relay 的「错误包络暂扣」同源,不复制第二份正则
|
|
5
|
+
|
|
6
|
+
// 空转重试阶梯(用户定:网络质量差 → 2s→8s→30s;末档对齐实测 retryAfterSeconds=30 的限流窗口)。
|
|
7
|
+
// MSLXDFF_EMPTY_TURN_RETRY_STEPS: JSON 数组(ms)。未设 = 用默认阶梯 [2000,8000,30000];显式 "[]" = 逃生阀,回旧式固定延迟。
|
|
8
|
+
// MSLXDFF_EMPTY_TURN_RETRIES: 重试上限。未设 = 阶梯档数(默认 3);0 = 关闭重试(空转直接换候选/终结)。
|
|
9
|
+
// 非法值(语法错/非正数)→ 每进程告警一次并按默认阶梯跑:绝不因配置手滑把重试整体关掉。
|
|
10
|
+
export const DEFAULT_EMPTY_TURN_STEPS = Object.freeze([2000, 8000, 30000]);
|
|
11
|
+
|
|
12
|
+
let stepsWarned = false;
|
|
13
|
+
function warnBadSteps(raw) {
|
|
14
|
+
if (stepsWarned) return;
|
|
15
|
+
stepsWarned = true;
|
|
16
|
+
try { console.warn(`[mslxdff] MSLXDFF_EMPTY_TURN_RETRY_STEPS 非法(${String(raw).slice(0, 60)}) → 改用默认阶梯 [${DEFAULT_EMPTY_TURN_STEPS.join(",")}]`); } catch {}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export function emptyRetryCfg() {
|
|
20
|
+
// 空串/纯空白 = 未设(.env 里 `MSLXDFF_EMPTY_TURN_RETRIES=` 是常见手滑,Number("")===0 会把整条恢复静默清零)
|
|
21
|
+
const rawMax = String(process.env.MSLXDFF_EMPTY_TURN_RETRIES ?? "").trim();
|
|
22
|
+
const r = rawMax === "" ? NaN : Number(rawMax);
|
|
23
|
+
const resolveMax = (fallback) => (Number.isInteger(r) && r >= 0 ? r : fallback);
|
|
24
|
+
const raw = process.env.MSLXDFF_EMPTY_TURN_RETRY_STEPS;
|
|
25
|
+
const s = raw == null ? "" : String(raw).trim();
|
|
26
|
+
// 逃生阀:显式空数组 → 旧式固定延迟(MSLXDFF_EMPTY_TURN_RETRY_DELAY_MS,默认 2s、最多 2 次)
|
|
27
|
+
if (s === "[]") {
|
|
28
|
+
const d = Number(process.env.MSLXDFF_EMPTY_TURN_RETRY_DELAY_MS);
|
|
29
|
+
return { max: resolveMax(2), delayMs: Number.isFinite(d) && d >= 0 ? d : 2000, steps: null };
|
|
30
|
+
}
|
|
31
|
+
let steps = DEFAULT_EMPTY_TURN_STEPS;
|
|
32
|
+
if (s !== "") {
|
|
33
|
+
let parsed = null;
|
|
34
|
+
try { parsed = JSON.parse(s); } catch { warnBadSteps(s); }
|
|
35
|
+
if (Array.isArray(parsed) && parsed.length && parsed.every((v) => Number.isFinite(Number(v)) && Number(v) > 0)) {
|
|
36
|
+
steps = parsed.map(Number);
|
|
37
|
+
} else if (parsed !== null) {
|
|
38
|
+
warnBadSteps(s); // 语法过了但形状不对(非数组/空数组元素/含非正数)
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return { max: resolveMax(steps.length), steps };
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
// retryAfterSeconds 来自上游可控文本,不设顶就会被拿捏:`retryAfterSeconds: 3600` → 单档挂 1 小时;
|
|
45
|
+
// 且 ms 数超过 setTimeout 上限时 Node 会钳成 1ms 并告警 → 对刚限流的上游连开三枪,正是要防的事。
|
|
46
|
+
// 顶只约束「上游能 imposed 多少」;用户自己配的更大阶梯档照办(那是显式意愿),仅保留 setTimeout 硬安全顶。
|
|
47
|
+
const SET_TIMEOUT_CEILING_MS = 2_147_483_647;
|
|
48
|
+
export function emptyTurnMaxWaitMs() {
|
|
49
|
+
const v = Number(process.env.MSLXDFF_EMPTY_TURN_MAX_WAIT_MS);
|
|
50
|
+
return Number.isFinite(v) && v > 0 ? Math.min(v, SET_TIMEOUT_CEILING_MS) : 60_000;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// 本次重试实际该等多久:按档取阶梯(超出档数循环复用),再按上游 retryAfterSeconds 抬到不低于该窗口。
|
|
54
|
+
// 限流没到点就重拉等于白烧一发(实测 2s 重拉撞 retryAfterSeconds=30 → 连 2/2 全灭,正是本次改动起因)。
|
|
55
|
+
export function computeNextDelay(stepIndex, steps, lastErr) {
|
|
56
|
+
const base = Number(process.env.MSLXDFF_EMPTY_TURN_RETRY_DELAY_MS);
|
|
57
|
+
let delayMs = Number.isFinite(base) && base >= 0 ? base : 2000;
|
|
58
|
+
if (Array.isArray(steps) && steps.length && Number.isInteger(stepIndex) && stepIndex >= 0) {
|
|
59
|
+
delayMs = steps[stepIndex % steps.length];
|
|
60
|
+
}
|
|
61
|
+
const after = extractRetryAfterSec(lastErr?.message || "");
|
|
62
|
+
if (after != null) delayMs = Math.max(delayMs, Math.min(after * 1000, emptyTurnMaxWaitMs()));
|
|
63
|
+
return Math.min(Math.round(delayMs), SET_TIMEOUT_CEILING_MS);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
// 空转重试抬额度:思考型模型常把 max_tokens 全花在 reasoning 上(实测 8192 刷满 → 零正文
|
|
67
|
+
// finish_reason=length),同参重拉必然复现 → 重试前把额度翻倍抬到顶,给模型"想完还能说话"的空间。
|
|
68
|
+
// 只加不减、有顶;客户端没设额度时由调用方决定是否兜底发明一次(floor 参数,见 emptyTurnMinRaiseTo;floor=0 回旧口径不发明)。
|
|
69
|
+
// MSLXDFF_EMPTY_TURN_RAISE_TOKENS=0 关闭抬额;默认顶 16384。
|
|
70
|
+
export function emptyRaiseCap() {
|
|
71
|
+
const c = Number(process.env.MSLXDFF_EMPTY_TURN_RAISE_TOKENS);
|
|
72
|
+
return Number.isInteger(c) && c >= 0 ? c : 16384;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
// 空转重试抬额度(含兜底):现网三类空轮里最多的是「思考吃满 max_tokens、零正文」
|
|
76
|
+
// (events.log:reasoningChars 10290/22652、wroteFrames 1972/2573、finish=length)。客户端设过额度 → 翻倍抬到 cap;
|
|
77
|
+
// 客户端根本没设额度 → 同参重拉必然复现,故用 MIN_RAISE_TO 兜底发明一次上限(=0 关,回旧口径「不替它发明」)。
|
|
78
|
+
export function emptyTurnMinRaiseTo() {
|
|
79
|
+
const v = Number(process.env.MSLXDFF_EMPTY_TURN_MIN_RAISE_TO);
|
|
80
|
+
if (v === 0 || (Number.isFinite(v) && v < 0)) return 0;
|
|
81
|
+
return Number.isInteger(v) && v > 0 ? v : 16384;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
export function withRaisedMaxTokens(payload, cap, floor = 0) {
|
|
85
|
+
if (!payload || typeof payload !== "object") return payload;
|
|
86
|
+
for (const key of ["max_tokens", "max_completion_tokens"]) {
|
|
87
|
+
const cur = Number(payload[key]);
|
|
88
|
+
if (Number.isFinite(cur) && cur > 0) {
|
|
89
|
+
if (!cap || cur >= cap) return payload; // 已到顶:只剩同参重拉(赌偶发空轮)
|
|
90
|
+
return { ...payload, [key]: Math.min(cap, cur * 2) };
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
if (floor) return { ...payload, max_tokens: Math.min(floor, cap || floor) }; // 客户端没设额度:兜底发明一次
|
|
94
|
+
return payload;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
// 首发输出额度托底:客户端"剩余上下文"算术算爆会把 max_tokens/max_completion_tokens 写成 1
|
|
98
|
+
// (实测 442 条消息 PI agent 会话 → 上游按 1 token 截断 finish=length、正文 0~5 字,循环停摆);
|
|
99
|
+
// 既有空转翻倍抬额 1→2→4 救不回来,且正文非零(2~5 字)进不了空转重试 → 首发前托平。
|
|
100
|
+
// 只托"存在且 <门槛"的值,不发明额度(发明归 emptyTurnMinRaiseTo)。
|
|
101
|
+
// MSLXDFF_EMPTY_TURN_MIN_TOKENS=0 关闭;MSLXDFF_EMPTY_TURN_TINY_MAX 改门槛。
|
|
102
|
+
export function outputFloorCfg() {
|
|
103
|
+
const rawMin = String(process.env.MSLXDFF_EMPTY_TURN_MIN_TOKENS ?? "").trim();
|
|
104
|
+
const min = rawMin === "" ? NaN : Number(rawMin);
|
|
105
|
+
const rawTiny = String(process.env.MSLXDFF_EMPTY_TURN_TINY_MAX ?? "").trim();
|
|
106
|
+
const tiny = rawTiny === "" ? NaN : Number(rawTiny);
|
|
107
|
+
return {
|
|
108
|
+
min: Number.isFinite(min) && min <= 0 ? 0 : (Number.isFinite(min) ? Math.floor(min) : 8192), // 0/负数=关(对齐 emptyTurnMinRaiseTo);非法/未设=8192
|
|
109
|
+
tiny: Number.isFinite(tiny) && tiny >= 0 ? Math.floor(tiny) : 64, // 非法/未设=64
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
export function withOutputFloor(payload) {
|
|
113
|
+
if (!payload || typeof payload !== "object") return payload;
|
|
114
|
+
const { min, tiny } = outputFloorCfg();
|
|
115
|
+
if (!min) return payload; // 0=关闭托底(空串=未设由 cfg 兜底成 8192)
|
|
116
|
+
let out = payload;
|
|
117
|
+
for (const key of ["max_tokens", "max_completion_tokens"]) {
|
|
118
|
+
if (payload[key] == null || payload[key] === "") continue; // 没设=原样,不发明
|
|
119
|
+
const cur = Number(payload[key]);
|
|
120
|
+
if (Number.isFinite(cur) && cur > 0 && cur < tiny) { const to = Math.max(Math.floor(cur), min); if (to > cur) out = { ...out, [key]: to }; } // >0 才算设过(0=上游默认值,抬了反降额——评审 P1);只加不减
|
|
121
|
+
}
|
|
122
|
+
return out;
|
|
123
|
+
}
|
|
124
|
+
// 空转追问:最后一次空转重试前追加一句 user 兜底(content 空轮大概率是模型“收尾犹豫”,
|
|
125
|
+
// 追问把它逼出一句“任务完成了”即可终结;前面重试仍原样重拉,防改写正常对话)。
|
|
126
|
+
// MSLXDFF_EMPTY_NUDGE=0 关闭;MSLXDFF_EMPTY_NUDGE_TEXT 改话术。
|
|
127
|
+
export function emptyNudgeCfg() {
|
|
128
|
+
const off = process.env.MSLXDFF_EMPTY_NUDGE;
|
|
129
|
+
if (off === "0" || String(off || "").toLowerCase() === "off" || String(off || "").toLowerCase() === "false") return { enabled: false, text: "" };
|
|
130
|
+
const custom = String(process.env.MSLXDFF_EMPTY_NUDGE_TEXT || "").trim();
|
|
131
|
+
return { enabled: true, text: custom || "如果你完成任务了,请简短的说:任务完成了。" };
|
|
132
|
+
}
|
|
133
|
+
export function withEmptyNudge(payload, text) {
|
|
134
|
+
const t = String(text || "").trim();
|
|
135
|
+
if (!t || !payload || !Array.isArray(payload.messages) || !payload.messages.length) return payload;
|
|
136
|
+
const last = payload.messages[payload.messages.length - 1];
|
|
137
|
+
if (last && last.role === "user" && String(last.content || "").includes(t)) return payload;
|
|
138
|
+
return { ...payload, messages: [...payload.messages, { role: "user", content: t }] };
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
// 请求级空轮等待预算:阶梯是「每发候选」独立算的,多候选串起来最坏 = N×(2+8+30),
|
|
142
|
+
// 客户端只是在等一个永远空白的回复。预算封顶「这一次请求最多白等多久」,超限直接收场。
|
|
143
|
+
// MSLXDFF_EMPTY_TURN_BUDGET_MS 覆盖(<=0 或未设 = 默认 45s:够装下一整个阶梯 + 一发换候选)。
|
|
144
|
+
export function emptyTurnBudgetMs() {
|
|
145
|
+
const v = Number(process.env.MSLXDFF_EMPTY_TURN_BUDGET_MS);
|
|
146
|
+
return Number.isFinite(v) && v > 0 ? v : 45_000;
|
|
147
|
+
}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { runAutoRace } from "./auto-race.js";
|
|
2
|
-
import { runSerialTrial } from "./serial-trial.js";
|
|
3
|
-
|
|
4
|
-
/**
|
|
5
|
-
* ExecutionEngine(薄编排)— auto 并发择优 → 串行 trial。
|
|
6
|
-
* 重活下沉 auto-race.js / serial-trial.js,本文件仅做顺序编排。
|
|
7
|
-
*/
|
|
8
|
-
export function createEngine(deps = {}) {
|
|
9
|
-
const { raceDeps, serialDeps } = deps;
|
|
10
|
-
async function run(state) {
|
|
11
|
-
const race = await runAutoRace(state, raceDeps);
|
|
12
|
-
if (race.done) return;
|
|
13
|
-
await runSerialTrial({ ...state, order: race.order }, serialDeps);
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
return { run };
|
|
17
|
-
}
|
|
1
|
+
import { runAutoRace } from "./auto-race.js";
|
|
2
|
+
import { runSerialTrial } from "./serial-trial.js";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* ExecutionEngine(薄编排)— auto 并发择优 → 串行 trial。
|
|
6
|
+
* 重活下沉 auto-race.js / serial-trial.js,本文件仅做顺序编排。
|
|
7
|
+
*/
|
|
8
|
+
export function createEngine(deps = {}) {
|
|
9
|
+
const { raceDeps, serialDeps } = deps;
|
|
10
|
+
async function run(state) {
|
|
11
|
+
const race = await runAutoRace(state, raceDeps);
|
|
12
|
+
if (race.done) return;
|
|
13
|
+
await runSerialTrial({ ...state, order: race.order }, serialDeps);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
return { run };
|
|
17
|
+
}
|
|
@@ -13,22 +13,6 @@ import { apiKindOf } from "../api-kind.js";
|
|
|
13
13
|
* 内部组合 Policy→Engine:解析 header/model → 产 order → 委托 engine 执行
|
|
14
14
|
* gateway 仅薄适配:readBody + request:received hook + 调 execute
|
|
15
15
|
*/
|
|
16
|
-
/**
|
|
17
|
-
* 指定 free 模型时是否允许横向切同池兄弟(BUG-7)。
|
|
18
|
-
* 缺省开:opencode 免费池的裸 id 模型(`mimo-v2.6-flash-free` 等)语义上就是"免费额度内随便用",
|
|
19
|
-
* 单个模型额度耗尽不该让整条链路失败。逃生阀 `MSLXDFF_FREE_POOL_FALLBACK=0` 回到"显式指定即锁死"。
|
|
20
|
-
* 只在**非 lockModel**(即不经组内 model-lock 转发)时生效。
|
|
21
|
-
*/
|
|
22
|
-
// 同池互备最多横向试几个(含首个指定的那个):额度类失败常见于"整池都满",
|
|
23
|
-
// 扫全池只会把快速失败拖成分钟级,试前几个足够区分"这个模型满"与"这池满"。
|
|
24
|
-
const FREE_POOL_MAX = 4;
|
|
25
|
-
|
|
26
|
-
export function freePoolFallbackOn(env = process.env) {
|
|
27
|
-
const raw = env.MSLXDFF_FREE_POOL_FALLBACK;
|
|
28
|
-
if (raw === undefined || raw === null || raw === "") return true;
|
|
29
|
-
const s = String(raw).trim().toLowerCase();
|
|
30
|
-
return !(s === "0" || s === "false" || s === "off" || s === "no");
|
|
31
|
-
}
|
|
32
16
|
|
|
33
17
|
export function createChatPipeline({ upstream, auto, logs, peers, groups, bus, token, plugins, maxHops } = {}) {
|
|
34
18
|
const engine = createEngine();
|
|
@@ -91,11 +75,10 @@ export function createChatPipeline({ upstream, auto, logs, peers, groups, bus, t
|
|
|
91
75
|
|
|
92
76
|
// order 推导 + plugin model:select 可改
|
|
93
77
|
// 语义:指定模型 = 死锁单模型(本机→组员同款,挂了就报挂,不兜其他 picks);只有 auto 才轮 picks
|
|
94
|
-
//
|
|
95
|
-
//
|
|
78
|
+
// 指定模型的额度耗尽时**不换模型**:横向只在同模型的组员/组长间接力(本机出口 IP 耗尽 → 换组员机器),
|
|
79
|
+
// 模型永不漂移。详见 serial-trial 的 order 单元素路径与 peer 接力。
|
|
96
80
|
// x-mslxdff-auto-provider 头可把 auto 候选限定到单供应商(opencode=裸 id 免费池),-chat 默认带
|
|
97
81
|
let order;
|
|
98
|
-
let poolFallback = false; // 指定 free 模型时的「同池互备」标记:只有额度类失败才允许继续换兄弟
|
|
99
82
|
if (lockModel) order = [requested];
|
|
100
83
|
else if (useAuto) {
|
|
101
84
|
let cands = auto ? await auto.candidates() : [""];
|
|
@@ -108,28 +91,13 @@ export function createChatPipeline({ upstream, auto, logs, peers, groups, bus, t
|
|
|
108
91
|
}
|
|
109
92
|
order = cands;
|
|
110
93
|
} else {
|
|
111
|
-
//
|
|
112
|
-
//
|
|
113
|
-
//
|
|
114
|
-
// candidatesFor 的持久化副作用(把指定模型加入勾选集)在任何分支都必须保留。
|
|
115
|
-
const wantFreePool = Boolean(auto && requested && freePoolFallbackOn() && isFreeModel(requested) && !String(requested).includes("/"));
|
|
94
|
+
// 指定模型 = 死锁单模型:额度耗尽只换组员/组长(同模型换机器),**绝不换模型**。
|
|
95
|
+
// candidatesFor 的持久化副作用(把显式指定的模型加入勾选集,供日后 auto 用)必须保留——
|
|
96
|
+
// 见 auto.js:180「显式指定某模型 = 认可它,自动加入勾选集」,历史上删它会丢勾选记录。
|
|
116
97
|
if (auto && requested) {
|
|
117
|
-
try {
|
|
118
|
-
const cands = await auto.candidatesFor(requested);
|
|
119
|
-
if (wantFreePool && Array.isArray(cands) && cands.length) {
|
|
120
|
-
// 上限截断:串行换人是"试一试"不是"扫全池",太多候选会把额度类失败也拖成分钟级
|
|
121
|
-
const samePool = cands
|
|
122
|
-
.filter((m) => m === requested || (isFreeModel(m) && !String(m).includes("/")))
|
|
123
|
-
.slice(0, FREE_POOL_MAX);
|
|
124
|
-
if (samePool.length > 1) {
|
|
125
|
-
order = samePool;
|
|
126
|
-
poolFallback = true;
|
|
127
|
-
evt("free-pool-fallback", { reqId, model: requested, pool: samePool, size: samePool.length });
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
} catch {}
|
|
98
|
+
try { await auto.candidatesFor(requested); } catch {}
|
|
131
99
|
}
|
|
132
|
-
|
|
100
|
+
order = [requested];
|
|
133
101
|
}
|
|
134
102
|
if (!order.length) order = [""];
|
|
135
103
|
const canFallback = order.length > 1;
|
|
@@ -163,7 +131,7 @@ export function createChatPipeline({ upstream, auto, logs, peers, groups, bus, t
|
|
|
163
131
|
await engine.run({
|
|
164
132
|
reqId, startedAt, req, res, body: req?.body, policy,
|
|
165
133
|
useAuto, lockModel, requested, hops,
|
|
166
|
-
canFallback, canForwardPeers,
|
|
134
|
+
canFallback, canForwardPeers,
|
|
167
135
|
perf0, stages, mark, evt, logCall, logError, done, handlerCtx,
|
|
168
136
|
auto, upstream, peers, groups, bus, token, plugins, logs,
|
|
169
137
|
order,
|