@tencent-connect/dsh-qqbot 0.4.0 → 0.5.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.
Files changed (216) hide show
  1. package/.orange-ci.yml +2 -68
  2. package/CHANGELOG.md +56 -0
  3. package/CHANGELOG_EN.md +95 -0
  4. package/README.md +119 -18
  5. package/README_EN.md +107 -17
  6. package/cordis.patch.yml +1 -1
  7. package/cordis.yml +46 -3
  8. package/dist/commands/help.d.ts +6 -7
  9. package/dist/commands/help.d.ts.map +1 -1
  10. package/dist/commands/help.js +23 -7
  11. package/dist/commands/help.js.map +1 -1
  12. package/dist/commands/index.d.ts +7 -5
  13. package/dist/commands/index.d.ts.map +1 -1
  14. package/dist/commands/index.js +12 -12
  15. package/dist/commands/index.js.map +1 -1
  16. package/dist/commands/misc.d.ts +10 -8
  17. package/dist/commands/misc.d.ts.map +1 -1
  18. package/dist/commands/misc.js +45 -8
  19. package/dist/commands/misc.js.map +1 -1
  20. package/dist/commands/model.d.ts +3 -4
  21. package/dist/commands/model.d.ts.map +1 -1
  22. package/dist/commands/model.js +8 -7
  23. package/dist/commands/model.js.map +1 -1
  24. package/dist/commands/preset.d.ts +8 -0
  25. package/dist/commands/preset.d.ts.map +1 -0
  26. package/dist/commands/preset.js +52 -0
  27. package/dist/commands/preset.js.map +1 -0
  28. package/dist/commands/session.d.ts +11 -7
  29. package/dist/commands/session.d.ts.map +1 -1
  30. package/dist/commands/session.js +29 -13
  31. package/dist/commands/session.js.map +1 -1
  32. package/dist/commands/status.d.ts +3 -4
  33. package/dist/commands/status.d.ts.map +1 -1
  34. package/dist/commands/status.js +2 -1
  35. package/dist/commands/status.js.map +1 -1
  36. package/dist/commands/types.d.ts +9 -2
  37. package/dist/commands/types.d.ts.map +1 -1
  38. package/dist/config.d.ts +40 -0
  39. package/dist/config.d.ts.map +1 -1
  40. package/dist/config.js +45 -9
  41. package/dist/config.js.map +1 -1
  42. package/dist/features/answer-parser.d.ts +9 -0
  43. package/dist/features/answer-parser.d.ts.map +1 -0
  44. package/dist/features/answer-parser.js +23 -0
  45. package/dist/features/answer-parser.js.map +1 -0
  46. package/dist/features/approval-channel.d.ts +76 -0
  47. package/dist/features/approval-channel.d.ts.map +1 -0
  48. package/dist/features/approval-channel.js +142 -0
  49. package/dist/features/approval-channel.js.map +1 -0
  50. package/dist/features/approval-renderer.d.ts +18 -0
  51. package/dist/features/approval-renderer.d.ts.map +1 -0
  52. package/dist/features/approval-renderer.js +52 -0
  53. package/dist/features/approval-renderer.js.map +1 -0
  54. package/dist/features/button-utils.d.ts +33 -0
  55. package/dist/features/button-utils.d.ts.map +1 -0
  56. package/dist/features/button-utils.js +27 -0
  57. package/dist/features/button-utils.js.map +1 -0
  58. package/dist/features/history-store.d.ts.map +1 -1
  59. package/dist/features/history-store.js +0 -1
  60. package/dist/features/history-store.js.map +1 -1
  61. package/dist/features/question-channel.d.ts +96 -0
  62. package/dist/features/question-channel.d.ts.map +1 -0
  63. package/dist/features/question-channel.js +234 -0
  64. package/dist/features/question-channel.js.map +1 -0
  65. package/dist/features/question-renderer.d.ts +20 -0
  66. package/dist/features/question-renderer.d.ts.map +1 -0
  67. package/dist/features/question-renderer.js +70 -0
  68. package/dist/features/question-renderer.js.map +1 -0
  69. package/dist/gateway/bootstrap.d.ts +3 -3
  70. package/dist/gateway/bootstrap.d.ts.map +1 -1
  71. package/dist/gateway/bootstrap.js +84 -8
  72. package/dist/gateway/bootstrap.js.map +1 -1
  73. package/dist/gateway/index.d.ts +2 -2
  74. package/dist/gateway/index.js +2 -2
  75. package/dist/gateway/middleware-setup.d.ts +3 -3
  76. package/dist/gateway/middleware-setup.d.ts.map +1 -1
  77. package/dist/gateway/middleware-setup.js +9 -7
  78. package/dist/gateway/middleware-setup.js.map +1 -1
  79. package/dist/index.d.ts +4 -3
  80. package/dist/index.d.ts.map +1 -1
  81. package/dist/index.js +44 -25
  82. package/dist/index.js.map +1 -1
  83. package/dist/media/media-cleaner.d.ts +19 -0
  84. package/dist/media/media-cleaner.d.ts.map +1 -0
  85. package/dist/media/media-cleaner.js +81 -0
  86. package/dist/media/media-cleaner.js.map +1 -0
  87. package/dist/media/send-file-tool.d.ts +35 -0
  88. package/dist/media/send-file-tool.d.ts.map +1 -0
  89. package/dist/media/send-file-tool.js +150 -0
  90. package/dist/media/send-file-tool.js.map +1 -0
  91. package/dist/media/vision-tool.d.ts +16 -0
  92. package/dist/media/vision-tool.d.ts.map +1 -0
  93. package/dist/media/vision-tool.js +241 -0
  94. package/dist/media/vision-tool.js.map +1 -0
  95. package/dist/middleware/attachment.d.ts +3 -3
  96. package/dist/middleware/attachment.d.ts.map +1 -1
  97. package/dist/middleware/attachment.js +17 -4
  98. package/dist/middleware/attachment.js.map +1 -1
  99. package/dist/middleware/question-answer.d.ts +10 -0
  100. package/dist/middleware/question-answer.d.ts.map +1 -0
  101. package/dist/middleware/question-answer.js +19 -0
  102. package/dist/middleware/question-answer.js.map +1 -0
  103. package/dist/model/index.d.ts +4 -4
  104. package/dist/model/index.js +3 -3
  105. package/dist/model/model-resolver.d.ts +27 -13
  106. package/dist/model/model-resolver.d.ts.map +1 -1
  107. package/dist/model/model-resolver.js +82 -27
  108. package/dist/model/model-resolver.js.map +1 -1
  109. package/dist/model/prefs-store.d.ts +6 -1
  110. package/dist/model/prefs-store.d.ts.map +1 -1
  111. package/dist/model/prefs-store.js +25 -1
  112. package/dist/model/prefs-store.js.map +1 -1
  113. package/dist/model/settings-reader.d.ts +1 -1
  114. package/dist/session/idle-evictor.d.ts +2 -2
  115. package/dist/session/idle-evictor.d.ts.map +1 -1
  116. package/dist/session/idle-evictor.js +1 -1
  117. package/dist/session/idle-evictor.js.map +1 -1
  118. package/dist/session/index.d.ts +3 -3
  119. package/dist/session/index.d.ts.map +1 -1
  120. package/dist/session/index.js +2 -2
  121. package/dist/session/session-manager.d.ts +67 -9
  122. package/dist/session/session-manager.d.ts.map +1 -1
  123. package/dist/session/session-manager.js +216 -20
  124. package/dist/session/session-manager.js.map +1 -1
  125. package/dist/session/types.d.ts +47 -1
  126. package/dist/session/types.d.ts.map +1 -1
  127. package/dist/setup/bind-routes.d.ts +78 -0
  128. package/dist/setup/bind-routes.d.ts.map +1 -0
  129. package/dist/setup/bind-routes.js +311 -0
  130. package/dist/setup/bind-routes.js.map +1 -0
  131. package/dist/setup/binding-service.d.ts +86 -0
  132. package/dist/setup/binding-service.d.ts.map +1 -0
  133. package/dist/setup/binding-service.js +175 -0
  134. package/dist/setup/binding-service.js.map +1 -0
  135. package/dist/setup/index.d.ts +50 -0
  136. package/dist/setup/index.d.ts.map +1 -0
  137. package/dist/setup/index.js +98 -0
  138. package/dist/setup/index.js.map +1 -0
  139. package/dist/setup/persist.d.ts +41 -0
  140. package/dist/setup/persist.d.ts.map +1 -0
  141. package/dist/setup/persist.js +201 -0
  142. package/dist/setup/persist.js.map +1 -0
  143. package/dist/setup/presenters.d.ts +40 -0
  144. package/dist/setup/presenters.d.ts.map +1 -0
  145. package/dist/setup/presenters.js +84 -0
  146. package/dist/setup/presenters.js.map +1 -0
  147. package/dist/setup/qr-svg.d.ts +8 -0
  148. package/dist/setup/qr-svg.d.ts.map +1 -0
  149. package/dist/setup/qr-svg.js +20 -0
  150. package/dist/setup/qr-svg.js.map +1 -0
  151. package/dist/shared/bind-protocol.d.ts +42 -0
  152. package/dist/shared/bind-protocol.d.ts.map +1 -0
  153. package/dist/shared/bind-protocol.js +19 -0
  154. package/dist/shared/bind-protocol.js.map +1 -0
  155. package/dist/shared/index.d.ts +3 -3
  156. package/dist/shared/index.d.ts.map +1 -1
  157. package/dist/shared/index.js +3 -3
  158. package/dist/shared/index.js.map +1 -1
  159. package/dist/shared/send-helper.js +1 -1
  160. package/dist/shared/utils.d.ts +10 -3
  161. package/dist/shared/utils.d.ts.map +1 -1
  162. package/dist/shared/utils.js +47 -6
  163. package/dist/shared/utils.js.map +1 -1
  164. package/dist/transport/attachment.d.ts +18 -7
  165. package/dist/transport/attachment.d.ts.map +1 -1
  166. package/dist/transport/attachment.js +77 -30
  167. package/dist/transport/attachment.js.map +1 -1
  168. package/dist/transport/inbound.d.ts +5 -4
  169. package/dist/transport/inbound.d.ts.map +1 -1
  170. package/dist/transport/inbound.js +120 -80
  171. package/dist/transport/inbound.js.map +1 -1
  172. package/dist/transport/index.d.ts +4 -4
  173. package/dist/transport/index.js +4 -4
  174. package/dist/transport/msgid-cache.d.ts +23 -0
  175. package/dist/transport/msgid-cache.d.ts.map +1 -0
  176. package/dist/transport/msgid-cache.js +57 -0
  177. package/dist/transport/msgid-cache.js.map +1 -0
  178. package/dist/transport/outbound-buffer.d.ts +9 -6
  179. package/dist/transport/outbound-buffer.d.ts.map +1 -1
  180. package/dist/transport/outbound-buffer.js +5 -5
  181. package/dist/transport/outbound-buffer.js.map +1 -1
  182. package/dist/transport/outbound.d.ts +9 -9
  183. package/dist/transport/outbound.d.ts.map +1 -1
  184. package/dist/transport/outbound.js +7 -7
  185. package/dist/transport/outbound.js.map +1 -1
  186. package/dist/transport/reply-limiter.d.ts +31 -0
  187. package/dist/transport/reply-limiter.d.ts.map +1 -0
  188. package/dist/transport/reply-limiter.js +50 -0
  189. package/dist/transport/reply-limiter.js.map +1 -0
  190. package/dist/transport/reply-target.d.ts +29 -0
  191. package/dist/transport/reply-target.d.ts.map +1 -0
  192. package/dist/transport/reply-target.js +55 -0
  193. package/dist/transport/reply-target.js.map +1 -0
  194. package/dist/transport/streaming-writer.d.ts +3 -3
  195. package/dist/transport/streaming-writer.d.ts.map +1 -1
  196. package/dist/transport/streaming-writer.js +1 -1
  197. package/dist/transport/streaming-writer.js.map +1 -1
  198. package/dist/transport/tool-presenter.d.ts +0 -1
  199. package/dist/transport/tool-presenter.d.ts.map +1 -1
  200. package/dist/transport/tool-presenter.js +0 -1
  201. package/dist/transport/tool-presenter.js.map +1 -1
  202. package/dist/types.d.ts +9 -15
  203. package/dist/types.d.ts.map +1 -1
  204. package/docs/assets/qqchannel.jpg +0 -0
  205. package/docs/assets/qqgroup.jpg +0 -0
  206. package/docs/assets/qrcode.png +0 -0
  207. package/lib/client.js +996 -0
  208. package/lib/client.js.map +1 -0
  209. package/package.json +44 -7
  210. package/pnpm-workspace.yaml +1 -0
  211. package/tsconfig.client.json +19 -0
  212. package/tsdown.client.config.ts +58 -0
  213. package/dist/setup.d.ts +0 -24
  214. package/dist/setup.d.ts.map +0 -1
  215. package/dist/setup.js +0 -170
  216. package/dist/setup.js.map +0 -1
@@ -13,16 +13,16 @@
13
13
  * > 宿主 agentDefaultModel 服务
14
14
  */
15
15
  import type { Context } from '@deepseek-ai/cordis';
16
- import type { ImQQBotConfig } from '../config.js';
17
- import type { Logger } from '../types.js';
18
- import type { ModelRoute, ModelEntry } from './types.js';
16
+ import type { ImQQBotConfig } from '../config.ts';
17
+ import type { Logger } from '../types.ts';
18
+ import type { ModelRoute, ModelEntry } from './types.ts';
19
19
  export declare class ModelResolver {
20
+ private readonly prefs;
21
+ private readonly settings;
20
22
  private readonly ctx;
21
23
  private readonly config;
22
24
  private readonly logger?;
23
- private readonly prefs;
24
- private readonly settings;
25
- constructor(ctx: Context, config: ImQQBotConfig, logger?: Logger | undefined);
25
+ constructor(ctx: Context, config: ImQQBotConfig, logger?: Logger);
26
26
  /**
27
27
  * 获取指定 sessionKey 的有效模型路由(create 用)
28
28
  *
@@ -34,12 +34,10 @@ export declare class ModelResolver {
34
34
  *
35
35
  * 优先级:per-peer 偏好 > cordis.yml 显式配置 > 默认链(settings.yaml > host)
36
36
  *
37
- * 注意:不能像 dsh-TUI 那样返回 undefined 让 session 沿用 requestHeader。
38
- * dsh-TUI 靠 installModelSelection 从 session.requestHeader 恢复 {{model}},
39
- * 而我们未装 installModelSelection,system-prompt 的 {{model}} 变量直接读
40
- * agent.options.model(agent-loop index.ts:352)——若无值会抛
37
+ * 这里不返回 undefined,因为未装 installModelSelection,system-prompt 的
38
+ * {{model}} 变量直接读 agent.options.model——若无值会抛
41
39
  * "prompt variable {{model}} has no value for this assembly"。
42
- * 因此这里兜底到默认链,确保 agent.options.model 始终有值。
40
+ * 因此兜底到默认链,确保 agent.options.model 始终有值。
43
41
  */
44
42
  getResumeRoute(sessionKey: string): ModelRoute | undefined;
45
43
  /**
@@ -66,6 +64,18 @@ export declare class ModelResolver {
66
64
  * 清除指定 sessionKey 的 sessionId 记录
67
65
  */
68
66
  clearSessionId(sessionKey: string): void;
67
+ /**
68
+ * 获取指定 sessionKey 的 per-peer preset 覆盖
69
+ */
70
+ getPreset(sessionKey: string): string | undefined;
71
+ /**
72
+ * 设置 per-peer preset 覆盖并持久化
73
+ */
74
+ setPreset(sessionKey: string, presetId: string): void;
75
+ /**
76
+ * 清除 per-peer preset 覆盖并持久化
77
+ */
78
+ clearPreset(sessionKey: string): boolean;
69
79
  /**
70
80
  * 解析默认模型路由(不含 per-peer 偏好)
71
81
  *
@@ -75,14 +85,18 @@ export declare class ModelResolver {
75
85
  resolveDefault(): ModelRoute;
76
86
  /**
77
87
  * 列出所有可用模型
88
+ *
89
+ * 优先走 ctx.llm 服务动态发现,服务不可用或失败时回退 settings.yaml 静态配置。
78
90
  */
79
- listModels(): ModelEntry[];
91
+ listModels(): Promise<ModelEntry[]>;
80
92
  /**
81
93
  * 列出可用 provider 名称
82
94
  */
83
95
  listProviders(): string[];
84
96
  private readFromHost;
85
- /** 统一的 Cordis 服务访问 */
97
+ /** 统一的 Cordis 服务访问(可选获取:服务未注入时静默返回 undefined,避免 Proxy 抛错) */
86
98
  private getService;
99
+ /** 获取 ctx.llm 服务(最小接口收窄,不可用时返回 undefined) */
100
+ private getLlmService;
87
101
  }
88
102
  //# sourceMappingURL=model-resolver.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/model/model-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAIzD,qBAAa,aAAa;IAKtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAN1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiB;gBAGvB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,aAAa,EACrB,MAAM,CAAC,EAAE,MAAM,YAAA;IAQlC;;;;OAIG;IACH,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAI7D;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAW1D;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAIxD;;OAEG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIvC;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAIxC;;OAEG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD;;OAEG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAIzD;;OAEG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIxC;;;;;OAKG;IACH,cAAc,IAAI,UAAU;IAc5B;;OAEG;IACH,UAAU,IAAI,UAAU,EAAE;IAI1B;;OAEG;IACH,aAAa,IAAI,MAAM,EAAE;IAuBzB,OAAO,CAAC,YAAY;IAoBpB,sBAAsB;IACtB,OAAO,CAAC,UAAU;CAKnB"}
1
+ {"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/model/model-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAUzD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiB;IAC1C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;gBAG/B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,aAAa,EACrB,MAAM,CAAC,EAAE,MAAM;IAWjB;;;;OAIG;IACH,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAI7D;;;;;;;;;OASG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAW1D;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAIxD;;OAEG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIvC;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAIxC;;OAEG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD;;OAEG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAIzD;;OAEG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIxC;;OAEG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIjD;;OAEG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIrD;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAIxC;;;;;OAKG;IACH,cAAc,IAAI,UAAU;IAc5B;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IA+BzC;;OAEG;IACH,aAAa,IAAI,MAAM,EAAE;IAgBzB,OAAO,CAAC,YAAY;IAoBpB,6DAA6D;IAC7D,OAAO,CAAC,UAAU;IASlB,6CAA6C;IAC7C,OAAO,CAAC,aAAa;CAatB"}
@@ -1,11 +1,11 @@
1
- import { PrefsStore } from './prefs-store.js';
2
- import { SettingsReader } from './settings-reader.js';
1
+ import { PrefsStore } from "./prefs-store.js";
2
+ import { SettingsReader } from "./settings-reader.js";
3
3
  export class ModelResolver {
4
+ prefs;
5
+ settings;
4
6
  ctx;
5
7
  config;
6
8
  logger;
7
- prefs;
8
- settings;
9
9
  constructor(ctx, config, logger) {
10
10
  this.ctx = ctx;
11
11
  this.config = config;
@@ -26,12 +26,10 @@ export class ModelResolver {
26
26
  *
27
27
  * 优先级:per-peer 偏好 > cordis.yml 显式配置 > 默认链(settings.yaml > host)
28
28
  *
29
- * 注意:不能像 dsh-TUI 那样返回 undefined 让 session 沿用 requestHeader。
30
- * dsh-TUI 靠 installModelSelection 从 session.requestHeader 恢复 {{model}},
31
- * 而我们未装 installModelSelection,system-prompt 的 {{model}} 变量直接读
32
- * agent.options.model(agent-loop index.ts:352)——若无值会抛
29
+ * 这里不返回 undefined,因为未装 installModelSelection,system-prompt 的
30
+ * {{model}} 变量直接读 agent.options.model——若无值会抛
33
31
  * "prompt variable {{model}} has no value for this assembly"。
34
- * 因此这里兜底到默认链,确保 agent.options.model 始终有值。
32
+ * 因此兜底到默认链,确保 agent.options.model 始终有值。
35
33
  */
36
34
  getResumeRoute(sessionKey) {
37
35
  const override = this.prefs.getOverride(sessionKey);
@@ -78,6 +76,24 @@ export class ModelResolver {
78
76
  clearSessionId(sessionKey) {
79
77
  this.prefs.clearSessionId(sessionKey);
80
78
  }
79
+ /**
80
+ * 获取指定 sessionKey 的 per-peer preset 覆盖
81
+ */
82
+ getPreset(sessionKey) {
83
+ return this.prefs.getPreset(sessionKey);
84
+ }
85
+ /**
86
+ * 设置 per-peer preset 覆盖并持久化
87
+ */
88
+ setPreset(sessionKey, presetId) {
89
+ this.prefs.setPreset(sessionKey, presetId);
90
+ }
91
+ /**
92
+ * 清除 per-peer preset 覆盖并持久化
93
+ */
94
+ clearPreset(sessionKey) {
95
+ return this.prefs.clearPreset(sessionKey);
96
+ }
81
97
  /**
82
98
  * 解析默认模型路由(不含 per-peer 偏好)
83
99
  *
@@ -98,29 +114,51 @@ export class ModelResolver {
98
114
  }
99
115
  /**
100
116
  * 列出所有可用模型
117
+ *
118
+ * 优先走 ctx.llm 服务动态发现,服务不可用或失败时回退 settings.yaml 静态配置。
101
119
  */
102
- listModels() {
120
+ async listModels() {
121
+ const llm = this.getLlmService();
122
+ if (!llm)
123
+ return this.settings.readModels();
124
+ try {
125
+ const providers = llm.listProviders();
126
+ const entries = [];
127
+ for (const provider of providers) {
128
+ const providerId = typeof provider === 'string' ? provider : provider.id;
129
+ try {
130
+ const models = await llm.listModels(providerId);
131
+ for (const model of models) {
132
+ entries.push({ provider: providerId, id: model.id, name: model.name });
133
+ }
134
+ }
135
+ catch (err) {
136
+ // 单个 provider 失败,跳过
137
+ this.logger?.debug(`ModelResolver: provider ${providerId} 模型列表获取失败: ${err instanceof Error ? err.message : String(err)}`);
138
+ }
139
+ }
140
+ if (entries.length > 0)
141
+ return entries;
142
+ }
143
+ catch (err) {
144
+ this.logger?.warn(`ModelResolver: 动态发现模型失败,回退 settings.yaml: ${err instanceof Error ? err.message : String(err)}`);
145
+ }
103
146
  return this.settings.readModels();
104
147
  }
105
148
  /**
106
149
  * 列出可用 provider 名称
107
150
  */
108
151
  listProviders() {
109
- try {
110
- const llm = this.getService('llm');
111
- if (llm && typeof llm.listProviders === 'function') {
112
- const providers = llm.listProviders();
113
- if (providers.length > 0) {
114
- const first = providers[0];
115
- if (typeof first === 'string')
116
- return providers;
117
- return providers.map((p) => p.id);
118
- }
152
+ const llm = this.getLlmService();
153
+ if (llm) {
154
+ const providers = llm.listProviders();
155
+ if (providers.length > 0) {
156
+ const first = providers[0];
157
+ if (typeof first === 'string')
158
+ return providers;
159
+ return providers.map((p) => p.id);
119
160
  }
120
161
  }
121
- catch {
122
- // 忽略
123
- }
124
162
  return this.settings.readProviders();
125
163
  }
126
164
  // ── 私有方法 ──
@@ -141,11 +179,28 @@ export class ModelResolver {
141
179
  }
142
180
  return undefined;
143
181
  }
144
- /** 统一的 Cordis 服务访问 */
182
+ /** 统一的 Cordis 服务访问(可选获取:服务未注入时静默返回 undefined,避免 Proxy 抛错) */
145
183
  getService(name) {
146
- const ctxAny = this.ctx;
147
- return ctxAny[name] ??
148
- (typeof ctxAny.get === 'function' ? ctxAny.get(name) : undefined);
184
+ try {
185
+ const ctxAny = this.ctx;
186
+ return typeof ctxAny.get === 'function' ? ctxAny.get(name) : undefined;
187
+ }
188
+ catch {
189
+ return undefined;
190
+ }
191
+ }
192
+ /** 获取 ctx.llm 服务(最小接口收窄,不可用时返回 undefined) */
193
+ getLlmService() {
194
+ try {
195
+ const llm = this.getService('llm');
196
+ if (llm && typeof llm.listProviders === 'function' && typeof llm.listModels === 'function') {
197
+ return llm;
198
+ }
199
+ }
200
+ catch (err) {
201
+ this.logger?.warn(`ModelResolver: ctx.llm 服务访问失败: ${err instanceof Error ? err.message : String(err)}`);
202
+ }
203
+ return undefined;
149
204
  }
150
205
  }
151
206
  //# sourceMappingURL=model-resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/model/model-resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/model/model-resolver.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { ModelRoute } from './types.js';
1
+ import type { ModelRoute } from './types.ts';
2
2
  /** 日志回调(可选) */
3
3
  type DebugFn = (msg: string) => void;
4
4
  export declare class PrefsStore {
@@ -6,6 +6,8 @@ export declare class PrefsStore {
6
6
  private overrides;
7
7
  /** per-peer 最新 sessionId(fork 后更新,内存态) */
8
8
  private sessionIds;
9
+ /** per-peer preset 偏好(内存态) */
10
+ private presets;
9
11
  /** 隔离偏好文件路径 */
10
12
  private readonly prefsPath;
11
13
  private readonly debugLog?;
@@ -17,6 +19,9 @@ export declare class PrefsStore {
17
19
  getSessionId(sessionKey: string): string | undefined;
18
20
  setSessionId(sessionKey: string, sessionId: string): void;
19
21
  clearSessionId(sessionKey: string): boolean;
22
+ getPreset(sessionKey: string): string | undefined;
23
+ setPreset(sessionKey: string, presetId: string): void;
24
+ clearPreset(sessionKey: string): boolean;
20
25
  private load;
21
26
  private write;
22
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"prefs-store.d.ts","sourceRoot":"","sources":["../../src/model/prefs-store.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAe;AACf,KAAK,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;AASrC,qBAAa,UAAU;IACrB,yBAAyB;IACzB,OAAO,CAAC,SAAS,CAAiC;IAClD,0CAA0C;IAC1C,OAAO,CAAC,UAAU,CAA6B;IAC/C,eAAe;IACf,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAU;gBAExB,QAAQ,CAAC,EAAE,OAAO;IAQ9B,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIvD,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAKxD,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAM1C,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAMxC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAKzD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAQ3C,OAAO,CAAC,IAAI;IAwBZ,OAAO,CAAC,KAAK;CAYd"}
1
+ {"version":3,"file":"prefs-store.d.ts","sourceRoot":"","sources":["../../src/model/prefs-store.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAe;AACf,KAAK,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;AAWrC,qBAAa,UAAU;IACrB,yBAAyB;IACzB,OAAO,CAAC,SAAS,CAAiC;IAClD,0CAA0C;IAC1C,OAAO,CAAC,UAAU,CAA6B;IAC/C,8BAA8B;IAC9B,OAAO,CAAC,OAAO,CAA6B;IAC5C,eAAe;IACf,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAU;gBAExB,QAAQ,CAAC,EAAE,OAAO;IAQ9B,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIvD,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAKxD,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAM1C,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAMxC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAKzD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAQ3C,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIjD,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKrD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAQxC,OAAO,CAAC,IAAI;IA+BZ,OAAO,CAAC,KAAK;CAad"}
@@ -1,5 +1,5 @@
1
1
  /**
2
- * PrefsStore — per-peer 模型偏好持久化
2
+ * PrefsStore — per-peer 会话偏好持久化(模型 + preset)
3
3
  *
4
4
  * 隔离文件 I/O 操作,便于单元测试时 mock。
5
5
  * 存储路径:~/.dsh-qqbot/model-prefs.json
@@ -12,6 +12,8 @@ export class PrefsStore {
12
12
  overrides = new Map();
13
13
  /** per-peer 最新 sessionId(fork 后更新,内存态) */
14
14
  sessionIds = new Map();
15
+ /** per-peer preset 偏好(内存态) */
16
+ presets = new Map();
15
17
  /** 隔离偏好文件路径 */
16
18
  prefsPath;
17
19
  debugLog;
@@ -51,6 +53,20 @@ export class PrefsStore {
51
53
  this.write();
52
54
  return deleted;
53
55
  }
56
+ // ── Preset 操作 ──
57
+ getPreset(sessionKey) {
58
+ return this.presets.get(sessionKey);
59
+ }
60
+ setPreset(sessionKey, presetId) {
61
+ this.presets.set(sessionKey, presetId);
62
+ this.write();
63
+ }
64
+ clearPreset(sessionKey) {
65
+ const deleted = this.presets.delete(sessionKey);
66
+ if (deleted)
67
+ this.write();
68
+ return deleted;
69
+ }
54
70
  // ── 私有方法 ──
55
71
  load() {
56
72
  try {
@@ -72,6 +88,13 @@ export class PrefsStore {
72
88
  }
73
89
  }
74
90
  }
91
+ if (data.presets && typeof data.presets === 'object') {
92
+ for (const [key, presetId] of Object.entries(data.presets)) {
93
+ if (typeof presetId === 'string' && presetId) {
94
+ this.presets.set(key, presetId);
95
+ }
96
+ }
97
+ }
75
98
  }
76
99
  catch (err) {
77
100
  this.debugLog?.(`loadPrefs failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -83,6 +106,7 @@ export class PrefsStore {
83
106
  const data = {
84
107
  overrides: Object.fromEntries(this.overrides.entries()),
85
108
  sessionIds: Object.fromEntries(this.sessionIds.entries()),
109
+ presets: Object.fromEntries(this.presets.entries()),
86
110
  };
87
111
  writeFileSync(this.prefsPath, JSON.stringify(data, null, 2), 'utf8');
88
112
  }
@@ -1 +1 @@
1
- {"version":3,"file":"prefs-store.js","sourceRoot":"","sources":["../../src/model/prefs-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prefs-store.js","sourceRoot":"","sources":["../../src/model/prefs-store.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { ModelRoute, ModelEntry } from './types.js';
1
+ import type { ModelRoute, ModelEntry } from './types.ts';
2
2
  export declare class SettingsReader {
3
3
  /** settings.yaml 缓存 */
4
4
  private settingsCache;
@@ -3,12 +3,12 @@
3
3
  *
4
4
  * 定期检查会话最后活跃时间,超时则自动回收释放资源。
5
5
  */
6
- import type { SessionRecord } from './types.js';
6
+ import type { SessionRecord } from './types.ts';
7
7
  export declare class IdleEvictor {
8
+ private timer;
8
9
  private readonly sessions;
9
10
  private readonly timeoutMs;
10
11
  private readonly onEvict;
11
- private timer;
12
12
  constructor(sessions: Map<string, SessionRecord>, timeoutMs: number, onEvict: (key: string, record: SessionRecord) => void);
13
13
  /** 执行一轮回收检查 */
14
14
  check(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"idle-evictor.d.ts","sourceRoot":"","sources":["../../src/session/idle-evictor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,qBAAa,WAAW;IAIpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL1B,OAAO,CAAC,KAAK,CAA+C;gBAGzC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,KAAK,IAAI;IAOxE,eAAe;IACf,KAAK,IAAI,IAAI;IASb,cAAc;IACd,OAAO,IAAI,IAAI;CAMhB"}
1
+ {"version":3,"file":"idle-evictor.d.ts","sourceRoot":"","sources":["../../src/session/idle-evictor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,qBAAa,WAAW;IACtB,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+C;gBAGrE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,KAAK,IAAI;IAUvD,eAAe;IACf,KAAK,IAAI,IAAI;IASb,cAAc;IACd,OAAO,IAAI,IAAI;CAMhB"}
@@ -1,8 +1,8 @@
1
1
  export class IdleEvictor {
2
+ timer = null;
2
3
  sessions;
3
4
  timeoutMs;
4
5
  onEvict;
5
- timer = null;
6
6
  constructor(sessions, timeoutMs, onEvict) {
7
7
  this.sessions = sessions;
8
8
  this.timeoutMs = timeoutMs;
@@ -1 +1 @@
1
- {"version":3,"file":"idle-evictor.js","sourceRoot":"","sources":["../../src/session/idle-evictor.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,WAAW;IAIH;IACA;IACA;IALX,KAAK,GAA0C,IAAI,CAAC;IAE5D,YACmB,QAAoC,EACpC,SAAiB,EACjB,OAAqD;QAFrD,aAAQ,GAAR,QAAQ,CAA4B;QACpC,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAA8C;QAEtE,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,eAAe;IACf,KAAK;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1C,IAAI,GAAG,GAAG,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC/C,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,cAAc;IACd,OAAO;QACL,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"idle-evictor.js","sourceRoot":"","sources":["../../src/session/idle-evictor.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,WAAW;IACd,KAAK,GAA0C,IAAI,CAAC;IAC3C,QAAQ,CAA6B;IACrC,SAAS,CAAS;IAClB,OAAO,CAA+C;IAEvE,YACE,QAAoC,EACpC,SAAiB,EACjB,OAAqD;QAErD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,eAAe;IACf,KAAK;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1C,IAAI,GAAG,GAAG,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC/C,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,cAAc;IACd,OAAO;QACL,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;CACF"}
@@ -3,7 +3,7 @@
3
3
  *
4
4
  * 管理 QQ peer → dsh Agent 的映射和生命周期。
5
5
  */
6
- export { SessionManager } from './session-manager.js';
7
- export { IdleEvictor } from './idle-evictor.js';
8
- export type { AgentSetup, SessionEventLike, DshAgent, DshAgentHandle, SessionsService, DshAgentRegistry, AgentPresetsLike, PresetComposition, SessionRecord, SessionStatus, TokenUsageStats, } from './types.js';
6
+ export { SessionManager } from './session-manager.ts';
7
+ export { IdleEvictor } from './idle-evictor.ts';
8
+ export type { AgentSetup, SessionEventLike, DshAgent, DshAgentHandle, SessionsService, DshAgentRegistry, AgentPresetsLike, PresetComposition, PresetEntry, PresetSwitchOutcome, SessionRecord, SessionStatus, TokenUsageStats, } from './types.ts';
9
9
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,YAAY,EACV,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,eAAe,GAChB,MAAM,YAAY,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,YAAY,EACV,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,eAAe,GAChB,MAAM,YAAY,CAAC"}
@@ -3,6 +3,6 @@
3
3
  *
4
4
  * 管理 QQ peer → dsh Agent 的映射和生命周期。
5
5
  */
6
- export { SessionManager } from './session-manager.js';
7
- export { IdleEvictor } from './idle-evictor.js';
6
+ export { SessionManager } from "./session-manager.js";
7
+ export { IdleEvictor } from "./idle-evictor.js";
8
8
  //# sourceMappingURL=index.js.map
@@ -1,28 +1,79 @@
1
1
  import type { Context } from '@deepseek-ai/cordis';
2
- import type { ChatScope, Logger, ReplyTarget } from '../types.js';
3
- import type { ImQQBotConfig } from '../config.js';
4
- import type { ModelRoute, ModelEntry } from '../model/types.js';
5
- import type { DshAgent, DshAgentRegistry, SessionRecord, SessionStatus, TokenUsageStats } from './types.js';
2
+ import type { ChatScope, Logger, ReplyTarget } from '../types.ts';
3
+ import type { ImQQBotConfig } from '../config.ts';
4
+ import type { ModelRoute, ModelEntry } from '../model/types.ts';
5
+ import type { QuestionChannel } from '../features/question-channel.ts';
6
+ import type { ApprovalChannel } from '../features/approval-channel.ts';
7
+ import type { DshAgent, DshAgentRegistry, PresetEntry, PresetSwitchOutcome, SessionRecord, SessionStatus, TokenUsageStats, CompactOutcome } from './types.ts';
6
8
  export declare class SessionManager {
9
+ private sessions;
10
+ private readonly evictor;
11
+ private readonly modelResolver;
7
12
  private readonly ctx;
8
13
  private readonly agents;
9
14
  private readonly config;
10
15
  private readonly logger;
11
- private sessions;
12
- private readonly evictor;
13
- private readonly modelResolver;
16
+ /** 由 bootstrap 注入的问答通道(ask_user_question → QQ),会话回收时清理其待答问题 */
17
+ questionChannel?: QuestionChannel;
18
+ /** 由 bootstrap 注入的审批通道(approval/request → QQ),会话回收时清理其待批审批 */
19
+ approvalChannel?: ApprovalChannel;
14
20
  constructor(ctx: Context, agents: DshAgentRegistry, config: ImQQBotConfig, logger: Logger);
21
+ /**
22
+ * 通过 system-prompt/assemble waterfall 注入群聊/私聊额外 system prompt。
23
+ *
24
+ * 该事件在每次 turn 构建 request 时触发;此处按会话 scope(群聊/私聊)
25
+ * 追加对应的额外 prompt section。会话尚未建立(首次 assemble)或未配置
26
+ * 额外 prompt 时原样返回,不做改动。
27
+ */
28
+ private registerScopePromptInjection;
15
29
  /**
16
30
  * 动态获取 sessions 服务(fork 能力,可选)
17
31
  */
18
32
  private getSessionsService;
33
+ /**
34
+ * 动态获取 agentPresets 服务(可选,未注入时返回 undefined)
35
+ */
36
+ private getPresetsService;
37
+ /**
38
+ * 从 session 持久化 header 读 session 当初的 preset(started 锁定语义)。
39
+ * 读不到(服务缺失 / session 不存在 / 未记录 agentPreset)返回 undefined。
40
+ */
41
+ private resolvePersistedPreset;
19
42
  getEffectiveModel(scope: ChatScope, peerId: string): ModelRoute | undefined;
20
43
  /**
21
- * 切换模型(fork + 重建,对齐 dsh-TUI 的 switchModel)
44
+ * 获取指定 peer 的生效 preset(per-peer 覆盖 > config.preset)
45
+ */
46
+ getEffectivePreset(scope: ChatScope, peerId: string): string | undefined;
47
+ /** 按 sessionKey 解析生效 preset */
48
+ private getEffectivePresetByKey;
49
+ /**
50
+ * 列出所有可用 preset(/preset 命令用)
51
+ */
52
+ listPresets(): Promise<PresetEntry[]>;
53
+ /**
54
+ * 切换模型(fork + 重建会话,保留历史)
22
55
  */
23
56
  setModelOverride(scope: ChatScope, peerId: string, route: ModelRoute): Promise<void>;
57
+ /**
58
+ * 切换指定 peer 的 agent preset(per-peer 覆盖)
59
+ *
60
+ * 已开始的会话保持锁定(blank-session contract):只持久化为新会话默认,
61
+ * 不 fork/rebuild 当前会话,避免历史工具调用与新 preset 工具集冲突。
62
+ */
63
+ setPresetOverride(scope: ChatScope, peerId: string, presetId: string): Promise<PresetSwitchOutcome>;
64
+ /**
65
+ * 清除 per-peer preset 覆盖,回到 config.preset / 默认(新会话生效)
66
+ */
67
+ clearPresetOverride(scope: ChatScope, peerId: string): Promise<PresetSwitchOutcome>;
68
+ /**
69
+ * fork + 重建会话(保留历史,换 model)
70
+ *
71
+ * options.route 缺省时沿用当前生效值。preset 沿用当前生效 preset(getEffectivePresetByKey)。
72
+ * fork 不可用或失败时降级为 dispose(下次消息重建)。
73
+ */
74
+ private rebuildSession;
24
75
  clearModelOverride(scope: ChatScope, peerId: string): void;
25
- listAvailableModels(): ModelEntry[];
76
+ listAvailableModels(): Promise<ModelEntry[]>;
26
77
  listProviders(): string[];
27
78
  getSessionRecord(scope: ChatScope, peerId: string): SessionRecord | undefined;
28
79
  getStatus(scope: ChatScope, peerId: string): SessionStatus;
@@ -38,6 +89,13 @@ export declare class SessionManager {
38
89
  findBySessionId(sessionId: string): SessionRecord | undefined;
39
90
  findByAgent(agent: DshAgent): SessionRecord | undefined;
40
91
  remove(scope: ChatScope, peerId: string): Promise<void>;
92
+ /**
93
+ * 原地压缩当前会话历史(保留 sessionId,用摘要替换旧历史)。
94
+ *
95
+ * 需通过 agentPresets.serviceFor(agent, 'compaction') 解析;未挂载时优雅降级。
96
+ * 这是「压缩上下文」的语义,区别于 remove() 的「换新会话」。
97
+ */
98
+ compact(scope: ChatScope, peerId: string): Promise<CompactOutcome>;
41
99
  disposeAll(): Promise<void>;
42
100
  get size(): number;
43
101
  }
@@ -1 +1 @@
1
- {"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/session/session-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,KAAK,EAEV,QAAQ,EAGR,gBAAgB,EAGhB,aAAa,EACb,aAAa,EACb,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAMvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAoC;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;gBAG3B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM;IAgBjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAU1B,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAI3E;;OAEG;IACG,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4D1F,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAM1D,mBAAmB,IAAI,UAAU,EAAE;IAInC,aAAa,IAAI,MAAM,EAAE;IAMzB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI7E,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa;IAe1D,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe;IAkBhE,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAsBxD,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,gBAAgB;YAIV,aAAa;IA2B3B,wCAAwC;IAClC,WAAW,CACf,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,aAAa,CAAC;IAqEzB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAO7D,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,aAAa,GAAG,SAAS;IAOjD,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWvD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}
1
+ {"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/session/session-manager.ts"],"names":[],"mappings":"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"}