@xixka/dsh-hub 0.2.4 → 0.2.6
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 +2 -0
- package/lib/account-pool.d.ts +54 -1
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +173 -5
- package/lib/account-pool.js.map +1 -1
- package/lib/account-probe.d.ts +15 -1
- package/lib/account-probe.d.ts.map +1 -1
- package/lib/account-probe.js +27 -3
- package/lib/account-probe.js.map +1 -1
- package/lib/aggregate-adapter.d.ts +7 -0
- package/lib/aggregate-adapter.d.ts.map +1 -1
- package/lib/aggregate-adapter.js +70 -1
- package/lib/aggregate-adapter.js.map +1 -1
- package/lib/aggregate-expiry.d.ts +66 -0
- package/lib/aggregate-expiry.d.ts.map +1 -1
- package/lib/aggregate-expiry.js +142 -3
- package/lib/aggregate-expiry.js.map +1 -1
- package/lib/auto-checkin.d.ts +285 -26
- package/lib/auto-checkin.d.ts.map +1 -1
- package/lib/auto-checkin.js +701 -40
- package/lib/auto-checkin.js.map +1 -1
- package/lib/autoclaw-auth.d.ts +29 -6
- package/lib/autoclaw-auth.d.ts.map +1 -1
- package/lib/autoclaw-auth.js +32 -8
- package/lib/autoclaw-auth.js.map +1 -1
- package/lib/autoclaw-credits.d.ts +1 -1
- package/lib/autoclaw-credits.js +1 -1
- package/lib/autoclaw-oauth.d.ts +108 -9
- package/lib/autoclaw-oauth.d.ts.map +1 -1
- package/lib/autoclaw-oauth.js +393 -25
- package/lib/autoclaw-oauth.js.map +1 -1
- package/lib/autoclaw-product.d.ts +9 -4
- package/lib/autoclaw-product.d.ts.map +1 -1
- package/lib/autoclaw-product.js +9 -4
- package/lib/autoclaw-product.js.map +1 -1
- package/lib/baizhi-adapter.d.ts +182 -0
- package/lib/baizhi-adapter.d.ts.map +1 -0
- package/lib/baizhi-adapter.js +457 -0
- package/lib/baizhi-adapter.js.map +1 -0
- package/lib/baizhi-auth.d.ts +205 -0
- package/lib/baizhi-auth.d.ts.map +1 -0
- package/lib/baizhi-auth.js +387 -0
- package/lib/baizhi-auth.js.map +1 -0
- package/lib/baizhi-browser-login.d.ts +141 -0
- package/lib/baizhi-browser-login.d.ts.map +1 -0
- package/lib/baizhi-browser-login.js +216 -0
- package/lib/baizhi-browser-login.js.map +1 -0
- package/lib/baizhi-credits.d.ts +220 -0
- package/lib/baizhi-credits.d.ts.map +1 -0
- package/lib/baizhi-credits.js +507 -0
- package/lib/baizhi-credits.js.map +1 -0
- package/lib/baizhi-messages.d.ts +98 -0
- package/lib/baizhi-messages.d.ts.map +1 -0
- package/lib/baizhi-messages.js +154 -0
- package/lib/baizhi-messages.js.map +1 -0
- package/lib/baizhi-product.d.ts +126 -0
- package/lib/baizhi-product.d.ts.map +1 -0
- package/lib/baizhi-product.js +135 -0
- package/lib/baizhi-product.js.map +1 -0
- package/lib/baizhi-rpc.d.ts +103 -0
- package/lib/baizhi-rpc.d.ts.map +1 -0
- package/lib/baizhi-rpc.js +272 -0
- package/lib/baizhi-rpc.js.map +1 -0
- package/lib/baizhi.d.ts +191 -0
- package/lib/baizhi.d.ts.map +1 -0
- package/lib/baizhi.js +298 -0
- package/lib/baizhi.js.map +1 -0
- package/lib/buddy-adapter.d.ts +57 -0
- package/lib/buddy-adapter.d.ts.map +1 -1
- package/lib/buddy-adapter.js +70 -7
- package/lib/buddy-adapter.js.map +1 -1
- package/lib/buddy-balance-rank.d.ts +40 -3
- package/lib/buddy-balance-rank.d.ts.map +1 -1
- package/lib/buddy-balance-rank.js +24 -1
- package/lib/buddy-balance-rank.js.map +1 -1
- package/lib/buddy-growth.d.ts +135 -10
- package/lib/buddy-growth.d.ts.map +1 -1
- package/lib/buddy-growth.js +1430 -234
- package/lib/buddy-growth.js.map +1 -1
- package/lib/canonical-models.d.ts.map +1 -1
- package/lib/canonical-models.js +31 -3
- package/lib/canonical-models.js.map +1 -1
- package/lib/cap-pow.d.ts +82 -0
- package/lib/cap-pow.d.ts.map +1 -0
- package/lib/cap-pow.js +209 -0
- package/lib/cap-pow.js.map +1 -0
- package/lib/client/jet-hub.js +76 -31
- package/lib/cline-adapter.d.ts +15 -1
- package/lib/cline-adapter.d.ts.map +1 -1
- package/lib/cline-adapter.js +61 -8
- package/lib/cline-adapter.js.map +1 -1
- package/lib/cline-models-dev.d.ts +16 -0
- package/lib/cline-models-dev.d.ts.map +1 -1
- package/lib/cline-models-dev.js +49 -1
- package/lib/cline-models-dev.js.map +1 -1
- package/lib/cline-models.d.ts +12 -10
- package/lib/cline-models.d.ts.map +1 -1
- package/lib/cline-models.js +40 -8
- package/lib/cline-models.js.map +1 -1
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +33 -2
- package/lib/codearts-credits.js.map +1 -1
- package/lib/credential-resolver.d.ts +27 -0
- package/lib/credential-resolver.d.ts.map +1 -1
- package/lib/credential-resolver.js +23 -0
- package/lib/credential-resolver.js.map +1 -1
- package/lib/credits.d.ts +18 -1
- package/lib/credits.d.ts.map +1 -1
- package/lib/credits.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +555 -31
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +48 -0
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +985 -35
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +54 -1
- package/lib/jet-hub-store.js.map +1 -1
- package/lib/llm-adapter.d.ts +54 -1
- package/lib/llm-adapter.d.ts.map +1 -1
- package/lib/llm-adapter.js +72 -3
- package/lib/llm-adapter.js.map +1 -1
- package/lib/llm-register-compat.d.ts +57 -0
- package/lib/llm-register-compat.d.ts.map +1 -1
- package/lib/llm-register-compat.js +91 -7
- package/lib/llm-register-compat.js.map +1 -1
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +8 -0
- package/lib/login.js.map +1 -1
- package/lib/magicrew-auth.d.ts.map +1 -1
- package/lib/magicrew-auth.js +4 -1
- package/lib/magicrew-auth.js.map +1 -1
- package/lib/magicrew-checkin.d.ts +139 -0
- package/lib/magicrew-checkin.d.ts.map +1 -0
- package/lib/magicrew-checkin.js +536 -0
- package/lib/magicrew-checkin.js.map +1 -0
- package/lib/magicrew-credits.d.ts +24 -1
- package/lib/magicrew-credits.d.ts.map +1 -1
- package/lib/magicrew-credits.js +175 -33
- package/lib/magicrew-credits.js.map +1 -1
- package/lib/magicrew-number.d.ts +68 -0
- package/lib/magicrew-number.d.ts.map +1 -0
- package/lib/magicrew-number.js +89 -0
- package/lib/magicrew-number.js.map +1 -0
- package/lib/magicrew-product.d.ts +75 -3
- package/lib/magicrew-product.d.ts.map +1 -1
- package/lib/magicrew-product.js +100 -0
- package/lib/magicrew-product.js.map +1 -1
- package/lib/minimax-dedup.d.ts +1 -1
- package/lib/minimax-dedup.d.ts.map +1 -1
- package/lib/minimax-dedup.js +1 -1
- package/lib/minimax-dedup.js.map +1 -1
- package/lib/model-catalog.d.ts +13 -0
- package/lib/model-catalog.d.ts.map +1 -1
- package/lib/model-catalog.js +12 -1
- package/lib/model-catalog.js.map +1 -1
- package/lib/models.d.ts +15 -1
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +112 -20
- package/lib/models.js.map +1 -1
- package/lib/monkeycode-adapter.d.ts +164 -0
- package/lib/monkeycode-adapter.d.ts.map +1 -0
- package/lib/monkeycode-adapter.js +438 -0
- package/lib/monkeycode-adapter.js.map +1 -0
- package/lib/monkeycode-auth.d.ts +222 -0
- package/lib/monkeycode-auth.d.ts.map +1 -0
- package/lib/monkeycode-auth.js +371 -0
- package/lib/monkeycode-auth.js.map +1 -0
- package/lib/monkeycode-browser-login.d.ts +180 -0
- package/lib/monkeycode-browser-login.d.ts.map +1 -0
- package/lib/monkeycode-browser-login.js +270 -0
- package/lib/monkeycode-browser-login.js.map +1 -0
- package/lib/monkeycode-credits.d.ts +277 -0
- package/lib/monkeycode-credits.d.ts.map +1 -0
- package/lib/monkeycode-credits.js +673 -0
- package/lib/monkeycode-credits.js.map +1 -0
- package/lib/monkeycode-messages.d.ts +137 -0
- package/lib/monkeycode-messages.d.ts.map +1 -0
- package/lib/monkeycode-messages.js +207 -0
- package/lib/monkeycode-messages.js.map +1 -0
- package/lib/monkeycode-product.d.ts +178 -0
- package/lib/monkeycode-product.d.ts.map +1 -0
- package/lib/monkeycode-product.js +156 -0
- package/lib/monkeycode-product.js.map +1 -0
- package/lib/monkeycode-rpc.d.ts +61 -0
- package/lib/monkeycode-rpc.d.ts.map +1 -0
- package/lib/monkeycode-rpc.js +342 -0
- package/lib/monkeycode-rpc.js.map +1 -0
- package/lib/monkeycode.d.ts +189 -0
- package/lib/monkeycode.d.ts.map +1 -0
- package/lib/monkeycode.js +296 -0
- package/lib/monkeycode.js.map +1 -0
- package/lib/oauth.d.ts +23 -0
- package/lib/oauth.d.ts.map +1 -1
- package/lib/oauth.js +98 -13
- package/lib/oauth.js.map +1 -1
- package/lib/openai-gateway/models.d.ts +23 -0
- package/lib/openai-gateway/models.d.ts.map +1 -1
- package/lib/openai-gateway/models.js +48 -19
- package/lib/openai-gateway/models.js.map +1 -1
- package/lib/openai-gateway/server.d.ts.map +1 -1
- package/lib/openai-gateway/server.js +6 -3
- package/lib/openai-gateway/server.js.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.d.ts.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.js +11 -0
- package/lib/openai-gateway/tencent-fingerprint.js.map +1 -1
- package/lib/opencode-proxy.d.ts +63 -0
- package/lib/opencode-proxy.d.ts.map +1 -1
- package/lib/opencode-proxy.js +80 -36
- package/lib/opencode-proxy.js.map +1 -1
- package/lib/permanent-lock-store.d.ts +7 -0
- package/lib/permanent-lock-store.d.ts.map +1 -1
- package/lib/permanent-lock-store.js +85 -10
- package/lib/permanent-lock-store.js.map +1 -1
- package/lib/provider-credits.d.ts.map +1 -1
- package/lib/provider-credits.js +167 -2
- package/lib/provider-credits.js.map +1 -1
- package/lib/provider-expiry.d.ts.map +1 -1
- package/lib/provider-expiry.js +67 -1
- package/lib/provider-expiry.js.map +1 -1
- package/lib/provider-onboarding.d.ts +10 -0
- package/lib/provider-onboarding.d.ts.map +1 -1
- package/lib/provider-onboarding.js +70 -0
- package/lib/provider-onboarding.js.map +1 -1
- package/lib/provider-registry.d.ts.map +1 -1
- package/lib/provider-registry.js +257 -16
- package/lib/provider-registry.js.map +1 -1
- package/lib/proxy-mask.d.ts.map +1 -1
- package/lib/proxy-mask.js +14 -1
- package/lib/proxy-mask.js.map +1 -1
- package/lib/qoder-adapter.d.ts +60 -2
- package/lib/qoder-adapter.d.ts.map +1 -1
- package/lib/qoder-adapter.js +215 -3
- package/lib/qoder-adapter.js.map +1 -1
- package/lib/qoder-credits.d.ts.map +1 -1
- package/lib/qoder-credits.js +34 -4
- package/lib/qoder-credits.js.map +1 -1
- package/lib/raccoon-adapter.d.ts +27 -0
- package/lib/raccoon-adapter.d.ts.map +1 -1
- package/lib/raccoon-adapter.js +38 -2
- package/lib/raccoon-adapter.js.map +1 -1
- package/lib/raccoon-product.d.ts.map +1 -1
- package/lib/raccoon-product.js +10 -4
- package/lib/raccoon-product.js.map +1 -1
- package/lib/refresh-scheduler.d.ts +14 -0
- package/lib/refresh-scheduler.d.ts.map +1 -1
- package/lib/refresh-scheduler.js +28 -2
- package/lib/refresh-scheduler.js.map +1 -1
- package/lib/service.d.ts +2 -0
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +55 -1
- package/lib/service.js.map +1 -1
- package/lib/session-cookie.d.ts +39 -0
- package/lib/session-cookie.d.ts.map +1 -0
- package/lib/session-cookie.js +69 -0
- package/lib/session-cookie.js.map +1 -0
- package/lib/types.d.ts +153 -5
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/lib/webdav-auto-sync.d.ts +8 -3
- package/lib/webdav-auto-sync.d.ts.map +1 -1
- package/lib/webdav-auto-sync.js +0 -0
- package/lib/webdav-auto-sync.js.map +1 -1
- package/lib/webdav-rpc.d.ts +13 -0
- package/lib/webdav-rpc.d.ts.map +1 -0
- package/lib/webdav-rpc.js +127 -0
- package/lib/webdav-rpc.js.map +1 -0
- package/lib/zcode-upstream.d.ts +23 -5
- package/lib/zcode-upstream.d.ts.map +1 -1
- package/lib/zcode-upstream.js +27 -9
- package/lib/zcode-upstream.js.map +1 -1
- package/package.json +3 -1
package/lib/magicrew-product.js
CHANGED
|
@@ -38,6 +38,40 @@ export const MAGICREW_MODELS_PATH = '/api/v1/flows/models';
|
|
|
38
38
|
export const MAGICREW_MODEL_POINTS_PATH = '/api/v1/products/model-points';
|
|
39
39
|
export const MAGICREW_POINTS_PATH = '/api/v1/quota/points/total';
|
|
40
40
|
export const MAGICREW_CHAT_PATH = '/v1/chat/completions';
|
|
41
|
+
/**
|
|
42
|
+
* 每日登录积分(= 真正的「每日签到」)。
|
|
43
|
+
*
|
|
44
|
+
* `POST <host>/api/v1/login-gift`,**请求体存在且为空串 `''`**(不是省略 body
|
|
45
|
+
* —— 照这句注释删掉 `body: ''` 就是协议回归),幂等,每天一次。
|
|
46
|
+
* - 国内站(超级麦吉):**+200 / 天**
|
|
47
|
+
* - 国际站(MagiCrew):**+50 / 天**
|
|
48
|
+
* - 当天已领 → HTTP 仍 200,但 body 里 `granted: false` +「今日已领取登录积分」
|
|
49
|
+
*
|
|
50
|
+
* ⚠️ 两站**逐字符同构**(同一个 Go 服务),故路径是共享常量而非产品字段。
|
|
51
|
+
* 来源:magpie 插件 `magpie-magicrew-auth/src/tasks.mjs:1-21` 的实测注释
|
|
52
|
+
* (2026-10-27 用真实网页登录抓包得到 `magicrew.ai` 的 `/login-gift`)。
|
|
53
|
+
*/
|
|
54
|
+
export const MAGICREW_LOGIN_GIFT_PATH = '/api/v1/login-gift';
|
|
55
|
+
/**
|
|
56
|
+
* 新手引导任务(=「新人奖励」)。
|
|
57
|
+
*
|
|
58
|
+
* - 查询:`GET <host>/api/v1/onboarding/tasks`
|
|
59
|
+
* - 完成:`PUT <host>/api/v1/onboarding/tasks/<code>/completion`(body 为 `{}`)
|
|
60
|
+
*
|
|
61
|
+
* 国内站 8 项,其中 7 项 PUT 即完成;第 8 项 `first_ai_work`
|
|
62
|
+
* 服务端回 **`9303`「该新人引导任务不支持手动完成」**,必须真发一条消息才置位。
|
|
63
|
+
* **每个账号一辈子一次**。
|
|
64
|
+
*
|
|
65
|
+
* ⚠️ 「8 项合计 500 积分」这个数字**在参考实现里查不到依据**(`api.mjs` 与
|
|
66
|
+
* `tasks.mjs` 只说了 8 项 / 7 项可 PUT,没给总分)⇒ 本仓不写死它,一切以
|
|
67
|
+
* 上游 `tasks[].points` 为准(`fetchMagicrewOnboardingStatus` 现场累加)。
|
|
68
|
+
*
|
|
69
|
+
* ⚠️⚠️ **国际站这个接口恒返回 `{participant_type: null, tasks: []}`** ——
|
|
70
|
+
* 那是「该账号没被登记进引导计划」,**不是**「已经领完了」。别把 0 项当成功
|
|
71
|
+
* 上报「新手福利 0 项已全部完成」(magpie 0.3.7 犯过这个错)。
|
|
72
|
+
* ⇒ 本插件照做(代码在,能领就领),但国际站预期就是「拿不到」。
|
|
73
|
+
*/
|
|
74
|
+
export const MAGICREW_ONBOARDING_TASKS_PATH = '/api/v1/onboarding/tasks';
|
|
41
75
|
/** 账号池凭据 ref 前缀(`jet-hub-store.ts` 的前缀表必须同步)。 */
|
|
42
76
|
export const MAGICREW_ACCOUNT_PREFIX = 'MAGICREW_ACCOUNT_';
|
|
43
77
|
/**
|
|
@@ -150,6 +184,72 @@ export const MAGICREW = Object.freeze({
|
|
|
150
184
|
chunkTimeoutMs: 300_000,
|
|
151
185
|
fallbackModels: MAGICREW_FALLBACK_MODELS,
|
|
152
186
|
});
|
|
187
|
+
/**
|
|
188
|
+
* **Magicrew 国际站**(MagiCrew,`www.magicrew.ai`)。
|
|
189
|
+
*
|
|
190
|
+
* ## 为什么是独立 provider 而不是 `MAGICREW` 的站点参数
|
|
191
|
+
*
|
|
192
|
+
* 判据与 `minimaxintl` / `autoclawintl` 同款(见 `src/minimax-product.ts` 文件头):
|
|
193
|
+
*
|
|
194
|
+
* | 判据 | 国内(超级麦吉) | 国际(MagiCrew) |
|
|
195
|
+
* |---|---|---|
|
|
196
|
+
* | 展示名 | 超级麦吉 | MagiCrew |
|
|
197
|
+
* | 网页 | `www.letsmagic.cn` | `www.magicrew.ai` |
|
|
198
|
+
* | API host | `i-magic-service.letsmagic.cn` | **`magic-service.magicrew.ai`** |
|
|
199
|
+
* | 登录体系 | 手机号 / 短信验证码 | 邮箱 / OAuth |
|
|
200
|
+
* | 每日签到 | +200 / 天 | **+50 / 天** |
|
|
201
|
+
* | 强制 org | 否(缺了仍 200) | **是**(缺了业务 API 回 `code 2182`「用户所在组织不存在」;
|
|
202
|
+
* 聊天网关 `/v1/*` 的形态**未定**,实测 apiKey 形态下仍 200) |
|
|
203
|
+
*
|
|
204
|
+
* 账号体系物理隔离(同一个 Go 服务,但数据面分开)⇒ 必须是独立 provider,
|
|
205
|
+
* 否则一个 provider 下会混进两套 host 的账号,选号器与余额全错位。
|
|
206
|
+
*
|
|
207
|
+
* ## ⚠️ `api.magicrew.ai` 不是这套 API
|
|
208
|
+
*
|
|
209
|
+
* 它是 teamshare 网关(`MAGIC_GATEWAY_ADDRESS`),对 `/v1/models`、`/api/v1/*`
|
|
210
|
+
* 一律回 `not match rule path`。真实业务 API 是 **`magic-service.magicrew.ai`**
|
|
211
|
+
* —— 来源:`GET https://www.magicrew.ai/workspace` 的 HTML 里内嵌的运行时配置
|
|
212
|
+
* `"MAGIC_SERVICE_BASE_URL":"https://magic-service.magicrew.ai"`
|
|
213
|
+
* (`MAGIC_APP_ENV: "international-prod"`)。
|
|
214
|
+
*
|
|
215
|
+
* ## ⚠️ 实现零复制
|
|
216
|
+
*
|
|
217
|
+
* `MagicrewAuth` / `MagicrewService` / `MagicrewAdapter` / 目录 / 积分 / 资料
|
|
218
|
+
* 全部复用国内版那一套,**只有本常量不同**(与 `autoclawintl` 同纪律:
|
|
219
|
+
* 复制会让同类缺陷修两遍)。
|
|
220
|
+
*/
|
|
221
|
+
export const MAGICREW_INTL = Object.freeze({
|
|
222
|
+
id: 'magicrewintl',
|
|
223
|
+
site: 'intl',
|
|
224
|
+
// ⚠️ 与客户端 `PROVIDER_REGISTRY` 的 label 语义一致(rail 宽度算式依赖长度)。
|
|
225
|
+
displayName: 'MagiCrew',
|
|
226
|
+
host: 'https://magic-service.magicrew.ai',
|
|
227
|
+
webOrigin: 'https://www.magicrew.ai',
|
|
228
|
+
/**
|
|
229
|
+
* ⚠️ **必须 `true`**:国际站缺 `organization-code` 时上游会拒。
|
|
230
|
+
*
|
|
231
|
+
* ⚠️ 二审更正:**两种端点两种形态** ——
|
|
232
|
+
* - 业务 API `/api/v1/*`(签到 / 目录 / 余额 / 计费):`{"code":2182,"message":"用户所在组织不存在"}`
|
|
233
|
+
* - 聊天网关 `/v1/chat/completions`:⚠️ **形态未定** —— 参考实现记的是「HTTP 500 +
|
|
234
|
+
* 22 字节裸文本」,但 2026-11-01 真实 apiKey 实测缺 org 时仍 HTTP 200 + 正常出流
|
|
235
|
+
*
|
|
236
|
+
* 国内站缺了仍 200,故两家取值不同。
|
|
237
|
+
*/
|
|
238
|
+
needsOrgOnGateway: true,
|
|
239
|
+
defaultCredentialRef: 'MAGICREWINTL_ACCESS_TOKEN',
|
|
240
|
+
requestTimeoutMs: 30_000,
|
|
241
|
+
chatHeaderTimeoutMs: 60_000,
|
|
242
|
+
catalogRetryMs: 60_000,
|
|
243
|
+
chunkTimeoutMs: 300_000,
|
|
244
|
+
/**
|
|
245
|
+
* ⚠️ 兜底模型表**与国内站共用**:两站是同一个 Go 服务的两个数据面,
|
|
246
|
+
* 目录端点 `/api/v1/flows/models` 逐字符同构,模型 id 集合理论上一致
|
|
247
|
+
* (实测国际站目录是同一批 id 的子集)。共表比复制一份更安全 ——
|
|
248
|
+
* 复制会让「新模型只补了一边」变成静默的能力差异。
|
|
249
|
+
* ⚠️ 本表的 ctx 值**必然腐坏**(见上方的双时间点对照),只作兜底。
|
|
250
|
+
*/
|
|
251
|
+
fallbackModels: MAGICREW_FALLBACK_MODELS,
|
|
252
|
+
});
|
|
153
253
|
/** 按 id 取静态兜底条目;未登记返回 `undefined`(**不编造**)。 */
|
|
154
254
|
export function magicrewFallbackModelOf(modelId) {
|
|
155
255
|
if (typeof modelId !== 'string' || modelId.length === 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magicrew-product.js","sourceRoot":"","sources":["../src/magicrew-product.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;
|
|
1
|
+
{"version":3,"file":"magicrew-product.js","sourceRoot":"","sources":["../src/magicrew-product.ts"],"names":[],"mappings":"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"}
|
package/lib/minimax-dedup.d.ts
CHANGED
|
@@ -48,7 +48,7 @@ export type MinimaxDedupOutcome =
|
|
|
48
48
|
| 'error';
|
|
49
49
|
export interface MinimaxDedupDeps {
|
|
50
50
|
pool: {
|
|
51
|
-
findAccountIdByIdentityField(provider: string, field: string, identity: string): Promise<string>;
|
|
51
|
+
findAccountIdByIdentityField(provider: string, field: string, identity: string, excludeAccountId?: string): Promise<string>;
|
|
52
52
|
/** 含已停用账号的按 id 查询(`AccountPool.findAccount` 是**同步**的)。 */
|
|
53
53
|
findAccount?(id: string): ProviderAccountEntry | undefined;
|
|
54
54
|
updateAccount(id: string, patch: Partial<Pick<ProviderAccountEntry, 'nickname' | 'enabled' | 'expiresAt' | 'refreshable'>>): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimax-dedup.d.ts","sourceRoot":"","sources":["../src/minimax-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEhF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,qCAAqC;AACrC,MAAM,MAAM,mBAAmB;AAC7B,uCAAuC;AACrC,qBAAqB;AACvB,wCAAwC;GACtC,uBAAuB;AACzB,8BAA8B;GAC5B,WAAW;AACb,wCAAwC;GACtC,UAAU;AACZ,kCAAkC;GAChC,OAAO,CAAA;AAEX,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE;QACJ,4BAA4B,
|
|
1
|
+
{"version":3,"file":"minimax-dedup.d.ts","sourceRoot":"","sources":["../src/minimax-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEhF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,qCAAqC;AACrC,MAAM,MAAM,mBAAmB;AAC7B,uCAAuC;AACrC,qBAAqB;AACvB,wCAAwC;GACtC,uBAAuB;AACzB,8BAA8B;GAC5B,WAAW;AACb,wCAAwC;GACtC,UAAU;AACZ,kCAAkC;GAChC,OAAO,CAAA;AAEX,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE;QACJ,4BAA4B,CAC1B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,CAAC,CAAA;QAClB,0DAA0D;QAC1D,WAAW,CAAC,CAAC,EAAE,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CAAA;QAC1D,aAAa,CACX,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,aAAa,CAAC,CAAC,GAC/F,OAAO,CAAC,IAAI,CAAC,CAAA;KACjB,CAAA;IACD,WAAW,EAAE;QACX,OAAO,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,GAAG,SAAS,CAAC,CAAA;QACnE,GAAG,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QACrD,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KACzC,CAAA;IACD,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAC1C;AAED,MAAM,WAAW,gBAAgB;IAC/B,yDAAyD;IACzD,UAAU,EAAE,MAAM,CAAA;IAClB,oBAAoB;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,iDAAiD;IACjD,oBAAoB,EAAE,MAAM,CAAA;IAC5B,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,yBAAyB;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,gBAAgB;IAChB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAKD;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC;IAAE,OAAO,EAAE,mBAAmB,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4HvE"}
|
package/lib/minimax-dedup.js
CHANGED
|
@@ -44,7 +44,7 @@ export async function dedupeMinimaxAccount(deps, args) {
|
|
|
44
44
|
return { outcome: 'skipped-no-identity' };
|
|
45
45
|
let existingId = '';
|
|
46
46
|
try {
|
|
47
|
-
existingId = await deps.pool.findAccountIdByIdentityField(args.providerId, 'user_id', identity);
|
|
47
|
+
existingId = await deps.pool.findAccountIdByIdentityField(args.providerId, 'user_id', identity, args.newAccountId);
|
|
48
48
|
}
|
|
49
49
|
catch (error) {
|
|
50
50
|
// ⚠️ 读不到池 ≠ 没有重复 ⇒ 绝不做任何破坏性动作(删号/清凭据都是不可逆的)。
|
package/lib/minimax-dedup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimax-dedup.js","sourceRoot":"","sources":["../src/minimax-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,OAAO,EAAE,aAAa,EAAsB,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"minimax-dedup.js","sourceRoot":"","sources":["../src/minimax-dedup.ts"],"names":[],"mappings":"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"}
|
package/lib/model-catalog.d.ts
CHANGED
|
@@ -38,6 +38,19 @@
|
|
|
38
38
|
*/
|
|
39
39
|
import type { LlmModelInfo, LlmResolvedModelInfo } from '@deepseek-ai/dsh-llm';
|
|
40
40
|
import { type AccountPool } from './account-pool.js';
|
|
41
|
+
/**
|
|
42
|
+
* `listModels` 实际返回的模型信息:宿主契约 + **附加的 `contextWindow`**。
|
|
43
|
+
*
|
|
44
|
+
* ⚠️ 宿主 `LlmModelInfo` 没有该字段(窗口只在 `resolveModel` 的 `context` 里)。
|
|
45
|
+
* ⚠️⚠️ **不能只靠它给网关供数**:宿主 `LlmRuntime.listModels()` 会按白名单
|
|
46
|
+
* 重建对象(只留 provider/id/name/description/inputModalities),这个附加字段
|
|
47
|
+
* 到网关时已经被剥掉。网关的 `/v1/models` 实际走 `resolveModelInfo().context`
|
|
48
|
+
* (见 `openai-gateway/models.ts` 的 `collectGatewayModelDetails`)。
|
|
49
|
+
* 此处保留是给**直接消费适配器 `listModels`** 的调用方与将来宿主扩展契约用。
|
|
50
|
+
*/
|
|
51
|
+
export interface CatalogModelInfo extends LlmModelInfo {
|
|
52
|
+
readonly contextWindow?: number;
|
|
53
|
+
}
|
|
41
54
|
/**
|
|
42
55
|
* 各家的**中间结构** —— 只承载「DSH 契约需要什么」,不承载私有信息。
|
|
43
56
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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"}
|
package/lib/model-catalog.js
CHANGED
|
@@ -301,7 +301,16 @@ export function createModelCatalog(deps, config) {
|
|
|
301
301
|
* 当前该展示的全量目录。未调用过时回落到 `syncCatalog()`。
|
|
302
302
|
*/
|
|
303
303
|
let cached;
|
|
304
|
-
/**
|
|
304
|
+
/**
|
|
305
|
+
* 把 `CatalogEntry` 摊成 `LlmModelInfo` 的公共字段(三态在这里落实)。
|
|
306
|
+
*
|
|
307
|
+
* ⚠️ `contextWindow` **不在宿主 `LlmModelInfo` 契约里**(窗口在
|
|
308
|
+
* `LlmResolvedModelInfo.context`,需逐模型 `resolveModel`)。这里作为
|
|
309
|
+
* **附加字段**带出,供直接消费适配器返回值的调用方使用。
|
|
310
|
+
* ⚠️⚠️ 它**到不了网关**:宿主 `LlmRuntime.listModels()` 会按白名单重建对象;
|
|
311
|
+
* 网关的 `/v1/models` 走 `collectGatewayModelDetails` 的 `resolveModelInfo`
|
|
312
|
+
* (见 `openai-gateway/models.ts`),不要以为本字段能修 issue #36。
|
|
313
|
+
*/
|
|
305
314
|
function toModelInfo(entry) {
|
|
306
315
|
const info = { provider: providerId, id: entry.id, name: entry.name };
|
|
307
316
|
// ⚠️ 三态:只有 `!== undefined` 才写入 —— 写 `['text']` 会明确声明不支持图片。
|
|
@@ -309,6 +318,8 @@ export function createModelCatalog(deps, config) {
|
|
|
309
318
|
info.inputModalities = entry.inputModalities;
|
|
310
319
|
if (entry.description !== undefined)
|
|
311
320
|
info.description = entry.description;
|
|
321
|
+
if (entry.contextWindow !== undefined)
|
|
322
|
+
info.contextWindow = entry.contextWindow;
|
|
312
323
|
return info;
|
|
313
324
|
}
|
|
314
325
|
/** `cached` 的落地时刻(毫秒)—— SWR 判「旧值还能不能先端出去」的输入。 */
|
package/lib/model-catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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"}
|
package/lib/models.d.ts
CHANGED
|
@@ -201,7 +201,21 @@ extraUnsignedHeaders?: Readonly<Record<string, string>>,
|
|
|
201
201
|
* AgentCenter 的 `agent-type` / `x-language` 是路由判据,必须签上
|
|
202
202
|
* (builtin 的 Agent-Type 实测不签也能过,但 AgentCenter 按同口径从严)。
|
|
203
203
|
*/
|
|
204
|
-
extraSignedHeaders?: Readonly<Record<string, string
|
|
204
|
+
extraSignedHeaders?: Readonly<Record<string, string>>,
|
|
205
|
+
/**
|
|
206
|
+
* 失败诊断标签(2026-11-04 修「修了好几轮都修不好」):传入时,非 2xx /
|
|
207
|
+
* 网络失败会打一条**脱敏**日志(状态码 + 响应体前 160 字符),让报障能
|
|
208
|
+
* 直接看到「死在哪一步、上游回了什么」。
|
|
209
|
+
*
|
|
210
|
+
* ⚠️ **不传时行为与旧版逐字节等价**(静默 undefined)—— builtin /
|
|
211
|
+
* gateway-config 的调用点与既有单测零影响;只有 AgentCenter 这条
|
|
212
|
+
* 「修了四轮还在报障」的腿需要它。
|
|
213
|
+
*
|
|
214
|
+
* 背景:本函数此前对**一切**失败(非 2xx / 超时 / 网络错)都静默返回
|
|
215
|
+
* `undefined`,连 HTTP 状态码都不留 ⇒ 前几轮修复(凭据轮换 / 窗口沿用 /
|
|
216
|
+
* 告警去重)全在「失败之后怎么办」上打转,而失败原因始终是黑盒。
|
|
217
|
+
*/
|
|
218
|
+
diagnosticLabel?: string): Promise<string | undefined>;
|
|
205
219
|
/**
|
|
206
220
|
* AgentCenter 单模型的 `model_parameters` → 动态窗口。
|
|
207
221
|
*
|
package/lib/models.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAMpD;;;GAGG;AACH,eAAO,MAAM,yBAAyB,mEAAmE,CAAA;AAEzG;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,sEAAsE,CAAA;AAEzG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,eAAO,MAAM,gCAAgC,0GAC4D,CAAA;AACzG,eAAO,MAAM,4BAA4B,mFACyC,CAAA;AAiBlF,2BAA2B;AAC3B,eAAO,MAAM,yBAAyB,QAAgB,CAAA;AAEtD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ;;;;;;;;;;OAUG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB;;;;;;;;;;;;;;;;;;;;OAoBG;IACH;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,oBAAoB;IACnC,8CAA8C;IAC9C,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB;;;;;;;;;;OAUG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB;AAED,sBAAsB;AACtB,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAE9E;AAQD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAQnD;AAwKD;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,KAAK,EACrB,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM;AACV,yCAAyC;AACzC,oBAAoB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACvD;;;;GAIG;AACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"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"}
|
package/lib/models.js
CHANGED
|
@@ -297,7 +297,21 @@ extraUnsignedHeaders,
|
|
|
297
297
|
* AgentCenter 的 `agent-type` / `x-language` 是路由判据,必须签上
|
|
298
298
|
* (builtin 的 Agent-Type 实测不签也能过,但 AgentCenter 按同口径从严)。
|
|
299
299
|
*/
|
|
300
|
-
extraSignedHeaders
|
|
300
|
+
extraSignedHeaders,
|
|
301
|
+
/**
|
|
302
|
+
* 失败诊断标签(2026-11-04 修「修了好几轮都修不好」):传入时,非 2xx /
|
|
303
|
+
* 网络失败会打一条**脱敏**日志(状态码 + 响应体前 160 字符),让报障能
|
|
304
|
+
* 直接看到「死在哪一步、上游回了什么」。
|
|
305
|
+
*
|
|
306
|
+
* ⚠️ **不传时行为与旧版逐字节等价**(静默 undefined)—— builtin /
|
|
307
|
+
* gateway-config 的调用点与既有单测零影响;只有 AgentCenter 这条
|
|
308
|
+
* 「修了四轮还在报障」的腿需要它。
|
|
309
|
+
*
|
|
310
|
+
* 背景:本函数此前对**一切**失败(非 2xx / 超时 / 网络错)都静默返回
|
|
311
|
+
* `undefined`,连 HTTP 状态码都不留 ⇒ 前几轮修复(凭据轮换 / 窗口沿用 /
|
|
312
|
+
* 告警去重)全在「失败之后怎么办」上打转,而失败原因始终是黑盒。
|
|
313
|
+
*/
|
|
314
|
+
diagnosticLabel) {
|
|
301
315
|
// ⚠️⚠️ **query 值必须落在安全集内**,否则**不发这个请求**(2026-10-30 审计 P2 D1)。
|
|
302
316
|
//
|
|
303
317
|
// `canonicalQueryOf` 的往返(decode → encode)在安全集外**可能与服务端口径
|
|
@@ -331,11 +345,28 @@ extraSignedHeaders) {
|
|
|
331
345
|
headers,
|
|
332
346
|
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
|
|
333
347
|
});
|
|
334
|
-
if (!response.ok)
|
|
348
|
+
if (!response.ok) {
|
|
349
|
+
// 只在调用方要诊断时才读 body(读完 response 即消费;不要 label 的
|
|
350
|
+
// 调用方保持「失败不触碰 body」的旧语义,行为零变化)。
|
|
351
|
+
if (diagnosticLabel !== undefined) {
|
|
352
|
+
let bodyHead = '';
|
|
353
|
+
try {
|
|
354
|
+
bodyHead = (await response.text()).slice(0, 160);
|
|
355
|
+
}
|
|
356
|
+
catch {
|
|
357
|
+
// body 读不出就只报状态码(如流式中断)
|
|
358
|
+
}
|
|
359
|
+
console.warn(`[codearts] ${diagnosticLabel} HTTP ${response.status}: ${bodyHead}`);
|
|
360
|
+
}
|
|
335
361
|
return undefined;
|
|
362
|
+
}
|
|
336
363
|
return await response.text();
|
|
337
364
|
}
|
|
338
|
-
catch {
|
|
365
|
+
catch (error) {
|
|
366
|
+
if (diagnosticLabel !== undefined) {
|
|
367
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
368
|
+
console.warn(`[codearts] ${diagnosticLabel} 请求失败(网络/超时): ${reason}`);
|
|
369
|
+
}
|
|
339
370
|
return undefined;
|
|
340
371
|
}
|
|
341
372
|
}
|
|
@@ -386,6 +417,29 @@ function takeAgentCenterImageIds() {
|
|
|
386
417
|
agentCenterImageIds = [];
|
|
387
418
|
return taken;
|
|
388
419
|
}
|
|
420
|
+
/**
|
|
421
|
+
* AgentCenter 响应的**信封兼容取键**(2026-11-04 修「动态窗口不可用」)。
|
|
422
|
+
*
|
|
423
|
+
* 历轮实测(2026-10-29/30)里 `useragents` 的 `agents` 与 `detail` 的 `gpts`
|
|
424
|
+
* 都在**顶层**;但华为云大量端点是 `{code, message, result: {…}}` 信封形态。
|
|
425
|
+
* 一旦 AgentCenter 某天也开始包信封,旧代码会 `Array.isArray(arr) === false`
|
|
426
|
+
* ⇒ 静默 `return out` ⇒ 症状与「签名失败 / 端点下线」**逐字相同**(正是
|
|
427
|
+
* 「修了好几轮都修不好」的形态 —— 失败原因不可见)。
|
|
428
|
+
*
|
|
429
|
+
* 取值顺序:**顶层优先**(现状成功路径逐字节不变),顶层没有再看 `result`
|
|
430
|
+
* 里 —— 顶层取得到的场景行为零变化,只有「顶层取不到」这个原本必死的
|
|
431
|
+
* 分支多一条活路。
|
|
432
|
+
*/
|
|
433
|
+
function envelopePick(container, key) {
|
|
434
|
+
const top = container[key];
|
|
435
|
+
if (top !== undefined && top !== null)
|
|
436
|
+
return top;
|
|
437
|
+
const result = container['result'];
|
|
438
|
+
if (typeof result === 'object' && result !== null) {
|
|
439
|
+
return result[key];
|
|
440
|
+
}
|
|
441
|
+
return undefined;
|
|
442
|
+
}
|
|
389
443
|
/**
|
|
390
444
|
* 拉 AgentCenter 的动态窗口表(best-effort:两步请求**任何一步**失败都返回
|
|
391
445
|
* 空 Map,**不阻断**调用方 —— 窗口缺失只是退化到静态表,目录本身不受影响)。
|
|
@@ -420,20 +474,27 @@ export async function fetchAgentCenterWindows(fetcher, ak, sk, st) {
|
|
|
420
474
|
// (名字 + 值 + 是否参与签名),四个端点共用;并在常量注释里写明
|
|
421
475
|
// 「实测矩阵(端点 × 头拼写 × 是否签名 → 状态码)」。
|
|
422
476
|
const signedExtras = { 'agent-type': 'AgentCenter', 'x-language': 'zh-cn' };
|
|
423
|
-
const listText = await fetchSignedGet(fetcher, SNAP_AGENT_CENTER_USERAGENTS_URL, ak, sk, st, undefined, signedExtras);
|
|
477
|
+
const listText = await fetchSignedGet(fetcher, SNAP_AGENT_CENTER_USERAGENTS_URL, ak, sk, st, undefined, signedExtras, 'AgentCenter useragents');
|
|
424
478
|
if (listText === undefined)
|
|
425
479
|
return out;
|
|
426
480
|
let agents;
|
|
427
481
|
try {
|
|
428
482
|
const parsed = JSON.parse(listText);
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
: undefined;
|
|
432
|
-
if (!Array.isArray(arr))
|
|
483
|
+
if (typeof parsed !== 'object' || parsed === null) {
|
|
484
|
+
console.warn(`[codearts] AgentCenter useragents 响应不是对象: ${listText.slice(0, 160)}`);
|
|
433
485
|
return out;
|
|
486
|
+
}
|
|
487
|
+
const arr = envelopePick(parsed, 'agents');
|
|
488
|
+
if (!Array.isArray(arr)) {
|
|
489
|
+
// 2026-11-04:历轮修复都拿不到这个证据(静默 return)。打出响应头
|
|
490
|
+
// 160 字符,上游挪信封(如 {result:{agents:[]}})或改键名当场可见。
|
|
491
|
+
console.warn(`[codearts] AgentCenter useragents 响应缺 agents 数组: ${listText.slice(0, 160)}`);
|
|
492
|
+
return out;
|
|
493
|
+
}
|
|
434
494
|
agents = arr;
|
|
435
495
|
}
|
|
436
496
|
catch {
|
|
497
|
+
console.warn(`[codearts] AgentCenter useragents 响应不是 JSON: ${listText.slice(0, 160)}`);
|
|
437
498
|
return out;
|
|
438
499
|
}
|
|
439
500
|
// 选 primary agent:有标记的优先,否则第一条可用的(与 codearts2api 参考实现同口径)。
|
|
@@ -469,22 +530,34 @@ export async function fetchAgentCenterWindows(fetcher, ak, sk, st) {
|
|
|
469
530
|
if (agentId === undefined)
|
|
470
531
|
agentId = id;
|
|
471
532
|
}
|
|
472
|
-
if (agentId === undefined)
|
|
533
|
+
if (agentId === undefined) {
|
|
534
|
+
// agents 数组非空却选不出 id:上游把 agent_id 键改名(如 original_id 换位)
|
|
535
|
+
// 或返回空数组的场景,旧实现静默退化。打出条数与首条键集帮下次定位。
|
|
536
|
+
const first = agents.find((item) => typeof item === 'object' && item !== null);
|
|
537
|
+
console.warn(`[codearts] AgentCenter useragents 返回 ${agents.length} 条 agent 但选不出 agent_id`
|
|
538
|
+
+ `(首条键集: ${first === undefined ? '(无对象条目)' : Object.keys(first).join(',')})`);
|
|
473
539
|
return out;
|
|
540
|
+
}
|
|
474
541
|
const detailUrl = `${SNAP_AGENT_CENTER_DETAIL_URL}?agent_id=${encodeURIComponent(agentId)}`;
|
|
475
|
-
const detailText = await fetchSignedGet(fetcher, detailUrl, ak, sk, st, undefined, signedExtras);
|
|
542
|
+
const detailText = await fetchSignedGet(fetcher, detailUrl, ak, sk, st, undefined, signedExtras, 'AgentCenter detail');
|
|
476
543
|
if (detailText === undefined)
|
|
477
544
|
return out;
|
|
478
545
|
try {
|
|
479
546
|
const parsed = JSON.parse(detailText);
|
|
480
|
-
if (typeof parsed !== 'object' || parsed === null)
|
|
547
|
+
if (typeof parsed !== 'object' || parsed === null) {
|
|
548
|
+
console.warn(`[codearts] AgentCenter detail 响应不是对象: ${detailText.slice(0, 160)}`);
|
|
481
549
|
return out;
|
|
482
|
-
|
|
483
|
-
|
|
550
|
+
}
|
|
551
|
+
const gpts = envelopePick(parsed, 'gpts');
|
|
552
|
+
if (typeof gpts !== 'object' || gpts === null) {
|
|
553
|
+
console.warn(`[codearts] AgentCenter detail 响应缺 gpts 对象: ${detailText.slice(0, 160)}`);
|
|
484
554
|
return out;
|
|
555
|
+
}
|
|
485
556
|
const gptsModels = gpts['models'];
|
|
486
|
-
if (!Array.isArray(gptsModels))
|
|
557
|
+
if (!Array.isArray(gptsModels)) {
|
|
558
|
+
console.warn(`[codearts] AgentCenter detail 响应缺 models 数组: ${detailText.slice(0, 160)}`);
|
|
487
559
|
return out;
|
|
560
|
+
}
|
|
488
561
|
for (const item of gptsModels) {
|
|
489
562
|
if (typeof item !== 'object' || item === null)
|
|
490
563
|
continue;
|
|
@@ -536,6 +609,25 @@ export async function fetchAgentCenterWindows(fetcher, ak, sk, st) {
|
|
|
536
609
|
...(typeof display === 'string' && display.length > 0 ? { name: display } : {}),
|
|
537
610
|
});
|
|
538
611
|
}
|
|
612
|
+
// ⚠️ **零窗口取证**(2026-11-04):detail 两步都通了、条目也非空,却一条
|
|
613
|
+
// 窗口都没收到 —— 最可能是上游把 `context_window` 改了形态(字符串/浮点),
|
|
614
|
+
// 而 {@link readAgentCenterWindow} 按审计定案「只认正整数、不臆造强转」。
|
|
615
|
+
// 打出首条的 `model_parameters` 键集与 context_window 实际形态,让下次
|
|
616
|
+
// 报障**不再需要盲猜**(要不要放开强转以取证为准,不在本轮决定)。
|
|
617
|
+
if (out.size === 0 && gptsModels.length > 0) {
|
|
618
|
+
const first = gptsModels.find((item) => typeof item === 'object' && item !== null);
|
|
619
|
+
const params = first?.['model_parameters'];
|
|
620
|
+
const paramsRecord = typeof params === 'object' && params !== null
|
|
621
|
+
? params
|
|
622
|
+
: undefined;
|
|
623
|
+
const ctxValue = paramsRecord?.['context_window'];
|
|
624
|
+
const keysText = paramsRecord === undefined
|
|
625
|
+
? `(model_parameters 形态: ${typeof params})`
|
|
626
|
+
: `键集: ${Object.keys(paramsRecord).join(',')}`;
|
|
627
|
+
console.warn(`[codearts] AgentCenter detail 返回 ${gptsModels.length} 条模型但零窗口`
|
|
628
|
+
+ `(首条 model_parameters ${keysText};`
|
|
629
|
+
+ `context_window 实际形态: ${ctxValue === undefined ? '缺失' : `${typeof ctxValue} ${JSON.stringify(ctxValue)}`})`);
|
|
630
|
+
}
|
|
539
631
|
}
|
|
540
632
|
catch {
|
|
541
633
|
return out;
|
|
@@ -676,7 +768,7 @@ nowMs = Date.now()) {
|
|
|
676
768
|
*/
|
|
677
769
|
const agentCenterWindows = await fetchAgentCenterWindows(fetcher, ak, sk, st);
|
|
678
770
|
// ⚠️ **窗口腿也要出参**(2026-11-02 15:41 二次报障后补):此前 gatewayOk /
|
|
679
|
-
// builtinOk 都能被接线层看到、唯独 AgentCenter
|
|
771
|
+
// builtinOk 都能被接线层看到、唯独 AgentCenter 只返回空 Map,接线层
|
|
680
772
|
// (`service.ts` 的目录轮换)无从判断「这轮目录是不是带着退化窗口交付的」。
|
|
681
773
|
// 可选字段:不写不影响既有判据(`isRemoteCatalogComplete` 仍只看前两个)。
|
|
682
774
|
if (outcome !== undefined)
|
|
@@ -710,11 +802,11 @@ nowMs = Date.now()) {
|
|
|
710
802
|
seen.add(id);
|
|
711
803
|
}
|
|
712
804
|
}
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
805
|
+
// ⚠️ 这里**不能立即记窗口告警**:`service.refreshModels` 还会按本轮健康度
|
|
806
|
+
// 轮换后备凭据。第一轮失败、第二轮恢复时,在这里打印会让用户看到
|
|
807
|
+
// 「动态窗口不可用」,但最终目录其实已带齐动态窗口(假告警)。
|
|
808
|
+
// 最终告警由 service 在选定本轮结果后统一记录;直接调用本函数的
|
|
809
|
+
// 调用方则可通过 `outcome.agentCenterOk` 获取同一事实。
|
|
718
810
|
/**
|
|
719
811
|
* 图片能力灌入:**builtin ∪ AgentCenter 并集**(2026-10-31 审计修 kimi-k3 盲区)。
|
|
720
812
|
*
|