yuangs 3.15.0 → 3.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,5 +2,5 @@ import { AgentThought } from './state';
|
|
|
2
2
|
import type { AIRequestMessage } from '../core/validation';
|
|
3
3
|
export declare class LLMAdapter {
|
|
4
4
|
static think(messages: AIRequestMessage[], mode?: 'chat' | 'command' | 'command+exec', onChunk?: (chunk: string) => void, model?: string, customSystemPrompt?: string): Promise<AgentThought>;
|
|
5
|
-
|
|
5
|
+
static parseThought(raw: string): AgentThought;
|
|
6
6
|
}
|
package/dist/agent/llmAdapter.js
CHANGED
|
@@ -9,29 +9,57 @@ const client_1 = require("../ai/client");
|
|
|
9
9
|
const json5_1 = __importDefault(require("json5"));
|
|
10
10
|
class LLMAdapter {
|
|
11
11
|
static async think(messages, mode = 'chat', onChunk, model, customSystemPrompt) {
|
|
12
|
-
|
|
12
|
+
// SYSTEM PROTOCOL V2.2 - CoT (Chain of Thought) 显式分离
|
|
13
|
+
let protocol = `[SYSTEM PROTOCOL V2.2]
|
|
13
14
|
- ROLE: AUTOMATED EXECUTION AGENT
|
|
14
|
-
- OUTPUT: STRICT JSON ONLY
|
|
15
|
-
- TALK: FORBIDDEN
|
|
16
15
|
- MODE: REACT (THINK -> ACTION -> PERCEIVE)
|
|
16
|
+
- OUTPUT: CoT Block + JSON Block
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
# EXECUTION PROTOCOL
|
|
19
|
+
1. **THINK**: First, analyze the user's request, the current context, and previous history. Plan your next step.
|
|
20
|
+
2. **ACT**: Generate a structured JSON action.
|
|
21
|
+
3. **OBSERVE**: Wait for the tool output.
|
|
22
|
+
|
|
23
|
+
# OUTPUT FORMAT
|
|
24
|
+
You must output a "Thought Block" followed by a "JSON Action Block".
|
|
25
|
+
|
|
26
|
+
[THOUGHT]
|
|
27
|
+
Explain your reasoning here.
|
|
28
|
+
- Why are you choosing this tool?
|
|
29
|
+
- If the previous step failed, how are you fixing it?
|
|
30
|
+
- If using a file, mention lines you are interested in.
|
|
31
|
+
[/THOUGHT]
|
|
32
|
+
|
|
33
|
+
\`\`\`json
|
|
19
34
|
{
|
|
20
35
|
"action_type": "tool_call" | "shell_cmd" | "answer",
|
|
21
|
-
"
|
|
22
|
-
"
|
|
23
|
-
"
|
|
24
|
-
"
|
|
25
|
-
"
|
|
36
|
+
"tool_name": "...",
|
|
37
|
+
"parameters": { ... },
|
|
38
|
+
"command": "...",
|
|
39
|
+
"risk_level": "low" | "medium" | "high",
|
|
40
|
+
"risk_explanation": "Required if risk is medium/high"
|
|
26
41
|
}
|
|
42
|
+
\`\`\`
|
|
43
|
+
|
|
44
|
+
# GUIDELINES
|
|
45
|
+
- **Silence**: Do not output conversational filler outside the [THOUGHT] block.
|
|
46
|
+
- **Safety**: If you must run a destructive command (rm, dd), set risk_level to "high".
|
|
47
|
+
- **Context**: You have access to files in context.
|
|
48
|
+
- **Formatting**: When answering (action_type="answer"), use standard Markdown.
|
|
27
49
|
|
|
28
|
-
|
|
29
|
-
1. If data is unknown (e.g. file list), use 'shell_cmd' or 'tool_call'.
|
|
30
|
-
2. NEVER explain how to do it. JUST EXECUTE.
|
|
31
|
-
3. Your output MUST start with '{' and end with '}'.
|
|
50
|
+
Example Task: "count files in /tmp"
|
|
32
51
|
|
|
33
|
-
|
|
34
|
-
|
|
52
|
+
[THOUGHT]
|
|
53
|
+
User wants to count files in /tmp directory. I'll use ls to list files and pipe to wc -l to count them. This is a safe operation with low risk.
|
|
54
|
+
[/THOUGHT]
|
|
55
|
+
|
|
56
|
+
\`\`\`json
|
|
57
|
+
{
|
|
58
|
+
"action_type": "shell_cmd",
|
|
59
|
+
"command": "ls /tmp | wc -l",
|
|
60
|
+
"risk_level": "low"
|
|
61
|
+
}
|
|
62
|
+
\`\`\``;
|
|
35
63
|
if (mode === 'command' || mode === 'command+exec') {
|
|
36
64
|
protocol += `\n\nCOMMAND MODE ACTIVE:
|
|
37
65
|
- Prioritize "shell_cmd" for any terminal-based task.
|
|
@@ -54,10 +82,13 @@ Your Output: {"action_type":"shell_cmd","reasoning":"count files","command":"ls
|
|
|
54
82
|
}
|
|
55
83
|
static parseThought(raw) {
|
|
56
84
|
try {
|
|
57
|
-
//
|
|
85
|
+
// CoT V2.2: 分别提取 [THOUGHT] 块和 JSON 块
|
|
86
|
+
const thoughtMatch = raw.match(/\[THOUGHT\]([\s\S]*?)\[\/THOUGHT\]/);
|
|
58
87
|
const jsonMatch = raw.match(/```json\n([\s\S]*?)\n```/) || raw.match(/\{[\s\S]*\}/);
|
|
59
88
|
if (jsonMatch) {
|
|
60
89
|
const parsed = json5_1.default.parse(jsonMatch[1] || jsonMatch[0]);
|
|
90
|
+
// 从 THOUGHT 块提取思考内容
|
|
91
|
+
const thoughtContent = thoughtMatch ? thoughtMatch[1].trim() : '';
|
|
61
92
|
// 如果明确标记为 done，或者动作为 answer，则视为任务结束
|
|
62
93
|
if (parsed.is_done === true || parsed.action_type === 'answer') {
|
|
63
94
|
return {
|
|
@@ -67,7 +98,8 @@ Your Output: {"action_type":"shell_cmd","reasoning":"count files","command":"ls
|
|
|
67
98
|
type: 'answer',
|
|
68
99
|
payload: {
|
|
69
100
|
content: parsed.final_answer || parsed.content || parsed.text || raw
|
|
70
|
-
}
|
|
101
|
+
},
|
|
102
|
+
reasoning: thoughtContent
|
|
71
103
|
};
|
|
72
104
|
}
|
|
73
105
|
// 智能推断动作类型：如果 AI 没给 action_type，我们根据字段猜测
|
|
@@ -92,9 +124,11 @@ Your Output: {"action_type":"shell_cmd","reasoning":"count files","command":"ls
|
|
|
92
124
|
parameters: parsed.parameters || parsed.params || {},
|
|
93
125
|
command: parsed.command || parsed.cmd || '',
|
|
94
126
|
diff: parsed.diff || parsed.patch || '',
|
|
95
|
-
content: parsed.content || parsed.text || ''
|
|
127
|
+
content: parsed.content || parsed.text || '',
|
|
128
|
+
risk_level: parsed.risk_level || 'low',
|
|
129
|
+
risk_explanation: parsed.risk_explanation || ''
|
|
96
130
|
},
|
|
97
|
-
reasoning:
|
|
131
|
+
reasoning: thoughtContent // 从 THOUGHT 块提取
|
|
98
132
|
};
|
|
99
133
|
}
|
|
100
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llmAdapter.js","sourceRoot":"","sources":["../../src/agent/llmAdapter.ts"],"names":[],"mappings":";;;;;;AACA,+BAA+B;AAG/B,yCAA6C;AAC7C,kDAA0B;AAE1B,MAAa,UAAU;IACrB,MAAM,CAAC,KAAK,CAAC,KAAK,CAChB,QAA4B,EAC5B,OAA4C,MAAM,EAClD,OAAiC,EACjC,KAAc,EACd,kBAA2B;QAE3B,IAAI,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"llmAdapter.js","sourceRoot":"","sources":["../../src/agent/llmAdapter.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/prompt.js
CHANGED
|
@@ -28,8 +28,44 @@ function buildChatPrompt(context, input) {
|
|
|
28
28
|
role: 'user',
|
|
29
29
|
content: input,
|
|
30
30
|
});
|
|
31
|
+
// Enhanced system prompt with role definition, interaction guidelines, and format standards
|
|
32
|
+
const systemPrompt = `你是一个专业的技术助手（Yuangs AI），专精于：
|
|
33
|
+
- 软件开发（前端、后端、DevOps）
|
|
34
|
+
- 系统管理和自动化
|
|
35
|
+
- 问题诊断和解决
|
|
36
|
+
- 技术方案设计
|
|
37
|
+
|
|
38
|
+
【交互原则】
|
|
39
|
+
1. 简洁明了：优先提供直接答案，必要时补充解释
|
|
40
|
+
2. 上下文感知：充分利用提供的文件和目录上下文
|
|
41
|
+
3. 实用导向：提供可执行的命令和代码示例
|
|
42
|
+
4. 渐进式说明：除非用户要求深度解析，否则先提供概要
|
|
43
|
+
|
|
44
|
+
【输出格式】
|
|
45
|
+
- 使用Markdown格式化代码、列表等
|
|
46
|
+
- 关键信息使用加粗或emoji标记
|
|
47
|
+
- 分步骤说明使用数字列表
|
|
48
|
+
- 代码块指定语言类型
|
|
49
|
+
|
|
50
|
+
【上下文使用】
|
|
51
|
+
- 当上下文中包含相关文件时，引用具体文件名和行号
|
|
52
|
+
- 对目录上下文中的文件进行相关性筛选
|
|
53
|
+
- 优先使用上下文中的信息作为回答基础
|
|
54
|
+
|
|
55
|
+
【当前能力】
|
|
56
|
+
✓ 读取和分析代码文件
|
|
57
|
+
✓ 执行Shell命令（需用户确认）
|
|
58
|
+
✓ 搜索和过滤文件内容
|
|
59
|
+
✓ Git操作和版本控制
|
|
60
|
+
✓ 代码生成和重构建议
|
|
61
|
+
|
|
62
|
+
【注意事项】
|
|
63
|
+
- 执行危险操作前会说明风险
|
|
64
|
+
- 无法直接修改文件，提供修改建议
|
|
65
|
+
- 大文件只读取关键部分以节省Token
|
|
66
|
+
- 敏感信息（如密码）不会保存`;
|
|
31
67
|
return {
|
|
32
|
-
system:
|
|
68
|
+
system: systemPrompt,
|
|
33
69
|
messages,
|
|
34
70
|
};
|
|
35
71
|
}
|
package/dist/agent/prompt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/agent/prompt.ts"],"names":[],"mappings":";;AAYA,kCAWC;AAjBD,yCAA8E;AAC9E,mCAA0C;AAC1C,2CAA2C;AAC3C,mDAAyD;AACzD,qCAA6C;AAE7C,SAAgB,WAAW,CACvB,MAAmB,EACnB,OAAqB,EACrB,IAAe,EACf,KAAa;IAEb,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAClB,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,wBAAwB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,eAAe,CACpB,OAAqB,EACrB,KAAa;IAEb,MAAM,QAAQ,GAAU;QACpB,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;KAC7B,CAAC;IAEF,iCAAiC;IACjC,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACtC,SAAS,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,OAAO,UAAU,CAClD,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEf,QAAQ,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,aAAa,WAAW,EAAE;SACtC,CAAC,CAAC;IACP,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC;QACV,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,KAAK;KACjB,CAAC,CAAC;IAEH,OAAO;QACH,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/agent/prompt.ts"],"names":[],"mappings":";;AAYA,kCAWC;AAjBD,yCAA8E;AAC9E,mCAA0C;AAC1C,2CAA2C;AAC3C,mDAAyD;AACzD,qCAA6C;AAE7C,SAAgB,WAAW,CACvB,MAAmB,EACnB,OAAqB,EACrB,IAAe,EACf,KAAa;IAEb,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAClB,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,wBAAwB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,eAAe,CACpB,OAAqB,EACrB,KAAa;IAEb,MAAM,QAAQ,GAAU;QACpB,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;KAC7B,CAAC;IAEF,iCAAiC;IACjC,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACtC,SAAS,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,OAAO,UAAU,CAClD,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEf,QAAQ,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,aAAa,WAAW,EAAE;SACtC,CAAC,CAAC;IACP,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC;QACV,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,KAAK;KACjB,CAAC,CAAC;IAEH,4FAA4F;IAC5F,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAkCT,CAAC;IAEb,OAAO;QACH,MAAM,EAAE,YAAY;QACpB,QAAQ;KACX,CAAC;AACN,CAAC;AAED,SAAS,wBAAwB,CAC7B,KAAa,EACb,OAAqB;IAErB,MAAM,EAAE,GAAG,IAAA,iBAAY,GAAE,CAAC;IAC1B,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,KAAK,CAAC,CAAC;IACxC,IAAI,UAAU,GAAG,IAAA,2BAAwB,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IAE7D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,SAAS,gBAAgB,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpH,UAAU,GAAG,YAAY,SAAS,OAAO,UAAU,EAAE,CAAC;IAC1D,CAAC;IAED,OAAO;QACH,QAAQ,EAAE;YACN;gBACI,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,UAAU;aACtB;SACJ;QACD,YAAY,EAAE,gCAAmB;KACpC,CAAC;AACN,CAAC"}
|