@eddyskywalker/dsh-chatgpt-subscription 0.53.0 → 0.54.0

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 (105) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/README.md +14 -8
  3. package/lib/client.js +72 -19
  4. package/lib/client.js.map +1 -1
  5. package/lib/index.js +20564 -19183
  6. package/lib/types/client/locales-ru/progress-updates.d.ts.map +1 -1
  7. package/lib/types/client/progress-updates/locales.d.ts +8 -2
  8. package/lib/types/client/progress-updates/locales.d.ts.map +1 -1
  9. package/lib/types/client/progress-updates/settings-binding.d.ts +3 -1
  10. package/lib/types/client/progress-updates/settings-binding.d.ts.map +1 -1
  11. package/lib/types/client/progress-updates/settings-section.d.ts.map +1 -1
  12. package/lib/types/compat.d.ts +35 -16
  13. package/lib/types/compat.d.ts.map +1 -1
  14. package/lib/types/host/adapter.d.ts +1 -1
  15. package/lib/types/host/adapter.d.ts.map +1 -1
  16. package/lib/types/host/antigravity/adapter.d.ts.map +1 -1
  17. package/lib/types/host/antigravity/mapper.d.ts +4 -24
  18. package/lib/types/host/antigravity/mapper.d.ts.map +1 -1
  19. package/lib/types/host/antigravity/types.d.ts +7 -1
  20. package/lib/types/host/antigravity/types.d.ts.map +1 -1
  21. package/lib/types/host/claude/adapter.d.ts.map +1 -1
  22. package/lib/types/host/claude/client.d.ts +19 -3
  23. package/lib/types/host/claude/client.d.ts.map +1 -1
  24. package/lib/types/host/claude/mapper.d.ts +105 -8
  25. package/lib/types/host/claude/mapper.d.ts.map +1 -1
  26. package/lib/types/host/claude/model-catalog.d.ts +97 -9
  27. package/lib/types/host/claude/model-catalog.d.ts.map +1 -1
  28. package/lib/types/host/claude/types.d.ts +21 -2
  29. package/lib/types/host/claude/types.d.ts.map +1 -1
  30. package/lib/types/host/cline-pass/adapter.d.ts +9 -1
  31. package/lib/types/host/cline-pass/adapter.d.ts.map +1 -1
  32. package/lib/types/host/cline-pass/mapper.d.ts +18 -0
  33. package/lib/types/host/cline-pass/mapper.d.ts.map +1 -1
  34. package/lib/types/host/cline-pass/types.d.ts +8 -2
  35. package/lib/types/host/cline-pass/types.d.ts.map +1 -1
  36. package/lib/types/host/codex-catalog.d.ts +9 -0
  37. package/lib/types/host/codex-catalog.d.ts.map +1 -1
  38. package/lib/types/host/command-code/adapter.d.ts.map +1 -1
  39. package/lib/types/host/command-code/mapper.d.ts +44 -2
  40. package/lib/types/host/command-code/mapper.d.ts.map +1 -1
  41. package/lib/types/host/command-code/model-catalog.d.ts +53 -11
  42. package/lib/types/host/command-code/model-catalog.d.ts.map +1 -1
  43. package/lib/types/host/command-code/routes.d.ts +6 -0
  44. package/lib/types/host/command-code/routes.d.ts.map +1 -1
  45. package/lib/types/host/command-code/types.d.ts +24 -3
  46. package/lib/types/host/command-code/types.d.ts.map +1 -1
  47. package/lib/types/host/common/account-pool.d.ts +33 -3
  48. package/lib/types/host/common/account-pool.d.ts.map +1 -1
  49. package/lib/types/host/common/idle-watchdog.d.ts +27 -7
  50. package/lib/types/host/common/idle-watchdog.d.ts.map +1 -1
  51. package/lib/types/host/common/model-request-control.d.ts.map +1 -1
  52. package/lib/types/host/glm-coding-plan/adapter.d.ts.map +1 -1
  53. package/lib/types/host/glm-coding-plan/mapper-anthropic.d.ts +111 -31
  54. package/lib/types/host/glm-coding-plan/mapper-anthropic.d.ts.map +1 -1
  55. package/lib/types/host/glm-coding-plan/mapper-openai.d.ts.map +1 -1
  56. package/lib/types/host/glm-coding-plan/model-catalog.d.ts +12 -3
  57. package/lib/types/host/glm-coding-plan/model-catalog.d.ts.map +1 -1
  58. package/lib/types/host/glm-coding-plan/types.d.ts +88 -3
  59. package/lib/types/host/glm-coding-plan/types.d.ts.map +1 -1
  60. package/lib/types/host/kimi-code/account-pool.d.ts +2 -2
  61. package/lib/types/host/kimi-code/account-pool.d.ts.map +1 -1
  62. package/lib/types/host/kimi-code/adapter.d.ts.map +1 -1
  63. package/lib/types/host/kimi-code/cache-wait.d.ts +28 -6
  64. package/lib/types/host/kimi-code/cache-wait.d.ts.map +1 -1
  65. package/lib/types/host/kimi-code/oauth.d.ts +21 -1
  66. package/lib/types/host/kimi-code/oauth.d.ts.map +1 -1
  67. package/lib/types/host/kimi-code/types.d.ts +19 -1
  68. package/lib/types/host/kimi-code/types.d.ts.map +1 -1
  69. package/lib/types/host/minimax-code/adapter.d.ts.map +1 -1
  70. package/lib/types/host/minimax-code/types.d.ts +7 -1
  71. package/lib/types/host/minimax-code/types.d.ts.map +1 -1
  72. package/lib/types/host/model-catalog.d.ts +14 -0
  73. package/lib/types/host/model-catalog.d.ts.map +1 -1
  74. package/lib/types/host/ollama/adapter.d.ts.map +1 -1
  75. package/lib/types/host/ollama/types.d.ts +10 -0
  76. package/lib/types/host/ollama/types.d.ts.map +1 -1
  77. package/lib/types/host/opendesign/adapter.d.ts.map +1 -1
  78. package/lib/types/host/opendesign/mapper.d.ts +31 -0
  79. package/lib/types/host/opendesign/mapper.d.ts.map +1 -1
  80. package/lib/types/host/opendesign/types.d.ts +8 -2
  81. package/lib/types/host/opendesign/types.d.ts.map +1 -1
  82. package/lib/types/host/qoder/adapter.d.ts.map +1 -1
  83. package/lib/types/host/qoder/mapper.d.ts +9 -0
  84. package/lib/types/host/qoder/mapper.d.ts.map +1 -1
  85. package/lib/types/host/responses-client.d.ts +22 -2
  86. package/lib/types/host/responses-client.d.ts.map +1 -1
  87. package/lib/types/host/responses-mapper.d.ts +44 -4
  88. package/lib/types/host/responses-mapper.d.ts.map +1 -1
  89. package/lib/types/host/step-code/adapter.d.ts.map +1 -1
  90. package/lib/types/host/step-code/client.d.ts +8 -0
  91. package/lib/types/host/step-code/client.d.ts.map +1 -1
  92. package/lib/types/host/step-code/mapper.d.ts +9 -5
  93. package/lib/types/host/step-code/mapper.d.ts.map +1 -1
  94. package/lib/types/host/step-code/model-catalog.d.ts +17 -0
  95. package/lib/types/host/step-code/model-catalog.d.ts.map +1 -1
  96. package/lib/types/host/wire-auth.d.ts +31 -0
  97. package/lib/types/host/wire-auth.d.ts.map +1 -1
  98. package/lib/types/host/workbuddy/adapter.d.ts.map +1 -1
  99. package/lib/types/host/workbuddy/types.d.ts +7 -1
  100. package/lib/types/host/workbuddy/types.d.ts.map +1 -1
  101. package/lib/types/index.d.ts +8 -0
  102. package/lib/types/index.d.ts.map +1 -1
  103. package/lib/types/shared/model-catalog.d.ts +58 -12
  104. package/lib/types/shared/model-catalog.d.ts.map +1 -1
  105. package/package.json +1 -1
@@ -74,7 +74,13 @@ export declare const QUOTA_CACHE_TTL_MS: number;
74
74
  export declare const CATALOG_CACHE_TTL_MS: number;
75
75
  export declare const DEFAULT_MAX_TOKENS = 32768;
76
76
  export declare const DEFAULT_CONTEXT_WINDOW = 128000;
77
- export declare const STREAM_IDLE_TIMEOUT_MS = 300000;
77
+ /**
78
+ * Idle ceiling for one streaming response before it is declared stalled.
79
+ *
80
+ * Strictly inside the transport's own 300 s stream timeout; see
81
+ * `host/common/idle-watchdog.ts` for the measured basis.
82
+ */
83
+ export declare const STREAM_IDLE_TIMEOUT_MS = 120000;
78
84
  export declare const STREAM_IDLE_TIMEOUT_CODE = "LLM_STREAM_IDLE_TIMEOUT";
79
85
  /**
80
86
  * Product identity for the provider API's `User-Agent`.
@@ -180,8 +186,23 @@ export declare function inputModalitiesFor(modelId: string): Array<'text' | 'ima
180
186
  */
181
187
  export declare function anthropicThinkingBudget(effort: string): number | null;
182
188
  /**
183
- * Output cap one request asks for when the caller omits one. A cap the registry
184
- * declares wins over the observed value, which in turn wins over the default.
189
+ * Output cap the official registry DECLARES for one model, or undefined when it
190
+ * declares none.
191
+ *
192
+ * A registry that declares no cap is not a model with a small cap: it is a model
193
+ * whose cap the provider decides. The table this plugin shipped before carried
194
+ * a hand-written cross-provider guess for those models, and a guess is wrong in
195
+ * both directions - too small truncates the answer, too large is refused by the
196
+ * provider. The official registry is the only authority, so a model that
197
+ * declares nothing there declares nothing on the wire either.
198
+ */
199
+ export declare function declaredMaxOutputTokens(modelId: string): number | undefined;
200
+ /**
201
+ * Output cap the host reserves against when the caller asks for none.
202
+ *
203
+ * This is HOST metadata: the number the settings card shows and the number a
204
+ * compaction reserves against. It is NOT a wire cap, and a request that carries
205
+ * no cap of its own sends none - see `requestMaxTokens` in `./mapper.ts`.
185
206
  */
186
207
  export declare function maxOutputTokensFor(modelId: string): number;
187
208
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/host/command-code/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/host/command-code/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAGhG,eAAO,MAAM,WAAW,iBAAiB,CAAA;AACzC,eAAO,MAAM,aAAa,iBAAiB,CAAA;AAE3C,oFAAoF;AACpF,eAAO,MAAM,WAAW,qBAAqB,CAAA;AAC7C,iFAAiF;AACjF,eAAO,MAAM,qBAAqB,aAAa,CAAA;AAC/C,sEAAsE;AACtE,eAAO,MAAM,aAAa,QAAQ,CAAA;AAElC,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAI3D,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAI9D,CAAA;AAED,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,iBAAiB,CAAA;AAEjD,0EAA0E;AAC1E,eAAO,MAAM,WAAW,kBAAkB,CAAA;AAC1C,gDAAgD;AAChD,eAAO,MAAM,oBAAoB,2BAA2B,CAAA;AAC5D,2DAA2D;AAC3D,eAAO,MAAM,0BAA0B,iCAAiC,CAAA;AACxE,0DAA0D;AAC1D,eAAO,MAAM,kBAAkB,yBAAyB,CAAA;AAExD,oFAAoF;AACpF,eAAO,MAAM,qBAAqB,OAAO,CAAA;AACzC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,sBAAsB,OAAO,CAAA;AAC1C,eAAO,MAAM,aAAa,cAAc,CAAA;AACxC,sFAAsF;AACtF,eAAO,MAAM,sBAAsB,uBAAuB,CAAA;AAC1D,oFAAoF;AACpF,eAAO,MAAM,yBAAyB,QAAS,CAAA;AAC/C,sDAAsD;AACtD,eAAO,MAAM,kBAAkB,QAAS,CAAA;AACxC,kFAAkF;AAClF,eAAO,MAAM,wBAAwB,gGAI3B,CAAA;AACV,eAAO,MAAM,gBAAgB,QAAgB,CAAA;AAC7C,eAAO,MAAM,oBAAoB,QAAS,CAAA;AAC1C,eAAO,MAAM,kBAAkB,QAAgB,CAAA;AAC/C,eAAO,MAAM,oBAAoB,QAAiB,CAAA;AAElD,eAAO,MAAM,kBAAkB,QAAS,CAAA;AACxC,eAAO,MAAM,sBAAsB,SAAU,CAAA;AAE7C;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,SAAU,CAAA;AAC7C,eAAO,MAAM,wBAAwB,4BAA4B,CAAA;AAEjE;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,qFAAqF,CAAA;AAEnH,wFAAwF;AACxF,eAAO,MAAM,cAAc,qBAAqB,CAAA;AAEhD,8EAA8E;AAC9E,eAAO,MAAM,cAAc,kBAAkB,CAAA;AAC7C,eAAO,MAAM,kBAAkB,+BAA+B,CAAA;AAC9D,eAAO,MAAM,sBAAsB,mCAAmC,CAAA;AACtE,eAAO,MAAM,mBAAmB,gCAAgC,CAAA;AAChE,eAAO,MAAM,qBAAqB,kCAAkC,CAAA;AACpE,eAAO,MAAM,iBAAiB,8BAA8B,CAAA;AAC5D,eAAO,MAAM,2BAA2B,wCAAwC,CAAA;AAChF,uEAAuE;AACvE,eAAO,MAAM,UAAU,cAAc,CAAA;AACrC,eAAO,MAAM,oBAAoB,yBAAyB,CAAA;AAC1D,eAAO,MAAM,WAAW,YAAY,CAAA;AAEpC,wBAAgB,aAAa,CAAC,GAAG,qBAAmC,GAAG,iBAAiB,CAGvF;AAED,wBAAgB,UAAU,CAAC,GAAG,GAAE,iBAAmC,GAAG,MAAM,CAE3E;AAED,wBAAgB,aAAa,CAAC,GAAG,GAAE,iBAAmC,GAAG,MAAM,CAE9E;AAED,wBAAgB,WAAW,CAAC,GAAG,GAAE,iBAAmC,GAAG,MAAM,CAE5E;AAED;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAE7D;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE;IAAE,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GAAG,eAAe,GAAG,SAAS,CAOlH;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAG7D;AAED;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,SAAS,CAAA;AAE9C;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,GAAG,SAAS,CAKzF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,CAO3E;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUrE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE3E;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAKQ,CAAA"}
@@ -41,6 +41,27 @@ export interface PoolAccountInput<TCredentials, TAccount> {
41
41
  /** The account this one replaces, when the dedupe key already exists. */
42
42
  existing?: TAccount;
43
43
  }
44
+ /**
45
+ * What one refresh is allowed to spend, as the caller states it.
46
+ *
47
+ * A refresh that fails transiently is normally retried inside the provider's
48
+ * own OAuth layer, and that layer has its own default budget. A caller that
49
+ * ALREADY owns a retry loop must be able to say so: when the harness retries a
50
+ * model request, an inner retry loop multiplies the two budgets, so one
51
+ * upstream hiccup costs the service several times more requests than the
52
+ * caller ever intended.
53
+ *
54
+ * The field is optional everywhere it appears. An absent budget means the
55
+ * provider's own default, so every existing call keeps its behaviour.
56
+ */
57
+ export interface AccountPoolRefreshOptions {
58
+ /**
59
+ * How many attempts one refresh gets, including the first.
60
+ *
61
+ * A positive integer. Absent means the provider's default.
62
+ */
63
+ maxAttempts?: number;
64
+ }
44
65
  /**
45
66
  * Provider-specific behaviour of one account pool.
46
67
  *
@@ -77,8 +98,14 @@ export interface AccountPoolHooks<TCredentials, TAccount extends PoolAccountShap
77
98
  expiresAt?(credentials: TCredentials): number | undefined;
78
99
  /** Whether the credential must be refreshed before the next request. */
79
100
  needsRefresh?(credentials: TCredentials, now: number): boolean;
80
- /** Refresh one credential, returning the value to persist back into the pool. */
81
- refresh?(credentials: TCredentials, fetchFn: typeof fetch): Promise<TCredentials>;
101
+ /**
102
+ * Refresh one credential, returning the value to persist back into the pool.
103
+ *
104
+ * The attempt budget the caller stated arrives as the third argument. It is
105
+ * absent when the caller expressed none, and a hook that ignores it keeps
106
+ * whatever budget its own provider defaults to.
107
+ */
108
+ refresh?(credentials: TCredentials, fetchFn: typeof fetch, options?: AccountPoolRefreshOptions): Promise<TCredentials>;
82
109
  /**
83
110
  * Classify a failed refresh.
84
111
  *
@@ -499,9 +526,12 @@ export declare class AccountPoolCore<TCredentials, TAccount extends PoolAccountS
499
526
  * @param excludeIds - accounts already tried for this request, so a retry
500
527
  * lands on a different account.
501
528
  * @param fetchFn - fetch used by the provider's token refresh.
529
+ * @param forceRefresh - renew even when the stored token still looks usable.
530
+ * @param options - what the refresh may spend, passed down to the provider's
531
+ * refresh hook. Absent means the provider's own default budget.
502
532
  * @throws LlmError with `RATE_LIMIT` when every account is cooling down.
503
533
  */
504
- getEffectiveAccount(excludeIds?: ReadonlySet<string>, fetchFn?: typeof fetch, forceRefresh?: boolean): Promise<{
534
+ getEffectiveAccount(excludeIds?: ReadonlySet<string>, fetchFn?: typeof fetch, forceRefresh?: boolean, options?: AccountPoolRefreshOptions): Promise<{
505
535
  account: TAccount;
506
536
  credentials: TCredentials;
507
537
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"account-pool.d.ts","sourceRoot":"","sources":["../../../../src/host/common/account-pool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"account-pool.d.ts","sourceRoot":"","sources":["../../../../src/host/common/account-pool.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,35 @@
1
- export declare const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 300000;
1
+ /**
2
+ * How long one stream may go without a single byte before it is called stalled.
3
+ *
4
+ * Strictly INSIDE the transport's own deadline on purpose. undici answers a
5
+ * stalled HTTP/2 stream at exactly 300 s, so the 300 s every line used to carry
6
+ * never decided anything: the watchdog and the transport expired together, the
7
+ * transport error won the race, and the turn paid the full five minutes of
8
+ * silence before DSH could retry — reported as a severed connection rather than
9
+ * as a stalled one. Two minutes is measured rather than guessed: over the 104
10
+ * requests of the session that prompted this value, the longest wait from a step
11
+ * starting to its first chunk was 65 s (a 210k-token prompt), and the longest
12
+ * silence once chunks were flowing was 6.4 s across 6,539 measured gaps. The
13
+ * adapters also pulse the watchdog when the response headers arrive, so a slow
14
+ * prefill is budgeted apart from in-stream silence instead of being read as a
15
+ * dead stream.
16
+ *
17
+ * `ollama/types.ts` deliberately keeps a longer budget: local inference is
18
+ * compute-bound, and a large prompt can legitimately take minutes to answer.
19
+ */
20
+ export declare const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 120000;
2
21
  export declare const STREAM_IDLE_TIMEOUT_CODE = "LLM_STREAM_IDLE_TIMEOUT";
3
22
  /**
4
23
  * The same budget under the name every provider adapter passes it by.
5
24
  *
6
- * Six provider `types.ts` files each declared their own
7
- * `STREAM_IDLE_TIMEOUT_MS = 300_000`, so one line ended up importing a sibling
8
- * line's copy just to name the same number. This alias is the single home: the
9
- * value is unchanged, and an adapter that took the constant from another line
10
- * can now take it from here without renaming its local usage.
25
+ * Six provider `types.ts` files each declare their own
26
+ * `STREAM_IDLE_TIMEOUT_MS`, so one line ended up importing a sibling line's copy
27
+ * just to name the same number. This alias is the single home: an adapter that
28
+ * took the constant from another line can take it from here without renaming its
29
+ * local usage, and a line whose budget is its own (ollama) says so in its own
30
+ * `types.ts`.
11
31
  */
12
- export declare const STREAM_IDLE_TIMEOUT_MS = 300000;
32
+ export declare const STREAM_IDLE_TIMEOUT_MS = 120000;
13
33
  /**
14
34
  * 传输层活动上报器。
15
35
  *
@@ -1 +1 @@
1
- {"version":3,"file":"idle-watchdog.d.ts","sourceRoot":"","sources":["../../../../src/host/common/idle-watchdog.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,8BAA8B,SAAU,CAAA;AACrD,eAAO,MAAM,wBAAwB,4BAA4B,CAAA;AAEjE;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,SAAiC,CAAA;AAEpE;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,uCAAuC;IACvC,KAAK,IAAI,IAAI,CAAA;CACd;AAED,qCAAqC;AACrC,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,KAAK,aAAa,CAAC,CAAC,CAAC,CAAA;AAEnG;;;GAGG;AACH,wBAAuB,sBAAsB,CAAC,CAAC,EAC7C,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,cAAc,EAAE,WAAW,GAAG,SAAS,EACvC,SAAS,GAAE,MAAuC,EAClD,WAAW,GAAE,MAAiC,EAC9C,WAAW,GAAE,MAAc,GAC1B,aAAa,CAAC,CAAC,CAAC,CAyClB"}
1
+ {"version":3,"file":"idle-watchdog.d.ts","sourceRoot":"","sources":["../../../../src/host/common/idle-watchdog.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,8BAA8B,SAAU,CAAA;AACrD,eAAO,MAAM,wBAAwB,4BAA4B,CAAA;AAEjE;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,SAAiC,CAAA;AAEpE;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,uCAAuC;IACvC,KAAK,IAAI,IAAI,CAAA;CACd;AAED,qCAAqC;AACrC,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,KAAK,aAAa,CAAC,CAAC,CAAC,CAAA;AAEnG;;;GAGG;AACH,wBAAuB,sBAAsB,CAAC,CAAC,EAC7C,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,cAAc,EAAE,WAAW,GAAG,SAAS,EACvC,SAAS,GAAE,MAAuC,EAClD,WAAW,GAAE,MAAiC,EAC9C,WAAW,GAAE,MAAc,GAC1B,aAAa,CAAC,CAAC,CAAC,CAyClB"}
@@ -1 +1 @@
1
- {"version":3,"file":"model-request-control.d.ts","sourceRoot":"","sources":["../../../../src/host/common/model-request-control.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,eAAO,MAAM,oBAAoB,2MAA4M,CAAA;AAC7O,MAAM,MAAM,kBAAkB,GAAG,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAA;AACpE,MAAM,WAAW,kBAAkB;IACjC,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAA;IACvD,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,gFAAgF;AAChF,wBAAgB,sBAAsB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,kBAAkB,CAqB/F;AAED,kGAAkG;AAClG,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAO9F;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,MAAM,EAAE,kBAAkB,CAAA;IAC1B,IAAI,CAAC,EAAE,eAAe,CAAA;CACvB;AAED,4FAA4F;AAC5F,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,OAAO,KAAK,EAAE,OAAO,EAAE,0BAA0B,GAAG,OAAO,KAAK,CAmErH"}
1
+ {"version":3,"file":"model-request-control.d.ts","sourceRoot":"","sources":["../../../../src/host/common/model-request-control.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,eAAO,MAAM,oBAAoB,2MAA4M,CAAA;AAC7O,MAAM,MAAM,kBAAkB,GAAG,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAA;AACpE,MAAM,WAAW,kBAAkB;IACjC,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAA;IACvD,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,gFAAgF;AAChF,wBAAgB,sBAAsB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,kBAAkB,CAqB/F;AAkBD,kGAAkG;AAClG,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAQ9F;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,MAAM,EAAE,kBAAkB,CAAA;IAC1B,IAAI,CAAC,EAAE,eAAe,CAAA;CACvB;AAED,4FAA4F;AAC5F,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,OAAO,KAAK,EAAE,OAAO,EAAE,0BAA0B,GAAG,OAAO,KAAK,CAmErH"}
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/host/glm-coding-plan/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/host/glm-coding-plan/adapter.ts"],"names":[],"mappings":"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"}
@@ -26,20 +26,38 @@
26
26
  * 只排上游那三档会踩本仓库记录过的 bug:`minimal` 属于「未识别」,未识别一律落在中档,
27
27
  * 于是 `minimal` 被发成 `high`——模型想得比用户要求的长得多,**更慢而且多计费**。
28
28
  *
29
- * 三、本文件**不伪造模型名**
29
+ * 三、effort 的**出口**是 `output_config.effort`,不是顶层 `reasoning_effort`
30
+ *
31
+ * 逐字证据:官方开源客户端 `zai-org/ZCode` 的 `config/provider/zcode-builtin.json`
32
+ * (`modelConfigRules.modelApiRules` 里 `apiTypeMatch: "anthropic-messages"` 的逐模型 map)
33
+ * 写的是 `output_config: { effort: reasoningLevel }`,而**全仓 `reasoning_effort` 零命中**
34
+ * ——顶层那个字段只出现在 OpenAI 面的 map 里(那一条由本线路的 OpenAI mapper 单独处理)。
35
+ * 本文件的 Anthropic 面照此改形状:`thinking.type` 说开/关,`output_config.effort` 说深度。
36
+ * 见 {@link glmThinkingControl}。
37
+ *
38
+ * 四、**关思考**是逐模型事实,不是本文件的全局假设
39
+ *
40
+ * 同一份官方规则集的 `reasoningLevel.values` 逐模型给:
41
+ * `.*glm-5\.3.*`(GLM-5.3 / GLM-5.3-Flash)是 `low/high/max`——**没有** `disabled`;
42
+ * `.*GLM-5\.2.*` 是 `disabled/high/max`;`.*GLM-5-Turbo.*` 是 `disabled/enabled`
43
+ * (它没有档位梯子,所以官方那条 map **不带** `output_config`)。
44
+ * 所以「恒开」与「可关」由目录的 `thinkingDisableable` 声明(见 `./model-catalog.ts`),
45
+ * 本文件只把它翻译成请求体,不在这里猜。
46
+ *
47
+ * 五、本文件**不伪造模型名**
30
48
  *
31
49
  * `GenerateOptions.model` 是调用方(模型目录)给的 id,逐字下发。本线路两区模型 id
32
50
  * 不一致(计划 R8),任何按前缀猜测或「顺手换成官方名」的改写都会把请求打到上游
33
51
  * 不认识的 id 上(`ERROR_CODE.UNKNOWN_MODEL` = 1211)。
34
52
  *
35
- * 四、分块语义照兄弟线路的 Anthropic 面,不另发明
53
+ * 六、分块语义照兄弟线路的 Anthropic 面,不另发明
36
54
  *
37
55
  * 思考 / 文本 / 工具调用是三个独立的 DSH 块:思考文本走 `reasoning-delta`,正文走
38
56
  * `text-delta`,工具参数逐字拼接后交给 `tool-call` 块的 `arguments` 字符串
39
57
  * (DSH 协议义务:参数保持模型产出的原始 JSON 串)。
40
58
  * 参考实现是 `../minimax-code/mapper.ts`(同为 Anthropic 面)与 `../claude/mapper.ts`。
41
59
  *
42
- * 五、思考块的**回放**本文件不做
60
+ * 七、思考块的**回放**本文件不做
43
61
  *
44
62
  * Claude / minimax 两条线会把签名的 thinking 块原样存进 replayState 再回传。本线路
45
63
  * 没有这个需求的证据:GLM 的 Anthropic 兼容面是否要求回放签名块,没有任何实测样本。
@@ -47,16 +65,26 @@
47
65
  * 本文件沿用那一条并在 {@link anthropicAssistantContent} 注明;**未验证**:改成
48
66
  * 「回放」是否会被本面接受(需要一条真实多轮会话样本)。
49
67
  *
68
+ * 八、`system` 走**块数组**,并在两个位置下缓存断点
69
+ *
70
+ * Anthropic Messages 面的 `system` 既可以是字符串,也可以是 `{type:'text'}` 块数组。
71
+ * 官方客户端走块数组(AI SDK 的 Anthropic 转换:每条 system 消息一块),
72
+ * 所以本线路也发块数组——顺带让**缓存断点**能落在 system 上:system 末块与
73
+ * 最新一条非 system 消息的可缓存末块各带一个 `cache_control: {type:'ephemeral'}`。
74
+ * 官方客户端的缓存断点只落在最新一条非 system 消息上
75
+ * (`zai-org/ZCode` 的 `core/src/runtime/helpers/provider-request-messages.ts`
76
+ * 的 `finalizeLatestNonSystemMessageCacheControl`,全仓唯一一处 `type:'ephemeral'`),
77
+ * 本文件**多给 system 末块一个**:长 system 提示词正是前缀缓存最值钱的一段,
78
+ * 而 Anthropic 允许一次请求最多 4 个断点。见 {@link glmAnthropicSystemBlocks}。
79
+ *
50
80
  * 未验证清单(本文件内逐条标注):
51
81
  *
52
- * 1. `reasoning_effort` 出现在 Anthropic 面上。等级 A 的证据只覆盖 OpenAI 面的
53
- * `/api/coding/paas/v4`;本面是同一平台的兼容网关,但它是否读顶层
54
- * `reasoning_effort` 没有实测样本。用 `buildGlmAnthropicRequest` 的
55
- * `sendReasoningEffort` 开关可整段关掉。
56
- * 2. `anthropic-version` 头网关是否强制要求。缺一条缺头的 4xx 样本。
57
- * 3. 网关在 Anthropic 面上发思考增量的词汇。本文件同时认 `thinking_delta` 与
82
+ * 1. `anthropic-version` 头网关是否强制要求。缺一条缺头的 4xx 样本。
83
+ * 2. 网关在 Anthropic 面上发思考增量的词汇。本文件同时认 `thinking_delta` 与
58
84
  * `reasoning_content`,两种都收。
59
- * 4. 历史里 reasoning 块不回放是否被本面接受(见第五节)。
85
+ * 3. 历史里 reasoning 块不回放是否被本面接受(见第七节)。
86
+ * 4. `cache_control` 在本线路上是否真的命中缓存、命中比例多少。本轮无实机账号
87
+ * (计划 D9),只按 Anthropic 公开协议与官方客户端的用法发形状。
60
88
  */
61
89
  import { LlmError, type ContentBlock, type GenerateOptions, type OutboundContentBlock, type StreamChunk } from '../common/llm-compat.ts';
62
90
  import { type ResolvedRequestImages } from '../common/request-images.ts';
@@ -79,6 +107,8 @@ export declare const GLM_ANTHROPIC_VERSION = "2023-06-01";
79
107
  * TIMEOUT / TRANSPORT 等),所以抛出后不会被重试策略放大。
80
108
  */
81
109
  export declare const UNSUPPORTED_OPTION_CODE = "UNSUPPORTED_OPTION";
110
+ /** Anthropic 内容块在线上是普通 JSON 对象。 */
111
+ export type AnthropicBlock = Record<string, unknown>;
82
112
  /**
83
113
  * Anthropic 面的完整 URL:`{模型面 base}{CHAT_PATH_ANTHROPIC}/v1/messages`。
84
114
  *
@@ -134,34 +164,79 @@ export interface GlmThinkingControl {
134
164
  thinking: boolean;
135
165
  }
136
166
  /**
137
- * 请求体里的思考控制字段。
167
+ * 请求体里的思考控制字段:**开/关**由 `thinking.type` 说,**深度**由 `output_config.effort` 说。
138
168
  *
139
- * `thinking: { type: 'enabled' }` 是**恒常发出**的一半:历史同族实现逐字记过
140
- * 「`thinking` 的默认是 enabled,GLM-5.3 / GLM-5.3-FLASH / GLM-4.7 把
141
- * `thinking.type: "disabled"` 当错误拒绝」(`7e40fce` 的 `src/host/zhipu/mapper.ts`
142
- * 头注释),所以本线路任何模型都不发关闭值。
169
+ * 形状逐字照官方开源客户端 `zai-org/ZCode` 的 `config/provider/zcode-builtin.json`
170
+ * (`modelConfigRules.modelApiRules` 里 `apiTypeMatch: "anthropic-messages"` 的逐模型 map):
143
171
  *
144
- * `reasoning_effort` 是选深度的一半,取 {@link glmEffortForLadder} 的收敛结果。
172
+ * - `.*glm-5\.3.*`(GLM-5.3 / GLM-5.3-Flash):
173
+ * `{"thinking":{"type":"enabled"},"output_config":{"effort": reasoningLevel}}`
174
+ * ——这一族**没有** `disabled` 分支,所以官方也没给 `disabled` 这个档位值。
175
+ * - `.*GLM-5\.2.*`:`reasoningLevel == "disabled" ? {"thinking":{"type":"disabled"}} :
176
+ * {"thinking":{"type":"enabled"},"output_config":{"effort": reasoningLevel}}`
177
+ * - `.*GLM-5-Turbo.*`:`{"thinking":{"type": reasoningLevel == "enabled" ? "enabled" : "disabled"}}`
178
+ * ——它没有档位梯子,所以官方那条 map **不带** `output_config`。
145
179
  *
146
- * **未验证**:`reasoning_effort` 落在 Anthropic 面上。等级 A 的证据(计划 `3.3、
147
- * `9ad8a53` 的 `CODING_EFFORTS`)只覆盖 OpenAI 面 `/api/coding/paas/v4`;本面是同一个
148
- * 平台的兼容网关,但它是否读顶层 `reasoning_effort` 没有实测样本,缺一次真实请求。
149
- * 之所以仍然默认发:另一个候选(Anthropic 原生的 `thinking.budget_tokens`)表达不了
150
- * 三档梯子,而 `sendReasoningEffort: false` 是一个出口而不是修复。
180
+ * 顶层 `reasoning_effort` **不发**:官方全仓 `reasoning_effort` 零命中,
181
+ * 顶层那个字段只出现在 OpenAI 面的 map 里。
182
+ *
183
+ * 「调用方要不要关思考」用 DSH 的档位词汇 `none` 表达(与 `../qoder/mapper.ts` 的
184
+ * `resolveQoderThinking` 同一词汇),并且**只在该模型声明可关时**才生效:
185
+ * 声明可关 = 目录的 `thinkingDisableable`(逐模型事实,见 `./model-catalog.ts`)。
186
+ * 不声明可关的模型收到 `none` 时仍按梯子收敛到最低档(GLM-5.3 家族会落 `low`),
187
+ * 因为官方规则集里那一族的 `values` 就没有 `disabled`。
151
188
  *
152
189
  * @param ladder - 模型真实梯子。
153
- * @param requested - 调用方给的档位。
154
- * @param sendReasoningEffort - 是否把收敛后的档位发成顶层字段,默认 true。
190
+ * @param requested - 调用方给的档位(`none` 表示不要思考)。
191
+ * @param sendReasoningEffort - 是否把收敛后的档位发进 `output_config`,默认 true。
192
+ * @param thinkingDisableable - 该模型是否接受关闭思考,默认 false(不声明就不发关闭值)。
193
+ */
194
+ export declare function glmThinkingControl(ladder: readonly string[], requested: string | undefined | null, sendReasoningEffort?: boolean, thinkingDisableable?: boolean): GlmThinkingControl;
195
+ /**
196
+ * 给最后一个可缓存块挂上缓存断点;一个可缓存块都没有就**不动**。
197
+ *
198
+ * 「最后一个」而不是「最后一个块」:一条消息的末尾可能是不可缓存的空块,
199
+ * 断点要落在它前面那个真正有内容的块上,否则这一轮的前缀缓存等于没开。
200
+ *
201
+ * 导出是为了让这条边界能被直接断言(空块不带断点、不可缓存块不带断点)。
155
202
  */
156
- export declare function glmThinkingControl(ladder: readonly string[], requested: string | undefined | null, sendReasoningEffort?: boolean): GlmThinkingControl;
203
+ export declare function glmAnthropicMarkCacheBreakpoint(content: AnthropicBlock[]): AnthropicBlock[];
204
+ /**
205
+ * 全部 system 贡献 → 开头的一段 `system` **块数组**。
206
+ *
207
+ * 形状对齐官方客户端(AI SDK 的 Anthropic 转换:每条 system 消息一块文本块),
208
+ * 而不是把全部 system 拼成一条字符串——块数组才能让缓存断点落在 system 上。
209
+ *
210
+ * 折叠顺序与内容都不变:`options.system` 在前、历史里的 system 消息按序在后,
211
+ * 是一个与轮次无关的稳定折叠(提示词是服务端要缓存的前缀,任何一处每轮变化
212
+ * 都会让整个缓存前缀失效)。
213
+ *
214
+ * **只换形状,不换内容**:块的切分点就是旧实现里 `\n\n` 的位置——分隔符留在前一块的
215
+ * 末尾,所以把各块文字拼起来与旧的「拼成一条」**逐字相同**。改动的是请求体的形状
216
+ * (字符串 → 块数组),不是模型看到的提示词。
217
+ *
218
+ * 空贡献**不产块**:空文本块既不承载内容也不该占断点。
219
+ *
220
+ * 末块带 `cache_control: {type:'ephemeral'}`:长 system 提示词是前缀缓存里最值钱
221
+ * 的一段(每次都要重发),而 Anthropic 允许一次请求最多 4 个断点。
222
+ */
223
+ export declare function glmAnthropicSystemBlocks(options: GenerateOptions): AnthropicBlock[];
157
224
  /** 本面这一次请求的构建选项。 */
158
225
  export interface GlmAnthropicRequestOptions {
159
226
  /** 模型目录为该模型声明的真实思考梯子。空数组 = 该模型不接受思考档位。 */
160
227
  ladder?: readonly string[];
161
228
  /** 这次请求读到的图片(`resolveRequestImages` 的产物)。 */
162
229
  images?: ResolvedRequestImages;
163
- /** 是否把收敛后的档位发成顶层 `reasoning_effort`,默认 true。见 {@link glmThinkingControl}。 */
230
+ /** 是否把收敛后的档位发进 `output_config.effort`,默认 true。见 {@link glmThinkingControl}。 */
164
231
  sendReasoningEffort?: boolean;
232
+ /**
233
+ * 该模型是否接受关闭思考,默认 false。
234
+ *
235
+ * 取目录的 `thinkingDisableable`(逐模型事实,见 `./model-catalog.ts`):
236
+ * 官方规则集里 GLM-5.2 / GLM-5-Turbo 的 `reasoningLevel.values` 含 `disabled`,
237
+ * GLM-5.3 家族不含。**不声明就不发关闭值**——发一个模型不认的值会被上游当错误拒绝。
238
+ */
239
+ thinkingDisableable?: boolean;
165
240
  /** 调用方不指定输出上限时用的值,默认 `./types.ts` 的 `DEFAULT_MAX_TOKENS`。 */
166
241
  defaultMaxTokens?: number;
167
242
  }
@@ -261,10 +336,15 @@ export interface GlmUpstreamErrorVerdict {
261
336
  /**
262
337
  * 这一类失败值不值得重试。
263
338
  *
264
- * 判据来自 `./types.ts` 的 `ERROR_CODE` 注释:可重试的只有 `RATE_LIMITED`(退避后重试,
265
- * 号池可换账号)与 `OVERLOADED`(瞬时过载);其余全部不可重试——重试一次确定的失败
339
+ * 判据来自 `./types.ts` 的 `ERROR_CODE` 注释与官方客户端的业务码表
340
+ * (`zai-org/ZCode` 的 `failure-provider-business-codes.ts`):官方把 1303 / 1312 /
341
+ * 1305 / 1302 与两条 500 恢复类判成可恢复,其余全部不可重试——重试一次确定的失败
266
342
  * 只会把它拖成多次,并在额度类错误上多烧一次额度。
267
343
  * `USAGE_LIMIT` / `PLAN_LIMIT` 带重置时刻,正确处置是等窗口重置而不是立刻重试。
344
+ *
345
+ * **这个字段与 `llmCode` 必须同时成立**:宿主按 `LlmError.code` 判可重试
346
+ * (重试集合见 `./adapter.ts`),所以不可重试的一律落在 `QUOTA` / `PROVIDER_ERROR` /
347
+ * `AUTH` / `INVALID_ARGS` / `NOT_FOUND` 这些**不在**重试集合里的码上。
268
348
  */
269
349
  retryable: boolean;
270
350
  /** 正文给出的业务码;没有则是 null。 */
@@ -277,14 +357,14 @@ export interface GlmUpstreamErrorVerdict {
277
357
  /**
278
358
  * 把一次上游失败判读成机器可路由的结论。
279
359
  *
280
- * 分类**不能停在状态行**:多个真实条件共用同一个 HTTP 状态(表里 429 有六条,
281
- * 401 有三条),所以正文里的业务码才是判据,状态行只在本面没给出业务码时兜底。
360
+ * 分类**不能停在状态行**:多个真实条件共用同一个 HTTP 状态(表里 429 有十几条,
361
+ * 401 有四条),所以正文里的业务码才是判据,状态行只在本面没给出业务码时兜底。
282
362
  *
283
363
  * 两个兜底方向都是有意选的:
284
364
  *
285
365
  * - 未知 5xx → 可重试(传输面故障,语义上与 OVERLOADED 同族)。
286
- * - 未知 429 → **不可重试**。本表里六条 429 里有五条是额度类,立即重试只会继续失败,
287
- * 还会多烧一次额度;宁可让调用方等一下也不要把它变成重试风暴。
366
+ * - 未知 429 → **不可重试**。本表里绝大多数 429 是额度类或终局的限流类,立即重试只会
367
+ * 继续失败,还会多烧一次额度;宁可让调用方等一下也不要把它变成重试风暴。
288
368
  *
289
369
  * @param input - HTTP 状态(可选)与上游正文(可选)。
290
370
  */
@@ -1 +1 @@
1
- {"version":3,"file":"mapper-anthropic.d.ts","sourceRoot":"","sources":["../../../../src/host/glm-coding-plan/mapper-anthropic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mapper-anthropic.d.ts","sourceRoot":"","sources":["../../../../src/host/glm-coding-plan/mapper-anthropic.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"mapper-openai.d.ts","sourceRoot":"","sources":["../../../../src/host/glm-coding-plan/mapper-openai.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mapper-openai.d.ts","sourceRoot":"","sources":["../../../../src/host/glm-coding-plan/mapper-openai.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAOH,OAAO,EACL,QAAQ,EAGR,KAAK,eAAe,EAEpB,KAAK,oBAAoB,EACzB,KAAK,WAAW,EAEjB,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,6BAA6B,CAAA;AAatF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,uBAAuB,uBAAuB,CAAA;AAE3D,uDAAuD;AACvD,eAAO,MAAM,wBAAwB,sBAAsB,CAAA;AAE3D,4CAA4C;AAC5C,eAAO,MAAM,cAAc,YAAY,CAAA;AAEvC,oEAAoE;AACpE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAElG;AAED,wDAAwD;AACxD,wBAAgB,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAEzF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACjC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxB;AAqCD;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,QAAQ,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5C,qBAAqB;IACrB,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC;;;;;OAKG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACnC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,EAAE,mBAGpC,CAAA;AAMD,8BAA8B;AAC9B,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;AAEtE,gCAAgC;AAChC,MAAM,MAAM,oBAAoB,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9E;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;CAAE,CAAA;AAEpC,gCAAgC;AAChC,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;AAI7E;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,QAAmB,CAAA;AA6DvD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe,CA4CpF;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,qBAAqB,GAAG,SAAS,EAC9C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,qBAAqB,CAAC,CAwBhC;AA8HD,sCAAsC;AACtC,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAKxE;AAwDD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,eAAe,EACxB,MAAM,GAAE,qBAA0C,EAClD,KAAK,GAAE,mBAA4C,GAClD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA+EzB;AAMD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK9D;AAmDD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,QAAQ,CAwKV;AAMD,UAAU,eAAe;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,mBAAmB;AACnB,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,oBAAoB,EAAE,CAAA;IAC9B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IAC3E,wBAAwB;IACxB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACvC,UAAU,EAAE,OAAO,CAAA;IACnB,WAAW,EAAE,OAAO,CAAA;IACpB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,qBAAqB;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,gBAAgB;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;IACvB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,wBAAgB,iBAAiB,IAAI,oBAAoB,CAgBxD;AAwCD,yCAAyC;AACzC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,GAAG,WAAW,EAAE,CAoF1F;AAuED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,WAAW,EAAE,CAOtE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAItE"}
@@ -8,10 +8,12 @@
8
8
  *
9
9
  * ## 事实来源(逐行标注,不混用)
10
10
  *
11
- * 1. **官方开源版内置配置** `zai-org/ZCode` 的 `config/provider/zcode-builtin.json`(revision 31,
12
- * 184927 字节)。**路径在仓库根,不在 `apps/zcode-cli/` 下**——后者没有 `config/` 目录,
11
+ * 1. **官方开源版内置配置** `zai-org/ZCode` 的 `config/provider/zcode-builtin.json`。
12
+ * **路径在仓库根,不在 `apps/zcode-cli/` 下**——后者没有 `config/` 目录,
13
13
  * 直连 `apps/zcode-cli/config/provider/zcode-builtin.json` 会 404。本文件下面引用的行号级事实
14
- * 都出自这一份(读取日期 2026-10-11):
14
+ * 都出自这一份。**读取日期 2026-10-30**(仓库 HEAD `a60ba6a`,**revision 43**,252317 字节);
15
+ * 更早一次读取是 revision 31(2026-10-11),本文档引用的这四行事实在两版之间**逐字未变**,
16
+ * 本轮按 revision 43 重新核对过:
15
17
  * - `zai-api` / `bigmodel-api` 两个模板(`access.type = zhipu-coding-plan-api-key`)与四个
16
18
  * `account:*-coding-plan` provider 的 `api.type` **全部**是 `anthropic-messages`,
17
19
  * `baseUrl` 就是本线路的 Anthropic 面(`https://api.z.ai/api/anthropic` /
@@ -20,6 +22,13 @@
20
22
  * `account:{zai,bigmodel}-{individual,team}-coding-plan` 启用**同样四个** id:
21
23
  * `GLM-5.3` / `GLM-5.3-Flash` / `GLM-5.2` / `GLM-5-Turbo`。所以本表是这四个,不多不少;
22
24
  * - `modelConfigRules.modelRules` 给出逐模型事实(见下方每一行的注释);
25
+ * - `modelConfigRules.modelApiRules` 里 `apiTypeMatch: "anthropic-messages"` 的逐模型
26
+ * **请求体 map** 给出本线路 Anthropic 面的思考字段形状,`../mapper-anthropic.ts` 照它实现:
27
+ * `.*glm-5\.3.*` → `{"thinking":{"type":"enabled"},"output_config":{"effort": reasoningLevel}}`;
28
+ * `.*GLM-5\.2.*` → disabled 分支只发 `thinking.type: disabled`,否则发
29
+ * `thinking.type: enabled` + `output_config.effort`;
30
+ * `.*GLM-5-Turbo.*` → `{"thinking":{"type": reasoningLevel == "enabled" ? "enabled" : "disabled"}}`
31
+ * (**不带** `output_config`,因为它没有档位梯子);
23
32
  * - `modelConfigRules.providerSiteRules` 有两条 `modelMatch: ".*"` 的站点规则,分别命中
24
33
  * `https://api\.z\.ai/api/anthropic` 与 `https://open\.bigmodel\.cn/api/anthropic`,
25
34
  * 把 `supportsImage/supportsVideo` 打开成 `true`——**这两个地址就是本线路的两个 Coding Plan
@@ -1 +1 @@
1
- {"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../../../../src/host/glm-coding-plan/model-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,SAAS,EACT,OAAO,EACR,MAAM,2CAA2C,CAAA;AAGlD;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,IAAI,CAAA;AAE3C,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAA;IACZ,6CAA6C;IAC7C,OAAO,EAAE,SAAS,SAAS,EAAE,CAAA;IAC7B;;;;;OAKG;IACH,gBAAgB,EAAE,SAAS,kBAAkB,EAAE,CAAA;IAC/C;;;OAGG;IACH,mBAAmB,EAAE,OAAO,CAAA;IAC5B,yCAAyC;IACzC,IAAI,EAAE,cAAc,CAAA;IACpB,qBAAqB;IACrB,cAAc,EAAE,OAAO,CAAA;IACvB,qCAAqC;IACrC,oBAAoB,EAAE,MAAM,CAAA;IAC5B,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,CAAA;IACxB,gCAAgC;IAChC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B;AAED,6DAA6D;AAC7D,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;AAiBvD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,+BAA+B,EAAE,SAAS,MAAM,EAG5D,CAAA;AAgJD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,EAAE,SAAS,aAAa,EAAkC,CAAA;AAExF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,iCAAiC,EAAE,SAAS,MAAM,EAAgB,CAAA;AAE/E,8BAA8B;AAC9B,eAAO,MAAM,aAAa,EAAE,SAAS,MAAM,EAA+C,CAAA;AAE1F;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,EAAE,SAAS,MAAM,EAAuB,CAAA;AAiB9E,2BAA2B;AAC3B,wBAAgB,YAAY,CAC1B,EAAE,EAAE,OAAO,EACX,OAAO,GAAE,SAAS,aAAa,EAAsB,GACpD,EAAE,IAAI,MAAM,CAEd;AAED,8CAA8C;AAC9C,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,MAAM,EACV,OAAO,GAAE,SAAS,aAAa,EAAsB,GACpD,SAAS,kBAAkB,EAAE,CAE/B;AAED,4CAA4C;AAC5C,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,MAAM,EACV,OAAO,GAAE,SAAS,aAAa,EAAsB,GACpD,OAAO,CAET;AAED,yCAAyC;AACzC,wBAAgB,YAAY,CAC1B,EAAE,EAAE,MAAM,EACV,OAAO,GAAE,SAAS,aAAa,EAAsB,GACpD,cAAc,CAEhB;AAED,oDAAoD;AACpD,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,MAAM,EACV,OAAO,GAAE,SAAS,aAAa,EAAsB,GACpD,MAAM,CAER;AAED,qDAAqD;AACrD,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,MAAM,EACV,OAAO,GAAE,SAAS,aAAa,EAAsB,GACpD,MAAM,CAER;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,MAAM,EACV,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,SAAS,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAO,GAC3D,aAAa,CAqBf;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,EAAE,EAAE,MAAM,EACV,OAAO,GAAE,SAAS,aAAa,EAAsB,GACpD,aAAa,CAEf;AAED,kDAAkD;AAClD,wBAAgB,eAAe,CAC7B,MAAM,EAAE,SAAS,EACjB,OAAO,GAAE,SAAS,aAAa,EAAsB,GACpD,aAAa,EAAE,CAEjB;AAED,iBAAiB;AACjB,wBAAgB,YAAY,CAAC,OAAO,GAAE,SAAS,aAAa,EAAsB,GAAG,MAAM,EAAE,CAE5F;AAED,iCAAiC;AACjC,wBAAgB,WAAW,CAAC,OAAO,GAAE,SAAS,aAAa,EAAsB,GAAG,MAAM,CAEzF;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ9E;AAED,6CAA6C;AAC7C,MAAM,WAAW,yBAAyB;IACxC,uBAAuB;IACvB,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,qCAAqC;IACrC,sBAAsB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAA;CAC7E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,SAAS,aAAa,EAAsB,EACrD,SAAS,GAAE,yBAA8B,GACxC,cAAc,EAAE,CAwBlB"}
1
+ {"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../../../../src/host/glm-coding-plan/model-catalog.ts"],"names":[],"mappings":"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"}