@zhin.js/agent 0.1.14 → 0.1.16

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 (198) hide show
  1. package/README.md +80 -43
  2. package/lib/builtin/activate-skill-tool.d.ts +21 -0
  3. package/lib/builtin/activate-skill-tool.d.ts.map +1 -0
  4. package/lib/builtin/activate-skill-tool.js +57 -0
  5. package/lib/builtin/activate-skill-tool.js.map +1 -0
  6. package/lib/builtin/ask-user-tool.d.ts +28 -0
  7. package/lib/builtin/ask-user-tool.d.ts.map +1 -0
  8. package/lib/builtin/ask-user-tool.js +182 -0
  9. package/lib/builtin/ask-user-tool.js.map +1 -0
  10. package/lib/builtin/bash-tool.d.ts +23 -0
  11. package/lib/builtin/bash-tool.d.ts.map +1 -0
  12. package/lib/builtin/bash-tool.js +64 -0
  13. package/lib/builtin/bash-tool.js.map +1 -0
  14. package/lib/builtin/bing-search-html.d.ts +37 -0
  15. package/lib/builtin/bing-search-html.d.ts.map +1 -0
  16. package/lib/builtin/bing-search-html.js +116 -0
  17. package/lib/builtin/bing-search-html.js.map +1 -0
  18. package/lib/builtin/builtin-base-tool.d.ts +25 -0
  19. package/lib/builtin/builtin-base-tool.d.ts.map +1 -0
  20. package/lib/builtin/builtin-base-tool.js +30 -0
  21. package/lib/builtin/builtin-base-tool.js.map +1 -0
  22. package/lib/builtin/edit-file-tool.d.ts +13 -0
  23. package/lib/builtin/edit-file-tool.d.ts.map +1 -0
  24. package/lib/builtin/edit-file-tool.js +81 -0
  25. package/lib/builtin/edit-file-tool.js.map +1 -0
  26. package/lib/builtin/file-edit-quote-utils.d.ts +24 -0
  27. package/lib/builtin/file-edit-quote-utils.d.ts.map +1 -0
  28. package/lib/builtin/file-edit-quote-utils.js +81 -0
  29. package/lib/builtin/file-edit-quote-utils.js.map +1 -0
  30. package/lib/builtin/glob-tool.d.ts +23 -0
  31. package/lib/builtin/glob-tool.d.ts.map +1 -0
  32. package/lib/builtin/glob-tool.js +54 -0
  33. package/lib/builtin/glob-tool.js.map +1 -0
  34. package/lib/builtin/grep-tool.d.ts +23 -0
  35. package/lib/builtin/grep-tool.d.ts.map +1 -0
  36. package/lib/builtin/grep-tool.js +118 -0
  37. package/lib/builtin/grep-tool.js.map +1 -0
  38. package/lib/builtin/install-skill-tool.d.ts +24 -0
  39. package/lib/builtin/install-skill-tool.d.ts.map +1 -0
  40. package/lib/builtin/install-skill-tool.js +76 -0
  41. package/lib/builtin/install-skill-tool.js.map +1 -0
  42. package/lib/builtin/list-dir-tool.d.ts +13 -0
  43. package/lib/builtin/list-dir-tool.d.ts.map +1 -0
  44. package/lib/builtin/list-dir-tool.js +59 -0
  45. package/lib/builtin/list-dir-tool.js.map +1 -0
  46. package/lib/builtin/read-file-tool.d.ts +14 -0
  47. package/lib/builtin/read-file-tool.d.ts.map +1 -0
  48. package/lib/builtin/read-file-tool.js +77 -0
  49. package/lib/builtin/read-file-tool.js.map +1 -0
  50. package/lib/builtin/read-memory-tool.d.ts +14 -0
  51. package/lib/builtin/read-memory-tool.d.ts.map +1 -0
  52. package/lib/builtin/read-memory-tool.js +49 -0
  53. package/lib/builtin/read-memory-tool.js.map +1 -0
  54. package/lib/builtin/spawn-task-tool.d.ts +20 -0
  55. package/lib/builtin/spawn-task-tool.d.ts.map +1 -0
  56. package/lib/builtin/spawn-task-tool.js +57 -0
  57. package/lib/builtin/spawn-task-tool.js.map +1 -0
  58. package/lib/builtin/todo-read-tool.d.ts +14 -0
  59. package/lib/builtin/todo-read-tool.d.ts.map +1 -0
  60. package/lib/builtin/todo-read-tool.js +56 -0
  61. package/lib/builtin/todo-read-tool.js.map +1 -0
  62. package/lib/builtin/todo-write-tool.d.ts +14 -0
  63. package/lib/builtin/todo-write-tool.d.ts.map +1 -0
  64. package/lib/builtin/todo-write-tool.js +54 -0
  65. package/lib/builtin/todo-write-tool.js.map +1 -0
  66. package/lib/builtin/web-fetch-tool.d.ts +19 -0
  67. package/lib/builtin/web-fetch-tool.d.ts.map +1 -0
  68. package/lib/builtin/web-fetch-tool.js +89 -0
  69. package/lib/builtin/web-fetch-tool.js.map +1 -0
  70. package/lib/builtin/web-search-locale.d.ts +16 -0
  71. package/lib/builtin/web-search-locale.d.ts.map +1 -0
  72. package/lib/builtin/web-search-locale.js +73 -0
  73. package/lib/builtin/web-search-locale.js.map +1 -0
  74. package/lib/builtin/web-search-tool.d.ts +20 -0
  75. package/lib/builtin/web-search-tool.d.ts.map +1 -0
  76. package/lib/builtin/web-search-tool.js +105 -0
  77. package/lib/builtin/web-search-tool.js.map +1 -0
  78. package/lib/builtin/web-tool-utils.d.ts +4 -0
  79. package/lib/builtin/web-tool-utils.d.ts.map +1 -0
  80. package/lib/builtin/web-tool-utils.js +4 -0
  81. package/lib/builtin/web-tool-utils.js.map +1 -0
  82. package/lib/builtin/write-file-tool.d.ts +13 -0
  83. package/lib/builtin/write-file-tool.d.ts.map +1 -0
  84. package/lib/builtin/write-file-tool.js +51 -0
  85. package/lib/builtin/write-file-tool.js.map +1 -0
  86. package/lib/builtin/write-memory-tool.d.ts +14 -0
  87. package/lib/builtin/write-memory-tool.d.ts.map +1 -0
  88. package/lib/builtin/write-memory-tool.js +50 -0
  89. package/lib/builtin/write-memory-tool.js.map +1 -0
  90. package/lib/builtin-tools.d.ts +10 -11
  91. package/lib/builtin-tools.d.ts.map +1 -1
  92. package/lib/builtin-tools.js +44 -862
  93. package/lib/builtin-tools.js.map +1 -1
  94. package/lib/defaults/tools.d.ts +3 -6
  95. package/lib/defaults/tools.d.ts.map +1 -1
  96. package/lib/defaults/tools.js +3 -11
  97. package/lib/defaults/tools.js.map +1 -1
  98. package/lib/index.d.ts +25 -3
  99. package/lib/index.d.ts.map +1 -1
  100. package/lib/index.js +24 -3
  101. package/lib/index.js.map +1 -1
  102. package/lib/init/create-zhin-agent.d.ts.map +1 -1
  103. package/lib/init/create-zhin-agent.js +4 -3
  104. package/lib/init/create-zhin-agent.js.map +1 -1
  105. package/lib/init/message-media.d.ts +8 -0
  106. package/lib/init/message-media.d.ts.map +1 -0
  107. package/lib/init/message-media.js +75 -0
  108. package/lib/init/message-media.js.map +1 -0
  109. package/lib/init/output-renderer.d.ts +3 -0
  110. package/lib/init/output-renderer.d.ts.map +1 -0
  111. package/lib/init/output-renderer.js +38 -0
  112. package/lib/init/output-renderer.js.map +1 -0
  113. package/lib/init/register-ai-trigger.d.ts +1 -1
  114. package/lib/init/register-ai-trigger.d.ts.map +1 -1
  115. package/lib/init/register-ai-trigger.js +35 -159
  116. package/lib/init/register-ai-trigger.js.map +1 -1
  117. package/lib/init/register-builtin-tools.d.ts.map +1 -1
  118. package/lib/init/register-builtin-tools.js +9 -5
  119. package/lib/init/register-builtin-tools.js.map +1 -1
  120. package/lib/orchestrator/index.d.ts +2 -0
  121. package/lib/orchestrator/index.d.ts.map +1 -1
  122. package/lib/orchestrator/index.js +1 -0
  123. package/lib/orchestrator/index.js.map +1 -1
  124. package/lib/orchestrator/resource-registry.d.ts +1 -0
  125. package/lib/orchestrator/resource-registry.d.ts.map +1 -1
  126. package/lib/orchestrator/resource-registry.js +6 -0
  127. package/lib/orchestrator/resource-registry.js.map +1 -1
  128. package/lib/orchestrator/tool-registry.d.ts +5 -11
  129. package/lib/orchestrator/tool-registry.d.ts.map +1 -1
  130. package/lib/orchestrator/tool-registry.js +30 -75
  131. package/lib/orchestrator/tool-registry.js.map +1 -1
  132. package/lib/orchestrator/tool-selection.d.ts +39 -0
  133. package/lib/orchestrator/tool-selection.d.ts.map +1 -0
  134. package/lib/orchestrator/tool-selection.js +319 -0
  135. package/lib/orchestrator/tool-selection.js.map +1 -0
  136. package/lib/orchestrator/types.d.ts +2 -0
  137. package/lib/orchestrator/types.d.ts.map +1 -1
  138. package/lib/reserved-tools.d.ts +3 -0
  139. package/lib/reserved-tools.d.ts.map +1 -0
  140. package/lib/reserved-tools.js +30 -0
  141. package/lib/reserved-tools.js.map +1 -0
  142. package/lib/service.d.ts +9 -5
  143. package/lib/service.d.ts.map +1 -1
  144. package/lib/service.js +42 -36
  145. package/lib/service.js.map +1 -1
  146. package/lib/subagent.d.ts +6 -0
  147. package/lib/subagent.d.ts.map +1 -1
  148. package/lib/subagent.js +33 -15
  149. package/lib/subagent.js.map +1 -1
  150. package/lib/task-executor.d.ts +1 -0
  151. package/lib/task-executor.d.ts.map +1 -1
  152. package/lib/task-executor.js +15 -8
  153. package/lib/task-executor.js.map +1 -1
  154. package/lib/zhin-agent/builtin-tools.d.ts +1 -3
  155. package/lib/zhin-agent/builtin-tools.d.ts.map +1 -1
  156. package/lib/zhin-agent/builtin-tools.js +4 -41
  157. package/lib/zhin-agent/builtin-tools.js.map +1 -1
  158. package/lib/zhin-agent/config.d.ts +7 -0
  159. package/lib/zhin-agent/config.d.ts.map +1 -1
  160. package/lib/zhin-agent/config.js +12 -7
  161. package/lib/zhin-agent/config.js.map +1 -1
  162. package/lib/zhin-agent/context-budget.d.ts +27 -0
  163. package/lib/zhin-agent/context-budget.d.ts.map +1 -0
  164. package/lib/zhin-agent/context-budget.js +50 -0
  165. package/lib/zhin-agent/context-budget.js.map +1 -0
  166. package/lib/zhin-agent/index.d.ts +10 -0
  167. package/lib/zhin-agent/index.d.ts.map +1 -1
  168. package/lib/zhin-agent/index.js +120 -84
  169. package/lib/zhin-agent/index.js.map +1 -1
  170. package/lib/zhin-agent/model-harness.d.ts +29 -0
  171. package/lib/zhin-agent/model-harness.d.ts.map +1 -0
  172. package/lib/zhin-agent/model-harness.js +67 -0
  173. package/lib/zhin-agent/model-harness.js.map +1 -0
  174. package/lib/zhin-agent/pre-exec.d.ts +7 -0
  175. package/lib/zhin-agent/pre-exec.d.ts.map +1 -0
  176. package/lib/zhin-agent/pre-exec.js +25 -0
  177. package/lib/zhin-agent/pre-exec.js.map +1 -0
  178. package/lib/zhin-agent/prompt.d.ts +10 -8
  179. package/lib/zhin-agent/prompt.d.ts.map +1 -1
  180. package/lib/zhin-agent/prompt.js +37 -30
  181. package/lib/zhin-agent/prompt.js.map +1 -1
  182. package/lib/zhin-agent/text-sanitize.d.ts +8 -0
  183. package/lib/zhin-agent/text-sanitize.d.ts.map +1 -0
  184. package/lib/zhin-agent/text-sanitize.js +19 -0
  185. package/lib/zhin-agent/text-sanitize.js.map +1 -0
  186. package/lib/zhin-agent/tool-runtime.d.ts +31 -0
  187. package/lib/zhin-agent/tool-runtime.d.ts.map +1 -0
  188. package/lib/zhin-agent/tool-runtime.js +49 -0
  189. package/lib/zhin-agent/tool-runtime.js.map +1 -0
  190. package/package.json +8 -6
  191. package/lib/tools.d.ts +0 -45
  192. package/lib/tools.d.ts.map +0 -1
  193. package/lib/tools.js +0 -205
  194. package/lib/tools.js.map +0 -1
  195. package/lib/zhin-agent/tool-collector.d.ts +0 -22
  196. package/lib/zhin-agent/tool-collector.d.ts.map +0 -1
  197. package/lib/zhin-agent/tool-collector.js +0 -225
  198. package/lib/zhin-agent/tool-collector.js.map +0 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zhin.js/agent",
3
- "version": "0.1.14",
3
+ "version": "0.1.16",
4
4
  "description": "Zhin AI Agent — session, ZhinAgent, init; composes @zhin.js/core providers and tools",
5
5
  "type": "module",
6
6
  "main": "./lib/index.js",
@@ -16,15 +16,17 @@
16
16
  "lib"
17
17
  ],
18
18
  "dependencies": {
19
+ "he": "^1.2.0",
19
20
  "js-yaml": "^4.1.0",
20
- "@zhin.js/ai": "1.1.14",
21
- "@zhin.js/core": "1.1.16"
21
+ "@zhin.js/ai": "1.1.16",
22
+ "@zhin.js/core": "1.1.18"
22
23
  },
23
24
  "devDependencies": {
25
+ "@types/he": "^1.2.3",
24
26
  "@types/js-yaml": "^4.0.9",
25
- "@types/node": "^25.6.0",
26
- "typescript": "^6.0.3",
27
- "rimraf": "^6.0.0"
27
+ "@types/node": "^25.7.0",
28
+ "rimraf": "^6.0.0",
29
+ "typescript": "^6.0.3"
28
30
  },
29
31
  "repository": {
30
32
  "type": "git",
package/lib/tools.d.ts DELETED
@@ -1,45 +0,0 @@
1
- /**
2
- * @zhin.js/ai - Built-in Tools
3
- * 内置工具集合 - 使用 ZhinTool 类定义
4
- */
5
- import { ZhinTool } from '@zhin.js/core';
6
- /**
7
- * 计算器工具
8
- * 支持基本运算和数学函数
9
- */
10
- export declare const calculatorTool: ZhinTool;
11
- /**
12
- * 时间工具
13
- * 获取当前时间和日期
14
- */
15
- export declare const timeTool: ZhinTool;
16
- /**
17
- * 网页搜索工具
18
- * 需要配置搜索 API
19
- */
20
- export declare const searchTool: ZhinTool;
21
- /**
22
- * 代码执行工具
23
- * 在安全沙箱中执行 JavaScript
24
- */
25
- export declare const codeRunnerTool: ZhinTool;
26
- /**
27
- * HTTP 请求工具
28
- * 发送 HTTP 请求获取数据
29
- */
30
- export declare const httpTool: ZhinTool;
31
- /**
32
- * 记忆工具
33
- * 让 AI 记住重要信息
34
- */
35
- export declare const memoryTool: ZhinTool;
36
- /**
37
- * 获取所有内置工具(ZhinTool 实例)
38
- * 注意:天气工具已移除,请使用 weather-tool 插件,支持多平台配置
39
- */
40
- export declare function getBuiltinTools(): ZhinTool[];
41
- /**
42
- * 获取所有可用的内置工具(包括可选工具)
43
- */
44
- export declare function getAllBuiltinTools(): ZhinTool[];
45
- //# sourceMappingURL=tools.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAgC,MAAM,eAAe,CAAC;AAEvE;;;GAGG;AACH,eAAO,MAAM,cAAc,UA0BvB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,QAAQ,UA+BjB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,UAAU,UAanB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,cAAc,UAqBvB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,QAAQ,UA0CjB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,UAAU,UAcnB,CAAC;AAEL;;;GAGG;AACH,wBAAgB,eAAe,IAAI,QAAQ,EAAE,CAK5C;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,EAAE,CAS/C"}
package/lib/tools.js DELETED
@@ -1,205 +0,0 @@
1
- /**
2
- * @zhin.js/ai - Built-in Tools
3
- * 内置工具集合 - 使用 ZhinTool 类定义
4
- */
5
- import { ZhinTool, evaluate, execute } from '@zhin.js/core';
6
- /**
7
- * 计算器工具
8
- * 支持基本运算和数学函数
9
- */
10
- export const calculatorTool = new ZhinTool('calculator')
11
- .desc('执行数学计算。支持基本运算(+、-、*、/、^)和数学函数(sin、cos、sqrt 等)')
12
- .keyword('计算', '算', 'calc', '数学', '求值', '运算')
13
- .tag('math', 'utility')
14
- .param('expression', { type: 'string', description: '数学表达式,例如 "2 + 3 * 4" 或 "sqrt(16)"' }, true)
15
- .execute(async ({ expression }) => {
16
- try {
17
- const sanitized = expression
18
- .replace(/[^0-9+\-*/().^eEsincosqrtabspowlogxMathPI\s]/g, '')
19
- .replace(/\bsqrt\b/g, 'Math.sqrt')
20
- .replace(/\bsin\b/g, 'Math.sin')
21
- .replace(/\bcos\b/g, 'Math.cos')
22
- .replace(/\btan\b/g, 'Math.tan')
23
- .replace(/\blog\b/g, 'Math.log')
24
- .replace(/\babs\b/g, 'Math.abs')
25
- .replace(/\bpow\b/g, 'Math.pow')
26
- .replace(/\bPI\b/g, 'Math.PI')
27
- .replace(/\bE\b(?![0-9])/g, 'Math.E')
28
- .replace(/\^/g, '**');
29
- const result = evaluate(sanitized, { Math });
30
- if (result === undefined)
31
- return { error: '无法计算表达式', expression };
32
- return { result, expression };
33
- }
34
- catch (error) {
35
- return { error: '无法计算表达式', expression };
36
- }
37
- });
38
- /**
39
- * 时间工具
40
- * 获取当前时间和日期
41
- */
42
- export const timeTool = new ZhinTool('get_time')
43
- .desc('获取当前时间和日期信息')
44
- .keyword('时间', '日期', '几点', '今天', '现在', 'time', 'date')
45
- .tag('time', 'utility')
46
- .param('timezone', { type: 'string', description: '时区,例如 "Asia/Shanghai" 或 "UTC"' })
47
- .param('format', { type: 'string', description: '输出格式: full(完整), date(日期), time(时间), timestamp(时间戳)' })
48
- .execute(async ({ timezone, format = 'full' }) => {
49
- const now = new Date();
50
- const options = {
51
- timeZone: timezone || 'Asia/Shanghai',
52
- };
53
- switch (format) {
54
- case 'date':
55
- options.dateStyle = 'full';
56
- break;
57
- case 'time':
58
- options.timeStyle = 'long';
59
- break;
60
- case 'timestamp':
61
- return { timestamp: now.getTime(), iso: now.toISOString() };
62
- default:
63
- options.dateStyle = 'full';
64
- options.timeStyle = 'long';
65
- }
66
- return {
67
- formatted: now.toLocaleString('zh-CN', options),
68
- timestamp: now.getTime(),
69
- iso: now.toISOString(),
70
- };
71
- });
72
- /**
73
- * 网页搜索工具
74
- * 需要配置搜索 API
75
- */
76
- export const searchTool = new ZhinTool('web_search')
77
- .desc('在互联网上搜索信息(需要配置搜索 API)')
78
- .keyword('搜索', '搜一下', '查找', '查一查', 'search', 'google')
79
- .tag('search', 'web')
80
- .param('query', { type: 'string', description: '搜索关键词' }, true)
81
- .param('limit', { type: 'number', description: '返回结果数量(默认 5)' })
82
- .execute(async ({ query, limit = 5 }) => {
83
- // 默认实现提示需要配置
84
- return {
85
- query,
86
- error: '搜索功能未配置,请提供搜索 API',
87
- hint: '可以集成 SerpAPI、Bing Search API 或 Google Custom Search',
88
- };
89
- });
90
- /**
91
- * 代码执行工具
92
- * 在安全沙箱中执行 JavaScript
93
- */
94
- export const codeRunnerTool = new ZhinTool('run_code')
95
- .desc('执行 JavaScript 代码(在安全沙箱中)')
96
- .keyword('代码', '执行', '运行', 'code', 'js', 'javascript')
97
- .tag('code', 'dev')
98
- .param('code', { type: 'string', description: 'JavaScript 代码' }, true)
99
- .execute(async ({ code }) => {
100
- try {
101
- const sandbox = {
102
- console: { log: (...args) => args.map(String).join(' ') },
103
- };
104
- const result = execute(code, sandbox);
105
- return {
106
- success: true,
107
- result: result !== undefined ? String(result) : 'undefined',
108
- };
109
- }
110
- catch (error) {
111
- return {
112
- success: false,
113
- error: error instanceof Error ? error.message : String(error),
114
- };
115
- }
116
- });
117
- /**
118
- * HTTP 请求工具
119
- * 发送 HTTP 请求获取数据
120
- */
121
- export const httpTool = new ZhinTool('http_request')
122
- .desc('发送 HTTP 请求获取数据')
123
- .keyword('http', 'api', '请求', '接口', 'url', 'fetch')
124
- .tag('http', 'web')
125
- .param('url', { type: 'string', description: '请求 URL' }, true)
126
- .param('method', { type: 'string', description: 'HTTP 方法: GET, POST, PUT, DELETE(默认 GET)' })
127
- .param('headers', { type: 'object', description: '请求头(JSON 对象)' })
128
- .param('body', { type: 'string', description: '请求体(JSON 字符串)' })
129
- .execute(async ({ url, method = 'GET', headers = {}, body }) => {
130
- try {
131
- const response = await fetch(url, {
132
- method: method,
133
- headers: {
134
- 'Content-Type': 'application/json',
135
- ...headers,
136
- },
137
- body: body ? body : undefined,
138
- });
139
- const contentType = response.headers.get('content-type') || '';
140
- let data;
141
- if (contentType.includes('application/json')) {
142
- data = await response.json();
143
- }
144
- else {
145
- data = await response.text();
146
- // 限制文本长度
147
- if (data.length > 5000) {
148
- data = data.substring(0, 5000) + '... (truncated)';
149
- }
150
- }
151
- return {
152
- status: response.status,
153
- statusText: response.statusText,
154
- data,
155
- };
156
- }
157
- catch (error) {
158
- return {
159
- error: error instanceof Error ? error.message : String(error),
160
- };
161
- }
162
- });
163
- /**
164
- * 记忆工具
165
- * 让 AI 记住重要信息
166
- */
167
- export const memoryTool = new ZhinTool('remember')
168
- .desc('记住用户告诉你的重要信息,以便后续对话中使用')
169
- .keyword('记住', '记忆', '记下', 'remember', '别忘了')
170
- .tag('memory', 'context')
171
- .param('key', { type: 'string', description: '记忆的标识符,如 "user_name", "preference"' }, true)
172
- .param('value', { type: 'string', description: '要记住的内容' }, true)
173
- .execute(async ({ key, value }, context) => {
174
- // 这里需要与 session/context manager 集成
175
- return {
176
- success: true,
177
- message: `已记住 ${key}: ${value}`,
178
- key,
179
- value,
180
- };
181
- });
182
- /**
183
- * 获取所有内置工具(ZhinTool 实例)
184
- * 注意:天气工具已移除,请使用 weather-tool 插件,支持多平台配置
185
- */
186
- export function getBuiltinTools() {
187
- return [
188
- calculatorTool,
189
- timeTool,
190
- ];
191
- }
192
- /**
193
- * 获取所有可用的内置工具(包括可选工具)
194
- */
195
- export function getAllBuiltinTools() {
196
- return [
197
- calculatorTool,
198
- timeTool,
199
- searchTool,
200
- codeRunnerTool,
201
- httpTool,
202
- memoryTool,
203
- ];
204
- }
205
- //# sourceMappingURL=tools.js.map
package/lib/tools.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"tools.js","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}
@@ -1,22 +0,0 @@
1
- /**
2
- * ZhinAgent 工具收集 — 两级过滤 (Skill → Tool) + 技能支持工具注入
3
- */
4
- import type { AgentTool } from '@zhin.js/ai';
5
- import type { Tool, ToolContext } from '../orchestrator/types.js';
6
- import type { SkillRegistry } from '../orchestrator/skill-registry.js';
7
- import type { ZhinAgentConfig } from './config.js';
8
- /**
9
- * Convert a Tool (with ToolContext) to an AgentTool, injecting context-provided parameters.
10
- */
11
- export declare function toAgentTool(tool: Tool, context?: ToolContext): AgentTool;
12
- export interface CollectToolsContext {
13
- config: Required<ZhinAgentConfig>;
14
- skillRegistry: SkillRegistry | null;
15
- externalRegistered: Map<string, AgentTool>;
16
- }
17
- /**
18
- * Two-level tool collection: Skill → Tool filtering, dedup, relevance ranking,
19
- * skill-support injection, and config-level allow/deny.
20
- */
21
- export declare function collectRelevantTools(message: string, context: ToolContext, externalTools: Tool[], ctx: CollectToolsContext): AgentTool[];
22
- //# sourceMappingURL=tool-collector.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"tool-collector.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/tool-collector.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAQnD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,SAAS,CAiExE;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC5C;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,IAAI,EAAE,EACrB,GAAG,EAAE,mBAAmB,GACvB,SAAS,EAAE,CAqJb"}
@@ -1,225 +0,0 @@
1
- /**
2
- * ZhinAgent 工具收集 — 两级过滤 (Skill → Tool) + 技能支持工具注入
3
- */
4
- import { Logger } from '@zhin.js/core';
5
- import { CachedToolFilter } from '@zhin.js/ai';
6
- import { PERM_MAP } from './config.js';
7
- const logger = new Logger(null, 'ZhinAgent:ToolCollector');
8
- /** Module-level cached tool filter instance (LRU, auto-invalidates on tool-set change) */
9
- const cachedFilter = new CachedToolFilter();
10
- /**
11
- * Convert a Tool (with ToolContext) to an AgentTool, injecting context-provided parameters.
12
- */
13
- export function toAgentTool(tool, context) {
14
- const originalExecute = tool.execute;
15
- const contextInjections = [];
16
- let cleanParameters = tool.parameters;
17
- if (context && tool.parameters?.properties) {
18
- const props = tool.parameters.properties;
19
- const filteredProps = {};
20
- const filteredRequired = [];
21
- for (const [key, schema] of Object.entries(props)) {
22
- if (schema.contextKey && context[schema.contextKey] != null) {
23
- contextInjections.push({
24
- paramName: key,
25
- contextKey: schema.contextKey,
26
- paramType: schema.type || 'string',
27
- });
28
- }
29
- else {
30
- filteredProps[key] = schema;
31
- if (tool.parameters.required?.includes(key)) {
32
- filteredRequired.push(key);
33
- }
34
- }
35
- }
36
- if (contextInjections.length > 0) {
37
- cleanParameters = {
38
- ...tool.parameters,
39
- properties: filteredProps,
40
- required: filteredRequired.length > 0 ? filteredRequired : undefined,
41
- };
42
- }
43
- }
44
- const at = {
45
- name: tool.name,
46
- description: tool.description,
47
- parameters: cleanParameters,
48
- execute: context
49
- ? async (args) => {
50
- const enrichedArgs = { ...args };
51
- for (const { paramName, contextKey, paramType } of contextInjections) {
52
- let value = context[contextKey];
53
- if (paramType === 'number' && typeof value === 'string') {
54
- value = Number(value);
55
- }
56
- else if (paramType === 'string' && typeof value !== 'string') {
57
- value = String(value);
58
- }
59
- enrichedArgs[paramName] = value;
60
- }
61
- return originalExecute(enrichedArgs, context);
62
- }
63
- : async (args) => originalExecute(args),
64
- };
65
- if (tool.tags?.length)
66
- at.tags = tool.tags;
67
- if (tool.keywords?.length)
68
- at.keywords = tool.keywords;
69
- if (tool.permissionLevel)
70
- at.permissionLevel = PERM_MAP[tool.permissionLevel] ?? 0;
71
- if (tool.preExecutable)
72
- at.preExecutable = true;
73
- if (tool.kind)
74
- at.kind = tool.kind;
75
- return at;
76
- }
77
- /**
78
- * Two-level tool collection: Skill → Tool filtering, dedup, relevance ranking,
79
- * skill-support injection, and config-level allow/deny.
80
- */
81
- export function collectRelevantTools(message, context, externalTools, ctx) {
82
- const { config, skillRegistry, externalRegistered } = ctx;
83
- const callerPerm = context.senderPermissionLevel
84
- ? (PERM_MAP[context.senderPermissionLevel] ?? 0)
85
- : (context.isOwner ? 4 : context.isBotAdmin ? 3 : context.isGroupOwner ? 2 : context.isGroupAdmin ? 1 : 0);
86
- const collected = [];
87
- const collectedNames = new Set();
88
- // 0. Detect if user mentions a known skill(名称或关键词,与 SkillFeature / SKILL.md 注入一致)
89
- let mentionedSkill = null;
90
- if (skillRegistry && skillRegistry.size > 0) {
91
- const msgLower = message.toLowerCase();
92
- outer: for (const skill of skillRegistry.getAll()) {
93
- if (msgLower.includes(skill.name.toLowerCase())) {
94
- mentionedSkill = skill.name;
95
- logger.debug(`[技能检测] 用户提到技能(名称): ${mentionedSkill}`);
96
- break;
97
- }
98
- for (const kw of skill.keywords || []) {
99
- if (kw && msgLower.includes(String(kw).toLowerCase())) {
100
- mentionedSkill = skill.name;
101
- logger.debug(`[技能检测] 用户提到技能(关键词→${skill.name}): ${kw}`);
102
- break outer;
103
- }
104
- }
105
- }
106
- }
107
- if (mentionedSkill) {
108
- const activateSkillTool = externalTools.find(t => t.name === 'activate_skill');
109
- if (activateSkillTool) {
110
- const toolPerm = activateSkillTool.permissionLevel ? (PERM_MAP[activateSkillTool.permissionLevel] ?? 0) : 0;
111
- if (toolPerm <= callerPerm) {
112
- collected.push(toAgentTool(activateSkillTool, context));
113
- collectedNames.add('activate_skill');
114
- logger.debug(`[技能激活] 已提前加入 activate_skill 工具(优先级最高)`);
115
- }
116
- }
117
- }
118
- // 1. SkillRegistry two-level filter
119
- if (skillRegistry) {
120
- const skills = skillRegistry.search(message, { maxResults: config.maxSkills, platform: context.platform });
121
- const skillStr = skills.length > 0
122
- ? skills.map(s => `${s.name}(${s.tools?.length || 0}工具)`).join(', ')
123
- : '(无匹配技能)';
124
- logger.debug(`[Skill 匹配] ${skillStr}` + (context.platform ? ` (平台: ${context.platform})` : ''));
125
- for (const skill of skills) {
126
- for (const tool of skill.tools) {
127
- if (tool.platforms?.length && context.platform && !tool.platforms.includes(context.platform))
128
- continue;
129
- if (tool.scopes?.length && context.scope && !tool.scopes.includes(context.scope))
130
- continue;
131
- const toolPerm = tool.permissionLevel ? (PERM_MAP[tool.permissionLevel] ?? 0) : 0;
132
- if (toolPerm > callerPerm)
133
- continue;
134
- if (collectedNames.has(tool.name))
135
- continue;
136
- collected.push(toAgentTool(tool, context));
137
- collectedNames.add(tool.name);
138
- }
139
- }
140
- }
141
- // 2. External tools
142
- let deduped = 0;
143
- for (const tool of externalTools) {
144
- const toolPerm = tool.permissionLevel ? (PERM_MAP[tool.permissionLevel] ?? 0) : 0;
145
- if (toolPerm > callerPerm)
146
- continue;
147
- if (collectedNames.has(tool.name)) {
148
- deduped++;
149
- continue;
150
- }
151
- collected.push(toAgentTool(tool, context));
152
- collectedNames.add(tool.name);
153
- }
154
- if (deduped > 0) {
155
- logger.debug(`externalTools 去重: 跳过 ${deduped} 个已由 Skill 提供的工具`);
156
- }
157
- // 3. Externally registered tools
158
- for (const tool of externalRegistered.values()) {
159
- if (tool.permissionLevel != null && tool.permissionLevel > callerPerm)
160
- continue;
161
- if (collectedNames.has(tool.name))
162
- continue;
163
- collected.push(tool);
164
- collectedNames.add(tool.name);
165
- }
166
- // 4. Relevance filtering (cached)
167
- const filtered = cachedFilter.filter(message, collected, {
168
- callerPermissionLevel: callerPerm,
169
- maxTools: config.maxTools,
170
- minScore: 0.3,
171
- });
172
- // Prioritize activate_skill when a skill name was detected
173
- if (mentionedSkill && filtered.length > 0) {
174
- const activateSkillIdx = filtered.findIndex(t => t.name === 'activate_skill');
175
- if (activateSkillIdx > 0) {
176
- const activateSkillTool = filtered[activateSkillIdx];
177
- filtered.splice(activateSkillIdx, 1);
178
- filtered.unshift(activateSkillTool);
179
- logger.debug(`[工具排序] activate_skill 提升至首位(因检测到技能: ${mentionedSkill})`);
180
- }
181
- }
182
- // Skill support tools injection
183
- const SKILL_SUPPORT_TOOLS = ['bash', 'web_fetch', 'web_search', 'write_file', 'read_file'];
184
- const hasSkillTool = filtered.some(t => t.name === 'activate_skill' || t.name === 'install_skill');
185
- if (hasSkillTool) {
186
- const filteredNames = new Set(filtered.map(t => t.name));
187
- for (const supportName of SKILL_SUPPORT_TOOLS) {
188
- if (filteredNames.has(supportName))
189
- continue;
190
- const supportTool = collected.find(t => t.name === supportName);
191
- if (supportTool) {
192
- filtered.push(supportTool);
193
- filteredNames.add(supportName);
194
- }
195
- }
196
- logger.debug(`[技能支持] 已补充工具: ${SKILL_SUPPORT_TOOLS.filter(n => filteredNames.has(n)).join(', ')}`);
197
- }
198
- // 5. Config-level allow/deny
199
- let final = filtered;
200
- const allowed = config.allowedTools;
201
- const disabled = config.disabledTools ?? [];
202
- if (allowed && allowed.length > 0) {
203
- const allowSet = new Set(allowed.map(n => n.toLowerCase()));
204
- final = final.filter(t => allowSet.has(t.name.toLowerCase()));
205
- if (final.length < filtered.length) {
206
- logger.debug(`[工具开关] allowedTools 限制: ${filtered.length} -> ${final.length}`);
207
- }
208
- }
209
- else if (disabled.length > 0) {
210
- const disabledSet = new Set(disabled.map(n => n.toLowerCase()));
211
- final = final.filter(t => !disabledSet.has(t.name.toLowerCase()));
212
- if (final.length < filtered.length) {
213
- logger.debug(`[工具开关] disabledTools 过滤: ${filtered.length} -> ${final.length}`);
214
- }
215
- }
216
- if (final.length > 0) {
217
- logger.debug(`[工具收集] 收集了 ${collected.length} 个工具,过滤后 ${final.length} 个,` +
218
- `用户消息相关性最高的: ${final.slice(0, 3).map(t => t.name).join(', ')}`);
219
- }
220
- else {
221
- logger.debug(`[工具收集] 收集了 ${collected.length} 个工具,但过滤后 0 个(没有超过相关性阈值的)`);
222
- }
223
- return final;
224
- }
225
- //# sourceMappingURL=tool-collector.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"tool-collector.js","sourceRoot":"","sources":["../../src/zhin-agent/tool-collector.ts"],"names":[],"mappings":"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"}