yuangs 6.2.3 → 6.4.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.
- package/dist/agent/AgentRuntime.d.ts +7 -23
- package/dist/agent/AgentRuntime.js +35 -542
- package/dist/agent/AgentRuntime.js.map +1 -1
- package/dist/agent/DualAgentRuntime.js +16 -16
- package/dist/agent/DualAgentRuntime.js.map +1 -1
- package/dist/agent/ExecutionCompleter.d.ts +31 -0
- package/dist/agent/ExecutionCompleter.js +83 -0
- package/dist/agent/ExecutionCompleter.js.map +1 -0
- package/dist/agent/ExecutionHandler.d.ts +34 -0
- package/dist/agent/ExecutionHandler.js +227 -0
- package/dist/agent/ExecutionHandler.js.map +1 -0
- package/dist/agent/ExecutionLearning.d.ts +8 -0
- package/dist/agent/ExecutionLearning.js +31 -0
- package/dist/agent/ExecutionLearning.js.map +1 -0
- package/dist/agent/ExecutionRecovery.d.ts +26 -0
- package/dist/agent/ExecutionRecovery.js +99 -0
- package/dist/agent/ExecutionRecovery.js.map +1 -0
- package/dist/agent/ExecutionStabilizer.d.ts +20 -0
- package/dist/agent/ExecutionStabilizer.js +101 -0
- package/dist/agent/ExecutionStabilizer.js.map +1 -0
- package/dist/agent/ExecutionTypes.d.ts +13 -0
- package/dist/agent/ExecutionTypes.js +9 -0
- package/dist/agent/ExecutionTypes.js.map +1 -0
- package/dist/agent/LLMCaller.d.ts +19 -0
- package/dist/agent/LLMCaller.js +103 -0
- package/dist/agent/LLMCaller.js.map +1 -0
- package/dist/agent/PreFlightChecker.d.ts +51 -0
- package/dist/agent/PreFlightChecker.js +148 -0
- package/dist/agent/PreFlightChecker.js.map +1 -0
- package/dist/agent/commandSemantics.js +12 -0
- package/dist/agent/commandSemantics.js.map +1 -1
- package/dist/agent/errorTracker.d.ts +10 -0
- package/dist/agent/errorTracker.js +36 -0
- package/dist/agent/errorTracker.js.map +1 -1
- package/dist/agent/executor.d.ts +12 -90
- package/dist/agent/executor.js +59 -881
- package/dist/agent/executor.js.map +1 -1
- package/dist/agent/governance/core.js.map +1 -1
- package/dist/agent/governance/riskScoring.js +6 -3
- package/dist/agent/governance/riskScoring.js.map +1 -1
- package/dist/agent/governance.js +4 -36
- package/dist/agent/governance.js.map +1 -1
- package/dist/agent/llm.js +11 -17
- package/dist/agent/llm.js.map +1 -1
- package/dist/agent/policy/engine.d.ts +2 -5
- package/dist/agent/policy/engine.js.map +1 -1
- package/dist/agent/policy/index.d.ts +1 -0
- package/dist/agent/policy/index.js +1 -0
- package/dist/agent/policy/index.js.map +1 -1
- package/dist/agent/policy/policies/WorkdirWrite.d.ts +11 -0
- package/dist/agent/policy/policies/WorkdirWrite.js +65 -0
- package/dist/agent/policy/policies/WorkdirWrite.js.map +1 -0
- package/dist/agent/policy/policies/noDangerousShell.js +1 -1
- package/dist/agent/policy/policies/noDangerousShell.js.map +1 -1
- package/dist/agent/policy/types.d.ts +6 -4
- package/dist/agent/skills.d.ts +12 -17
- package/dist/agent/skills.js +45 -52
- package/dist/agent/skills.js.map +1 -1
- package/dist/agent/state.d.ts +33 -3
- package/dist/agent/state.js +14 -0
- package/dist/agent/state.js.map +1 -1
- package/dist/agent/tools/AnalyzeDependencies.d.ts +9 -0
- package/dist/agent/tools/AnalyzeDependencies.js +91 -0
- package/dist/agent/tools/AnalyzeDependencies.js.map +1 -0
- package/dist/agent/tools/AppendFile.d.ts +8 -0
- package/dist/agent/tools/AppendFile.js +36 -0
- package/dist/agent/tools/AppendFile.js.map +1 -0
- package/dist/agent/tools/CodeDiff.d.ts +8 -0
- package/dist/agent/tools/CodeDiff.js +36 -0
- package/dist/agent/tools/CodeDiff.js.map +1 -0
- package/dist/agent/tools/ContinueReading.d.ts +8 -0
- package/dist/agent/tools/ContinueReading.js +59 -0
- package/dist/agent/tools/ContinueReading.js.map +1 -0
- package/dist/agent/tools/FileInfo.d.ts +8 -0
- package/dist/agent/tools/FileInfo.js +43 -0
- package/dist/agent/tools/FileInfo.js.map +1 -0
- package/dist/agent/tools/GitDiff.d.ts +8 -0
- package/dist/agent/tools/GitDiff.js +40 -0
- package/dist/agent/tools/GitDiff.js.map +1 -0
- package/dist/agent/tools/GitLog.d.ts +8 -0
- package/dist/agent/tools/GitLog.js +36 -0
- package/dist/agent/tools/GitLog.js.map +1 -0
- package/dist/agent/tools/GitStatus.d.ts +8 -0
- package/dist/agent/tools/GitStatus.js +38 -0
- package/dist/agent/tools/GitStatus.js.map +1 -0
- package/dist/agent/tools/ListDirectoryTree.d.ts +9 -0
- package/dist/agent/tools/ListDirectoryTree.js +63 -0
- package/dist/agent/tools/ListDirectoryTree.js.map +1 -0
- package/dist/agent/tools/ListFiles.d.ts +9 -0
- package/dist/agent/tools/ListFiles.js +53 -0
- package/dist/agent/tools/ListFiles.js.map +1 -0
- package/dist/agent/tools/ReadFile.d.ts +8 -0
- package/dist/agent/tools/ReadFile.js +33 -0
- package/dist/agent/tools/ReadFile.js.map +1 -0
- package/dist/agent/tools/ReadFileLines.d.ts +8 -0
- package/dist/agent/tools/ReadFileLines.js +45 -0
- package/dist/agent/tools/ReadFileLines.js.map +1 -0
- package/dist/agent/tools/ReadFileLinesFromEnd.d.ts +8 -0
- package/dist/agent/tools/ReadFileLinesFromEnd.js +48 -0
- package/dist/agent/tools/ReadFileLinesFromEnd.js.map +1 -0
- package/dist/agent/tools/SearchInFiles.d.ts +8 -0
- package/dist/agent/tools/SearchInFiles.js +70 -0
- package/dist/agent/tools/SearchInFiles.js.map +1 -0
- package/dist/agent/tools/SearchSymbol.d.ts +8 -0
- package/dist/agent/tools/SearchSymbol.js +62 -0
- package/dist/agent/tools/SearchSymbol.js.map +1 -0
- package/dist/agent/tools/ShellCmd.d.ts +8 -0
- package/dist/agent/tools/ShellCmd.js +40 -0
- package/dist/agent/tools/ShellCmd.js.map +1 -0
- package/dist/agent/tools/WriteFile.d.ts +8 -0
- package/dist/agent/tools/WriteFile.js +35 -0
- package/dist/agent/tools/WriteFile.js.map +1 -0
- package/dist/agent/tools/index.d.ts +20 -0
- package/dist/agent/tools/index.js +50 -0
- package/dist/agent/tools/index.js.map +1 -0
- package/dist/agent/tools/pathSafety.d.ts +9 -0
- package/dist/agent/tools/pathSafety.js +85 -0
- package/dist/agent/tools/pathSafety.js.map +1 -0
- package/dist/agent/tools/registry.d.ts +40 -0
- package/dist/agent/tools/registry.js +77 -0
- package/dist/agent/tools/registry.js.map +1 -0
- package/dist/agent/tools/types.d.ts +21 -0
- package/dist/agent/tools/types.js +3 -0
- package/dist/agent/tools/types.js.map +1 -0
- package/dist/agent/tools/utils.d.ts +43 -0
- package/dist/agent/tools/utils.js +158 -0
- package/dist/agent/tools/utils.js.map +1 -0
- package/dist/agent/types.d.ts +5 -3
- package/dist/ai/client.d.ts +2 -2
- package/dist/ai/client.js +16 -23
- package/dist/ai/client.js.map +1 -1
- package/dist/audit/timeline.js +7 -5
- package/dist/audit/timeline.js.map +1 -1
- package/dist/cli.js +12 -6
- package/dist/cli.js.map +1 -1
- package/dist/commands/handleAIChat.js +1 -1
- package/dist/commands/handleAIChat.js.map +1 -1
- package/dist/commands/handleAICommand.js +3 -3
- package/dist/commands/handleAICommand.js.map +1 -1
- package/dist/commands/skillsCommands.js +4 -42
- package/dist/commands/skillsCommands.js.map +1 -1
- package/dist/core/ConfigService.d.ts +87 -0
- package/dist/core/ConfigService.js +259 -0
- package/dist/core/ConfigService.js.map +1 -0
- package/dist/core/executionRecord.d.ts +1 -1
- package/dist/core/explain.js +2 -2
- package/dist/core/explain.js.map +1 -1
- package/dist/core/git/BackupManager.d.ts +30 -0
- package/dist/core/git/BackupManager.js +153 -0
- package/dist/core/git/BackupManager.js.map +1 -0
- package/dist/core/git/ConflictResolver.js.map +1 -1
- package/dist/core/replayDiff.js +5 -5
- package/dist/core/replayDiff.js.map +1 -1
- package/dist/core/skillTypes.d.ts +22 -0
- package/dist/core/skillTypes.js +17 -0
- package/dist/core/skillTypes.js.map +1 -0
- package/dist/utils/Logger.d.ts +24 -5
- package/dist/utils/Logger.js +89 -63
- package/dist/utils/Logger.js.map +1 -1
- package/dist/utils/storage.d.ts +22 -0
- package/dist/utils/storage.js +62 -0
- package/dist/utils/storage.js.map +1 -0
- package/package.json +3 -1
- package/dist/core/ConfigManager.d.ts +0 -39
- package/dist/core/ConfigManager.js +0 -127
- package/dist/core/ConfigManager.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ConfigService.js","sourceRoot":"","sources":["../../src/core/ConfigService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MergedConfig } from './configMerge';
|
|
2
2
|
import { ModelCapabilities, CapabilityMatchExplanation } from './modelMatcher';
|
|
3
3
|
import { CapabilityRequirement } from './modelMatcher';
|
|
4
|
-
import { Skill } from '
|
|
4
|
+
import { Skill } from './skillTypes';
|
|
5
5
|
export interface ExecutionMeta {
|
|
6
6
|
commandName: string;
|
|
7
7
|
timestamp: string;
|
package/dist/core/explain.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.explainExecution = explainExecution;
|
|
4
|
-
const
|
|
4
|
+
const skillTypes_1 = require("./skillTypes");
|
|
5
5
|
/**
|
|
6
6
|
* Explain Output Spec v1
|
|
7
7
|
* - Stable, human-readable, diff-friendly
|
|
@@ -55,7 +55,7 @@ function explainExecution(record) {
|
|
|
55
55
|
const scored = skills
|
|
56
56
|
.map(skill => ({
|
|
57
57
|
skill,
|
|
58
|
-
score: (0,
|
|
58
|
+
score: (0, skillTypes_1.computeSkillScore)(skill, now),
|
|
59
59
|
}))
|
|
60
60
|
.sort((a, b) => b.score - a.score);
|
|
61
61
|
for (const { skill, score } of scored) {
|
package/dist/core/explain.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../../src/core/explain.ts"],"names":[],"mappings":";;AASA,4CAgGC;AAxGD,
|
|
1
|
+
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../../src/core/explain.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
export interface BackupRef {
|
|
2
|
+
filePath: string;
|
|
3
|
+
method: 'stash' | 'snapshot';
|
|
4
|
+
ref: string;
|
|
5
|
+
timestamp: number;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* 文件修改前备份管理器
|
|
9
|
+
* 使用 git stash 或文件快照实现写入前备份,支持回滚
|
|
10
|
+
*/
|
|
11
|
+
export declare class BackupManager {
|
|
12
|
+
/**
|
|
13
|
+
* 在执行 write_file / append_file / code_diff 前调用
|
|
14
|
+
* 自动保存文件当前状态,返回备份引用
|
|
15
|
+
*/
|
|
16
|
+
static beforeWrite(filePath: string): Promise<BackupRef | null>;
|
|
17
|
+
/**
|
|
18
|
+
* 回滚到备份状态
|
|
19
|
+
*/
|
|
20
|
+
static rollback(backup: BackupRef): Promise<boolean>;
|
|
21
|
+
/**
|
|
22
|
+
* 清理过期的备份文件
|
|
23
|
+
*/
|
|
24
|
+
static cleanup(): Promise<void>;
|
|
25
|
+
private static isGitRepo;
|
|
26
|
+
private static backupViaStash;
|
|
27
|
+
private static rollbackViaStash;
|
|
28
|
+
private static backupViaSnapshot;
|
|
29
|
+
private static rollbackViaSnapshot;
|
|
30
|
+
}
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.BackupManager = void 0;
|
|
7
|
+
const child_process_1 = require("child_process");
|
|
8
|
+
const util_1 = require("util");
|
|
9
|
+
const promises_1 = __importDefault(require("fs/promises"));
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
11
|
+
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
12
|
+
const BACKUP_DIR = path_1.default.join(process.cwd(), '.yuangs-backup');
|
|
13
|
+
const MAX_BACKUP_AGE_MS = 24 * 60 * 60 * 1000; // 24h
|
|
14
|
+
/**
|
|
15
|
+
* 文件修改前备份管理器
|
|
16
|
+
* 使用 git stash 或文件快照实现写入前备份,支持回滚
|
|
17
|
+
*/
|
|
18
|
+
class BackupManager {
|
|
19
|
+
/**
|
|
20
|
+
* 在执行 write_file / append_file / code_diff 前调用
|
|
21
|
+
* 自动保存文件当前状态,返回备份引用
|
|
22
|
+
*/
|
|
23
|
+
static async beforeWrite(filePath) {
|
|
24
|
+
try {
|
|
25
|
+
const absPath = path_1.default.resolve(filePath);
|
|
26
|
+
// 文件不存在,无需备份
|
|
27
|
+
try {
|
|
28
|
+
await promises_1.default.stat(absPath);
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
// 尝试 git stash 方案
|
|
34
|
+
if (await this.isGitRepo()) {
|
|
35
|
+
return this.backupViaStash(absPath);
|
|
36
|
+
}
|
|
37
|
+
// 降级:文件快照
|
|
38
|
+
return this.backupViaSnapshot(absPath);
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
console.warn(`[BackupManager] 备份失败 (${filePath}): ${error.message}`);
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* 回滚到备份状态
|
|
47
|
+
*/
|
|
48
|
+
static async rollback(backup) {
|
|
49
|
+
try {
|
|
50
|
+
switch (backup.method) {
|
|
51
|
+
case 'stash':
|
|
52
|
+
return this.rollbackViaStash(backup.ref);
|
|
53
|
+
case 'snapshot':
|
|
54
|
+
return this.rollbackViaSnapshot(backup.ref, backup.filePath);
|
|
55
|
+
default:
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
console.warn(`[BackupManager] 回滚失败: ${error.message}`);
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* 清理过期的备份文件
|
|
66
|
+
*/
|
|
67
|
+
static async cleanup() {
|
|
68
|
+
try {
|
|
69
|
+
await promises_1.default.rm(BACKUP_DIR, { recursive: true, force: true });
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
// ignore
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
// --- Private ---
|
|
76
|
+
static async isGitRepo() {
|
|
77
|
+
try {
|
|
78
|
+
await execAsync('git rev-parse --git-dir', { maxBuffer: 1024 * 1024 });
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
static async backupViaStash(absPath) {
|
|
86
|
+
try {
|
|
87
|
+
// 检查文件是否有未暂存的修改
|
|
88
|
+
const { stdout } = await execAsync(`git diff --name-only -- "${absPath}"`, { maxBuffer: 1024 * 1024 });
|
|
89
|
+
if (!stdout.trim()) {
|
|
90
|
+
// 文件已暂存或无修改,用 snapshot 降级
|
|
91
|
+
return null;
|
|
92
|
+
}
|
|
93
|
+
const message = `yuangs-backup-${Date.now()}`;
|
|
94
|
+
await execAsync(`git stash push -m "${message}" -- "${absPath}"`, { maxBuffer: 1024 * 1024 });
|
|
95
|
+
// 获取最新的 stash ref
|
|
96
|
+
const { stdout: stashRef } = await execAsync('git stash list --format="%H" -1', { maxBuffer: 1024 * 1024 });
|
|
97
|
+
return {
|
|
98
|
+
filePath: absPath,
|
|
99
|
+
method: 'stash',
|
|
100
|
+
ref: stashRef.trim(),
|
|
101
|
+
timestamp: Date.now(),
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
// git stash 失败,降级到 snapshot
|
|
106
|
+
return this.backupViaSnapshot(absPath);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
static async rollbackViaStash(stashRef) {
|
|
110
|
+
try {
|
|
111
|
+
// 查找并恢复对应的 stash
|
|
112
|
+
await execAsync(`git stash pop "${stashRef}"`, { maxBuffer: 1024 * 1024 });
|
|
113
|
+
return true;
|
|
114
|
+
}
|
|
115
|
+
catch {
|
|
116
|
+
// 尝试 drop
|
|
117
|
+
try {
|
|
118
|
+
await execAsync(`git stash drop "${stashRef}"`, { maxBuffer: 1024 * 1024 });
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
// ignore
|
|
122
|
+
}
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
static async backupViaSnapshot(absPath) {
|
|
127
|
+
await promises_1.default.mkdir(BACKUP_DIR, { recursive: true });
|
|
128
|
+
const safeName = absPath.replace(/[^a-zA-Z0-9]/g, '_');
|
|
129
|
+
const backupFile = path_1.default.join(BACKUP_DIR, `${safeName}.${Date.now()}.bak`);
|
|
130
|
+
await promises_1.default.copyFile(absPath, backupFile);
|
|
131
|
+
return {
|
|
132
|
+
filePath: absPath,
|
|
133
|
+
method: 'snapshot',
|
|
134
|
+
ref: backupFile,
|
|
135
|
+
timestamp: Date.now(),
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
static async rollbackViaSnapshot(backupPath, originalPath) {
|
|
139
|
+
try {
|
|
140
|
+
if (!originalPath)
|
|
141
|
+
return false;
|
|
142
|
+
const content = await promises_1.default.readFile(backupPath, 'utf-8');
|
|
143
|
+
await promises_1.default.writeFile(originalPath, content, 'utf-8');
|
|
144
|
+
await promises_1.default.rm(backupPath, { force: true });
|
|
145
|
+
return true;
|
|
146
|
+
}
|
|
147
|
+
catch {
|
|
148
|
+
return false;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
exports.BackupManager = BackupManager;
|
|
153
|
+
//# sourceMappingURL=BackupManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BackupManager.js","sourceRoot":"","sources":["../../../src/core/git/BackupManager.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqC;AACrC,+BAAiC;AACjC,2DAA6B;AAC7B,gDAAwB;AAExB,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC;AASlC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC;AAC9D,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,MAAM;AAErD;;;GAGG;AACH,MAAa,aAAa;IACxB;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,QAAgB;QACvC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAEvC,aAAa;YACb,IAAI,CAAC;gBACH,MAAM,kBAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB;YAClB,IAAI,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;YAED,UAAU;YACV,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,yBAAyB,QAAQ,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAiB;QACrC,IAAI,CAAC;YACH,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;gBACtB,KAAK,OAAO;oBACV,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC3C,KAAK,UAAU;oBACb,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC/D;oBACE,OAAO,KAAK,CAAC;YACjB,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,yBAAyB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACvD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC;YACH,MAAM,kBAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAED,kBAAkB;IAEV,MAAM,CAAC,KAAK,CAAC,SAAS;QAC5B,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,OAAe;QACjD,IAAI,CAAC;YACH,gBAAgB;YAChB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,4BAA4B,OAAO,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;YACvG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;gBACnB,0BAA0B;gBAC1B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,OAAO,GAAG,iBAAiB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC9C,MAAM,SAAS,CAAC,sBAAsB,OAAO,SAAS,OAAO,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;YAE9F,kBAAkB;YAClB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,SAAS,CAAC,iCAAiC,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;YAE5G,OAAO;gBACL,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,OAAO;gBACf,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE;gBACpB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,4BAA4B;YAC5B,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QACpD,IAAI,CAAC;YACH,iBAAiB;YACjB,MAAM,SAAS,CAAC,kBAAkB,QAAQ,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;YAC3E,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,UAAU;YACV,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,mBAAmB,QAAQ,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;YAC9E,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACpD,MAAM,kBAAE,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,QAAQ,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE1E,MAAM,kBAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAEvC,OAAO;YACL,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE,UAAU;YAClB,GAAG,EAAE,UAAU;YACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAkB,EAAE,YAAqB;QAChF,IAAI,CAAC;YACH,IAAI,CAAC,YAAY;gBAAE,OAAO,KAAK,CAAC;YAChC,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACvD,MAAM,kBAAE,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YACnD,MAAM,kBAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;AA5ID,sCA4IC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConflictResolver.js","sourceRoot":"","sources":["../../../src/core/git/ConflictResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"ConflictResolver.js","sourceRoot":"","sources":["../../../src/core/git/ConflictResolver.ts"],"names":[],"mappings":"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"}
|
package/dist/core/replayDiff.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.diffExecution = diffExecution;
|
|
4
4
|
exports.formatReplayDiff = formatReplayDiff;
|
|
5
|
-
const
|
|
5
|
+
const skillTypes_1 = require("./skillTypes");
|
|
6
6
|
function diffExecution(original, current) {
|
|
7
7
|
return {
|
|
8
8
|
decisionDiff: diffDecision(original, current),
|
|
@@ -89,7 +89,7 @@ function diffSkills(original, current) {
|
|
|
89
89
|
const origSkill = origSkillMap.get(skill.name);
|
|
90
90
|
if (!origSkill) {
|
|
91
91
|
// Added
|
|
92
|
-
const score = (0,
|
|
92
|
+
const score = (0, skillTypes_1.computeSkillScore)(skill, now);
|
|
93
93
|
const totalUses = skill.successCount + skill.failureCount;
|
|
94
94
|
const successRate = totalUses === 0 ? 0.5 : skill.successCount / totalUses;
|
|
95
95
|
added.push({
|
|
@@ -103,8 +103,8 @@ function diffSkills(original, current) {
|
|
|
103
103
|
}
|
|
104
104
|
else {
|
|
105
105
|
// Check if changed
|
|
106
|
-
const origScore = (0,
|
|
107
|
-
const currScore = (0,
|
|
106
|
+
const origScore = (0, skillTypes_1.computeSkillScore)(origSkill, now);
|
|
107
|
+
const currScore = (0, skillTypes_1.computeSkillScore)(skill, now);
|
|
108
108
|
const origTotalUses = origSkill.successCount + origSkill.failureCount;
|
|
109
109
|
const currTotalUses = skill.successCount + skill.failureCount;
|
|
110
110
|
const origSuccessRate = origTotalUses === 0 ? 0.5 : origSkill.successCount / origTotalUses;
|
|
@@ -126,7 +126,7 @@ function diffSkills(original, current) {
|
|
|
126
126
|
// Find removed skills
|
|
127
127
|
for (const skill of origSkills) {
|
|
128
128
|
if (!currSkillMap.has(skill.name)) {
|
|
129
|
-
const score = (0,
|
|
129
|
+
const score = (0, skillTypes_1.computeSkillScore)(skill, now);
|
|
130
130
|
const totalUses = skill.successCount + skill.failureCount;
|
|
131
131
|
const successRate = totalUses === 0 ? 0.5 : skill.successCount / totalUses;
|
|
132
132
|
removed.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replayDiff.js","sourceRoot":"","sources":["../../src/core/replayDiff.ts"],"names":[],"mappings":";;AA2DA,sCASC;AA4JD,4CA2DC;AA1RD,
|
|
1
|
+
{"version":3,"file":"replayDiff.js","sourceRoot":"","sources":["../../src/core/replayDiff.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Skill interface — extracted from agent/skills to break
|
|
3
|
+
* the backwards dependency from core/ to agent/.
|
|
4
|
+
*/
|
|
5
|
+
export interface Skill {
|
|
6
|
+
id: string;
|
|
7
|
+
name: string;
|
|
8
|
+
description: string;
|
|
9
|
+
whenToUse: string;
|
|
10
|
+
planTemplate: any;
|
|
11
|
+
successCount: number;
|
|
12
|
+
failureCount: number;
|
|
13
|
+
confidence: number;
|
|
14
|
+
lastUsed: number;
|
|
15
|
+
createdAt: number;
|
|
16
|
+
enabled: boolean;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Compute a skill's score (0-1) based on success rate, freshness, and confidence.
|
|
20
|
+
* Pure function — no dependencies.
|
|
21
|
+
*/
|
|
22
|
+
export declare function computeSkillScore(skill: Skill, now?: number): number;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.computeSkillScore = computeSkillScore;
|
|
4
|
+
/**
|
|
5
|
+
* Compute a skill's score (0-1) based on success rate, freshness, and confidence.
|
|
6
|
+
* Pure function — no dependencies.
|
|
7
|
+
*/
|
|
8
|
+
function computeSkillScore(skill, now = Date.now()) {
|
|
9
|
+
const totalUses = skill.successCount + skill.failureCount;
|
|
10
|
+
const successRate = totalUses === 0 ? 0.5 : skill.successCount / totalUses;
|
|
11
|
+
// 时间衰减 (Freshness): 半衰期约 14 天
|
|
12
|
+
const idleDays = (now - skill.lastUsed) / (1000 * 60 * 60 * 24);
|
|
13
|
+
const freshness = Math.exp(-idleDays / 14);
|
|
14
|
+
// 综合得分: 45% 成功率 + 35% 新鲜度 + 20% 置信度
|
|
15
|
+
return (0.45 * successRate) + (0.35 * freshness) + (0.20 * skill.confidence);
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=skillTypes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skillTypes.js","sourceRoot":"","sources":["../../src/core/skillTypes.ts"],"names":[],"mappings":";;AAsBA,8CAUC;AAdD;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,KAAY,EAAE,MAAc,IAAI,CAAC,GAAG,EAAE;IACtE,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IAC1D,MAAM,WAAW,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC;IAE3E,8BAA8B;IAC9B,MAAM,QAAQ,GAAG,CAAC,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;IAE3C,oCAAoC;IACpC,OAAO,CAAC,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;AAC/E,CAAC"}
|
package/dist/utils/Logger.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Logger as PinoLogger } from 'pino';
|
|
1
2
|
export declare enum LogLevel {
|
|
2
3
|
DEBUG = 0,
|
|
3
4
|
INFO = 1,
|
|
@@ -12,17 +13,35 @@ export interface LogEntry {
|
|
|
12
13
|
data?: any;
|
|
13
14
|
}
|
|
14
15
|
/**
|
|
15
|
-
*
|
|
16
|
+
* 模块级日志包装器,自动附加 module 字段
|
|
17
|
+
*/
|
|
18
|
+
export declare class ModuleLogger {
|
|
19
|
+
private pino;
|
|
20
|
+
private module;
|
|
21
|
+
constructor(pino: PinoLogger, module: string);
|
|
22
|
+
debug(message: string, data?: Record<string, unknown>): void;
|
|
23
|
+
info(message: string, data?: Record<string, unknown>): void;
|
|
24
|
+
warn(message: string, data?: Record<string, unknown>): void;
|
|
25
|
+
error(message: string, data?: Record<string, unknown>): void;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* 结构化日志系统(pino 实现)
|
|
29
|
+
* - 双输出:JSON 追加到 ~/.yuangs/logs/<date>.log + 终端标准输出
|
|
30
|
+
* - 级别通过 YUANGS_LOG_LEVEL 环境变量控制(默认 info)
|
|
16
31
|
*/
|
|
17
32
|
export declare class Logger {
|
|
18
33
|
private static instance;
|
|
19
|
-
private
|
|
20
|
-
private logFile?;
|
|
34
|
+
private pino;
|
|
21
35
|
private constructor();
|
|
22
36
|
static getInstance(): Logger;
|
|
37
|
+
/** 测试用:重置单例 */
|
|
38
|
+
static resetForTesting(): void;
|
|
39
|
+
private init;
|
|
40
|
+
private flush;
|
|
23
41
|
setLogLevel(level: LogLevel): void;
|
|
24
|
-
|
|
25
|
-
|
|
42
|
+
/** 获取当前日志级别 */
|
|
43
|
+
get level(): LogLevel;
|
|
44
|
+
child(module: string): ModuleLogger;
|
|
26
45
|
debug(module: string, message: string, data?: any): void;
|
|
27
46
|
info(module: string, message: string, data?: any): void;
|
|
28
47
|
warn(module: string, message: string, data?: any): void;
|
package/dist/utils/Logger.js
CHANGED
|
@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.logger = exports.Logger = exports.LogLevel = void 0;
|
|
7
|
-
const
|
|
6
|
+
exports.logger = exports.Logger = exports.ModuleLogger = exports.LogLevel = void 0;
|
|
7
|
+
const pino_1 = __importDefault(require("pino"));
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
|
+
const os_1 = __importDefault(require("os"));
|
|
10
11
|
var LogLevel;
|
|
11
12
|
(function (LogLevel) {
|
|
12
13
|
LogLevel[LogLevel["DEBUG"] = 0] = "DEBUG";
|
|
@@ -14,21 +15,60 @@ var LogLevel;
|
|
|
14
15
|
LogLevel[LogLevel["WARN"] = 2] = "WARN";
|
|
15
16
|
LogLevel[LogLevel["ERROR"] = 3] = "ERROR";
|
|
16
17
|
})(LogLevel || (exports.LogLevel = LogLevel = {}));
|
|
18
|
+
const LOG_DIR = path_1.default.join(os_1.default.homedir(), '.yuangs', 'logs');
|
|
19
|
+
function getLogFilePath() {
|
|
20
|
+
if (!fs_1.default.existsSync(LOG_DIR)) {
|
|
21
|
+
fs_1.default.mkdirSync(LOG_DIR, { recursive: true });
|
|
22
|
+
}
|
|
23
|
+
const today = new Date().toISOString().slice(0, 10);
|
|
24
|
+
return path_1.default.join(LOG_DIR, `${today}.log`);
|
|
25
|
+
}
|
|
26
|
+
function getEnvLogLevel() {
|
|
27
|
+
const level = process.env.YUANGS_LOG_LEVEL?.toLowerCase();
|
|
28
|
+
if (['debug', 'info', 'warn', 'error'].includes(level || ''))
|
|
29
|
+
return level;
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
const LEVEL_MAP = {
|
|
33
|
+
debug: LogLevel.DEBUG,
|
|
34
|
+
info: LogLevel.INFO,
|
|
35
|
+
warn: LogLevel.WARN,
|
|
36
|
+
error: LogLevel.ERROR,
|
|
37
|
+
};
|
|
38
|
+
/**
|
|
39
|
+
* 模块级日志包装器,自动附加 module 字段
|
|
40
|
+
*/
|
|
41
|
+
class ModuleLogger {
|
|
42
|
+
pino;
|
|
43
|
+
module;
|
|
44
|
+
constructor(pino, module) {
|
|
45
|
+
this.pino = pino;
|
|
46
|
+
this.module = module;
|
|
47
|
+
}
|
|
48
|
+
debug(message, data) {
|
|
49
|
+
this.pino.debug({ module: this.module, msg: message, ...data });
|
|
50
|
+
}
|
|
51
|
+
info(message, data) {
|
|
52
|
+
this.pino.info({ module: this.module, msg: message, ...data });
|
|
53
|
+
}
|
|
54
|
+
warn(message, data) {
|
|
55
|
+
this.pino.warn({ module: this.module, msg: message, ...data });
|
|
56
|
+
}
|
|
57
|
+
error(message, data) {
|
|
58
|
+
this.pino.error({ module: this.module, msg: message, ...data });
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
exports.ModuleLogger = ModuleLogger;
|
|
17
62
|
/**
|
|
18
|
-
*
|
|
63
|
+
* 结构化日志系统(pino 实现)
|
|
64
|
+
* - 双输出:JSON 追加到 ~/.yuangs/logs/<date>.log + 终端标准输出
|
|
65
|
+
* - 级别通过 YUANGS_LOG_LEVEL 环境变量控制(默认 info)
|
|
19
66
|
*/
|
|
20
67
|
class Logger {
|
|
21
|
-
static instance;
|
|
22
|
-
|
|
23
|
-
logFile;
|
|
68
|
+
static instance = null;
|
|
69
|
+
pino;
|
|
24
70
|
constructor() {
|
|
25
|
-
|
|
26
|
-
const logDir = path_1.default.join(process.cwd(), '.ai', 'logs');
|
|
27
|
-
if (!fs_1.default.existsSync(logDir)) {
|
|
28
|
-
fs_1.default.mkdirSync(logDir, { recursive: true });
|
|
29
|
-
}
|
|
30
|
-
const today = new Date().toISOString().split('T')[0];
|
|
31
|
-
this.logFile = path_1.default.join(logDir, `${today}.log`);
|
|
71
|
+
this.init();
|
|
32
72
|
}
|
|
33
73
|
static getInstance() {
|
|
34
74
|
if (!Logger.instance) {
|
|
@@ -36,65 +76,51 @@ class Logger {
|
|
|
36
76
|
}
|
|
37
77
|
return Logger.instance;
|
|
38
78
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
const mod = chalk_1.default.cyan(`[${entry.module}]`);
|
|
45
|
-
let msg = entry.message;
|
|
46
|
-
switch (entry.level) {
|
|
47
|
-
case 'DEBUG':
|
|
48
|
-
msg = chalk_1.default.gray(msg);
|
|
49
|
-
break;
|
|
50
|
-
case 'INFO':
|
|
51
|
-
msg = chalk_1.default.white(msg);
|
|
52
|
-
break;
|
|
53
|
-
case 'WARN':
|
|
54
|
-
msg = chalk_1.default.yellow(msg);
|
|
55
|
-
break;
|
|
56
|
-
case 'ERROR':
|
|
57
|
-
msg = chalk_1.default.red.bold(msg);
|
|
58
|
-
break;
|
|
59
|
-
}
|
|
60
|
-
return `${ts} ${mod} ${msg}`;
|
|
61
|
-
}
|
|
62
|
-
log(level, module, message, data) {
|
|
63
|
-
if (level < this.logLevel)
|
|
64
|
-
return;
|
|
65
|
-
const entry = {
|
|
66
|
-
timestamp: new Date().toISOString(),
|
|
67
|
-
level: LogLevel[level],
|
|
68
|
-
module,
|
|
69
|
-
message,
|
|
70
|
-
data,
|
|
71
|
-
};
|
|
72
|
-
// 控制台输出
|
|
73
|
-
console.log(this.formatMessage(entry));
|
|
74
|
-
if (data && level >= LogLevel.WARN) {
|
|
75
|
-
console.dir(data, { depth: null });
|
|
76
|
-
}
|
|
77
|
-
// 写入文件
|
|
78
|
-
if (this.logFile) {
|
|
79
|
-
try {
|
|
80
|
-
fs_1.default.appendFileSync(this.logFile, JSON.stringify(entry) + '\n');
|
|
81
|
-
}
|
|
82
|
-
catch (e) {
|
|
83
|
-
// 忽略日志写入错误,避免干扰主流程
|
|
84
|
-
}
|
|
79
|
+
/** 测试用:重置单例 */
|
|
80
|
+
static resetForTesting() {
|
|
81
|
+
if (Logger.instance) {
|
|
82
|
+
Logger.instance.flush();
|
|
83
|
+
Logger.instance = null;
|
|
85
84
|
}
|
|
86
85
|
}
|
|
86
|
+
init() {
|
|
87
|
+
const envLevel = getEnvLogLevel();
|
|
88
|
+
const logStream = fs_1.default.createWriteStream(getLogFilePath(), { flags: 'a' });
|
|
89
|
+
this.pino = (0, pino_1.default)({
|
|
90
|
+
level: envLevel || 'info',
|
|
91
|
+
formatters: {
|
|
92
|
+
level: (label) => ({ level: label.toUpperCase() }),
|
|
93
|
+
},
|
|
94
|
+
}, pino_1.default.multistream([
|
|
95
|
+
{ stream: logStream, level: 'trace' },
|
|
96
|
+
{ stream: pino_1.default.destination({ dest: 1, sync: false }), level: envLevel || 'info' },
|
|
97
|
+
]));
|
|
98
|
+
}
|
|
99
|
+
flush() {
|
|
100
|
+
this.pino?.flush();
|
|
101
|
+
}
|
|
102
|
+
setLogLevel(level) {
|
|
103
|
+
const name = LogLevel[level].toLowerCase();
|
|
104
|
+
this.pino.level = name;
|
|
105
|
+
}
|
|
106
|
+
/** 获取当前日志级别 */
|
|
107
|
+
get level() {
|
|
108
|
+
return LEVEL_MAP[this.pino.level] ?? LogLevel.INFO;
|
|
109
|
+
}
|
|
110
|
+
child(module) {
|
|
111
|
+
return new ModuleLogger(this.pino.child({ module }), module);
|
|
112
|
+
}
|
|
87
113
|
debug(module, message, data) {
|
|
88
|
-
this.
|
|
114
|
+
this.pino.debug({ module, msg: message, data });
|
|
89
115
|
}
|
|
90
116
|
info(module, message, data) {
|
|
91
|
-
this.
|
|
117
|
+
this.pino.info({ module, msg: message, data });
|
|
92
118
|
}
|
|
93
119
|
warn(module, message, data) {
|
|
94
|
-
this.
|
|
120
|
+
this.pino.warn({ module, msg: message, data });
|
|
95
121
|
}
|
|
96
122
|
error(module, message, data) {
|
|
97
|
-
this.
|
|
123
|
+
this.pino.error({ module, msg: message, data });
|
|
98
124
|
}
|
|
99
125
|
}
|
|
100
126
|
exports.Logger = Logger;
|