dsh-kenari-plugin 0.1.1 → 0.2.1

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/lib/catalog.js CHANGED
@@ -139,14 +139,25 @@ function slugToDisplayName(id) {
139
139
  return merged.map(spellNameToken).join(' ');
140
140
  }
141
141
  /**
142
- * 一个模型的展示名。
142
+ * 写进路由的模型名统一带的路由前缀。
143
+ *
144
+ * 只加在**路由条目**上({@link toModelProfile} 的 `name`):那是 dsh 印模型名的地方,
145
+ * 而 dsh 只在 `/` 模型菜单里印所属 provider,composer 的模型按钮与会话头部只有展示名
146
+ * 一个字段 —— Kenari 与官方 DeepSeek 存在同名模型(`deepseek-v4-1-flash` 两边都有),
147
+ * 不写前缀就分不出当前用的是哪条路由。
148
+ *
149
+ * 插件自己那一页的模型表不加:它整页都在 Kenari 节里,每行再写一遍 Kenari 是噪音。
150
+ */
151
+ export const DISPLAY_NAME_PREFIX = 'Kenari ';
152
+ /**
153
+ * 一个模型自己的名字:目录给了 `name` 就用它,否则按 id 还原。
143
154
  *
144
155
  * 目录里只有 8 个模型自带 `name`,而且**都不是会话模型**(语音、图像、视频那几个),
145
- * 所以会话模型的展示名必须能从 id 还原。这里的推导不是猜:Kenari 给出 `name` 的那 8 个
156
+ * 所以会话模型的名字必须能从 id 还原。这里的推导不是猜:Kenari 给出 `name` 的那 8 个
146
157
  * 模型与本函数的输出**逐字一致**(Veo 3.1 Lite、MiniMax Speech 2.8 Turbo、
147
158
  * Nano Banana Pro…),`test/catalog-view.mjs` 用它们反测。
148
159
  *
149
- * dsh 的「显示名称」是纯展示字段(不参与请求),所以还原值即使不完美也只是可改的默认值。
160
+ * 名字原样给:要写进路由时由 {@link toModelProfile} 加前缀,两处口径不同是故意的。
150
161
  */
151
162
  export function displayNameOf(model) {
152
163
  const named = typeof model.name === 'string' ? model.name.trim() : '';
@@ -186,8 +197,11 @@ export function recommendedMaxTokens(contextWindow) {
186
197
  * 字段必须逐个来自目录:pi-ai 的 schema 会拒绝多余或拼错的键。
187
198
  *
188
199
  * `name` 与 `maxTokens` 都写:前者是 dsh 模型目录里那个「显示名称」框(不写就空着),
189
- * 后者是每请求输出上限(不写则整条路由共用 pi-ai 的 `defaultMaxTokens` 32768,
200
+ * 后者是每请求输出上限(不写则整条路由共用 pi-ai 的 defaultMaxTokens 32768,
190
201
  * 于是每个模型看到的都是同一个数)。两者的推导见上面两个函数。
202
+ *
203
+ * `name` 是**唯一**带路由前缀的地方:这条 profile 写进 `llm-pi-ai` 之后,就是 dsh 的
204
+ * 模型按钮、会话头部与 `/` 菜单印出来的字符串。
191
205
  */
192
206
  export function toModelProfile(model) {
193
207
  const efforts = reasoningEffortsOf(model);
@@ -197,7 +211,7 @@ export function toModelProfile(model) {
197
211
  const maxTokens = recommendedMaxTokens(contextWindow);
198
212
  return {
199
213
  id: model.id,
200
- name: displayNameOf(model),
214
+ name: DISPLAY_NAME_PREFIX + displayNameOf(model),
201
215
  ...(contextWindow === undefined ? {} : { contextWindow }),
202
216
  ...(maxTokens === undefined ? {} : { maxTokens }),
203
217
  input: inputModalitiesOf(model),
@@ -1 +1 @@
1
- {"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}
@@ -32,4 +32,28 @@ export interface DefaultRouteDeps {
32
32
  * @param deps - 目录、套餐表与 HTTP 依赖。
33
33
  */
34
34
  export declare function applyPlanDefaultRoute(ctx: Context, deps: DefaultRouteDeps): Promise<void>;
35
+ /** 名字刷新只用到目录(判据是"这行还是不是旧口径的名字")与日志。 */
36
+ export interface RouteNameDeps {
37
+ readonly http: KenariHttpDeps;
38
+ readonly catalog: KenariCatalog;
39
+ }
40
+ /**
41
+ * 把**已经物化进用户层**的旧名字刷成当前口径。
42
+ *
43
+ * 为什么需要它:路由模型名由 `toModelProfile` 加前缀,但设置是**一次性物化**的——
44
+ * {@link applyPlanDefaultRoute} 只在用户层没写过数组时才写,挑选器加模型也只 append、
45
+ * 不覆盖已存在的 id。所以口径一变(0.2.0 起加 `Kenari ` 前缀),已经写进去的那批名字
46
+ * 会永远停在旧口径,除非用户自己一个个改。
47
+ *
48
+ * 改写判据刻意收得很紧:**只动仍然逐字等于旧口径派生值的名字**(`displayNameOf` 的输出,
49
+ * 见 src/catalog.ts)——也就是"这一行还是插件当初写的那一行"。用户改过的名字(改名、
50
+ * 清空、或者已经带前缀)不匹配,一个字节都不碰。判据是值本身,而不是"这行是不是插件
51
+ * 写的":后者没有留存,也无法可靠推断。
52
+ *
53
+ * 写入形状与挑选器一致:`set` 整份数组(pi-ai 的语义是存下来的数组整份替换生效值),
54
+ * 所以必须带上用户层里的全部条目,且只改 `name` 一个字段。
55
+ * @param ctx - 已注入 `settings` 的上下文。
56
+ * @param deps - 目录与日志依赖。
57
+ */
58
+ export declare function refreshRouteModelNames(ctx: Context, deps: RouteNameDeps): Promise<void>;
35
59
  //# sourceMappingURL=default-route.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"default-route.d.ts","sourceRoot":"","sources":["../src/default-route.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAW/C,YAAY;AACZ,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;IAC7B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAA;IAC/B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAC5B;AA4BD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+D/F"}
1
+ {"version":3,"file":"default-route.d.ts","sourceRoot":"","sources":["../src/default-route.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAW/C,YAAY;AACZ,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;IAC7B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAA;IAC/B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAC5B;AA4BD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+D/F;AAED,uCAAuC;AACvC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;IAC7B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAA;CAChC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7F"}
@@ -15,7 +15,7 @@
15
15
  * 不会反复改写;用户在 Models 页改过之后也永远不会被这里覆盖。
16
16
  * @module dsh-kenari-plugin/default-route
17
17
  */
18
- import { isChatCapable, toModelProfile } from './catalog.js';
18
+ import { DISPLAY_NAME_PREFIX, displayNameOf, isChatCapable, toModelProfile } from './catalog.js';
19
19
  import { kenariGet } from './http.js';
20
20
  /** pi-ai 的 profile 数组路径(相对 `llm-pi-ai` 节根)。 */
21
21
  const ROUTE = { ns: 'llm-pi-ai', provider: 'kenari' };
@@ -108,4 +108,62 @@ export async function applyPlanDefaultRoute(ctx, deps) {
108
108
  deps.http.logger?.warn(`kenari: 默认路由计算失败,保持预置默认:${err instanceof Error ? err.message : String(err)}`);
109
109
  }
110
110
  }
111
+ /**
112
+ * 把**已经物化进用户层**的旧名字刷成当前口径。
113
+ *
114
+ * 为什么需要它:路由模型名由 `toModelProfile` 加前缀,但设置是**一次性物化**的——
115
+ * {@link applyPlanDefaultRoute} 只在用户层没写过数组时才写,挑选器加模型也只 append、
116
+ * 不覆盖已存在的 id。所以口径一变(0.2.0 起加 `Kenari ` 前缀),已经写进去的那批名字
117
+ * 会永远停在旧口径,除非用户自己一个个改。
118
+ *
119
+ * 改写判据刻意收得很紧:**只动仍然逐字等于旧口径派生值的名字**(`displayNameOf` 的输出,
120
+ * 见 src/catalog.ts)——也就是"这一行还是插件当初写的那一行"。用户改过的名字(改名、
121
+ * 清空、或者已经带前缀)不匹配,一个字节都不碰。判据是值本身,而不是"这行是不是插件
122
+ * 写的":后者没有留存,也无法可靠推断。
123
+ *
124
+ * 写入形状与挑选器一致:`set` 整份数组(pi-ai 的语义是存下来的数组整份替换生效值),
125
+ * 所以必须带上用户层里的全部条目,且只改 `name` 一个字段。
126
+ * @param ctx - 已注入 `settings` 的上下文。
127
+ * @param deps - 目录与日志依赖。
128
+ */
129
+ export async function refreshRouteModelNames(ctx, deps) {
130
+ const log = deps.http.logger;
131
+ try {
132
+ const descriptors = ctx.settings.describe({ redactSecrets: true });
133
+ const entry = descriptors.find((descriptor) => descriptor.ns === ROUTE.ns);
134
+ if (entry === undefined)
135
+ return;
136
+ const stored = pathGet(entry.user, MODELS_PATH);
137
+ // 用户层没有这个数组 = 还没物化过,生效值就是 patch 里那份,本身已是当前口径。
138
+ if (!Array.isArray(stored))
139
+ return;
140
+ let refreshed = 0;
141
+ const next = [];
142
+ for (const row of stored) {
143
+ const record = typeof row === 'object' && row !== null ? row : undefined;
144
+ const id = record?.id;
145
+ const name = record?.name;
146
+ if (record === undefined || typeof id !== 'string' || typeof name !== 'string') {
147
+ next.push(row);
148
+ continue;
149
+ }
150
+ const resolved = await deps.catalog.resolve(id);
151
+ // 查不到的 id 不动:它可能是用户手写的路由条目,插件没有资格替它改名。
152
+ if (resolved === undefined || name !== displayNameOf(resolved.model)) {
153
+ next.push(row);
154
+ continue;
155
+ }
156
+ next.push({ ...record, name: DISPLAY_NAME_PREFIX + name });
157
+ refreshed += 1;
158
+ }
159
+ if (refreshed === 0)
160
+ return;
161
+ await ctx.settings.mutate(ROUTE.ns, [{ op: 'set', path: [...MODELS_PATH], value: next }], entry.revision);
162
+ log?.info(`kenari: 已把路由里 ${refreshed} 个模型名刷成当前口径(加 ${DISPLAY_NAME_PREFIX}前缀)`);
163
+ }
164
+ catch (err) {
165
+ // 名字没刷新只是名字旧,不影响任何请求
166
+ deps.http.logger?.warn(`kenari: 路由模型名刷新失败,保持原样:${err instanceof Error ? err.message : String(err)}`);
167
+ }
168
+ }
111
169
  //# sourceMappingURL=default-route.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"default-route.js","sourceRoot":"","sources":["../src/default-route.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"default-route.js","sourceRoot":"","sources":["../src/default-route.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -48,12 +48,14 @@ export interface Config {
48
48
  modelRecoveryEnabled?: boolean;
49
49
  /** 参与恢复的 provider 路由;范围外的路由行为完全不变。 */
50
50
  modelRecoveryProviders?: string[];
51
- /** 首次请求之后的额外重试次数(kenari-direct 路由;llm-pi-ai 路由见 cordis.patch.yml)。 */
51
+ /** 首次请求之后的额外重试次数(两条 Kenari 路由都由插件自己的恢复状态机执行)。 */
52
52
  modelRetryMaxRetries?: number;
53
- /** 每次重试前的固定等待毫秒数(同上传导范围)。 */
53
+ /** 每次重试前的固定等待毫秒数。 */
54
54
  modelRetryDelayMs?: number;
55
55
  /** 允许重试的失败码;不能为空。 */
56
56
  modelRetryableCodes?: string[];
57
+ /** 是否注入「正在本地重试」通知(重试期间界面没有别的痕迹)。 */
58
+ modelRetryNoticeEnabled?: boolean;
57
59
  /** 是否允许换模型(关掉则只重试)。 */
58
60
  modelSwitchEnabled?: boolean;
59
61
  /** 换模型/回退默认 provider 前的等待毫秒数。 */
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAkCxC,kFAAkF;AAClF,MAAM,WAAW,MAAM;IACrB,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,wFAAwF;IACxF,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,8DAA8D;IAC9D,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kEAAkE;IAClE,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,iDAAiD;IACjD,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,kGAAkG;IAClG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,mGAAmG;IACnG,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,uEAAuE;IACvE,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,mGAAmG;IACnG,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,yDAAyD;IACzD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,6CAA6C;IAC7C,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,sCAAsC;IACtC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAA;IACjC,sEAAsE;IACtE,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,6BAA6B;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,qBAAqB;IACrB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC9B,uBAAuB;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,iCAAiC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,4CAA4C;IAC5C,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC/B,yBAAyB;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,yCAAyC;IACzC,yBAAyB,CAAC,EAAE,OAAO,CAAA;IACnC,yDAAyD;IACzD,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,6EAA6E;IAC7E,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAC9B;AAED,eAAO,MAAM,MAAM,EAAE,CAAC,CAAC,MAAM,CAkC3B,CAAA;AAEF,qDAAqD;AACrD,eAAO,MAAM,IAAI,WAAW,CAAA;AAE5B,mEAAmE;AACnE,eAAO,MAAM,MAAM,UAAmB,CAAA;AA4CtC;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAqLxD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAkCxC,kFAAkF;AAClF,MAAM,WAAW,MAAM;IACrB,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,wFAAwF;IACxF,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,8DAA8D;IAC9D,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kEAAkE;IAClE,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,iDAAiD;IACjD,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,kGAAkG;IAClG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,mGAAmG;IACnG,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,uEAAuE;IACvE,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,mGAAmG;IACnG,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,yDAAyD;IACzD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,6CAA6C;IAC7C,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,sCAAsC;IACtC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAA;IACjC,iDAAiD;IACjD,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,qBAAqB;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,qBAAqB;IACrB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC9B,oCAAoC;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,uBAAuB;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,iCAAiC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,4CAA4C;IAC5C,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC/B,yBAAyB;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,yCAAyC;IACzC,yBAAyB,CAAC,EAAE,OAAO,CAAA;IACnC,yDAAyD;IACzD,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,6EAA6E;IAC7E,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAC9B;AAED,eAAO,MAAM,MAAM,EAAE,CAAC,CAAC,MAAM,CAmC3B,CAAA;AAEF,qDAAqD;AACrD,eAAO,MAAM,IAAI,WAAW,CAAA;AAE5B,mEAAmE;AACnE,eAAO,MAAM,MAAM,UAAmB,CAAA;AA4CtC;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CA+LxD"}
package/lib/index.js CHANGED
@@ -19,13 +19,13 @@ import { KenariCatalog } from './catalog.js';
19
19
  import { KenariPlans } from './plans.js';
20
20
  import { registerCatalogView } from './catalog-view.js';
21
21
  import { registerFaviconRoute } from './favicon.js';
22
- import { applyPlanDefaultRoute } from './default-route.js';
22
+ import { applyPlanDefaultRoute, refreshRouteModelNames } from './default-route.js';
23
23
  import { BalanceMonitor, BillingLedger } from './billing.js';
24
24
  import { installKenariSettings, KENARI_SETTINGS_NAMESPACE } from './settings.js';
25
25
  import { KenariLlmAdapter } from './llm/adapter.js';
26
26
  import { ModelCandidates } from './llm/candidates.js';
27
27
  import { installModelRecovery } from './llm/recovery.js';
28
- import { kenariRetryPolicy } from './llm/retry.js';
28
+ import { dshRetryDisabledPolicy } from './llm/retry.js';
29
29
  import { installSessionTitlePrefix } from './session-title.js';
30
30
  import { registerDocsTools } from './tools/docs.js';
31
31
  import { registerAccountTools } from './tools/account.js';
@@ -60,6 +60,7 @@ export const Config = z.object({
60
60
  modelRetryableCodes: z.array(z.string()).default([
61
61
  'EMPTY_RESPONSE', 'RATE_LIMIT', 'SERVER', 'TIMEOUT', 'TRANSPORT',
62
62
  ]),
63
+ modelRetryNoticeEnabled: z.boolean().default(true),
63
64
  modelSwitchEnabled: z.boolean().default(true),
64
65
  modelSwitchDelayMs: z.number().step(1).min(0).default(5_000),
65
66
  modelSwitchSkipCodes: z.array(z.string()).default([
@@ -211,8 +212,17 @@ export function apply(ctx, config) {
211
212
  // 默认路由:按当前 key 的套餐把「免缓存额度」模型填进 `kenari` 路由。
212
213
  // 预设是静态 YAML,算不出套餐相关的东西,所以要在设置节挂上之后补一次
213
214
  // (用户层已经自己写过 models 时一律不动,详见 src/default-route.ts)。
215
+ //
216
+ // 紧接着刷一次名字:路由名会随口径变(0.2.0 起带 `Kenari ` 前缀),而设置是
217
+ // 一次性物化的,不刷就会永远停在旧写法。只动"仍然是旧口径派生值"的那些名字。
214
218
  ctx.inject(['settings'], (settingsCtx) => {
215
- void applyPlanDefaultRoute(settingsCtx, { http: deps, catalog, plans });
219
+ void (async () => {
220
+ await applyPlanDefaultRoute(settingsCtx, { http: deps, catalog, plans });
221
+ await refreshRouteModelNames(settingsCtx, { http: deps, catalog });
222
+ })().catch((err) => {
223
+ // 两者各自都吞了自己的失败;走到这里说明有出乎意料的抛出,记一笔但不影响加载
224
+ deps.logger?.warn(`kenari: 路由初始化(默认路由/名字刷新)异常:${err instanceof Error ? err.message : String(err)}`);
225
+ });
216
226
  });
217
227
  // 第 5 期(可选):自带 LlmAdapter。默认关闭,且路由名与 llm-pi-ai 预设不同,
218
228
  // 所以两条路可以并存、可以回退;开启后模型的 usage 与费用也进同一本账。
@@ -223,11 +233,8 @@ export function apply(ctx, config) {
223
233
  catalog,
224
234
  billing,
225
235
  logger,
226
- retryPolicy: kenariRetryPolicy({
227
- maxRetries: liveConfig.modelRetryMaxRetries ?? 5,
228
- delayMs: liveConfig.modelRetryDelayMs ?? 5_000,
229
- retryableCodes: liveConfig.modelRetryableCodes,
230
- }),
236
+ // 重试由恢复状态机自己做(见 ./llm/recovery.ts),dsh 自带的重试在这条路由上关掉
237
+ retryPolicy: dshRetryDisabledPolicy(),
231
238
  }, (imageRef) => {
232
239
  const attachments = ctx.get('attachments');
233
240
  if (attachments === undefined)
@@ -264,6 +271,10 @@ export function apply(ctx, config) {
264
271
  enabled: liveConfig.modelRecoveryEnabled ?? true,
265
272
  providers: liveConfig.modelRecoveryProviders ?? ['kenari', 'kenari-direct'],
266
273
  switchEnabled: liveConfig.modelSwitchEnabled ?? true,
274
+ retryMaxRetries: liveConfig.modelRetryMaxRetries ?? 5,
275
+ retryDelayMs: liveConfig.modelRetryDelayMs ?? 5_000,
276
+ retryCodes: liveConfig.modelRetryableCodes ?? [],
277
+ retryNoticeEnabled: liveConfig.modelRetryNoticeEnabled ?? true,
267
278
  switchDelayMs: liveConfig.modelSwitchDelayMs ?? 5_000,
268
279
  skipCodes: liveConfig.modelSwitchSkipCodes ?? [],
269
280
  noticeEnabled: liveConfig.modelSwitchNoticeEnabled ?? true,
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,8 @@
2
2
  * 「换一个上下文 >= 当前的模型」的候选挑选。
3
3
  *
4
4
  * 挑最小够用者而不是最大者:一次失败不值得把会话切到又贵又慢的最大上下文模型。
5
- * 阈值取**当前**模型的窗口,所以一次会话里窗口只会持平或变大,不会来回横跳。
5
+ * 阈值取**当前**模型的窗口,所以一次会话里窗口只会持平或变大;要防止的正是「持平」那种
6
+ * 情况下的来回横跳(两个同窗口模型互相切),所以调用方会把本 step 里失败过的路由传进来排除。
6
7
  * @module dsh-kenari-plugin/llm/candidates
7
8
  */
8
9
  /** 候选挑选用到的 `ctx.llm` 最小面。注入是为了单测能替身,也避免把整个 LlmRuntime 拖进依赖。 */
@@ -39,6 +40,8 @@ export interface PickInput {
39
40
  model: string;
40
41
  contextWindow?: number;
41
42
  signal?: AbortSignal;
43
+ /** 额外排除的路由(`provider/model`),用于本 step 内已经失败过的那些 —— 不再回头。 */
44
+ exclude?: readonly string[];
42
45
  }
43
46
  /**
44
47
  * 找一个上下文窗口 >= 阈值的候选:先在同一 provider 内,再跨 provider。
@@ -1 +1 @@
1
- {"version":3,"file":"candidates.d.ts","sourceRoot":"","sources":["../../src/llm/candidates.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,aAAa,IAAI,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IAC1C,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAA;IAChE,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,OAAO,CAAC,EAAE;YAAE,aAAa,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAA;CAC1H;AAED,yBAAyB;AACzB,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,mCAAmC;AACnC,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,cAAc,CAAA;IACnB,uDAAuD;IACvD,UAAU,EAAE,MAAM,CAAA;IAClB,qBAAqB;IACrB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;CACnB;AAED,kBAAkB;AAClB,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED;;;GAGG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+D;IACrF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAc;gBAEL,IAAI,EAAE,mBAAmB;IAItD,0DAA0D;YAC5C,SAAS;IA4BvB,gCAAgC;IAC1B,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;CAalE"}
1
+ {"version":3,"file":"candidates.d.ts","sourceRoot":"","sources":["../../src/llm/candidates.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,aAAa,IAAI,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IAC1C,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAA;IAChE,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,OAAO,CAAC,EAAE;YAAE,aAAa,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAA;CAC1H;AAED,yBAAyB;AACzB,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,mCAAmC;AACnC,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,cAAc,CAAA;IACnB,uDAAuD;IACvD,UAAU,EAAE,MAAM,CAAA;IAClB,qBAAqB;IACrB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;CACnB;AAED,kBAAkB;AAClB,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,4DAA4D;IAC5D,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC5B;AAED;;;GAGG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+D;IACrF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAc;gBAEL,IAAI,EAAE,mBAAmB;IAItD,0DAA0D;YAC5C,SAAS;IA4BvB,gCAAgC;IAC1B,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;CAclE"}
@@ -2,7 +2,8 @@
2
2
  * 「换一个上下文 >= 当前的模型」的候选挑选。
3
3
  *
4
4
  * 挑最小够用者而不是最大者:一次失败不值得把会话切到又贵又慢的最大上下文模型。
5
- * 阈值取**当前**模型的窗口,所以一次会话里窗口只会持平或变大,不会来回横跳。
5
+ * 阈值取**当前**模型的窗口,所以一次会话里窗口只会持平或变大;要防止的正是「持平」那种
6
+ * 情况下的来回横跳(两个同窗口模型互相切),所以调用方会把本 step 里失败过的路由传进来排除。
6
7
  * @module dsh-kenari-plugin/llm/candidates
7
8
  */
8
9
  /**
@@ -51,13 +52,14 @@ export class ModelCandidates {
51
52
  /** 找最小够用的候选;找不到返回 undefined。 */
52
53
  async pick(input) {
53
54
  const threshold = input.contextWindow ?? 0;
54
- const local = smallestAtLeast(await this.entriesOf(input.provider, input.signal), input.model, threshold);
55
+ const excluded = new Set(input.exclude ?? []);
56
+ const local = smallestAtLeast(await this.entriesOf(input.provider, input.signal), input.model, threshold, excluded);
55
57
  if (local !== undefined)
56
58
  return local;
57
59
  for (const entry of this.deps.llm.listProviders()) {
58
60
  if (entry.id === input.provider)
59
61
  continue;
60
- const found = smallestAtLeast(await this.entriesOf(entry.id, input.signal), undefined, threshold);
62
+ const found = smallestAtLeast(await this.entriesOf(entry.id, input.signal), undefined, threshold, excluded);
61
63
  if (found !== undefined)
62
64
  return found;
63
65
  }
@@ -65,14 +67,16 @@ export class ModelCandidates {
65
67
  }
66
68
  }
67
69
  /**
68
- * 排除 `exclude`、取 `contextWindow >= threshold` 的最小者。
70
+ * 排除 `exclude` 这个模型、以及 `tried` 里的路由,取 `contextWindow >= threshold` 的最小者。
69
71
  * 同窗口时按 model id 字典序取小 —— 确定性很重要,否则同一份配置在不同机器上会换到不同模型。
70
72
  */
71
- function smallestAtLeast(entries, exclude, threshold) {
73
+ function smallestAtLeast(entries, exclude, threshold, tried) {
72
74
  let best;
73
75
  for (const entry of entries) {
74
76
  if (exclude !== undefined && entry.model === exclude)
75
77
  continue;
78
+ if (tried.has(`${entry.provider}/${entry.model}`))
79
+ continue;
76
80
  if (entry.contextWindow < threshold)
77
81
  continue;
78
82
  if (best === undefined
@@ -1 +1 @@
1
- {"version":3,"file":"candidates.js","sourceRoot":"","sources":["../../src/llm/candidates.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"candidates.js","sourceRoot":"","sources":["../../src/llm/candidates.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,19 @@
1
1
  /**
2
- * Kenari 路由的模型失败恢复:重试用尽后换模型,再不行回退默认 provider
2
+ * Kenari 路由的模型失败恢复:同路由重试 → 换模型 → 回退默认 provider,逐级升级。
3
3
  *
4
- * 分工:5s × 5 的重试交给 dsh 自带的 `dsh-llm-retry`(声明式策略,见 `./retry.ts`),
5
- * 本模块只负责它放弃之后的升级 —— 因为在同一个 step 内改 provider/model dsh 没提供的缝。
4
+ * 三个阶段都由本模块负责,`dsh-llm-retry` 在 Kenari 路由上是关掉的(见 `./retry.ts`)。
5
+ * 原因:`agent/request-error` 是没有默认行为的瀑布,不调用 `next()` 的监听器会否决它后面的
6
+ * 一切;只要注册顺序被 live reload 翻过来一次,排在后面的 llm-retry 就永久出局,而插件
7
+ * 观察不到。实测线上 `llm/retry` 事件数为 0、换模型发生在第一次失败上,说明承诺的 5 次重试
8
+ * 从未执行。把重试收进自己的状态机,行为才是可验证、可测试的。
6
9
  *
7
10
  * 两个监听器的注册顺序是设计的一部分,不是随手写的:
8
11
  * 1. `agent/request` 用 `prepend` 挂在**最外层**。瀑布里外层拿最终决定权,而
9
12
  * `installModelSelection` 会用「本 step 组装时捕获的」原模型回写 —— 排在内层会被它改回去
10
13
  * (`packages/core/agent/src/model-selection.ts:88-105`)。
11
- * 2. `agent/request-error` 用默认顺序,也就是内层:`dsh-llm-retry` 决定重试时不会 `next()`,
12
- * 所以我们只在它放弃(码不可重试或次数用尽)之后才被调用。
14
+ * 2. `agent/request-error` 用默认顺序,但**先 `await next()`**:链上(`dsh-llm-retry`、
15
+ * compaction 等)若已决定重试,我们原样放行;只有链上放弃时才走自己的升级。这样无论
16
+ * 注册顺序如何,插件都不会饿死别人的恢复策略。
13
17
  * @module dsh-kenari-plugin/llm/recovery
14
18
  */
15
19
  import type { Context } from '@deepseek-ai/cordis';
@@ -25,10 +29,18 @@ export interface Target {
25
29
  export interface ModelRecoveryDeps {
26
30
  /** 总开关。false 时一个监听器都不装。 */
27
31
  enabled: boolean;
28
- /** 参与恢复的 provider 路由;范围外的失败原样交给下一个监听者。 */
32
+ /** 参与恢复的 provider 路由;范围外的失败原样交给链上的其他监听者。 */
29
33
  providers: readonly string[];
30
- /** 是否允许换模型;false 时只依赖 dsh 的重试,用尽后该轮以 error 结束。 */
34
+ /** 是否允许换模型;false 时只做同路由重试,预算用尽后该轮以 error 结束。 */
31
35
  switchEnabled: boolean;
36
+ /** 首次请求之后的额外重试次数。 */
37
+ retryMaxRetries: number;
38
+ /** 每次重试前的固定等待毫秒数。 */
39
+ retryDelayMs: number;
40
+ /** 允许重试的失败码;码不在其中直接进入换模型阶段。 */
41
+ retryCodes: readonly string[];
42
+ /** 是否注入「正在本地重试」的通知 —— 重试期间界面没有别的痕迹,静默等待会让人困惑。 */
43
+ retryNoticeEnabled: boolean;
32
44
  /** 换模型/回退前的等待毫秒数。 */
33
45
  switchDelayMs: number;
34
46
  /** 跳过「同 provider 换模型」、直接回退 provider 的失败码。 */
@@ -1 +1 @@
1
- {"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../src/llm/recovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAK7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAKtD,6DAA6D;AAC7D,MAAM,WAAW,MAAM;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,iBAAiB,CAAA;CACpC;AAUD,oBAAoB;AACpB,MAAM,WAAW,iBAAiB;IAChC,2BAA2B;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,0CAA0C;IAC1C,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,kDAAkD;IAClD,aAAa,EAAE,OAAO,CAAA;IACtB,qBAAqB;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,6CAA6C;IAC7C,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,kBAAkB;IAClB,aAAa,EAAE,OAAO,CAAA;IACtB,UAAU,EAAE,eAAe,CAAA;IAC3B,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;IAC1C,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAC9D;AAUD,+DAA+D;AAC/D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,GAAG,IAAI,CA8FhF"}
1
+ {"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../src/llm/recovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAM7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAKtD,6DAA6D;AAC7D,MAAM,WAAW,MAAM;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,iBAAiB,CAAA;CACpC;AAkBD,oBAAoB;AACpB,MAAM,WAAW,iBAAiB;IAChC,2BAA2B;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,4CAA4C;IAC5C,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,gDAAgD;IAChD,aAAa,EAAE,OAAO,CAAA;IACtB,qBAAqB;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,qBAAqB;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,+BAA+B;IAC/B,UAAU,EAAE,SAAS,MAAM,EAAE,CAAA;IAC7B,iDAAiD;IACjD,kBAAkB,EAAE,OAAO,CAAA;IAC3B,qBAAqB;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,6CAA6C;IAC7C,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,kBAAkB;IAClB,aAAa,EAAE,OAAO,CAAA;IACtB,UAAU,EAAE,eAAe,CAAA;IAC3B,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;IAC1C,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAC9D;AAwBD,+DAA+D;AAC/D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,GAAG,IAAI,CAyKhF"}