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.
Files changed (330) hide show
  1. package/README.md +3 -3
  2. package/bin/mslxdff.js +1 -1
  3. package/docs/cli_help_mini.md +146 -0
  4. package/package.json +38 -38
  5. package/plugins/README.md +14 -14
  6. package/plugins/prefer-model.mjs.example +14 -14
  7. package/src/anthropic/canonical-json.js +55 -0
  8. package/src/anthropic/count-tokens.js +61 -61
  9. package/src/anthropic/request-body.js +183 -126
  10. package/src/anthropic/request-shape.js +60 -0
  11. package/src/anthropic/session-id.js +58 -0
  12. package/src/anthropic/shared.js +18 -18
  13. package/src/anthropic/sse-aggregate.js +56 -56
  14. package/src/anthropic/tool-media.js +75 -0
  15. package/src/anthropic/translate.js +296 -287
  16. package/src/anthropic/web-search.js +361 -361
  17. package/src/api-kind.js +31 -31
  18. package/src/autostart.js +288 -288
  19. package/src/bench/probe.js +1 -1
  20. package/src/bench/runner.js +1 -1
  21. package/src/bench/via-probe.js +1 -1
  22. package/src/bench/via.js +144 -144
  23. package/src/bench/workbuddy-bench.js +1 -1
  24. package/src/chat/config.js +11 -11
  25. package/src/chat/cooling.js +81 -81
  26. package/src/chat/direct.js +58 -58
  27. package/src/chat/index.js +6 -6
  28. package/src/chat/spinner.js +38 -38
  29. package/src/chat/sse.js +69 -69
  30. package/src/chat/stats.js +247 -247
  31. package/src/chat/store.js +48 -48
  32. package/src/chat/tool-handlers.js +67 -67
  33. package/src/chat/tools.js +1 -1
  34. package/src/chat/upstream.js +59 -59
  35. package/src/chat-pipeline/auto-race.js +158 -158
  36. package/src/chat-pipeline/empty-turn.js +147 -147
  37. package/src/chat-pipeline/engine.js +17 -17
  38. package/src/chat-pipeline/index.js +8 -40
  39. package/src/chat-pipeline/serial-trial.js +279 -283
  40. package/src/chat-pipeline/terminal-verdict.js +132 -147
  41. package/src/chooser.js +54 -54
  42. package/src/claude-desktop/apply.js +101 -101
  43. package/src/claude-desktop/context1m.js +38 -38
  44. package/src/claude-desktop/doctor.js +146 -146
  45. package/src/claude-desktop/slots.js +152 -152
  46. package/src/cli/bootstrap.js +1 -1
  47. package/src/cli/commands/claude-desktop.js +284 -284
  48. package/src/cli/commands/daemon.js +231 -231
  49. package/src/cli/commands/model/list-live.js +22 -22
  50. package/src/cli/commands/model/list-providers.js +76 -76
  51. package/src/cli/commands/model/list-render.js +77 -77
  52. package/src/cli/commands/model/list-sort.js +52 -52
  53. package/src/cli/commands/model/list-tty.js +76 -76
  54. package/src/cli/commands/model/list.js +166 -166
  55. package/src/cli/commands/model/live-models.js +24 -24
  56. package/src/cli/commands/model/stats.js +43 -43
  57. package/src/cli/commands/model/status.js +47 -47
  58. package/src/cli/commands/model.js +51 -51
  59. package/src/cli/commands/provider/add.js +108 -108
  60. package/src/cli/commands/provider/allowlist.js +99 -99
  61. package/src/cli/commands/provider/cline-free.js +99 -99
  62. package/src/cli/commands/provider/cline-login.js +218 -218
  63. package/src/cli/commands/provider/cline-quota.js +65 -65
  64. package/src/cli/commands/provider/codearts-login.js +45 -45
  65. package/src/cli/commands/provider/config.js +119 -119
  66. package/src/cli/commands/provider/globalqwenwork-login.js +126 -126
  67. package/src/cli/commands/provider/keys-guard.js +50 -50
  68. package/src/cli/commands/provider/keys.js +161 -161
  69. package/src/cli/commands/provider/qoder-checkin.js +81 -81
  70. package/src/cli/commands/provider/qoder-login.js +102 -102
  71. package/src/cli/commands/provider/raccoon-login.js +180 -180
  72. package/src/cli/commands/provider/raccoon-password.js +162 -162
  73. package/src/cli/commands/provider/raccoon-quota.js +109 -109
  74. package/src/cli/commands/provider/traework-checkin.js +144 -144
  75. package/src/cli/commands/provider/traework-login.js +164 -164
  76. package/src/cli/commands/provider/workbuddy-login.js +153 -153
  77. package/src/cli/commands/provider/zcode-login.js +77 -77
  78. package/src/cli/commands/provider/zcode-quota.js +55 -55
  79. package/src/cli/commands/provider.js +1 -1
  80. package/src/cli/commands/stats.js +158 -149
  81. package/src/cli/commands/system.js +261 -261
  82. package/src/cli/commands/timezone.js +47 -47
  83. package/src/cli/commands/use-group.js +60 -60
  84. package/src/cli/commands/workbuddy.js +189 -189
  85. package/src/cli/format.js +141 -141
  86. package/src/cli/group-helpers.js +70 -70
  87. package/src/cli/help.js +80 -80
  88. package/src/cli/index.js +70 -70
  89. package/src/cli/interactive.js +121 -121
  90. package/src/cli/join-core.js +99 -99
  91. package/src/cli/join-wizard.js +175 -175
  92. package/src/cli/policy.js +136 -136
  93. package/src/cli/provider-row.js +126 -126
  94. package/src/cli/util.js +24 -24
  95. package/src/compat.js +53 -53
  96. package/src/events.js +38 -38
  97. package/src/free-lane.js +131 -131
  98. package/src/free-watcher.js +63 -63
  99. package/src/groups.js +262 -262
  100. package/src/logs.js +195 -195
  101. package/src/metrics.js +71 -62
  102. package/src/model-capabilities/context-lookup.js +65 -65
  103. package/src/model-capabilities/merge.js +142 -142
  104. package/src/model-trace.js +187 -187
  105. package/src/models.js +1 -1
  106. package/src/opencode-identity.js +72 -72
  107. package/src/peers.js +254 -254
  108. package/src/plugins.js +107 -107
  109. package/src/providers/AGENTS.md +49 -0
  110. package/src/providers/base.js +164 -164
  111. package/src/providers/classify.js +22 -22
  112. package/src/providers/cline/allowlist-sync.js +93 -93
  113. package/src/providers/cline/free-catalog.js +71 -71
  114. package/src/providers/cline/headers.js +37 -37
  115. package/src/providers/cline/index.js +130 -130
  116. package/src/providers/cline/models.js +150 -150
  117. package/src/providers/cline/usage.js +274 -274
  118. package/src/providers/codearts/auth-pool.js +148 -148
  119. package/src/providers/codearts/concurrency.js +34 -34
  120. package/src/providers/codearts/const.js +65 -65
  121. package/src/providers/codearts/dpop.js +95 -95
  122. package/src/providers/codearts/index.js +175 -175
  123. package/src/providers/codearts/login.js +214 -214
  124. package/src/providers/codearts/models.js +182 -182
  125. package/src/providers/codearts/sign.js +96 -96
  126. package/src/providers/codearts/sse.js +204 -204
  127. package/src/providers/codearts/stream.js +209 -209
  128. package/src/providers/codearts/sts.js +124 -124
  129. package/src/providers/codearts.js +1 -1
  130. package/src/providers/dispatcher.js +146 -146
  131. package/src/providers/generic.js +156 -156
  132. package/src/providers/globalqwenwork/account-store.js +141 -141
  133. package/src/providers/globalqwenwork/constants.js +73 -73
  134. package/src/providers/globalqwenwork/crypto.js +2 -2
  135. package/src/providers/globalqwenwork/http.js +2 -2
  136. package/src/providers/globalqwenwork/index.js +331 -331
  137. package/src/providers/globalqwenwork/payload.js +147 -147
  138. package/src/providers/globalqwenwork/rsa.js +2 -2
  139. package/src/providers/globalqwenwork/sse.js +2 -2
  140. package/src/providers/globalqwenwork/stream.js +2 -2
  141. package/src/providers/globalqwenwork.js +1 -1
  142. package/src/providers/globalworkbuddy/account-store.js +198 -198
  143. package/src/providers/globalworkbuddy/auth.js +97 -97
  144. package/src/providers/globalworkbuddy/catalog.js +138 -138
  145. package/src/providers/globalworkbuddy/constants.js +73 -73
  146. package/src/providers/globalworkbuddy/device-auth.js +120 -120
  147. package/src/providers/globalworkbuddy/errors.js +98 -98
  148. package/src/providers/globalworkbuddy/headers.js +89 -89
  149. package/src/providers/globalworkbuddy/models.js +96 -96
  150. package/src/providers/globalworkbuddy/payload.js +80 -80
  151. package/src/providers/index.js +5 -5
  152. package/src/providers/model-id.js +172 -172
  153. package/src/providers/opencode.js +19 -19
  154. package/src/providers/openrouter.js +31 -31
  155. package/src/providers/qoder/account-store.js +106 -106
  156. package/src/providers/qoder/aggregate.js +60 -60
  157. package/src/providers/qoder/baseprompt.json +591 -591
  158. package/src/providers/qoder/checkin.js +160 -160
  159. package/src/providers/qoder/constants.js +44 -44
  160. package/src/providers/qoder/encode.js +41 -41
  161. package/src/providers/qoder/fingerprint.js +38 -38
  162. package/src/providers/qoder/models.js +77 -77
  163. package/src/providers/qoder/oauth.js +84 -84
  164. package/src/providers/qoder/payload.js +162 -162
  165. package/src/providers/qoder/request.js +27 -27
  166. package/src/providers/qoder/session.js +134 -134
  167. package/src/providers/qoder/sticky.js +38 -38
  168. package/src/providers/qoder/stream.js +116 -116
  169. package/src/providers/qoder.js +1 -1
  170. package/src/providers/raccoon/account-store.js +216 -216
  171. package/src/providers/raccoon/auth.js +67 -67
  172. package/src/providers/raccoon/chat.js +228 -228
  173. package/src/providers/raccoon/const.js +180 -180
  174. package/src/providers/raccoon/credits.js +185 -185
  175. package/src/providers/raccoon/crypto.js +43 -43
  176. package/src/providers/raccoon/envelope.js +31 -31
  177. package/src/providers/raccoon/headers.js +45 -45
  178. package/src/providers/raccoon/index.js +216 -216
  179. package/src/providers/raccoon/login.js +279 -279
  180. package/src/providers/raccoon/models.js +160 -160
  181. package/src/providers/raccoon/password-login.js +102 -102
  182. package/src/providers/raccoon/qr-codewords.js +115 -115
  183. package/src/providers/raccoon/qr.js +236 -236
  184. package/src/providers/raccoon/sse.js +135 -135
  185. package/src/providers/responses-channel.js +120 -120
  186. package/src/providers/share-keys.js +53 -53
  187. package/src/providers/traework/account-store.js +234 -234
  188. package/src/providers/traework/chat.js +217 -217
  189. package/src/providers/traework/checkin.js +77 -77
  190. package/src/providers/traework/constants.js +41 -41
  191. package/src/providers/traework/errors.js +52 -52
  192. package/src/providers/traework/headers.js +79 -79
  193. package/src/providers/traework/index.js +132 -132
  194. package/src/providers/traework/market-identity.js +116 -116
  195. package/src/providers/traework/models.js +98 -98
  196. package/src/providers/traework/payload.js +86 -86
  197. package/src/providers/traework/sse.js +184 -184
  198. package/src/providers/traework/token.js +52 -52
  199. package/src/providers/traework.js +2 -2
  200. package/src/providers/workbuddy/account-store.js +186 -186
  201. package/src/providers/workbuddy/auth.js +158 -158
  202. package/src/providers/workbuddy/balance.js +86 -86
  203. package/src/providers/workbuddy/cat-travel.js +125 -125
  204. package/src/providers/workbuddy/checkin.js +75 -75
  205. package/src/providers/workbuddy/desktop-info.js +78 -78
  206. package/src/providers/workbuddy/growth-api.js +67 -67
  207. package/src/providers/workbuddy/growth-plans.js +63 -63
  208. package/src/providers/workbuddy/growth.js +181 -181
  209. package/src/providers/workbuddy/index.js +217 -217
  210. package/src/providers/workbuddy/models.js +126 -126
  211. package/src/providers/workbuddy/payload.js +141 -141
  212. package/src/providers/workbuddy/rotation-log.js +83 -83
  213. package/src/providers/workbuddy/sanitize-tools.js +61 -61
  214. package/src/providers/workbuddy/sdk-chat.js +26 -26
  215. package/src/providers/workbuddy-balance.js +78 -78
  216. package/src/providers/zcode/account-store.js +129 -129
  217. package/src/providers/zcode/auth.js +28 -28
  218. package/src/providers/zcode/chat.js +179 -179
  219. package/src/providers/zcode/const.js +54 -54
  220. package/src/providers/zcode/context-shape.js +162 -162
  221. package/src/providers/zcode/headers.js +93 -93
  222. package/src/providers/zcode/index.js +124 -124
  223. package/src/providers/zcode/models.js +65 -65
  224. package/src/providers/zcode/oauth.js +120 -120
  225. package/src/providers/zcode/quota.js +176 -176
  226. package/src/providers/zcode/sse.js +196 -196
  227. package/src/readline-compat.js +25 -25
  228. package/src/responses/translate.js +311 -311
  229. package/src/routes/AGENTS.md +37 -0
  230. package/src/routes/chat/broadband-handler.js +72 -72
  231. package/src/routes/chat/empty-turn-report.js +31 -31
  232. package/src/routes/chat/exhausted-handler.js +87 -87
  233. package/src/routes/chat/hedge-handler.js +130 -130
  234. package/src/routes/chat/index.js +1 -1
  235. package/src/routes/chat/local-handler.js +63 -63
  236. package/src/routes/chat/peer-handler.js +81 -81
  237. package/src/routes/chat.js +3 -3
  238. package/src/routes/fallback.js +88 -88
  239. package/src/routes/groups-relay.js +214 -214
  240. package/src/routes/groups.js +122 -122
  241. package/src/routes/helpers.js +93 -83
  242. package/src/routes/index.js +147 -147
  243. package/src/routes/messages-route.js +375 -365
  244. package/src/routes/peers.js +10 -2
  245. package/src/routes/relay-queue.js +181 -181
  246. package/src/routes/relay.js +60 -60
  247. package/src/routes/responses-route.js +213 -213
  248. package/src/routes/stream-body.js +84 -84
  249. package/src/routes/stream-hold.js +337 -337
  250. package/src/routes/stream-scan.js +366 -366
  251. package/src/routes.js +3 -3
  252. package/src/runtime/auto-update.js +113 -113
  253. package/src/runtime/broadband-stream.js +79 -79
  254. package/src/runtime/broadband.js +103 -103
  255. package/src/runtime/group-sync.js +81 -81
  256. package/src/runtime/keep-warm.js +120 -120
  257. package/src/runtime/lifecycle-forensics.js +116 -116
  258. package/src/runtime/lifecycle-log.js +87 -87
  259. package/src/runtime/log-stamp.js +73 -73
  260. package/src/runtime/proc-info.js +137 -137
  261. package/src/runtime/qoder-checkin.js +93 -93
  262. package/src/runtime/raccoon-checkin.js +126 -126
  263. package/src/runtime/server-lifecycle.js +189 -189
  264. package/src/runtime/traework-checkin.js +118 -118
  265. package/src/runtime/workbuddy-checkin.js +120 -120
  266. package/src/runtime/workbuddy-growth.js +133 -133
  267. package/src/state/facade.js +58 -58
  268. package/src/state/memory.js +162 -162
  269. package/src/state/merge.js +25 -25
  270. package/src/state/migrations/cline-unify.js +94 -94
  271. package/src/state/migrations.js +33 -33
  272. package/src/state/persist.js +42 -42
  273. package/src/state/provider-config.js +142 -142
  274. package/src/state/schemas/group.js +31 -31
  275. package/src/state/schemas/model.js +94 -94
  276. package/src/state/schemas/peer.js +31 -31
  277. package/src/state/schemas/port.js +10 -10
  278. package/src/state/schemas/provider.js +202 -202
  279. package/src/state/schemas/timezone.js +70 -70
  280. package/src/state/schemas/token.js +48 -48
  281. package/src/state/schemas/use-group.js +102 -102
  282. package/src/state/store.js +176 -176
  283. package/src/state.js +1 -1
  284. package/src/sync-claude-desktop.js +234 -234
  285. package/src/sync-claude.js +152 -152
  286. package/src/sync-codex.js +116 -116
  287. package/src/sync-workbuddy.js +158 -158
  288. package/src/talk-full-redact.js +129 -129
  289. package/src/talk-full.js +131 -131
  290. package/src/talk-log.js +257 -257
  291. package/src/text-tokens.js +52 -52
  292. package/src/thinking-effort.js +67 -67
  293. package/src/time.js +106 -106
  294. package/src/timeline.js +26 -26
  295. package/src/transport/index.js +1 -1
  296. package/src/upstream-engine/index.js +74 -74
  297. package/src/upstream-engine/mode.js +15 -15
  298. package/src/upstream-engine/sdk/attempt.js +221 -221
  299. package/src/upstream-engine/sdk/chat.js +28 -28
  300. package/src/upstream-engine/sdk/convert.js +192 -192
  301. package/src/upstream-engine/sdk/diagnose.js +62 -62
  302. package/src/upstream-engine/sdk/dispatch.js +55 -55
  303. package/src/upstream-engine/sdk/responses.js +176 -176
  304. package/src/upstream-engine/sdk/sse.js +166 -166
  305. package/src/upstream-responses.js +305 -305
  306. package/src/usage/cache-fields.js +58 -0
  307. package/src/usage/record.js +109 -106
  308. package/src/usage/report.js +209 -195
  309. package/src/v6pool/claim.js +157 -157
  310. package/src/v6pool/config.js +65 -65
  311. package/src/v6pool/detect.js +130 -130
  312. package/src/v6pool/index.js +152 -152
  313. package/src/v6pool/prefix.js +140 -140
  314. package/src/v6pool/probe.js +40 -40
  315. package/src/v6pool/report.js +104 -104
  316. package/src/v6pool/rotate.js +263 -263
  317. package/src/warp-pool/config.js +74 -74
  318. package/src/warp-pool/health.js +106 -106
  319. package/src/warp-pool/identity.js +141 -141
  320. package/src/warp-pool/index.js +358 -358
  321. package/src/warp-pool/keys.js +29 -29
  322. package/src/warp-pool/nodes.js +95 -95
  323. package/src/warp-pool/ports.js +160 -160
  324. package/src/warp-pool/register.js +113 -113
  325. package/src/warp-pool/report.js +232 -232
  326. package/src/warp-pool/revive.js +168 -168
  327. package/src/warp-pool/rotate.js +214 -214
  328. package/src/warp-pool/strategy.js +43 -43
  329. package/src/warp-pool/verdict.js +69 -69
  330. package/src/warp-pool/wireproxy.js +162 -162
@@ -1,231 +1,231 @@
1
- import { existsSync, writeFileSync } from "node:fs";
2
- import { startDaemon, stopDaemon, readPid, readPidVersion, isPidAlive, pidFile, logFile, waitPidGone, reapGhostDaemons } from "../../daemon.js";
3
- import { setPort } from "../../state.js";
4
- import { logDir, eventsFile, callsFile, errorsFile } from "../../logs.js";
5
- import { effectivePort, waitForHealth, stopDaemonIfOutdated, compareSemver, argValue } from "../policy.js";
6
- import { printStatus } from "../status.js";
7
- import { findDaemons, fmtAlive } from "../../runtime/proc-info.js";
8
-
9
- /** 停 daemon 并**等它真死**:只发 SIGTERM 就起新的会留下幽灵(隧道子进程把事件循环钉住,见 daemon.js waitPidGone)。 */
10
- async function stopDaemonHard(reason) {
11
- const pid = readPid();
12
- const r = stopDaemon({ reason });
13
- if (pid && r.stopped) {
14
- const g = await waitPidGone(pid);
15
- if (!g.died) console.log(`⚠ 旧 daemon (pid ${pid}) 等了 ${Math.round(g.waitedMs / 1000)}s 仍没退(已补 SIGKILL)—— 若仍在世,它会和新的抢端口`);
16
- else if (g.forced) console.log(`旧 daemon (pid ${pid}) 未响应 SIGTERM,已 SIGKILL(等了 ${Math.round(g.waitedMs / 1000)}s)`);
17
- }
18
- return r;
19
- }
20
-
21
- export async function handleStop(args) {
22
- if (!(args.includes("-stop") || args.includes("--stop"))) return false;
23
- const { stopped, pid, reason } = await stopDaemonHard("stop");
24
- if (stopped) {
25
- console.log(`mslxdff daemon stopped (pid ${pid})`);
26
- } else if (pid) {
27
- // 「有 pid 但没停成」≠「没在跑」:杀被拒时它还在监听端口,说成 not running 会让人以为可以安全重启。
28
- console.log(`mslxdff daemon NOT stopped (pid ${pid})${reason ? `: ${reason}` : ""}`);
29
- process.exit(1);
30
- } else {
31
- console.log(`mslxdff daemon not running${reason ? ` (${reason})` : ""}`);
32
- }
33
- process.exit(0);
34
- }
35
-
36
- export async function handleRestart(args, VERSION) {
37
- if (!((args.includes("-restart") || args.includes("--restart")) && !process.env.MSLXDFF_DAEMON)) return false;
38
- const pid = readPid();
39
- const alive = pid ? isPidAlive(pid) : false;
40
- if (alive) {
41
- console.log(`restarting daemon (pid ${pid})...`);
42
- const r = await stopDaemonHard("restart");
43
- // 停不掉就别起新的(BUG-29):旧 daemon 还占着端口 ⇒ 新进程 bind 必 EADDRINUSE 立刻退出,
44
- // 而 waitForHealth 打的是**旧** daemon 的 /health(照样 200)、Windows 上 findDaemons 读不到 /proc
45
- // 恒返回空 ⇒ 最后打印「restarted as ... (pid <新的死 pid>)」,把「重启失败且旧版还在跑」谎报成成功。
46
- if (!r.stopped && r.pid) {
47
- console.error(`⚠ 旧 daemon (pid ${r.pid}) 没能停掉:${r.reason}`);
48
- console.error(" 继续起新进程只会让它在 EADDRINUSE 上立刻退出,而旧版仍在应答 —— 已中止。");
49
- console.error(" 请用管理员终端重试(mslxdff -stop,或 taskkill /PID " + r.pid + " /F)后再 -restart。");
50
- process.exit(1);
51
- }
52
- } else if (pid) {
53
- console.log(`daemon pid ${pid} is stale (not running) — starting fresh...`);
54
- try { stopDaemon({ reason: "restart" }); } catch {}
55
- } else {
56
- console.log("daemon not running — starting...");
57
- }
58
- // 结构性盲区收口:不在 daemon.pid 里的 daemon 永远杀不到(真机:Oct16 起的旧 daemon 活了一整天,
59
- // 与新版互杀 warp-pool 端口;两边日志格式交错才暴露)。起新的之前先清干净。
60
- const ghosts = await reapGhostDaemons({ log: (m) => console.log(m) });
61
- if (ghosts.length) console.log(`已清掉 ${ghosts.length} 个不在册的 daemon(pid ${ghosts.map((g) => g.pid).join(", ")})`);
62
- const port = effectivePort(args);
63
- const spawnedPid = startDaemon([]);
64
- // 只认**刚起的那个 pid**:旧 daemon 若仍占着端口,它的 /health 同样 200(BUG-29 谎报的根源)。
65
- const health = await waitForHealth(port, 4000, { expectPid: spawnedPid });
66
- // 诚实报错:/health 可能由**残留的旧 daemon** 应答(它也在监听同一个端口),所以不能只看 health。
67
- // 新进程已经死了就更不该报成功——Windows 上 EADDRINUSE 秒退时 CLI 什么都收不到。
68
- const leftover = findDaemons({ self: spawnedPid });
69
- const leftTxt = leftover.map((g) => `pid ${g.pid}(已运行 ${fmtAlive(g.aliveSec)})`).join(";");
70
- if (!isPidAlive(spawnedPid)) {
71
- console.error(`⚠ 新 daemon (pid ${spawnedPid}) 启动后立即退出 —— 端口 ${port} 大概仍被旧进程占着(EADDRINUSE)。`);
72
- if (leftover.length) console.error(` 仍在跑的旧 daemon:${leftTxt}`);
73
- console.error(` 详见 ${logFile()}`);
74
- process.exit(1);
75
- }
76
- if (leftover.length) {
77
- console.log(`⚠ 仍有 ${leftover.length} 个旧 daemon 在跑:${leftTxt} —— 它们会和新的抢出口池端口,请 kill 掉`);
78
- } else if (health.ok) console.log(`mslxdff v${VERSION} restarted as a background daemon (pid ${spawnedPid})`);
79
- else console.log(`mslxdff v${VERSION} restarted (pid ${spawnedPid}) — health check pending (http://127.0.0.1:${port}/health)`);
80
- console.log(`endpoint: http://localhost:${port}/v1`);
81
- console.log(`log: ${logFile()}`);
82
- console.log(`pid: ${pidFile()}`);
83
- process.exit(0);
84
- }
85
-
86
- export async function handlePort(args) {
87
- const portArg = argValue(args, "-port", "--port");
88
- if (!portArg || process.env.MSLXDFF_DAEMON) return false;
89
- const port = Number(portArg);
90
- if (!Number.isInteger(port) || port <= 0 || port > 65535) {
91
- console.error(`invalid port: ${portArg}`);
92
- process.exit(1);
93
- }
94
- setPort(port);
95
- const daemon = readPid();
96
- if (daemon) {
97
- // 同 BUG-29:老 daemon 还在(同一个配置端口)时起新的一定抢不到端口,且 -port 已落盘,
98
- // 谎报「restarted on port N」会让人以为新端口已生效,实际仍是旧的(甚至旧的监听着旧端口)。
99
- const r = stopDaemon({ reason: "restart" });
100
- if (!r.stopped && r.pid) {
101
- console.error(`⚠ 旧 daemon (pid ${r.pid}) 没能停掉:${r.reason}`);
102
- console.error(` 端口已保存为 ${port},但它要等旧进程退出后才生效。已中止,未启动新进程。`);
103
- process.exit(1);
104
- }
105
- const spawned = startDaemon(["-port", String(port)]);
106
- const health = await waitForHealth(port, 4000, { expectPid: spawned });
107
- if (!isPidAlive(spawned)) {
108
- console.error(`⚠ 新 daemon (pid ${spawned}) 启动后立即退出 —— 端口 ${port} 大概仍被占用(EADDRINUSE)。详见 ${logFile()}`);
109
- process.exit(1);
110
- }
111
- console.log(`mslxdff restarted on port ${port} (pid ${spawned})${health.ok ? "" : " — health check pending"}`);
112
- console.log(`endpoint: http://localhost:${port}/v1`);
113
- } else {
114
- console.log(`port saved: ${port} (daemon not running; takes effect on next start)`);
115
- }
116
- process.exit(0);
117
- }
118
-
119
- export async function handleDaemonFlag(args, VERSION) {
120
- if (!(args.includes("-d") || args.includes("--daemon"))) return false;
121
- if (!process.env.MSLXDFF_DAEMON) {
122
- const port = effectivePort(args);
123
- stopDaemonIfOutdated(VERSION);
124
- const keptPid = readPid();
125
- if (keptPid && isPidAlive(keptPid)) {
126
- const rv = readPidVersion();
127
- if (rv && compareSemver(rv, VERSION) > 0) {
128
- await printStatus(VERSION);
129
- console.log(`daemon already running newer v${rv} — not starting v${VERSION}`);
130
- process.exit(0);
131
- }
132
- }
133
- const spawnedPid = startDaemon(args.filter((a) => a !== "-d" && a !== "--daemon"));
134
- const health = await waitForHealth(port, 4000, { expectPid: spawnedPid });
135
- // 起完立刻死了 = 端口被占(旧 daemon 没清掉)。报「started」会让人以为它在服务。
136
- if (!isPidAlive(spawnedPid)) {
137
- console.error(`⚠ daemon (pid ${spawnedPid}) 启动后立即退出 —— 端口 ${port} 大概仍被占用(EADDRINUSE)。详见 ${logFile()}`);
138
- process.exit(1);
139
- }
140
- console.log(`mslxdff daemon started (pid ${spawnedPid})${health.ok ? "" : " — health check pending"}`);
141
- console.log(`log: ${logFile()}`);
142
- console.log(`pid: ${pidFile()}`);
143
- process.exit(0);
144
- }
145
- return false; // we ARE the daemon — fall through to bootstrap
146
- }
147
-
148
- export async function handleDebug(args) {
149
- if (!(args.includes("-debug") || args.includes("--debug"))) return false;
150
- // systemd 自启协同:若后台 daemon 由 user service(Restart=always, RestartSec=3)托管,
151
- // 仅 stopDaemon() 会让 systemd 3 秒后拉起新实例 → 抢 8989 → EADDRINUSE 自愈反杀本 debug 前台。
152
- // 必须先 systemctl stop(主动停止不会被 Restart 拉起)。
153
- if (process.platform === "linux") {
154
- try {
155
- const { execFile } = await import("node:child_process");
156
- const active = await new Promise((res) => execFile("systemctl", ["--user", "is-active", "mslxdff"], { windowsHide: true, timeout: 4000 }, (e, so) => res(String(so || "").trim())));
157
- if (active === "active") {
158
- await new Promise((res) => execFile("systemctl", ["--user", "stop", "mslxdff"], { windowsHide: true, timeout: 6000 }, () => res()));
159
- console.log("[debug] stopped systemd user service (mslxdff) — it will be restarted on exit");
160
- }
161
- } catch {}
162
- }
163
- const { stopped, pid } = stopDaemon({ reason: "debug-takeover" });
164
- if (stopped) console.log(`[debug] stopped background daemon (pid ${pid})`);
165
- // 等旧 daemon 真正退出再抢端口(Windows 端口释放有延迟,否则 EADDRINUSE 会让 debug 立即崩)
166
- if (stopped && pid) {
167
- const t0 = Date.now();
168
- while (isPidAlive(pid) && Date.now() - t0 < 4000) {
169
- await new Promise((r) => setTimeout(r, 100));
170
- }
171
- await new Promise((r) => setTimeout(r, 150));
172
- }
173
- try {
174
- const dir = logDir();
175
- const toClear = [eventsFile(), callsFile(), errorsFile(), logFile()];
176
- let cleared = 0;
177
- for (const f of toClear) {
178
- try {
179
- if (existsSync(f)) {
180
- writeFileSync(f, "");
181
- cleared++;
182
- }
183
- } catch {}
184
- }
185
- console.log(`[debug] 已清理旧日志 ${cleared} 个文件 (${dir}),本次会话干净输出`);
186
- } catch {}
187
- console.log("--- live (Ctrl+C: stop debugging and restore background daemon) ---");
188
- process.env.MSLXDFF_DEBUG = "1";
189
- process.env.MSLXDFF_DAEMON = "1";
190
- return false; // fall through to daemon body
191
- }
192
-
193
- export async function handleBareRun(args, VERSION) {
194
- if (process.env.MSLXDFF_DAEMON) return false;
195
- const pid = readPid();
196
- if (pid && isPidAlive(pid)) {
197
- const rv = readPidVersion();
198
- if (rv && compareSemver(rv, VERSION) >= 0) {
199
- await printStatus(VERSION);
200
- const { printHelp } = await import("../help.js");
201
- printHelp(VERSION);
202
- process.exit(0);
203
- }
204
- }
205
- const port = effectivePort(args);
206
- stopDaemonIfOutdated(VERSION);
207
- const pid2 = readPid();
208
- if (pid2 && isPidAlive(pid2)) {
209
- const rv2 = readPidVersion();
210
- if (rv2 && compareSemver(rv2, VERSION) >= 0) {
211
- await printStatus(VERSION);
212
- const { printHelp } = await import("../help.js");
213
- printHelp(VERSION);
214
- process.exit(0);
215
- }
216
- }
217
- const spawnedPid = startDaemon([]);
218
- const health = await waitForHealth(port, 4000, { expectPid: spawnedPid });
219
- // 裸跑是用户最常敲的命令,更不能谎报:旧 daemon 若仍占端口,新进程 EADDRINUSE 秒退,
220
- // 而 waitForHealth 打的是旧 daemon 的 /health(照样 200)——见 BUG-29/30。
221
- if (!isPidAlive(spawnedPid)) {
222
- console.error(`⚠ daemon (pid ${spawnedPid}) 启动后立即退出 —— 端口 ${port} 大概仍被占用(EADDRINUSE)。详见 ${logFile()}`);
223
- process.exit(1);
224
- }
225
- console.log(`mslxdff v${VERSION} started as a background daemon (pid ${spawnedPid})${health.ok ? "" : " — health check pending"}`);
226
- console.log(`endpoint: http://localhost:${port}/v1`);
227
- console.log(`log: ${logFile()}`);
228
- console.log(`pid: ${pidFile()}`);
229
- console.log(`status: run \`mslxdff\` again (or \`mslxdff -status\`)`);
230
- process.exit(0);
231
- }
1
+ import { existsSync, writeFileSync } from "node:fs";
2
+ import { startDaemon, stopDaemon, readPid, readPidVersion, isPidAlive, pidFile, logFile, waitPidGone, reapGhostDaemons } from "../../daemon.js";
3
+ import { setPort } from "../../state.js";
4
+ import { logDir, eventsFile, callsFile, errorsFile } from "../../logs.js";
5
+ import { effectivePort, waitForHealth, stopDaemonIfOutdated, compareSemver, argValue } from "../policy.js";
6
+ import { printStatus } from "../status.js";
7
+ import { findDaemons, fmtAlive } from "../../runtime/proc-info.js";
8
+
9
+ /** 停 daemon 并**等它真死**:只发 SIGTERM 就起新的会留下幽灵(隧道子进程把事件循环钉住,见 daemon.js waitPidGone)。 */
10
+ async function stopDaemonHard(reason) {
11
+ const pid = readPid();
12
+ const r = stopDaemon({ reason });
13
+ if (pid && r.stopped) {
14
+ const g = await waitPidGone(pid);
15
+ if (!g.died) console.log(`⚠ 旧 daemon (pid ${pid}) 等了 ${Math.round(g.waitedMs / 1000)}s 仍没退(已补 SIGKILL)—— 若仍在世,它会和新的抢端口`);
16
+ else if (g.forced) console.log(`旧 daemon (pid ${pid}) 未响应 SIGTERM,已 SIGKILL(等了 ${Math.round(g.waitedMs / 1000)}s)`);
17
+ }
18
+ return r;
19
+ }
20
+
21
+ export async function handleStop(args) {
22
+ if (!(args.includes("-stop") || args.includes("--stop"))) return false;
23
+ const { stopped, pid, reason } = await stopDaemonHard("stop");
24
+ if (stopped) {
25
+ console.log(`mslxdff daemon stopped (pid ${pid})`);
26
+ } else if (pid) {
27
+ // 「有 pid 但没停成」≠「没在跑」:杀被拒时它还在监听端口,说成 not running 会让人以为可以安全重启。
28
+ console.log(`mslxdff daemon NOT stopped (pid ${pid})${reason ? `: ${reason}` : ""}`);
29
+ process.exit(1);
30
+ } else {
31
+ console.log(`mslxdff daemon not running${reason ? ` (${reason})` : ""}`);
32
+ }
33
+ process.exit(0);
34
+ }
35
+
36
+ export async function handleRestart(args, VERSION) {
37
+ if (!((args.includes("-restart") || args.includes("--restart")) && !process.env.MSLXDFF_DAEMON)) return false;
38
+ const pid = readPid();
39
+ const alive = pid ? isPidAlive(pid) : false;
40
+ if (alive) {
41
+ console.log(`restarting daemon (pid ${pid})...`);
42
+ const r = await stopDaemonHard("restart");
43
+ // 停不掉就别起新的(BUG-29):旧 daemon 还占着端口 ⇒ 新进程 bind 必 EADDRINUSE 立刻退出,
44
+ // 而 waitForHealth 打的是**旧** daemon 的 /health(照样 200)、Windows 上 findDaemons 读不到 /proc
45
+ // 恒返回空 ⇒ 最后打印「restarted as ... (pid <新的死 pid>)」,把「重启失败且旧版还在跑」谎报成成功。
46
+ if (!r.stopped && r.pid) {
47
+ console.error(`⚠ 旧 daemon (pid ${r.pid}) 没能停掉:${r.reason}`);
48
+ console.error(" 继续起新进程只会让它在 EADDRINUSE 上立刻退出,而旧版仍在应答 —— 已中止。");
49
+ console.error(" 请用管理员终端重试(mslxdff -stop,或 taskkill /PID " + r.pid + " /F)后再 -restart。");
50
+ process.exit(1);
51
+ }
52
+ } else if (pid) {
53
+ console.log(`daemon pid ${pid} is stale (not running) — starting fresh...`);
54
+ try { stopDaemon({ reason: "restart" }); } catch {}
55
+ } else {
56
+ console.log("daemon not running — starting...");
57
+ }
58
+ // 结构性盲区收口:不在 daemon.pid 里的 daemon 永远杀不到(真机:Oct16 起的旧 daemon 活了一整天,
59
+ // 与新版互杀 warp-pool 端口;两边日志格式交错才暴露)。起新的之前先清干净。
60
+ const ghosts = await reapGhostDaemons({ log: (m) => console.log(m) });
61
+ if (ghosts.length) console.log(`已清掉 ${ghosts.length} 个不在册的 daemon(pid ${ghosts.map((g) => g.pid).join(", ")})`);
62
+ const port = effectivePort(args);
63
+ const spawnedPid = startDaemon([]);
64
+ // 只认**刚起的那个 pid**:旧 daemon 若仍占着端口,它的 /health 同样 200(BUG-29 谎报的根源)。
65
+ const health = await waitForHealth(port, 4000, { expectPid: spawnedPid });
66
+ // 诚实报错:/health 可能由**残留的旧 daemon** 应答(它也在监听同一个端口),所以不能只看 health。
67
+ // 新进程已经死了就更不该报成功——Windows 上 EADDRINUSE 秒退时 CLI 什么都收不到。
68
+ const leftover = findDaemons({ self: spawnedPid });
69
+ const leftTxt = leftover.map((g) => `pid ${g.pid}(已运行 ${fmtAlive(g.aliveSec)})`).join(";");
70
+ if (!isPidAlive(spawnedPid)) {
71
+ console.error(`⚠ 新 daemon (pid ${spawnedPid}) 启动后立即退出 —— 端口 ${port} 大概仍被旧进程占着(EADDRINUSE)。`);
72
+ if (leftover.length) console.error(` 仍在跑的旧 daemon:${leftTxt}`);
73
+ console.error(` 详见 ${logFile()}`);
74
+ process.exit(1);
75
+ }
76
+ if (leftover.length) {
77
+ console.log(`⚠ 仍有 ${leftover.length} 个旧 daemon 在跑:${leftTxt} —— 它们会和新的抢出口池端口,请 kill 掉`);
78
+ } else if (health.ok) console.log(`mslxdff v${VERSION} restarted as a background daemon (pid ${spawnedPid})`);
79
+ else console.log(`mslxdff v${VERSION} restarted (pid ${spawnedPid}) — health check pending (http://127.0.0.1:${port}/health)`);
80
+ console.log(`endpoint: http://localhost:${port}/v1`);
81
+ console.log(`log: ${logFile()}`);
82
+ console.log(`pid: ${pidFile()}`);
83
+ process.exit(0);
84
+ }
85
+
86
+ export async function handlePort(args) {
87
+ const portArg = argValue(args, "-port", "--port");
88
+ if (!portArg || process.env.MSLXDFF_DAEMON) return false;
89
+ const port = Number(portArg);
90
+ if (!Number.isInteger(port) || port <= 0 || port > 65535) {
91
+ console.error(`invalid port: ${portArg}`);
92
+ process.exit(1);
93
+ }
94
+ setPort(port);
95
+ const daemon = readPid();
96
+ if (daemon) {
97
+ // 同 BUG-29:老 daemon 还在(同一个配置端口)时起新的一定抢不到端口,且 -port 已落盘,
98
+ // 谎报「restarted on port N」会让人以为新端口已生效,实际仍是旧的(甚至旧的监听着旧端口)。
99
+ const r = stopDaemon({ reason: "restart" });
100
+ if (!r.stopped && r.pid) {
101
+ console.error(`⚠ 旧 daemon (pid ${r.pid}) 没能停掉:${r.reason}`);
102
+ console.error(` 端口已保存为 ${port},但它要等旧进程退出后才生效。已中止,未启动新进程。`);
103
+ process.exit(1);
104
+ }
105
+ const spawned = startDaemon(["-port", String(port)]);
106
+ const health = await waitForHealth(port, 4000, { expectPid: spawned });
107
+ if (!isPidAlive(spawned)) {
108
+ console.error(`⚠ 新 daemon (pid ${spawned}) 启动后立即退出 —— 端口 ${port} 大概仍被占用(EADDRINUSE)。详见 ${logFile()}`);
109
+ process.exit(1);
110
+ }
111
+ console.log(`mslxdff restarted on port ${port} (pid ${spawned})${health.ok ? "" : " — health check pending"}`);
112
+ console.log(`endpoint: http://localhost:${port}/v1`);
113
+ } else {
114
+ console.log(`port saved: ${port} (daemon not running; takes effect on next start)`);
115
+ }
116
+ process.exit(0);
117
+ }
118
+
119
+ export async function handleDaemonFlag(args, VERSION) {
120
+ if (!(args.includes("-d") || args.includes("--daemon"))) return false;
121
+ if (!process.env.MSLXDFF_DAEMON) {
122
+ const port = effectivePort(args);
123
+ stopDaemonIfOutdated(VERSION);
124
+ const keptPid = readPid();
125
+ if (keptPid && isPidAlive(keptPid)) {
126
+ const rv = readPidVersion();
127
+ if (rv && compareSemver(rv, VERSION) > 0) {
128
+ await printStatus(VERSION);
129
+ console.log(`daemon already running newer v${rv} — not starting v${VERSION}`);
130
+ process.exit(0);
131
+ }
132
+ }
133
+ const spawnedPid = startDaemon(args.filter((a) => a !== "-d" && a !== "--daemon"));
134
+ const health = await waitForHealth(port, 4000, { expectPid: spawnedPid });
135
+ // 起完立刻死了 = 端口被占(旧 daemon 没清掉)。报「started」会让人以为它在服务。
136
+ if (!isPidAlive(spawnedPid)) {
137
+ console.error(`⚠ daemon (pid ${spawnedPid}) 启动后立即退出 —— 端口 ${port} 大概仍被占用(EADDRINUSE)。详见 ${logFile()}`);
138
+ process.exit(1);
139
+ }
140
+ console.log(`mslxdff daemon started (pid ${spawnedPid})${health.ok ? "" : " — health check pending"}`);
141
+ console.log(`log: ${logFile()}`);
142
+ console.log(`pid: ${pidFile()}`);
143
+ process.exit(0);
144
+ }
145
+ return false; // we ARE the daemon — fall through to bootstrap
146
+ }
147
+
148
+ export async function handleDebug(args) {
149
+ if (!(args.includes("-debug") || args.includes("--debug"))) return false;
150
+ // systemd 自启协同:若后台 daemon 由 user service(Restart=always, RestartSec=3)托管,
151
+ // 仅 stopDaemon() 会让 systemd 3 秒后拉起新实例 → 抢 8989 → EADDRINUSE 自愈反杀本 debug 前台。
152
+ // 必须先 systemctl stop(主动停止不会被 Restart 拉起)。
153
+ if (process.platform === "linux") {
154
+ try {
155
+ const { execFile } = await import("node:child_process");
156
+ const active = await new Promise((res) => execFile("systemctl", ["--user", "is-active", "mslxdff"], { windowsHide: true, timeout: 4000 }, (e, so) => res(String(so || "").trim())));
157
+ if (active === "active") {
158
+ await new Promise((res) => execFile("systemctl", ["--user", "stop", "mslxdff"], { windowsHide: true, timeout: 6000 }, () => res()));
159
+ console.log("[debug] stopped systemd user service (mslxdff) — it will be restarted on exit");
160
+ }
161
+ } catch {}
162
+ }
163
+ const { stopped, pid } = stopDaemon({ reason: "debug-takeover" });
164
+ if (stopped) console.log(`[debug] stopped background daemon (pid ${pid})`);
165
+ // 等旧 daemon 真正退出再抢端口(Windows 端口释放有延迟,否则 EADDRINUSE 会让 debug 立即崩)
166
+ if (stopped && pid) {
167
+ const t0 = Date.now();
168
+ while (isPidAlive(pid) && Date.now() - t0 < 4000) {
169
+ await new Promise((r) => setTimeout(r, 100));
170
+ }
171
+ await new Promise((r) => setTimeout(r, 150));
172
+ }
173
+ try {
174
+ const dir = logDir();
175
+ const toClear = [eventsFile(), callsFile(), errorsFile(), logFile()];
176
+ let cleared = 0;
177
+ for (const f of toClear) {
178
+ try {
179
+ if (existsSync(f)) {
180
+ writeFileSync(f, "");
181
+ cleared++;
182
+ }
183
+ } catch {}
184
+ }
185
+ console.log(`[debug] 已清理旧日志 ${cleared} 个文件 (${dir}),本次会话干净输出`);
186
+ } catch {}
187
+ console.log("--- live (Ctrl+C: stop debugging and restore background daemon) ---");
188
+ process.env.MSLXDFF_DEBUG = "1";
189
+ process.env.MSLXDFF_DAEMON = "1";
190
+ return false; // fall through to daemon body
191
+ }
192
+
193
+ export async function handleBareRun(args, VERSION) {
194
+ if (process.env.MSLXDFF_DAEMON) return false;
195
+ const pid = readPid();
196
+ if (pid && isPidAlive(pid)) {
197
+ const rv = readPidVersion();
198
+ if (rv && compareSemver(rv, VERSION) >= 0) {
199
+ await printStatus(VERSION);
200
+ const { printHelp } = await import("../help.js");
201
+ printHelp(VERSION);
202
+ process.exit(0);
203
+ }
204
+ }
205
+ const port = effectivePort(args);
206
+ stopDaemonIfOutdated(VERSION);
207
+ const pid2 = readPid();
208
+ if (pid2 && isPidAlive(pid2)) {
209
+ const rv2 = readPidVersion();
210
+ if (rv2 && compareSemver(rv2, VERSION) >= 0) {
211
+ await printStatus(VERSION);
212
+ const { printHelp } = await import("../help.js");
213
+ printHelp(VERSION);
214
+ process.exit(0);
215
+ }
216
+ }
217
+ const spawnedPid = startDaemon([]);
218
+ const health = await waitForHealth(port, 4000, { expectPid: spawnedPid });
219
+ // 裸跑是用户最常敲的命令,更不能谎报:旧 daemon 若仍占端口,新进程 EADDRINUSE 秒退,
220
+ // 而 waitForHealth 打的是旧 daemon 的 /health(照样 200)——见 BUG-29/30。
221
+ if (!isPidAlive(spawnedPid)) {
222
+ console.error(`⚠ daemon (pid ${spawnedPid}) 启动后立即退出 —— 端口 ${port} 大概仍被占用(EADDRINUSE)。详见 ${logFile()}`);
223
+ process.exit(1);
224
+ }
225
+ console.log(`mslxdff v${VERSION} started as a background daemon (pid ${spawnedPid})${health.ok ? "" : " — health check pending"}`);
226
+ console.log(`endpoint: http://localhost:${port}/v1`);
227
+ console.log(`log: ${logFile()}`);
228
+ console.log(`pid: ${pidFile()}`);
229
+ console.log(`status: run \`mslxdff\` again (or \`mslxdff -status\`)`);
230
+ process.exit(0);
231
+ }
@@ -1,22 +1,22 @@
1
- // 交互式 `-models` 候选合并(从 list.js 拆出以守住 ≤10KB 体积门)。
2
- // allowAny 且空白名单的供应商(qoder/codearts 类)不写 allowlist,其模型只存在于
3
- // daemon 聚合的 /v1/models —— 不并入这些 id,该供应商在交互列表里「一个都挑不到」。
4
- import { loadProviderAllowedModels } from "../../../state.js";
5
-
6
- /** 把「空白名单且已启用」供应商的网关 live 模型并入候选(按前缀归属,去重)。 */
7
- export async function mergeLiveIds({ combinedIds, seen, knownProviders, liveIds }) {
8
- const needsLive = knownProviders.filter(
9
- (k) => String(k).toLowerCase() !== "opencode" && loadProviderAllowedModels(k).length === 0,
10
- );
11
- if (!needsLive.length) return;
12
- const { fetchDaemonModelIds } = await import("./live-models.js");
13
- const live = await fetchDaemonModelIds();
14
- for (const id of live) {
15
- if (liveIds.includes(id)) continue; // 单供应商缓存已含 → 不重复
16
- const pid = String(id).includes("/") ? String(id).split("/")[0].toLowerCase() : "opencode";
17
- if (!needsLive.some((k) => String(k).toLowerCase() === pid)) continue;
18
- if (seen.has(id)) continue;
19
- seen.add(id);
20
- combinedIds.push(id);
21
- }
22
- }
1
+ // 交互式 `-models` 候选合并(从 list.js 拆出以守住 ≤10KB 体积门)。
2
+ // allowAny 且空白名单的供应商(qoder/codearts 类)不写 allowlist,其模型只存在于
3
+ // daemon 聚合的 /v1/models —— 不并入这些 id,该供应商在交互列表里「一个都挑不到」。
4
+ import { loadProviderAllowedModels } from "../../../state.js";
5
+
6
+ /** 把「空白名单且已启用」供应商的网关 live 模型并入候选(按前缀归属,去重)。 */
7
+ export async function mergeLiveIds({ combinedIds, seen, knownProviders, liveIds }) {
8
+ const needsLive = knownProviders.filter(
9
+ (k) => String(k).toLowerCase() !== "opencode" && loadProviderAllowedModels(k).length === 0,
10
+ );
11
+ if (!needsLive.length) return;
12
+ const { fetchDaemonModelIds } = await import("./live-models.js");
13
+ const live = await fetchDaemonModelIds();
14
+ for (const id of live) {
15
+ if (liveIds.includes(id)) continue; // 单供应商缓存已含 → 不重复
16
+ const pid = String(id).includes("/") ? String(id).split("/")[0].toLowerCase() : "opencode";
17
+ if (!needsLive.some((k) => String(k).toLowerCase() === pid)) continue;
18
+ if (seen.has(id)) continue;
19
+ seen.add(id);
20
+ combinedIds.push(id);
21
+ }
22
+ }