@fllf/agent-sdk 0.1.1 → 0.1.3

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 (270) hide show
  1. package/CHANGELOG.md +169 -0
  2. package/README.md +844 -184
  3. package/dist/agent/Agent.d.ts +16 -5
  4. package/dist/agent/Agent.d.ts.map +1 -1
  5. package/dist/agent/Agent.js +283 -2
  6. package/dist/agent/Agent.js.map +1 -1
  7. package/dist/agent/index.d.ts +1 -1
  8. package/dist/agent/index.d.ts.map +1 -1
  9. package/dist/agent/types.d.ts +27 -3
  10. package/dist/agent/types.d.ts.map +1 -1
  11. package/dist/config/config.d.ts +22 -3
  12. package/dist/config/config.d.ts.map +1 -1
  13. package/dist/config/config.js +194 -47
  14. package/dist/config/config.js.map +1 -1
  15. package/dist/config/index.d.ts +1 -1
  16. package/dist/config/index.d.ts.map +1 -1
  17. package/dist/errors.d.ts +74 -0
  18. package/dist/errors.d.ts.map +1 -0
  19. package/dist/errors.js +186 -0
  20. package/dist/errors.js.map +1 -0
  21. package/dist/executors/base-executor.d.ts +14 -0
  22. package/dist/executors/base-executor.d.ts.map +1 -0
  23. package/dist/executors/base-executor.js +31 -0
  24. package/dist/executors/base-executor.js.map +1 -0
  25. package/dist/executors/base.d.ts +36 -5
  26. package/dist/executors/base.d.ts.map +1 -1
  27. package/dist/executors/chat-request-builder.d.ts +10 -0
  28. package/dist/executors/chat-request-builder.d.ts.map +1 -0
  29. package/dist/executors/chat-request-builder.js +96 -0
  30. package/dist/executors/chat-request-builder.js.map +1 -0
  31. package/dist/executors/index.d.ts +4 -1
  32. package/dist/executors/index.d.ts.map +1 -1
  33. package/dist/executors/index.js +6 -1
  34. package/dist/executors/index.js.map +1 -1
  35. package/dist/executors/rag-executor.js +1 -1
  36. package/dist/executors/rag-executor.js.map +1 -1
  37. package/dist/executors/simple-chat-executor.d.ts +4 -2
  38. package/dist/executors/simple-chat-executor.d.ts.map +1 -1
  39. package/dist/executors/simple-chat-executor.js +59 -57
  40. package/dist/executors/simple-chat-executor.js.map +1 -1
  41. package/dist/executors/tool-calling-executor.d.ts +20 -2
  42. package/dist/executors/tool-calling-executor.d.ts.map +1 -1
  43. package/dist/executors/tool-calling-executor.js +189 -91
  44. package/dist/executors/tool-calling-executor.js.map +1 -1
  45. package/dist/history/base.d.ts +55 -2
  46. package/dist/history/base.d.ts.map +1 -1
  47. package/dist/history/base.js +49 -0
  48. package/dist/history/base.js.map +1 -1
  49. package/dist/history/compression.d.ts +49 -0
  50. package/dist/history/compression.d.ts.map +1 -0
  51. package/dist/history/compression.js +53 -0
  52. package/dist/history/compression.js.map +1 -0
  53. package/dist/history/context-window.d.ts +33 -0
  54. package/dist/history/context-window.d.ts.map +1 -0
  55. package/dist/history/context-window.js +68 -0
  56. package/dist/history/context-window.js.map +1 -0
  57. package/dist/history/in-memory.d.ts +6 -4
  58. package/dist/history/in-memory.d.ts.map +1 -1
  59. package/dist/history/in-memory.js +25 -39
  60. package/dist/history/in-memory.js.map +1 -1
  61. package/dist/history/index.d.ts +9 -2
  62. package/dist/history/index.d.ts.map +1 -1
  63. package/dist/history/index.js +18 -1
  64. package/dist/history/index.js.map +1 -1
  65. package/dist/history/postgres/index.d.ts +4 -0
  66. package/dist/history/postgres/index.d.ts.map +1 -0
  67. package/dist/history/postgres/index.js +20 -0
  68. package/dist/history/postgres/index.js.map +1 -0
  69. package/dist/history/postgres/postgres-message-history-store.d.ts +35 -0
  70. package/dist/history/postgres/postgres-message-history-store.d.ts.map +1 -0
  71. package/dist/history/postgres/postgres-message-history-store.js +195 -0
  72. package/dist/history/postgres/postgres-message-history-store.js.map +1 -0
  73. package/dist/history/postgres/schema.d.ts +18 -0
  74. package/dist/history/postgres/schema.d.ts.map +1 -0
  75. package/dist/history/postgres/schema.js +46 -0
  76. package/dist/history/postgres/schema.js.map +1 -0
  77. package/dist/history/postgres/sql.d.ts +29 -0
  78. package/dist/history/postgres/sql.d.ts.map +1 -0
  79. package/dist/history/postgres/sql.js +102 -0
  80. package/dist/history/postgres/sql.js.map +1 -0
  81. package/dist/history/postgres/types.d.ts +20 -0
  82. package/dist/history/postgres/types.d.ts.map +1 -0
  83. package/dist/history/postgres/types.js +3 -0
  84. package/dist/history/postgres/types.js.map +1 -0
  85. package/dist/history/tool-pairing.d.ts +11 -0
  86. package/dist/history/tool-pairing.d.ts.map +1 -0
  87. package/dist/history/tool-pairing.js +52 -0
  88. package/dist/history/tool-pairing.js.map +1 -0
  89. package/dist/index.d.ts +2 -0
  90. package/dist/index.d.ts.map +1 -1
  91. package/dist/index.js +2 -0
  92. package/dist/index.js.map +1 -1
  93. package/dist/llm/LLM.d.ts +1 -0
  94. package/dist/llm/LLM.d.ts.map +1 -1
  95. package/dist/llm/LLM.js +136 -26
  96. package/dist/llm/LLM.js.map +1 -1
  97. package/dist/llm/errors.d.ts +11 -1
  98. package/dist/llm/errors.d.ts.map +1 -1
  99. package/dist/llm/errors.js +50 -1
  100. package/dist/llm/errors.js.map +1 -1
  101. package/dist/llm/factory.d.ts +14 -2
  102. package/dist/llm/factory.d.ts.map +1 -1
  103. package/dist/llm/factory.js +48 -9
  104. package/dist/llm/factory.js.map +1 -1
  105. package/dist/llm/index.d.ts +8 -3
  106. package/dist/llm/index.d.ts.map +1 -1
  107. package/dist/llm/index.js +10 -1
  108. package/dist/llm/index.js.map +1 -1
  109. package/dist/llm/providers/anthropic.d.ts +14 -0
  110. package/dist/llm/providers/anthropic.d.ts.map +1 -0
  111. package/dist/llm/providers/anthropic.js +336 -0
  112. package/dist/llm/providers/anthropic.js.map +1 -0
  113. package/dist/llm/providers/openai-compatible.d.ts +7 -0
  114. package/dist/llm/providers/openai-compatible.d.ts.map +1 -1
  115. package/dist/llm/providers/openai-compatible.js +151 -47
  116. package/dist/llm/providers/openai-compatible.js.map +1 -1
  117. package/dist/llm/stream-accumulator.d.ts +17 -0
  118. package/dist/llm/stream-accumulator.d.ts.map +1 -0
  119. package/dist/llm/stream-accumulator.js +83 -0
  120. package/dist/llm/stream-accumulator.js.map +1 -0
  121. package/dist/llm/tool-arguments.d.ts +6 -0
  122. package/dist/llm/tool-arguments.d.ts.map +1 -0
  123. package/dist/llm/tool-arguments.js +20 -0
  124. package/dist/llm/tool-arguments.js.map +1 -0
  125. package/dist/llm/types.d.ts +76 -4
  126. package/dist/llm/types.d.ts.map +1 -1
  127. package/dist/messages/content.d.ts +36 -0
  128. package/dist/messages/content.d.ts.map +1 -0
  129. package/dist/messages/content.js +70 -0
  130. package/dist/messages/content.js.map +1 -0
  131. package/dist/messages/index.d.ts +4 -2
  132. package/dist/messages/index.d.ts.map +1 -1
  133. package/dist/messages/index.js +10 -1
  134. package/dist/messages/index.js.map +1 -1
  135. package/dist/messages/message.d.ts +11 -9
  136. package/dist/messages/message.d.ts.map +1 -1
  137. package/dist/messages/message.js +69 -4
  138. package/dist/messages/message.js.map +1 -1
  139. package/dist/messages/types.d.ts +12 -0
  140. package/dist/messages/types.d.ts.map +1 -1
  141. package/dist/observability/collecting-observer.d.ts +8 -0
  142. package/dist/observability/collecting-observer.d.ts.map +1 -0
  143. package/dist/observability/collecting-observer.js +15 -0
  144. package/dist/observability/collecting-observer.js.map +1 -0
  145. package/dist/observability/index.d.ts +1 -0
  146. package/dist/observability/index.d.ts.map +1 -1
  147. package/dist/observability/index.js +3 -1
  148. package/dist/observability/index.js.map +1 -1
  149. package/dist/observability/observer.d.ts.map +1 -1
  150. package/dist/observability/observer.js +14 -1
  151. package/dist/observability/observer.js.map +1 -1
  152. package/dist/observability/types.d.ts +16 -1
  153. package/dist/observability/types.d.ts.map +1 -1
  154. package/dist/rag/chunking/auto-chunker.d.ts +7 -0
  155. package/dist/rag/chunking/auto-chunker.d.ts.map +1 -1
  156. package/dist/rag/chunking/auto-chunker.js +13 -0
  157. package/dist/rag/chunking/auto-chunker.js.map +1 -1
  158. package/dist/rag/chunking/chunker.d.ts.map +1 -1
  159. package/dist/rag/chunking/chunker.js +29 -5
  160. package/dist/rag/chunking/chunker.js.map +1 -1
  161. package/dist/rag/chunking/index.d.ts +2 -0
  162. package/dist/rag/chunking/index.d.ts.map +1 -1
  163. package/dist/rag/chunking/index.js +2 -0
  164. package/dist/rag/chunking/index.js.map +1 -1
  165. package/dist/rag/chunking/markdown-chunker.d.ts.map +1 -1
  166. package/dist/rag/chunking/markdown-chunker.js.map +1 -1
  167. package/dist/rag/chunking/qa-pair-chunker.d.ts +23 -0
  168. package/dist/rag/chunking/qa-pair-chunker.d.ts.map +1 -0
  169. package/dist/rag/chunking/qa-pair-chunker.js +162 -0
  170. package/dist/rag/chunking/qa-pair-chunker.js.map +1 -0
  171. package/dist/rag/chunking/semantic-chunker.d.ts +19 -0
  172. package/dist/rag/chunking/semantic-chunker.d.ts.map +1 -0
  173. package/dist/rag/chunking/semantic-chunker.js +291 -0
  174. package/dist/rag/chunking/semantic-chunker.js.map +1 -0
  175. package/dist/rag/embeddings/embedder.d.ts.map +1 -1
  176. package/dist/rag/embeddings/embedder.js +6 -0
  177. package/dist/rag/embeddings/embedder.js.map +1 -1
  178. package/dist/rag/embeddings/openai-compatible-embedder.d.ts +22 -4
  179. package/dist/rag/embeddings/openai-compatible-embedder.d.ts.map +1 -1
  180. package/dist/rag/embeddings/openai-compatible-embedder.js +108 -14
  181. package/dist/rag/embeddings/openai-compatible-embedder.js.map +1 -1
  182. package/dist/rag/generation/context-builder.d.ts +7 -0
  183. package/dist/rag/generation/context-builder.d.ts.map +1 -1
  184. package/dist/rag/generation/context-builder.js +4 -1
  185. package/dist/rag/generation/context-builder.js.map +1 -1
  186. package/dist/rag/ingestion/metadata.d.ts +6 -1
  187. package/dist/rag/ingestion/metadata.d.ts.map +1 -1
  188. package/dist/rag/ingestion/metadata.js +6 -2
  189. package/dist/rag/ingestion/metadata.js.map +1 -1
  190. package/dist/rag/pipeline.d.ts.map +1 -1
  191. package/dist/rag/pipeline.js +34 -11
  192. package/dist/rag/pipeline.js.map +1 -1
  193. package/dist/rag/retrieval/index.d.ts +1 -0
  194. package/dist/rag/retrieval/index.d.ts.map +1 -1
  195. package/dist/rag/retrieval/index.js +1 -0
  196. package/dist/rag/retrieval/index.js.map +1 -1
  197. package/dist/rag/retrieval/parent-child-expanding-retriever.d.ts +31 -0
  198. package/dist/rag/retrieval/parent-child-expanding-retriever.d.ts.map +1 -0
  199. package/dist/rag/retrieval/parent-child-expanding-retriever.js +194 -0
  200. package/dist/rag/retrieval/parent-child-expanding-retriever.js.map +1 -0
  201. package/dist/rag/stores/in-memory-keyword-store.d.ts.map +1 -1
  202. package/dist/rag/stores/in-memory-keyword-store.js +3 -8
  203. package/dist/rag/stores/in-memory-keyword-store.js.map +1 -1
  204. package/dist/rag/stores/keyword-tokenizer.d.ts +4 -0
  205. package/dist/rag/stores/keyword-tokenizer.d.ts.map +1 -0
  206. package/dist/rag/stores/keyword-tokenizer.js +113 -0
  207. package/dist/rag/stores/keyword-tokenizer.js.map +1 -0
  208. package/dist/rag/stores/postgres/pg-vector-store.d.ts.map +1 -1
  209. package/dist/rag/stores/postgres/pg-vector-store.js +21 -8
  210. package/dist/rag/stores/postgres/pg-vector-store.js.map +1 -1
  211. package/dist/rag/stores/postgres/postgres-document-store.d.ts.map +1 -1
  212. package/dist/rag/stores/postgres/postgres-document-store.js +26 -13
  213. package/dist/rag/stores/postgres/postgres-document-store.js.map +1 -1
  214. package/dist/rag/stores/postgres/postgres-keyword-store.d.ts.map +1 -1
  215. package/dist/rag/stores/postgres/postgres-keyword-store.js +43 -43
  216. package/dist/rag/stores/postgres/postgres-keyword-store.js.map +1 -1
  217. package/dist/rag/stores/postgres/sql.d.ts +22 -0
  218. package/dist/rag/stores/postgres/sql.d.ts.map +1 -1
  219. package/dist/rag/stores/postgres/sql.js +42 -0
  220. package/dist/rag/stores/postgres/sql.js.map +1 -1
  221. package/dist/rag/stores/types.d.ts +5 -0
  222. package/dist/rag/stores/types.d.ts.map +1 -1
  223. package/dist/rag/types.d.ts +6 -0
  224. package/dist/rag/types.d.ts.map +1 -1
  225. package/dist/testing/agent.d.ts +11 -0
  226. package/dist/testing/agent.d.ts.map +1 -0
  227. package/dist/testing/agent.js +45 -0
  228. package/dist/testing/agent.js.map +1 -0
  229. package/dist/testing/history-contract.d.ts +12 -0
  230. package/dist/testing/history-contract.d.ts.map +1 -0
  231. package/dist/testing/history-contract.js +111 -0
  232. package/dist/testing/history-contract.js.map +1 -0
  233. package/dist/testing/index.d.ts +11 -0
  234. package/dist/testing/index.d.ts.map +1 -0
  235. package/dist/testing/index.js +16 -0
  236. package/dist/testing/index.js.map +1 -0
  237. package/dist/testing/models.d.ts +34 -0
  238. package/dist/testing/models.d.ts.map +1 -0
  239. package/dist/testing/models.js +74 -0
  240. package/dist/testing/models.js.map +1 -0
  241. package/dist/testing/tool-schema.d.ts +6 -0
  242. package/dist/testing/tool-schema.d.ts.map +1 -0
  243. package/dist/testing/tool-schema.js +29 -0
  244. package/dist/testing/tool-schema.js.map +1 -0
  245. package/dist/testing/tools.d.ts +21 -0
  246. package/dist/testing/tools.d.ts.map +1 -0
  247. package/dist/testing/tools.js +43 -0
  248. package/dist/testing/tools.js.map +1 -0
  249. package/dist/tools/base.d.ts +38 -7
  250. package/dist/tools/base.d.ts.map +1 -1
  251. package/dist/tools/base.js +238 -11
  252. package/dist/tools/base.js.map +1 -1
  253. package/dist/tools/builtin/advancedSearchTool.d.ts.map +1 -1
  254. package/dist/tools/builtin/advancedSearchTool.js +30 -4
  255. package/dist/tools/builtin/advancedSearchTool.js.map +1 -1
  256. package/dist/tools/builtin/ragSearchTool.d.ts +6 -3
  257. package/dist/tools/builtin/ragSearchTool.d.ts.map +1 -1
  258. package/dist/tools/builtin/ragSearchTool.js +8 -6
  259. package/dist/tools/builtin/ragSearchTool.js.map +1 -1
  260. package/dist/tools/executor.d.ts +30 -2
  261. package/dist/tools/executor.d.ts.map +1 -1
  262. package/dist/tools/executor.js +83 -15
  263. package/dist/tools/executor.js.map +1 -1
  264. package/dist/tools/index.d.ts +3 -1
  265. package/dist/tools/index.d.ts.map +1 -1
  266. package/dist/tools/registry.d.ts +15 -3
  267. package/dist/tools/registry.d.ts.map +1 -1
  268. package/dist/tools/registry.js +21 -2
  269. package/dist/tools/registry.js.map +1 -1
  270. package/package.json +58 -4
@@ -1,14 +1,28 @@
1
1
  import { z } from 'zod';
2
- import type { ChatToolSchema } from '../llm/types';
2
+ import { ToolError } from '../errors';
3
+ import type { ChatToolSchema, ToolDefinition } from '../llm/types';
4
+ import type { MessageContent } from '../messages/content';
3
5
  export type ToolInputSchema = z.ZodType;
4
6
  export type ToolInput<TSchema extends ToolInputSchema> = z.infer<TSchema>;
5
- export interface ToolOptions<TSchema extends ToolInputSchema> {
7
+ export type ToolErrorMode = 'return_to_model' | 'throw';
8
+ export type ToolPermissionChecker = (context: ToolRunContext) => boolean | Promise<boolean>;
9
+ export interface ToolRunContext {
10
+ runId: string;
11
+ agentName?: string | undefined;
12
+ sessionId?: string | undefined;
13
+ metadata?: Record<string, unknown> | undefined;
14
+ signal?: AbortSignal | undefined;
15
+ }
16
+ export interface ToolOptions<TSchema extends ToolInputSchema, TResult = unknown> {
6
17
  name: string;
7
18
  description: string;
8
19
  schema: TSchema;
20
+ timeoutMs?: number;
21
+ errorMode?: ToolErrorMode;
22
+ canExecute?: ToolPermissionChecker;
23
+ serializeResult?: (result: TResult) => MessageContent;
9
24
  }
10
- export declare class ToolValidationError extends Error {
11
- readonly toolName: string;
25
+ export declare class ToolValidationError extends ToolError {
12
26
  readonly issues: readonly z.core.$ZodIssue[];
13
27
  constructor(toolName: string, error: z.ZodError);
14
28
  }
@@ -16,13 +30,30 @@ export declare abstract class Tool<TSchema extends ToolInputSchema = ToolInputSc
16
30
  readonly name: string;
17
31
  readonly description: string;
18
32
  readonly schema: TSchema;
19
- protected constructor(options: ToolOptions<TSchema>);
33
+ readonly timeoutMs: number | undefined;
34
+ readonly errorMode: ToolErrorMode;
35
+ private readonly permissionChecker;
36
+ private readonly resultSerializer;
37
+ protected constructor(options: ToolOptions<TSchema, TResult>);
20
38
  /**
21
39
  * 模型返回的是未可信的 JSON 参数,进入具体工具前必须先通过 schema。
22
40
  * 子类只实现 run(validatedInput),不用重复写参数校验样板代码。
23
41
  */
24
- execute(parameters: unknown): Promise<TResult>;
42
+ execute(parameters: unknown, context?: Partial<ToolRunContext>): Promise<TResult>;
43
+ /**
44
+ * 工具结果最终要作为消息内容反馈给模型。
45
+ * 默认策略:字符串与 content block 数组原样透传,其余值用 JSON 序列化,
46
+ * 避免对象被降级成 "[object Object]" 这类对模型无意义的文本。
47
+ */
48
+ serializeResult(result: TResult): MessageContent;
49
+ toToolSchema(): ToolDefinition;
50
+ /**
51
+ * @deprecated 请使用 toToolSchema();此方法返回 OpenAI 专有形状。
52
+ */
25
53
  toOpenAISchema(): ChatToolSchema;
26
- protected abstract run(parameters: ToolInput<TSchema>): TResult | Promise<TResult>;
54
+ protected abstract run(parameters: ToolInput<TSchema>, context: ToolRunContext): TResult | Promise<TResult>;
55
+ protected canExecute(_context: ToolRunContext): boolean | Promise<boolean>;
56
+ private ensureCanExecute;
57
+ private runWithControls;
27
58
  }
28
59
  //# sourceMappingURL=base.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/tools/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC;AACxC,MAAM,MAAM,SAAS,CAAC,OAAO,SAAS,eAAe,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAE1E,MAAM,WAAW,WAAW,CAAC,OAAO,SAAS,eAAe;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAEjC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,QAAQ;CAMlD;AAED,8BAAsB,IAAI,CACtB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,OAAO,GAAG,OAAO;IAEjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB,SAAS,aAAa,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC;IAMnD;;;OAGG;IACG,OAAO,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IASpD,cAAc,IAAI,cAAc;IAYhC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CACrF"}
1
+ {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/tools/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAGH,SAAS,EAGZ,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC;AACxC,MAAM,MAAM,SAAS,CAAC,OAAO,SAAS,eAAe,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC1E,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,OAAO,CAAC;AACxD,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAI5F,MAAM,WAAW,cAAc;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC/C,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED,MAAM,WAAW,WAAW,CAAC,OAAO,SAAS,eAAe,EAAE,OAAO,GAAG,OAAO;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,cAAc,CAAC;CACzD;AAED,qBAAa,mBAAoB,SAAQ,SAAS;IAC9C,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAEjC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,QAAQ;CAalD;AAED,8BAAsB,IAAI,CACtB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,OAAO,GAAG,OAAO;IAEjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoC;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoD;IAErF,SAAS,aAAa,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;IAY5D;;;OAGG;IACG,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAUvF;;;;OAIG;IACH,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,cAAc;IAwBhD,YAAY,IAAI,cAAc;IAS9B;;OAEG;IACH,cAAc,IAAI,cAAc;IAahC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAClB,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAC9B,OAAO,EAAE,cAAc,GACxB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAE7B,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAI5D,gBAAgB;YAWhB,eAAe;CAyDhC"}
@@ -2,13 +2,22 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Tool = exports.ToolValidationError = void 0;
4
4
  const zod_1 = require("zod");
5
- class ToolValidationError extends Error {
6
- toolName;
5
+ const errors_1 = require("../errors");
6
+ const content_1 = require("../messages/content");
7
+ const TOOL_NAME_PATTERN = /^[a-zA-Z0-9_-]{1,64}$/;
8
+ class ToolValidationError extends errors_1.ToolError {
7
9
  issues;
8
10
  constructor(toolName, error) {
9
- super(`Tool "${toolName}" received invalid parameters.`);
10
- this.name = 'ToolValidationError';
11
- this.toolName = toolName;
11
+ super(`Tool "${toolName}" received invalid parameters.`, {
12
+ code: 'tool_validation',
13
+ retryable: false,
14
+ toolName,
15
+ cause: error,
16
+ metadata: {
17
+ toolName,
18
+ issueCount: error.issues.length,
19
+ },
20
+ });
12
21
  this.issues = error.issues;
13
22
  }
14
23
  }
@@ -17,35 +26,253 @@ class Tool {
17
26
  name;
18
27
  description;
19
28
  schema;
29
+ timeoutMs;
30
+ errorMode;
31
+ permissionChecker;
32
+ resultSerializer;
20
33
  constructor(options) {
34
+ validateToolOptions(options);
21
35
  this.name = options.name;
22
36
  this.description = options.description;
23
37
  this.schema = options.schema;
38
+ this.timeoutMs = options.timeoutMs;
39
+ this.errorMode = options.errorMode ?? 'return_to_model';
40
+ this.permissionChecker = options.canExecute;
41
+ this.resultSerializer = options.serializeResult;
24
42
  }
25
43
  /**
26
44
  * 模型返回的是未可信的 JSON 参数,进入具体工具前必须先通过 schema。
27
45
  * 子类只实现 run(validatedInput),不用重复写参数校验样板代码。
28
46
  */
29
- async execute(parameters) {
47
+ async execute(parameters, context) {
30
48
  const parsed = await this.schema.safeParseAsync(parameters);
31
49
  if (!parsed.success) {
32
50
  throw new ToolValidationError(this.name, parsed.error);
33
51
  }
34
- return await this.run(parsed.data);
52
+ const runContext = createToolRunContext(context);
53
+ return await this.runWithControls(parsed.data, runContext);
35
54
  }
55
+ /**
56
+ * 工具结果最终要作为消息内容反馈给模型。
57
+ * 默认策略:字符串与 content block 数组原样透传,其余值用 JSON 序列化,
58
+ * 避免对象被降级成 "[object Object]" 这类对模型无意义的文本。
59
+ */
60
+ serializeResult(result) {
61
+ if (this.resultSerializer) {
62
+ return this.resultSerializer(result);
63
+ }
64
+ if (typeof result === 'string') {
65
+ return result;
66
+ }
67
+ if ((0, content_1.isMessageContent)(result)) {
68
+ return result;
69
+ }
70
+ if (result === undefined) {
71
+ return '';
72
+ }
73
+ try {
74
+ return JSON.stringify(result) ?? String(result);
75
+ }
76
+ catch {
77
+ return String(result);
78
+ }
79
+ }
80
+ toToolSchema() {
81
+ return {
82
+ name: this.name,
83
+ description: this.description,
84
+ strict: true,
85
+ parameters: toStrictObjectSchema(this.schema),
86
+ };
87
+ }
88
+ /**
89
+ * @deprecated 请使用 toToolSchema();此方法返回 OpenAI 专有形状。
90
+ */
36
91
  toOpenAISchema() {
92
+ const schema = this.toToolSchema();
37
93
  return {
38
94
  type: 'function',
39
95
  function: {
40
- name: this.name,
41
- description: this.description,
42
- strict: true,
43
- parameters: toStrictObjectSchema(this.schema),
96
+ name: schema.name,
97
+ description: schema.description,
98
+ strict: schema.strict ?? true,
99
+ parameters: schema.parameters,
44
100
  },
45
101
  };
46
102
  }
103
+ canExecute(_context) {
104
+ return true;
105
+ }
106
+ async ensureCanExecute(context) {
107
+ const allowedBySubclass = await this.canExecute(context);
108
+ const allowedByOptions = this.permissionChecker
109
+ ? await this.permissionChecker(context)
110
+ : true;
111
+ if (!allowedBySubclass || !allowedByOptions) {
112
+ throw new errors_1.ToolPermissionError(this.name);
113
+ }
114
+ }
115
+ async runWithControls(parameters, context) {
116
+ const attemptSignal = createToolAttemptSignal(this.name, context.signal, this.timeoutMs);
117
+ const startedAt = Date.now();
118
+ let timeoutId;
119
+ let abortCleanup;
120
+ try {
121
+ const controlledContext = withToolSignal(context, attemptSignal.signal);
122
+ const operation = (async () => {
123
+ await this.ensureCanExecute(controlledContext);
124
+ return await this.run(parameters, controlledContext);
125
+ })();
126
+ const race = [operation];
127
+ if (this.timeoutMs !== undefined && this.timeoutMs > 0) {
128
+ race.push(new Promise((_resolve, reject) => {
129
+ timeoutId = setTimeout(() => {
130
+ attemptSignal.abortForTimeout();
131
+ reject(new errors_1.ToolTimeoutError(this.name, this.timeoutMs));
132
+ }, this.timeoutMs);
133
+ }));
134
+ }
135
+ const abortRace = createToolAbortRace(this.name, attemptSignal.signal, attemptSignal.abortedByCaller);
136
+ if (abortRace !== undefined) {
137
+ race.push(abortRace.promise);
138
+ abortCleanup = abortRace.cleanup;
139
+ }
140
+ return await Promise.race(race);
141
+ }
142
+ catch (error) {
143
+ if (attemptSignal.timedOut()) {
144
+ throw new errors_1.ToolTimeoutError(this.name, this.timeoutMs ?? Date.now() - startedAt, {
145
+ cause: error,
146
+ });
147
+ }
148
+ if (attemptSignal.abortedByCaller()) {
149
+ throw new errors_1.ToolAbortError(this.name, { cause: error });
150
+ }
151
+ throw error;
152
+ }
153
+ finally {
154
+ if (timeoutId !== undefined) {
155
+ clearTimeout(timeoutId);
156
+ }
157
+ abortCleanup?.();
158
+ attemptSignal.cleanup();
159
+ }
160
+ }
47
161
  }
48
162
  exports.Tool = Tool;
163
+ function validateToolOptions(options) {
164
+ if (typeof options.name !== 'string' || !TOOL_NAME_PATTERN.test(options.name)) {
165
+ throwInvalidToolOption('name', 'must be 1-64 characters and contain only letters, numbers, underscores, or hyphens', typeof options.name === 'string' ? options.name : '<invalid>');
166
+ }
167
+ if (typeof options.description !== 'string' || options.description.trim().length === 0) {
168
+ throwInvalidToolOption('description', 'must be a non-empty string', options.name);
169
+ }
170
+ if (!isZodSchema(options.schema)) {
171
+ throwInvalidToolOption('schema', 'must be a Zod schema', options.name);
172
+ }
173
+ if (options.timeoutMs !== undefined
174
+ && (!Number.isFinite(options.timeoutMs) || options.timeoutMs < 0)) {
175
+ throwInvalidToolOption('timeoutMs', 'must be a non-negative finite number', options.name);
176
+ }
177
+ if (options.errorMode !== undefined
178
+ && options.errorMode !== 'return_to_model'
179
+ && options.errorMode !== 'throw') {
180
+ throwInvalidToolOption('errorMode', 'must be "return_to_model" or "throw"', options.name);
181
+ }
182
+ if (options.canExecute !== undefined && typeof options.canExecute !== 'function') {
183
+ throwInvalidToolOption('canExecute', 'must be a function', options.name);
184
+ }
185
+ if (options.serializeResult !== undefined && typeof options.serializeResult !== 'function') {
186
+ throwInvalidToolOption('serializeResult', 'must be a function', options.name);
187
+ }
188
+ }
189
+ function throwInvalidToolOption(option, reason, toolName) {
190
+ throw new errors_1.ToolConfigurationError(`Invalid ToolOptions.${option}: ${reason}.`, {
191
+ toolName,
192
+ metadata: {
193
+ option,
194
+ toolName,
195
+ },
196
+ });
197
+ }
198
+ function isZodSchema(value) {
199
+ return typeof value === 'object'
200
+ && value !== null
201
+ && 'safeParseAsync' in value
202
+ && typeof value.safeParseAsync === 'function';
203
+ }
204
+ function createToolRunContext(context) {
205
+ return {
206
+ runId: context?.runId ?? 'standalone',
207
+ agentName: context?.agentName,
208
+ sessionId: context?.sessionId,
209
+ metadata: context?.metadata,
210
+ signal: context?.signal,
211
+ };
212
+ }
213
+ function createToolAttemptSignal(toolName, callerSignal, timeoutMs) {
214
+ if (callerSignal?.aborted) {
215
+ throw new errors_1.ToolAbortError(toolName, { cause: callerSignal.reason });
216
+ }
217
+ const needsSignal = callerSignal !== undefined || (timeoutMs !== undefined && timeoutMs > 0);
218
+ if (!needsSignal) {
219
+ return {
220
+ signal: undefined,
221
+ timedOut: () => false,
222
+ abortedByCaller: () => false,
223
+ abortForTimeout: () => undefined,
224
+ cleanup: () => undefined,
225
+ };
226
+ }
227
+ const controller = new AbortController();
228
+ let timedOut = false;
229
+ let abortedByCaller = false;
230
+ const onCallerAbort = () => {
231
+ abortedByCaller = true;
232
+ controller.abort(callerSignal?.reason);
233
+ };
234
+ callerSignal?.addEventListener('abort', onCallerAbort, { once: true });
235
+ return {
236
+ signal: controller.signal,
237
+ timedOut: () => timedOut,
238
+ abortedByCaller: () => abortedByCaller,
239
+ abortForTimeout: () => {
240
+ timedOut = true;
241
+ controller.abort();
242
+ },
243
+ cleanup: () => {
244
+ callerSignal?.removeEventListener('abort', onCallerAbort);
245
+ },
246
+ };
247
+ }
248
+ function withToolSignal(context, signal) {
249
+ return {
250
+ ...context,
251
+ signal,
252
+ };
253
+ }
254
+ function createToolAbortRace(toolName, signal, abortedByCaller) {
255
+ if (signal === undefined) {
256
+ return undefined;
257
+ }
258
+ let onAbort;
259
+ const promise = new Promise((_resolve, reject) => {
260
+ onAbort = () => {
261
+ if (abortedByCaller()) {
262
+ reject(new errors_1.ToolAbortError(toolName));
263
+ }
264
+ };
265
+ signal.addEventListener('abort', onAbort, { once: true });
266
+ });
267
+ return {
268
+ promise,
269
+ cleanup: () => {
270
+ if (onAbort !== undefined) {
271
+ signal.removeEventListener('abort', onAbort);
272
+ }
273
+ },
274
+ };
275
+ }
49
276
  function toStrictObjectSchema(schema) {
50
277
  const jsonSchema = zod_1.z.toJSONSchema(schema);
51
278
  const normalizedSchema = stripUnsupportedJsonSchemaFields(jsonSchema);
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/tools/base.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAYxB,MAAa,mBAAoB,SAAQ,KAAK;IACjC,QAAQ,CAAS;IACjB,MAAM,CAA8B;IAE7C,YAAY,QAAgB,EAAE,KAAiB;QAC3C,KAAK,CAAC,SAAS,QAAQ,gCAAgC,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC/B,CAAC;CACJ;AAVD,kDAUC;AAED,MAAsB,IAAI;IAIb,IAAI,CAAS;IACb,WAAW,CAAS;IACpB,MAAM,CAAU;IAEzB,YAAsB,OAA6B;QAC/C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO,CAAC,UAAmB;QAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,cAAc;QACV,OAAO;YACH,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE;gBACN,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,MAAM,EAAE,IAAI;gBACZ,UAAU,EAAE,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC;aAChD;SACJ,CAAC;IACN,CAAC;CAGJ;AAxCD,oBAwCC;AAED,SAAS,oBAAoB,CAAC,MAAuB;IACjD,MAAM,UAAU,GAAG,OAAC,CAAC,YAAY,CAAC,MAAM,CAA4B,CAAC;IACrE,MAAM,gBAAgB,GAAG,gCAAgC,CAAC,UAAU,CAAC,CAAC;IAEtE,4CAA4C;IAC5C,gBAAgB,CAAC,IAAI,GAAG,QAAQ,CAAC;IACjC,gBAAgB,CAAC,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC;QAC/D,CAAC,CAAC,gBAAgB,CAAC,UAAU;QAC7B,CAAC,CAAC,EAAE,CAAC;IACT,gBAAgB,CAAC,oBAAoB,GAAG,KAAK,CAAC;IAE9C,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAED,SAAS,gCAAgC,CAAC,MAA+B;IACrE,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IAC7B,OAAO,MAAM,CAAC,OAAO,CAAC;IAEtB,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/tools/base.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"advancedSearchTool.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/advancedSearchTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,QAAA,MAAM,wBAAwB;;iBAE5B,CAAC;AAEH,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAkBxE,MAAM,WAAW,wBAAwB;IACrC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,yBAAyB;IACtC,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACrC;AAED,qBAAa,kBAAmB,SAAQ,IAAI,CAAC,OAAO,wBAAwB,CAAC;IACzE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;gBAElD,OAAO,GAAE,yBAA8B;IAWnD,OAAO,CAAC,kBAAkB;cAsBV,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;YA4B1D,gBAAgB;YAyChB,iBAAiB;CA4BlC"}
1
+ {"version":3,"file":"advancedSearchTool.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/advancedSearchTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,QAAA,MAAM,wBAAwB;;iBAE5B,CAAC;AAEH,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAkBxE,MAAM,WAAW,wBAAwB;IACrC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,yBAAyB;IACtC,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACrC;AAED,qBAAa,kBAAmB,SAAQ,IAAI,CAAC,OAAO,wBAAwB,CAAC;IACzE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;gBAElD,OAAO,GAAE,yBAA8B;IAWnD,OAAO,CAAC,kBAAkB;cAsBV,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;YA4B1D,gBAAgB;YAyChB,iBAAiB;CA4BlC"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.AdvancedSearchTool = void 0;
4
4
  const zod_1 = require("zod");
5
+ const errors_1 = require("../../errors");
5
6
  const base_1 = require("../base");
6
7
  const AdvancedSearchToolSchema = zod_1.z.object({
7
8
  query: zod_1.z.string().trim().min(1).describe('需要搜索的关键词或问题'),
@@ -69,7 +70,7 @@ class AdvancedSearchTool extends base_1.Tool {
69
70
  async searchWithTavily(query) {
70
71
  const apiKey = process.env.TAVILY_API_KEY;
71
72
  if (!apiKey) {
72
- throw new Error('TAVILY_API_KEY 未配置');
73
+ throwMissingApiKeyError(this.name, 'TAVILY_API_KEY', 'tavily');
73
74
  }
74
75
  const response = await fetch('https://api.tavily.com/search', {
75
76
  method: 'POST',
@@ -83,7 +84,7 @@ class AdvancedSearchTool extends base_1.Tool {
83
84
  }),
84
85
  });
85
86
  if (!response.ok) {
86
- throw new Error(`Tavily 请求失败, 状态码: ${response.status}`);
87
+ throwSearchRequestError(this.name, 'tavily', response.status);
87
88
  }
88
89
  const data = await response.json();
89
90
  let result = '';
@@ -103,7 +104,7 @@ class AdvancedSearchTool extends base_1.Tool {
103
104
  async searchWithSerpApi(query) {
104
105
  const apiKey = process.env.SERPAPI_API_KEY;
105
106
  if (!apiKey) {
106
- throw new Error('SERPAPI_API_KEY 未配置');
107
+ throwMissingApiKeyError(this.name, 'SERPAPI_API_KEY', 'serpapi');
107
108
  }
108
109
  const url = new URL('https://serpapi.com/search.json');
109
110
  url.searchParams.append('q', query);
@@ -111,7 +112,7 @@ class AdvancedSearchTool extends base_1.Tool {
111
112
  url.searchParams.append('num', '3');
112
113
  const response = await fetch(url.toString());
113
114
  if (!response.ok) {
114
- throw new Error(`SerpApi 请求失败, 状态码: ${response.status}`);
115
+ throwSearchRequestError(this.name, 'serpapi', response.status);
115
116
  }
116
117
  const data = await response.json();
117
118
  const organicResults = Array.isArray(data.organic_results) ? data.organic_results : [];
@@ -131,4 +132,29 @@ function toText(value) {
131
132
  function formatError(error) {
132
133
  return error instanceof Error ? error.message : String(error);
133
134
  }
135
+ function throwMissingApiKeyError(toolName, variable, source) {
136
+ throw new errors_1.ToolExecutionError(toolName, new errors_1.ConfigError(`${variable} is not configured.`, {
137
+ code: 'missing_tool_api_key',
138
+ metadata: {
139
+ source,
140
+ variable,
141
+ },
142
+ }), {
143
+ code: 'tool_search_config',
144
+ metadata: {
145
+ source,
146
+ variable,
147
+ },
148
+ });
149
+ }
150
+ function throwSearchRequestError(toolName, source, status) {
151
+ throw new errors_1.ToolExecutionError(toolName, `${source} request failed with status ${status}.`, {
152
+ code: 'tool_search_request_failed',
153
+ retryable: status >= 500 || status === 429,
154
+ metadata: {
155
+ source,
156
+ status,
157
+ },
158
+ });
159
+ }
134
160
  //# sourceMappingURL=advancedSearchTool.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"advancedSearchTool.js","sourceRoot":"","sources":["../../../src/tools/builtin/advancedSearchTool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"advancedSearchTool.js","sourceRoot":"","sources":["../../../src/tools/builtin/advancedSearchTool.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,16 @@
1
1
  import { z } from 'zod';
2
2
  import type { RagPipeline, RetrievedChunk, RetrieveOptions } from '../../rag';
3
3
  import { Tool } from '../base';
4
+ /**
5
+ * 安全边界:tenantId / knowledgeBaseId / acl 是服务端的权限配置,
6
+ * 绝不能出现在 LLM 可见的参数 schema 里——否则模型(或注入的提示词)
7
+ * 可以伪造任意租户身份越权检索。这些字段只能来自 defaultRetrieveOptions,
8
+ * LLM 传入的任何同名字段都会在 schema 校验阶段被丢弃。
9
+ */
4
10
  export declare const RagSearchToolSchema: z.ZodObject<{
5
11
  query: z.ZodString;
6
12
  topK: z.ZodOptional<z.ZodNumber>;
7
13
  minScore: z.ZodOptional<z.ZodNumber>;
8
- tenantId: z.ZodOptional<z.ZodString>;
9
- knowledgeBaseId: z.ZodOptional<z.ZodString>;
10
- acl: z.ZodOptional<z.ZodArray<z.ZodString>>;
11
14
  documentIds: z.ZodOptional<z.ZodArray<z.ZodString>>;
12
15
  sources: z.ZodOptional<z.ZodArray<z.ZodString>>;
13
16
  metadataFilter: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -1 +1 @@
1
- {"version":3,"file":"ragSearchTool.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/ragSearchTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACR,WAAW,EACX,cAAc,EACd,eAAe,EAClB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,eAAO,MAAM,mBAAmB;;;;;;;;;;iBAU9B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,WAAW,CAAC;IACtB,sBAAsB,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,aAAc,SAAQ,IAAI,CAAC,OAAO,mBAAmB,EAAE,MAAM,CAAC;IACvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAiC;IACxE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,OAAO,EAAE,oBAAoB;cAYzB,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;CAQlE;AAED,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,cAAc,EAAE,EACxB,YAAY,SAAgB,GAC7B,MAAM,CAQR"}
1
+ {"version":3,"file":"ragSearchTool.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/ragSearchTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACR,WAAW,EACX,cAAc,EACd,eAAe,EAClB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB;;;;;;;iBAO9B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,WAAW,CAAC;IACtB,sBAAsB,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,aAAc,SAAQ,IAAI,CAAC,OAAO,mBAAmB,EAAE,MAAM,CAAC;IACvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAiC;IACxE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,OAAO,EAAE,oBAAoB;cAYzB,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;CAQlE;AAED,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,cAAc,EAAE,EACxB,YAAY,SAAgB,GAC7B,MAAM,CAQR"}
@@ -4,13 +4,16 @@ exports.RagSearchTool = exports.RagSearchToolSchema = void 0;
4
4
  exports.formatRetrievedChunks = formatRetrievedChunks;
5
5
  const zod_1 = require("zod");
6
6
  const base_1 = require("../base");
7
+ /**
8
+ * 安全边界:tenantId / knowledgeBaseId / acl 是服务端的权限配置,
9
+ * 绝不能出现在 LLM 可见的参数 schema 里——否则模型(或注入的提示词)
10
+ * 可以伪造任意租户身份越权检索。这些字段只能来自 defaultRetrieveOptions,
11
+ * LLM 传入的任何同名字段都会在 schema 校验阶段被丢弃。
12
+ */
7
13
  exports.RagSearchToolSchema = zod_1.z.object({
8
14
  query: zod_1.z.string().trim().min(1).describe('需要检索的知识库问题或关键词。'),
9
15
  topK: zod_1.z.number().int().positive().optional().describe('最多返回的证据片段数量。'),
10
16
  minScore: zod_1.z.number().optional().describe('最低相关性分数。'),
11
- tenantId: zod_1.z.string().trim().min(1).optional().describe('租户 ID。'),
12
- knowledgeBaseId: zod_1.z.string().trim().min(1).optional().describe('知识库 ID。'),
13
- acl: zod_1.z.array(zod_1.z.string().trim().min(1)).optional().describe('调用者权限标签。'),
14
17
  documentIds: zod_1.z.array(zod_1.z.string().trim().min(1)).optional().describe('限定检索的文档 ID。'),
15
18
  sources: zod_1.z.array(zod_1.z.string().trim().min(1)).optional().describe('限定检索的来源路径或来源标识。'),
16
19
  metadataFilter: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional().describe('元数据精确过滤条件。'),
@@ -64,11 +67,10 @@ function buildRetrieveOptions(defaults, input) {
64
67
  const options = {
65
68
  ...defaults,
66
69
  };
70
+ // 只允许 LLM 覆盖检索调优类字段;tenantId / knowledgeBaseId / acl
71
+ // 属于服务端权限配置,永远以 defaults 为准(schema 也不接收这些字段)。
67
72
  assignIfDefined(options, 'topK', input.topK);
68
73
  assignIfDefined(options, 'minScore', input.minScore);
69
- assignIfDefined(options, 'tenantId', input.tenantId);
70
- assignIfDefined(options, 'knowledgeBaseId', input.knowledgeBaseId);
71
- assignIfDefined(options, 'acl', input.acl);
72
74
  assignIfDefined(options, 'documentIds', input.documentIds);
73
75
  assignIfDefined(options, 'sources', input.sources);
74
76
  assignIfDefined(options, 'metadataFilter', input.metadataFilter);
@@ -1 +1 @@
1
- {"version":3,"file":"ragSearchTool.js","sourceRoot":"","sources":["../../../src/tools/builtin/ragSearchTool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ragSearchTool.js","sourceRoot":"","sources":["../../../src/tools/builtin/ragSearchTool.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,38 @@
1
1
  import type { ChatToolCall } from '../llm/types';
2
+ import type { MessageContent } from '../messages/content';
2
3
  import type { TraceContext } from '../observability';
4
+ import type { ToolErrorMode } from './base';
3
5
  import type { ToolRegistry } from './registry';
6
+ export interface ToolExecutorOptions {
7
+ metadata?: Record<string, unknown>;
8
+ signal?: AbortSignal;
9
+ errorMode?: ToolErrorMode;
10
+ }
11
+ /**
12
+ * 单个 tool call 的执行结果。
13
+ * isError 让上层(以及能表达 is_error 的 provider)区分正常输出与错误反馈,
14
+ * 而不必靠解析文本内容猜测。
15
+ */
16
+ export interface ToolCallOutcome {
17
+ toolCallId: string;
18
+ toolName: string;
19
+ content: MessageContent;
20
+ isError: boolean;
21
+ }
4
22
  export declare class ToolExecutor {
5
23
  private readonly registry;
6
24
  private readonly trace?;
7
- constructor(registry: ToolRegistry, trace?: TraceContext | undefined);
8
- execute(toolCall: ChatToolCall): Promise<string>;
25
+ private readonly options;
26
+ constructor(registry: ToolRegistry, trace?: TraceContext | undefined, options?: ToolExecutorOptions);
27
+ execute(toolCall: ChatToolCall): Promise<ToolCallOutcome>;
28
+ /**
29
+ * 并发执行一批 tool call,返回顺序与输入一致。
30
+ * errorMode 为 throw 时任何一个失败都会让整批 reject。
31
+ */
32
+ executeMany(toolCalls: ChatToolCall[]): Promise<ToolCallOutcome[]>;
33
+ private toErrorOutcome;
34
+ private describeUnknownTool;
35
+ private createRunContext;
36
+ private resolveErrorMode;
9
37
  }
10
38
  //# sourceMappingURL=executor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/tools/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAKjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,qBAAa,YAAY;IAEjB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;gBADN,QAAQ,EAAE,YAAY,EACtB,KAAK,CAAC,EAAE,YAAY,YAAA;IAGnC,OAAO,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;CAuEzD"}
1
+ {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/tools/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAOrD,OAAO,KAAK,EACR,aAAa,EAEhB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,aAAa,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,cAAc,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;CACpB;AAED,qBAAa,YAAY;IAEjB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,QAAQ,EAAE,YAAY,EACtB,KAAK,CAAC,EAAE,YAAY,YAAA,EACpB,OAAO,GAAE,mBAAwB;IAGhD,OAAO,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IA4F/D;;;OAGG;IACG,WAAW,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAIxE,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,gBAAgB;CAI3B"}