@xixka/dsh-hub 0.4.11 → 0.4.12

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 (39) hide show
  1. package/lib/atomcode-auth.js +3 -3
  2. package/lib/atomcode-auth.js.map +1 -1
  3. package/lib/atomcode-credits.js +3 -3
  4. package/lib/atomcode-credits.js.map +1 -1
  5. package/lib/atomcode-product.d.ts +8 -0
  6. package/lib/atomcode-product.d.ts.map +1 -1
  7. package/lib/atomcode-product.js +10 -0
  8. package/lib/atomcode-product.js.map +1 -1
  9. package/lib/chromium-session.d.ts +102 -51
  10. package/lib/chromium-session.d.ts.map +1 -1
  11. package/lib/chromium-session.js +361 -147
  12. package/lib/chromium-session.js.map +1 -1
  13. package/lib/doubao-login.d.ts +0 -20
  14. package/lib/doubao-login.d.ts.map +1 -1
  15. package/lib/doubao-login.js +53 -17
  16. package/lib/doubao-login.js.map +1 -1
  17. package/lib/doubao-signin.d.ts +0 -32
  18. package/lib/doubao-signin.d.ts.map +1 -1
  19. package/lib/doubao-signin.js +21 -35
  20. package/lib/doubao-signin.js.map +1 -1
  21. package/lib/login.d.ts +7 -20
  22. package/lib/login.d.ts.map +1 -1
  23. package/lib/login.js +7 -21
  24. package/lib/login.js.map +1 -1
  25. package/lib/loomy-adapter.d.ts.map +1 -1
  26. package/lib/loomy-adapter.js +23 -7
  27. package/lib/loomy-adapter.js.map +1 -1
  28. package/lib/openai-compat.d.ts.map +1 -1
  29. package/lib/openai-compat.js +6 -0
  30. package/lib/openai-compat.js.map +1 -1
  31. package/lib/raccoon-account-queue.d.ts +15 -0
  32. package/lib/raccoon-account-queue.d.ts.map +1 -0
  33. package/lib/raccoon-account-queue.js +59 -0
  34. package/lib/raccoon-account-queue.js.map +1 -0
  35. package/lib/raccoon-adapter.d.ts +3 -0
  36. package/lib/raccoon-adapter.d.ts.map +1 -1
  37. package/lib/raccoon-adapter.js +226 -190
  38. package/lib/raccoon-adapter.js.map +1 -1
  39. package/package.json +1 -1
@@ -0,0 +1,59 @@
1
+ /**
2
+ * Raccoon 专用的账号推理队列。
3
+ *
4
+ * 只服务 `raccoon-adapter.ts` 的 `/chat/completions` 流式请求,不复用也不
5
+ * 修改全局 `SerialQueue`,因此登录、签到、积分、目录及其他 provider 完全
6
+ * 不受影响。一个实例对应一个账号;槽位持有到 SSE 消费结束才释放。
7
+ */
8
+ export class RaccoonAccountQueue {
9
+ tail = Promise.resolve();
10
+ /** 等待轮到本请求,返回幂等释放函数;等待期间取消不会焊死后续队列。 */
11
+ async acquire(options = {}) {
12
+ const previous = this.tail;
13
+ let releaseTail;
14
+ this.tail = new Promise((resolve) => { releaseTail = resolve; });
15
+ let released = false;
16
+ const release = () => {
17
+ if (released)
18
+ return;
19
+ released = true;
20
+ releaseTail();
21
+ };
22
+ try {
23
+ await waitForPrevious(previous, options.signal);
24
+ return release;
25
+ }
26
+ catch (error) {
27
+ release();
28
+ throw error;
29
+ }
30
+ }
31
+ }
32
+ async function waitForPrevious(previous, signal) {
33
+ if (signal === undefined) {
34
+ await previous;
35
+ return;
36
+ }
37
+ if (signal.aborted)
38
+ throw abortError();
39
+ await new Promise((resolve, reject) => {
40
+ const onAbort = () => {
41
+ signal.removeEventListener('abort', onAbort);
42
+ reject(abortError());
43
+ };
44
+ signal.addEventListener('abort', onAbort, { once: true });
45
+ void previous.then(() => {
46
+ signal.removeEventListener('abort', onAbort);
47
+ resolve();
48
+ }, (error) => {
49
+ signal.removeEventListener('abort', onAbort);
50
+ reject(error);
51
+ });
52
+ });
53
+ }
54
+ function abortError() {
55
+ const error = new Error('等待同账号的前一个商汤请求期间,当前请求已取消');
56
+ error.name = 'AbortError';
57
+ return error;
58
+ }
59
+ //# sourceMappingURL=raccoon-account-queue.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"raccoon-account-queue.js","sourceRoot":"","sources":["../src/raccoon-account-queue.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,OAAO,mBAAmB;IACtB,IAAI,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAA;IAE/C,uCAAuC;IACvC,KAAK,CAAC,OAAO,CAAC,UAAoC,EAAE;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;QAC1B,IAAI,WAAwB,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,GAAG,WAAW,GAAG,OAAO,CAAA,CAAC,CAAC,CAAC,CAAA;QACrE,IAAI,QAAQ,GAAG,KAAK,CAAA;QACpB,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,IAAI,QAAQ;gBAAE,OAAM;YACpB,QAAQ,GAAG,IAAI,CAAA;YACf,WAAW,EAAE,CAAA;QACf,CAAC,CAAA;QAED,IAAI,CAAC;YACH,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;YAC/C,OAAO,OAAO,CAAA;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,CAAA;YACT,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;CACF;AAED,KAAK,UAAU,eAAe,CAAC,QAAuB,EAAE,MAAoB;IAC1E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,QAAQ,CAAA;QACd,OAAM;IACR,CAAC;IACD,IAAI,MAAM,CAAC,OAAO;QAAE,MAAM,UAAU,EAAE,CAAA;IACtC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC5C,MAAM,CAAC,UAAU,EAAE,CAAC,CAAA;QACtB,CAAC,CAAA;QACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QACzD,KAAK,QAAQ,CAAC,IAAI,CAChB,GAAG,EAAE;YACH,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC5C,OAAO,EAAE,CAAA;QACX,CAAC,EACD,CAAC,KAAc,EAAE,EAAE;YACjB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC5C,MAAM,CAAC,KAAc,CAAC,CAAA;QACxB,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,UAAU;IACjB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAClD,KAAK,CAAC,IAAI,GAAG,YAAY,CAAA;IACzB,OAAO,KAAK,CAAA;AACd,CAAC"}
@@ -296,6 +296,9 @@ export declare class RaccoonAdapter extends LlmAdapter {
296
296
  * (现状);只有 `catalogAt` 则无内容可展示。
297
297
  */
298
298
  private catalogAt;
299
+ /** 每账号一条推理队列:同账号最多一个完整 SSE 请求在途。 */
300
+ private readonly accountRequestQueues;
301
+ private requestQueueFor;
299
302
  /** 目录加载闸门:并发去重 + 失败/空结果冷却(见 `remote-catalog-gate.ts`)。 */
300
303
  private readonly catalogGate;
301
304
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"raccoon-adapter.d.ts","sourceRoot":"","sources":["../src/raccoon-adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"raccoon-adapter.d.ts","sourceRoot":"","sources":["../src/raccoon-adapter.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,7 @@
21
21
  import { LlmAdapter, LlmError, ReasoningEffortId } from '@deepseek-ai/dsh-llm';
22
22
  import { createModelCatalog, isCatalogFresh, isCatalogFreshFor } from './model-catalog.js';
23
23
  import { RemoteCatalogGate } from './remote-catalog-gate.js';
24
+ import { RaccoonAccountQueue } from './raccoon-account-queue.js';
24
25
  import { broadcastCatalogChanged } from './catalog-broadcast.js';
25
26
  import { isRaccoonExpired } from './raccoon.js';
26
27
  import { RACCOON, RACCOON_DEFAULT_EFFORT, RACCOON_EFFORT_NAMES, RACCOON_EFFORT_OFF, RACCOON_EFFORT_ON, RACCOON_REASONING_EFFORTS, } from './raccoon-product.js';
@@ -358,6 +359,19 @@ export class RaccoonAdapter extends LlmAdapter {
358
359
  * (现状);只有 `catalogAt` 则无内容可展示。
359
360
  */
360
361
  catalogAt = 0;
362
+ /** 每账号一条推理队列:同账号最多一个完整 SSE 请求在途。 */
363
+ accountRequestQueues = new Map();
364
+ requestQueueFor(accountId, accessToken) {
365
+ // 池账号用稳定 id;旧单凭据模式没有账号 id 时以 token 区分,绝不把
366
+ // 不同单凭据误串成同一条全局队列。token 只留在内存,不输出日志。
367
+ const key = accountId || accessToken;
368
+ let queue = this.accountRequestQueues.get(key);
369
+ if (queue === undefined) {
370
+ queue = new RaccoonAccountQueue();
371
+ this.accountRequestQueues.set(key, queue);
372
+ }
373
+ return queue;
374
+ }
361
375
  /** 目录加载闸门:并发去重 + 失败/空结果冷却(见 `remote-catalog-gate.ts`)。 */
362
376
  catalogGate;
363
377
  /**
@@ -594,209 +608,231 @@ export class RaccoonAdapter extends LlmAdapter {
594
608
  }
595
609
  catch { /* 反查失败不阻断主路径:轮换退化为「不标记」 */ }
596
610
  }
597
- const messages = serializeMessages(options.messages, imageUrls);
598
- /**
599
- * 前置 system 消息(若有)。
600
- *
601
- * ⚠️ 必须**先拼再放进对象**,不要在对象字面量里写两次 `messages` ——
602
- * 后者依赖「后面的键覆盖前面」这一隐式行为,读者极易误判成漏了 system。
603
- */
604
- const wireMessages = options.system !== undefined && options.system.length > 0
605
- ? [{ role: 'system', content: options.system }, ...messages]
606
- : messages;
607
- /**
608
- * 思考档位 → `extra_body` 内容。
609
- *
610
- * ⚠️ 在 `buildBody` **之外**算一次:`buildBody` 会在重试时被多次调用,
611
- * 每次重算虽无害但没必要。
612
- *
613
- * ⚠️ **会话自动命名(`purpose: 'session-title'`)必须关闭思考**(issue
614
- * IKKVDH):DSH 用 **64 token** 发标题请求且**不传 `reasoningEffort`**,
615
- * 而宿主会把本模型的默认档(本家恒为 `'on'`)注入进来
616
- * (`effective = requested ?? reasoning.defaultEffort`)。照常开思考时实测
617
- * 均值约 222 个思考 token,必然顶穿 64 ⇒ 正文 0 字符、
618
- * `finish_reason:'length'` ⇒ DSH 直接拒绝、标题永远停在 fallback。
619
- *
620
- * 本家的档位表是**恒声明的两档**(`on`/`off`,与模型无关,见
621
- * `raccoon-product.ts`)⇒ 任何模型都**关得掉**,故不需要抬预算。
622
- */
623
- const titlePlan = planSessionTitleThinking({
624
- purpose: options.purpose,
625
- requestedEffort: options.reasoningEffort === undefined ? undefined : String(options.reasoningEffort),
626
- declaredEfforts: RACCOON_REASONING_EFFORTS,
627
- maxTokens: options.maxTokens,
628
- });
629
- const thinking = raccoonThinkingExtraBody(titlePlan.effort);
630
- // ⚠️ **请求体这一腿也必须夹**(issue IKS1L5):`titlePlan.maxTokens` 对非标题
631
- // 请求是原样透传调用方的 `maxTokens` 的(用户 / OpenAI 兼容网关都能塞 999999),
632
- // 上游会把整轮打成 400 且该 model group 没有 fallback。
633
- const requestMaxTokens = clampRaccoonMaxTokens(titlePlan.maxTokens);
634
- /** 构造请求体。 */
635
- const buildBody = () => JSON.stringify({
636
- model: options.model,
637
- messages: wireMessages,
638
- stream: true,
639
- ...requestMaxTokens !== undefined ? { max_tokens: requestMaxTokens } : {},
640
- ...options.temperature !== undefined ? { temperature: options.temperature } : {},
641
- ...options.stop !== undefined && options.stop.length > 0 ? { stop: options.stop } : {},
642
- // ⚠️ tools 必须真的下发到请求体**顶层**:Qoder/TRAE 都因漏发而让模型
643
- // 在正文里臆造 XML 工具调用,harness 认不出 → 任务终止。
644
- ...options.tools !== undefined && options.tools.length > 0
645
- ? {
646
- tools: options.tools.map((tool) => ({
647
- type: 'function',
648
- function: {
649
- name: tool.name,
650
- ...tool.description.length > 0 ? { description: tool.description } : {},
651
- ...tool.parameters === undefined ? {} : { parameters: tool.parameters },
652
- },
653
- })),
654
- }
655
- : {},
656
- // 思考档位(开 / 关)。⚠️ **必须在 `extra_body` 内** —— 实测放顶层会被忽略
657
- //(连非法值都不报错)。不传档位时不发该字段,保持服务端默认(= 开)。
658
- ...thinking !== undefined ? { extra_body: thinking } : {},
659
- });
660
- const headers = () => ({
661
- Accept: 'text/event-stream',
662
- 'Content-Type': 'application/json',
663
- Authorization: `Bearer ${credential?.access_token ?? ''}`,
664
- 'X-Org-Code': credential?.office_identity ?? '',
665
- 'X-Raccoon-Language': 'zh',
666
- 'X-Client-Platform': this.product.clientPlatform,
667
- });
668
- /** 发送一次 chat 请求。 */
669
- const send = async () => {
670
- try {
671
- return await this.fetchImpl(`${this.product.apiBase}${this.product.llmApiPrefix}/chat/completions`, {
672
- method: 'POST',
673
- headers: headers(),
674
- body: buildBody(),
675
- signal: options.signal,
676
- });
677
- }
678
- catch (error) {
679
- if (options.signal?.aborted)
680
- throw error;
681
- if (isTransportError(error)) {
682
- throw new LlmError(`raccoon: transport error: ${error instanceof Error ? error.message : String(error)}`, 'TRANSPORT', { cause: error });
683
- }
684
- throw error;
685
- }
611
+ let requestQueue = this.requestQueueFor(activeAccountId, credential.access_token);
612
+ let releaseRequest = await requestQueue.acquire({ signal: options.signal });
613
+ const switchRequestAccount = async () => {
614
+ const nextQueue = this.requestQueueFor(activeAccountId, credential?.access_token ?? '');
615
+ if (nextQueue === requestQueue)
616
+ return;
617
+ // 旧账号的 HTTP 响应已经落定,先释放再等新账号,避免两个并发请求
618
+ // 交叉换号时分别持有对方所需队列而死锁。释放函数幂等,外层 finally
619
+ // 在等待新队列被取消时也能安全收尾。
620
+ releaseRequest();
621
+ releaseRequest = await nextQueue.acquire({ signal: options.signal });
622
+ requestQueue = nextQueue;
686
623
  };
687
- let response = await send();
688
- // 401/403 时续期一次并重试(raccoon 有 refresh_token 轮换)。
689
- if (response.status === 401 || response.status === 403) {
690
- await this.options.refresh();
691
- const refreshed = await this.options.resolveCredential(options.model, options.sessionId);
692
- if (refreshed === undefined || refreshed.access_token.length === 0) {
693
- throw new LlmError('raccoon: credential expired and refresh failed', 'AUTH', { status: response.status });
694
- }
695
- credential = refreshed;
696
- // ⚠️ **必须跟着重新反查账号 id**(PR !71 审计发现):`resolveCredential`
697
- // 是「池优先」的(`src/index.ts` 的 raccoon 分支先 `getAvailableAccount`
698
- // 再回退单凭据 ref),而 `refresh()` 续期的是**默认单凭据 ref**。
699
- // ⇒ 续期后取回的凭据**可能属于另一个账号**,但 `activeAccountId` 还停在
700
- // 刷新前的那个号上。
701
- // 后果(实测可复现):A 的 token 过期 → 刷新后拿到 B 的凭据 → B 随后
702
- // 返回额度耗尽,而冷却标记却**记在 A 头上** ⇒ 没耗尽的 A 被封 24h,
703
- // 真该封的 B 下次仍被选中(本段要修的「卡死在一个号上」照旧)。
704
- // 这与 AGENTS.md 记的 Qoder「标记用了会变的回调导致标错账号」同型。
705
- if (this.options.accountPool) {
706
- try {
707
- activeAccountId = await this.options.accountPool.findAccountIdByCredential(this.product.id, refreshed.access_token) ?? '';
708
- }
709
- catch { /* 反查失败不阻断主路径:轮换退化为「不标记」 */ }
710
- }
711
- response = await send();
712
- }
713
- if (!response.ok) {
714
- let errorText = await response.text().catch(() => '');
715
- let status = response.status;
624
+ try {
625
+ const messages = serializeMessages(options.messages, imageUrls);
716
626
  /**
717
- * 请求级账号轮换(2026-10-05,用户报障「余额用完一个号就卡死」)。
627
+ * 前置 system 消息(若有)。
718
628
  *
719
- * ## 为什么必须有这一段
629
+ * ⚠️ 必须**先拼再放进对象**,不要在对象字面量里写两次 `messages` ——
630
+ * 后者依赖「后面的键覆盖前面」这一隐式行为,读者极易误判成漏了 system。
631
+ */
632
+ const wireMessages = options.system !== undefined && options.system.length > 0
633
+ ? [{ role: 'system', content: options.system }, ...messages]
634
+ : messages;
635
+ /**
636
+ * 思考档位 → `extra_body` 内容。
720
637
  *
721
- * `resolveCredential` 从池里取号按**手动顺序**(`getAvailableAccount`
722
- * 的既有语义),失败类别不写标记时,下次请求取回的**仍是同一个号**。
723
- * 首号余额耗尽(`14018 Credits exhausted`)→ 错误抛给 harness →
724
- * 下次请求还是它 ⇒ 用户看到的是「卡死在一个号上」,池里其余账号
725
- * 完好却永远轮不到。
638
+ * ⚠️ 在 `buildBody` **之外**算一次:`buildBody` 会在重试时被多次调用,
639
+ * 每次重算虽无害但没必要。
726
640
  *
727
- * ## 语义对齐 buddy(本项目无感换号的基准实现)
641
+ * ⚠️ **会话自动命名(`purpose: 'session-title'`)必须关闭思考**(issue
642
+ * IKKVDH):DSH 用 **64 token** 发标题请求且**不传 `reasoningEffort`**,
643
+ * 而宿主会把本模型的默认档(本家恒为 `'on'`)注入进来
644
+ * (`effective = requested ?? reasoning.defaultEffort`)。照常开思考时实测
645
+ * 均值约 222 个思考 token,必然顶穿 64 ⇒ 正文 0 字符、
646
+ * `finish_reason:'length'` ⇒ DSH 直接拒绝、标题永远停在 fallback。
728
647
  *
729
- * - **可换号**的失败类别:余额/额度耗尽(14018 / Credits / quota /
730
- * 积分不足等)、限流(429)、认证(401/403——单号凭据失效时池里
731
- * 可能有别的好号);**非额度且非限流**(400 参数错等)换号无益,
732
- * 按原错误抛(避免把「请求本身有问题」吞成「均不可用」)。
733
- * - **每个账号只试一次**:`tried` 传给 `getAvailableAccount`——不排除
734
- * 会拿回同一个号(池排序不因失败而变),换号形同虚设。
735
- * - **只有配额 / 限流类才写冷却**(`recordsRaccoonRateLimit`):
736
- * 认证类(401/403)**只换号、绝不写标记** —— 详见
737
- * {@link RaccoonFailureClass} 记的 2026-10-06 全池被封事故。
738
- * - **全部试完才报错**,且带**最后一次**的真实原因——笼统的
739
- * 「所有账号均不可用」会丢掉服务端真正说的东西(buddy 上同款教训)。
740
- * - **冷却时长按类别**:`quota` 记 24 小时(日配额;无可靠重置字段,
741
- * 与 trae 4008 同形)、`rate` 记 1 小时。
648
+ * 本家的档位表是**恒声明的两档**(`on`/`off`,与模型无关,见
649
+ * `raccoon-product.ts`)⇒ 任何模型都**关得掉**,故不需要抬预算。
742
650
  */
743
- let failureClass = classifyRaccoonFailure(errorText, status);
744
- const accountPool = this.options.accountPool;
745
- if (accountPool && failureClass !== 'other') {
746
- const tried = new Set();
747
- if (activeAccountId)
748
- tried.add(activeAccountId);
749
- const markCurrentAccount = async () => {
750
- // 每次失败后立即记账,包括轮换预算用尽的最后一个账号。
751
- // 认证错误只换号,不写模型冷却。
752
- if (!activeAccountId || !recordsRaccoonRateLimit(failureClass))
753
- return;
754
- await accountPool.updateModelRateLimit(activeAccountId, options.model, Date.now() + (failureClass === 'rate'
755
- ? RACCOON_RATE_LIMIT_COOLDOWN_MS
756
- : RACCOON_QUOTA_COOLDOWN_MS));
757
- };
758
- await markCurrentAccount();
759
- const maxRotate = RACCOON_MAX_ROTATE - 1;
760
- for (let round = 0; round < maxRotate; round++) {
761
- const next = await accountPool.getAvailableAccount(this.product.id, options.model, tried);
762
- if (!next || tried.has(next.entry.id))
763
- break;
764
- tried.add(next.entry.id);
765
- credential = next.credential;
766
- activeAccountId = next.entry.id;
767
- response = await send();
768
- if (response.ok) {
769
- // ⚠️ 业务失败也可能以 HTTP 200 + SSE 内嵌错误帧返回(既有说明见下)。
770
- yield* consumeOpenAiSse(response, { signal: options.signal }, {
771
- label: 'raccoon',
772
- firstTokenTimeoutMs: resolveFirstTokenTimeoutMs(),
773
- chunkTimeoutMs: resolveChunkTimeoutMs(),
774
- ...options.maxTokens === undefined ? {} : { maxTokens: options.maxTokens },
775
- });
776
- return;
651
+ const titlePlan = planSessionTitleThinking({
652
+ purpose: options.purpose,
653
+ requestedEffort: options.reasoningEffort === undefined ? undefined : String(options.reasoningEffort),
654
+ declaredEfforts: RACCOON_REASONING_EFFORTS,
655
+ maxTokens: options.maxTokens,
656
+ });
657
+ const thinking = raccoonThinkingExtraBody(titlePlan.effort);
658
+ // ⚠️ **请求体这一腿也必须夹**(issue IKS1L5):`titlePlan.maxTokens` 对非标题
659
+ // 请求是原样透传调用方的 `maxTokens` 的(用户 / OpenAI 兼容网关都能塞 999999),
660
+ // 上游会把整轮打成 400 且该 model group 没有 fallback。
661
+ const requestMaxTokens = clampRaccoonMaxTokens(titlePlan.maxTokens);
662
+ /** 构造请求体。 */
663
+ const buildBody = () => JSON.stringify({
664
+ model: options.model,
665
+ messages: wireMessages,
666
+ stream: true,
667
+ ...requestMaxTokens !== undefined ? { max_tokens: requestMaxTokens } : {},
668
+ ...options.temperature !== undefined ? { temperature: options.temperature } : {},
669
+ ...options.stop !== undefined && options.stop.length > 0 ? { stop: options.stop } : {},
670
+ // ⚠️ tools 必须真的下发到请求体**顶层**:Qoder/TRAE 都因漏发而让模型
671
+ // 在正文里臆造 XML 工具调用,harness 认不出 → 任务终止。
672
+ ...options.tools !== undefined && options.tools.length > 0
673
+ ? {
674
+ tools: options.tools.map((tool) => ({
675
+ type: 'function',
676
+ function: {
677
+ name: tool.name,
678
+ ...tool.description.length > 0 ? { description: tool.description } : {},
679
+ ...tool.parameters === undefined ? {} : { parameters: tool.parameters },
680
+ },
681
+ })),
777
682
  }
778
- errorText = await response.text().catch(() => '');
779
- status = response.status;
780
- failureClass = classifyRaccoonFailure(errorText, status);
683
+ : {},
684
+ // 思考档位(开 / 关)。⚠️ **必须在 `extra_body` 内** —— 实测放顶层会被忽略
685
+ //(连非法值都不报错)。不传档位时不发该字段,保持服务端默认(= 开)。
686
+ ...thinking !== undefined ? { extra_body: thinking } : {},
687
+ });
688
+ const headers = () => ({
689
+ Accept: 'text/event-stream',
690
+ 'Content-Type': 'application/json',
691
+ Authorization: `Bearer ${credential?.access_token ?? ''}`,
692
+ 'X-Org-Code': credential?.office_identity ?? '',
693
+ 'X-Raccoon-Language': 'zh',
694
+ 'X-Client-Platform': this.product.clientPlatform,
695
+ });
696
+ /** 发送一次 chat 请求。 */
697
+ const send = async () => {
698
+ try {
699
+ return await this.fetchImpl(`${this.product.apiBase}${this.product.llmApiPrefix}/chat/completions`, {
700
+ method: 'POST',
701
+ headers: headers(),
702
+ body: buildBody(),
703
+ signal: options.signal,
704
+ });
705
+ }
706
+ catch (error) {
707
+ if (options.signal?.aborted)
708
+ throw error;
709
+ if (isTransportError(error)) {
710
+ throw new LlmError(`raccoon: transport error: ${error instanceof Error ? error.message : String(error)}`, 'TRANSPORT', { cause: error });
711
+ }
712
+ throw error;
713
+ }
714
+ };
715
+ let response = await send();
716
+ // 401/403 时续期一次并重试(raccoon 有 refresh_token 轮换)。
717
+ if (response.status === 401 || response.status === 403) {
718
+ await this.options.refresh();
719
+ const refreshed = await this.options.resolveCredential(options.model, options.sessionId);
720
+ if (refreshed === undefined || refreshed.access_token.length === 0) {
721
+ throw new LlmError('raccoon: credential expired and refresh failed', 'AUTH', { status: response.status });
722
+ }
723
+ credential = refreshed;
724
+ // ⚠️ **必须跟着重新反查账号 id**(PR !71 审计发现):`resolveCredential`
725
+ // 是「池优先」的(`src/index.ts` 的 raccoon 分支先 `getAvailableAccount`
726
+ // 再回退单凭据 ref),而 `refresh()` 续期的是**默认单凭据 ref**。
727
+ // ⇒ 续期后取回的凭据**可能属于另一个账号**,但 `activeAccountId` 还停在
728
+ // 刷新前的那个号上。
729
+ // 后果(实测可复现):A 的 token 过期 → 刷新后拿到 B 的凭据 → B 随后
730
+ // 返回额度耗尽,而冷却标记却**记在 A 头上** ⇒ 没耗尽的 A 被封 24h,
731
+ // 真该封的 B 下次仍被选中(本段要修的「卡死在一个号上」照旧)。
732
+ // 这与 AGENTS.md 记的 Qoder「标记用了会变的回调导致标错账号」同型。
733
+ if (this.options.accountPool) {
734
+ try {
735
+ activeAccountId = await this.options.accountPool.findAccountIdByCredential(this.product.id, refreshed.access_token) ?? '';
736
+ }
737
+ catch { /* 反查失败不阻断主路径:轮换退化为「不标记」 */ }
738
+ }
739
+ await switchRequestAccount();
740
+ response = await send();
741
+ }
742
+ if (!response.ok) {
743
+ let errorText = await response.text().catch(() => '');
744
+ let status = response.status;
745
+ /**
746
+ * 请求级账号轮换(2026-10-05,用户报障「余额用完一个号就卡死」)。
747
+ *
748
+ * ## 为什么必须有这一段
749
+ *
750
+ * `resolveCredential` 从池里取号按**手动顺序**(`getAvailableAccount`
751
+ * 的既有语义),失败类别不写标记时,下次请求取回的**仍是同一个号**。
752
+ * 首号余额耗尽(`14018 Credits exhausted`)→ 错误抛给 harness →
753
+ * 下次请求还是它 ⇒ 用户看到的是「卡死在一个号上」,池里其余账号
754
+ * 完好却永远轮不到。
755
+ *
756
+ * ## 语义对齐 buddy(本项目无感换号的基准实现)
757
+ *
758
+ * - **可换号**的失败类别:余额/额度耗尽(14018 / Credits / quota /
759
+ * 积分不足等)、限流(429)、认证(401/403——单号凭据失效时池里
760
+ * 可能有别的好号);**非额度且非限流**(400 参数错等)换号无益,
761
+ * 按原错误抛(避免把「请求本身有问题」吞成「均不可用」)。
762
+ * - **每个账号只试一次**:`tried` 传给 `getAvailableAccount`——不排除
763
+ * 会拿回同一个号(池排序不因失败而变),换号形同虚设。
764
+ * - **只有配额 / 限流类才写冷却**(`recordsRaccoonRateLimit`):
765
+ * 认证类(401/403)**只换号、绝不写标记** —— 详见
766
+ * {@link RaccoonFailureClass} 记的 2026-10-06 全池被封事故。
767
+ * - **全部试完才报错**,且带**最后一次**的真实原因——笼统的
768
+ * 「所有账号均不可用」会丢掉服务端真正说的东西(buddy 上同款教训)。
769
+ * - **冷却时长按类别**:`quota` 记 24 小时(日配额;无可靠重置字段,
770
+ * 与 trae 4008 同形)、`rate` 记 1 小时。
771
+ */
772
+ let failureClass = classifyRaccoonFailure(errorText, status);
773
+ const accountPool = this.options.accountPool;
774
+ if (accountPool && failureClass !== 'other') {
775
+ const tried = new Set();
776
+ if (activeAccountId)
777
+ tried.add(activeAccountId);
778
+ const markCurrentAccount = async () => {
779
+ // 每次失败后立即记账,包括轮换预算用尽的最后一个账号。
780
+ // 认证错误只换号,不写模型冷却。
781
+ if (!activeAccountId || !recordsRaccoonRateLimit(failureClass))
782
+ return;
783
+ await accountPool.updateModelRateLimit(activeAccountId, options.model, Date.now() + (failureClass === 'rate'
784
+ ? RACCOON_RATE_LIMIT_COOLDOWN_MS
785
+ : RACCOON_QUOTA_COOLDOWN_MS));
786
+ };
781
787
  await markCurrentAccount();
782
- if (failureClass === 'other') {
783
- // 新账号失败但不是可换号类别:按原错误分类抛出(buddy 同款)。
784
- throw abortLikeOrNormal(errorText, status);
788
+ const maxRotate = RACCOON_MAX_ROTATE - 1;
789
+ for (let round = 0; round < maxRotate; round++) {
790
+ const next = await accountPool.getAvailableAccount(this.product.id, options.model, tried);
791
+ if (!next || tried.has(next.entry.id))
792
+ break;
793
+ tried.add(next.entry.id);
794
+ credential = next.credential;
795
+ activeAccountId = next.entry.id;
796
+ await switchRequestAccount();
797
+ response = await send();
798
+ if (response.ok) {
799
+ // ⚠️ 业务失败也可能以 HTTP 200 + SSE 内嵌错误帧返回(既有说明见下)。
800
+ yield* consumeOpenAiSse(response, { signal: options.signal }, {
801
+ label: 'raccoon',
802
+ firstTokenTimeoutMs: resolveFirstTokenTimeoutMs(),
803
+ chunkTimeoutMs: resolveChunkTimeoutMs(),
804
+ ...options.maxTokens === undefined ? {} : { maxTokens: options.maxTokens },
805
+ });
806
+ return;
807
+ }
808
+ errorText = await response.text().catch(() => '');
809
+ status = response.status;
810
+ failureClass = classifyRaccoonFailure(errorText, status);
811
+ await markCurrentAccount();
812
+ if (failureClass === 'other') {
813
+ // 新账号失败但不是可换号类别:按原错误分类抛出(buddy 同款)。
814
+ throw abortLikeOrNormal(errorText, status);
815
+ }
785
816
  }
817
+ throw new LlmError(`raccoon: 模型 ${options.model} 所有账号均不可用(${errorDetail(errorText)})`, failureClass === 'rate' ? 'RATE_LIMIT'
818
+ : failureClass === 'auth' ? 'AUTH'
819
+ : 'QUOTA_EXCEEDED', { status });
786
820
  }
787
- throw new LlmError(`raccoon: 模型 ${options.model} 所有账号均不可用(${errorDetail(errorText)})`, failureClass === 'rate' ? 'RATE_LIMIT'
788
- : failureClass === 'auth' ? 'AUTH'
789
- : 'QUOTA_EXCEEDED', { status });
821
+ throw abortLikeOrNormal(errorText, status);
790
822
  }
791
- throw abortLikeOrNormal(errorText, status);
823
+ // ⚠️ 业务失败也可能以 HTTP 200 + SSE 内嵌错误帧返回,由 consumeOpenAiSse 处理。
824
+ yield* consumeOpenAiSse(response, { signal: options.signal }, {
825
+ label: 'raccoon',
826
+ firstTokenTimeoutMs: resolveFirstTokenTimeoutMs(),
827
+ chunkTimeoutMs: resolveChunkTimeoutMs(),
828
+ ...options.maxTokens === undefined ? {} : { maxTokens: options.maxTokens },
829
+ });
830
+ }
831
+ finally {
832
+ // 持有到 SSE 完整消费(或异常、调用方提前 return)才释放;只在
833
+ // fetch 返回时释放会让同账号的第二个请求与第一条流并发上行。
834
+ releaseRequest();
792
835
  }
793
- // ⚠️ 业务失败也可能以 HTTP 200 + SSE 内嵌错误帧返回,由 consumeOpenAiSse 处理。
794
- yield* consumeOpenAiSse(response, { signal: options.signal }, {
795
- label: 'raccoon',
796
- firstTokenTimeoutMs: resolveFirstTokenTimeoutMs(),
797
- chunkTimeoutMs: resolveChunkTimeoutMs(),
798
- ...options.maxTokens === undefined ? {} : { maxTokens: options.maxTokens },
799
- });
800
836
  }
801
837
  }
802
838
  /** 首 token 超时(毫秒);可用环境变量覆盖(与其余适配器同约定)。 */