feihong-code 7.0.0 → 7.2.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/.github/workflows/release.yml +173 -0
- package/CHANGELOG.md +50 -0
- package/dist/agent/browser-agent.js +354 -0
- package/dist/agent/browser-agent.js.map +1 -0
- package/dist/agent/change-manager.js +433 -0
- package/dist/agent/change-manager.js.map +1 -0
- package/dist/agent/code-rag.js +293 -0
- package/dist/agent/code-rag.js.map +1 -0
- package/dist/agent/code-writer.js +13 -1
- package/dist/agent/code-writer.js.map +1 -1
- package/dist/agent/completion-engine.js +522 -0
- package/dist/agent/completion-engine.js.map +1 -0
- package/dist/agent/context-compactor.js +188 -10
- package/dist/agent/context-compactor.js.map +1 -1
- package/dist/agent/custom-agent.js +368 -0
- package/dist/agent/custom-agent.js.map +1 -0
- package/dist/agent/design-to-code.js +218 -0
- package/dist/agent/design-to-code.js.map +1 -0
- package/dist/agent/event-driven-agent.js +359 -0
- package/dist/agent/event-driven-agent.js.map +1 -0
- package/dist/agent/git-integration.js +324 -0
- package/dist/agent/git-integration.js.map +1 -0
- package/dist/agent/layered-memory.js +329 -0
- package/dist/agent/layered-memory.js.map +1 -0
- package/dist/agent/multi-agent.js +359 -0
- package/dist/agent/multi-agent.js.map +1 -0
- package/dist/agent/orchestrator.js +127 -16
- package/dist/agent/orchestrator.js.map +1 -1
- package/dist/agent/quality-gate.js +139 -0
- package/dist/agent/quality-gate.js.map +1 -1
- package/dist/agent/self-correction.js +274 -0
- package/dist/agent/self-correction.js.map +1 -0
- package/dist/agent/self-heal.js +40 -10
- package/dist/agent/self-heal.js.map +1 -1
- package/dist/agent/solo-agent.js +321 -0
- package/dist/agent/solo-agent.js.map +1 -0
- package/dist/agent/symbol-index.js +258 -28
- package/dist/agent/symbol-index.js.map +1 -1
- package/dist/agent/team-collaboration.js +252 -0
- package/dist/agent/team-collaboration.js.map +1 -0
- package/dist/agent/type-checker.js +229 -0
- package/dist/agent/type-checker.js.map +1 -0
- package/dist/cli/run.js +1 -0
- package/dist/cli/run.js.map +1 -1
- package/dist/integrations/collaboration.js +219 -0
- package/dist/integrations/collaboration.js.map +1 -0
- package/dist/integrations/figma.js +307 -0
- package/dist/integrations/figma.js.map +1 -0
- package/dist/integrations/sso.js +327 -0
- package/dist/integrations/sso.js.map +1 -0
- package/dist/knowledge/library.js +301 -0
- package/dist/knowledge/library.js.map +1 -0
- package/dist/plugins/manager.js +332 -0
- package/dist/plugins/manager.js.map +1 -0
- package/dist/runtime/event-log.js.map +1 -1
- package/dist/tools/browser/browser.tool.js +217 -0
- package/dist/tools/browser/browser.tool.js.map +1 -0
- package/dist/tools/index.js +2 -0
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/shell/exec.js +50 -10
- package/dist/tools/shell/exec.js.map +1 -1
- package/dist/tools/shell/run-shell.tool.js +8 -2
- package/dist/tools/shell/run-shell.tool.js.map +1 -1
- package/dist/training/completion-evaluator.js +213 -0
- package/dist/training/completion-evaluator.js.map +1 -0
- package/dist/training/fim-data.js +248 -0
- package/dist/training/fim-data.js.map +1 -0
- package/dist/voice/voice-programming.js +223 -0
- package/dist/voice/voice-programming.js.map +1 -0
- package/dist/web/public/css/style.css +58 -0
- package/dist/web/public/index.html +210 -0
- package/dist/web/public/js/api.js +115 -1
- package/dist/web/public/js/mock-api.js +234 -0
- package/dist/web/public/js/monaco-editor.js +203 -0
- package/dist/web/public/js/ui.js +926 -4
- package/dist/web/public/manifest.json +59 -0
- package/dist/web/public/service-worker.js +173 -0
- package/dist/web/public/vendor/monaco/vs/abap-D-t0cyap.js +1 -0
- package/dist/web/public/vendor/monaco/vs/apex-CcIm7xu6.js +1 -0
- package/dist/web/public/vendor/monaco/vs/assets/css.worker-URu8fCFR.js +97 -0
- package/dist/web/public/vendor/monaco/vs/assets/editor.worker-lj3bdIIn.js +30 -0
- package/dist/web/public/vendor/monaco/vs/assets/editorWebWorkerMain-CA_vMoUU.js +30 -0
- package/dist/web/public/vendor/monaco/vs/assets/html.worker-D1SL3iM8.js +474 -0
- package/dist/web/public/vendor/monaco/vs/assets/json.worker-CoJx_OPf.js +62 -0
- package/dist/web/public/vendor/monaco/vs/assets/ts.worker-BWKtMYOk.js +67722 -0
- package/dist/web/public/vendor/monaco/vs/azcli-BA0tQDCg.js +1 -0
- package/dist/web/public/vendor/monaco/vs/basic-languages/monaco.contribution.js +1 -0
- package/dist/web/public/vendor/monaco/vs/bat-C397hTD6.js +1 -0
- package/dist/web/public/vendor/monaco/vs/bicep-DF5aW17k.js +2 -0
- package/dist/web/public/vendor/monaco/vs/cameligo-plsz8qhj.js +1 -0
- package/dist/web/public/vendor/monaco/vs/clojure-Y2auQMzK.js +1 -0
- package/dist/web/public/vendor/monaco/vs/coffee-Bu45yuWE.js +1 -0
- package/dist/web/public/vendor/monaco/vs/cpp-CkKPQIni.js +1 -0
- package/dist/web/public/vendor/monaco/vs/csharp-CX28MZyh.js +1 -0
- package/dist/web/public/vendor/monaco/vs/csp-D8uWnyxW.js +1 -0
- package/dist/web/public/vendor/monaco/vs/css-CaeNmE3S.js +3 -0
- package/dist/web/public/vendor/monaco/vs/css.worker-CyhWkhHo.js +1 -0
- package/dist/web/public/vendor/monaco/vs/cssMode-CV6Ay48H.js +1 -0
- package/dist/web/public/vendor/monaco/vs/cypher-DVThT8BS.js +1 -0
- package/dist/web/public/vendor/monaco/vs/dart-CmGfCvrO.js +1 -0
- package/dist/web/public/vendor/monaco/vs/dockerfile-CZqqYdch.js +1 -0
- package/dist/web/public/vendor/monaco/vs/ecl-30fUercY.js +1 -0
- package/dist/web/public/vendor/monaco/vs/editor/editor.main.css +1 -0
- package/dist/web/public/vendor/monaco/vs/editor/editor.main.js +1 -0
- package/dist/web/public/vendor/monaco/vs/editor/editor.worker.js +1 -0
- package/dist/web/public/vendor/monaco/vs/editor-KLE6jdfb.js +831 -0
- package/dist/web/public/vendor/monaco/vs/editor.js +1 -0
- package/dist/web/public/vendor/monaco/vs/editorWorkerHost-fVE1cjcC.js +35 -0
- package/dist/web/public/vendor/monaco/vs/elixir-xjPaIfzF.js +1 -0
- package/dist/web/public/vendor/monaco/vs/flow9-DqtmStfK.js +1 -0
- package/dist/web/public/vendor/monaco/vs/freemarker2-FWreY7v7.js +3 -0
- package/dist/web/public/vendor/monaco/vs/fsharp-BOMdg4U1.js +1 -0
- package/dist/web/public/vendor/monaco/vs/go-D_hbi-Jt.js +1 -0
- package/dist/web/public/vendor/monaco/vs/graphql-CKUU4kLG.js +1 -0
- package/dist/web/public/vendor/monaco/vs/handlebars-CZi4pHCH.js +1 -0
- package/dist/web/public/vendor/monaco/vs/hcl-DTaboeZW.js +1 -0
- package/dist/web/public/vendor/monaco/vs/html-j_7ZTNRU.js +1 -0
- package/dist/web/public/vendor/monaco/vs/html.worker-CA3iAimZ.js +1 -0
- package/dist/web/public/vendor/monaco/vs/htmlMode-27by_KM4.js +1 -0
- package/dist/web/public/vendor/monaco/vs/index-049xrXrp.js +1 -0
- package/dist/web/public/vendor/monaco/vs/index-CBVt3dzv.js +5 -0
- package/dist/web/public/vendor/monaco/vs/index.js +1 -0
- package/dist/web/public/vendor/monaco/vs/ini-CsNwO04R.js +1 -0
- package/dist/web/public/vendor/monaco/vs/initialize-DL0l1TGY.js +1 -0
- package/dist/web/public/vendor/monaco/vs/java-CI4ZMsH9.js +1 -0
- package/dist/web/public/vendor/monaco/vs/javascript-DTJl4Jn1.js +1 -0
- package/dist/web/public/vendor/monaco/vs/json.worker-BizpAl9O.js +1 -0
- package/dist/web/public/vendor/monaco/vs/jsonMode-DLUiMUrI.js +1 -0
- package/dist/web/public/vendor/monaco/vs/julia-BwzEvaQw.js +1 -0
- package/dist/web/public/vendor/monaco/vs/kotlin-IUYPiTV8.js +1 -0
- package/dist/web/public/vendor/monaco/vs/language/css/css.worker.js +66 -0
- package/dist/web/public/vendor/monaco/vs/language/css/monaco.contribution.js +1 -0
- package/dist/web/public/vendor/monaco/vs/language/html/html.worker.js +443 -0
- package/dist/web/public/vendor/monaco/vs/language/html/monaco.contribution.js +1 -0
- package/dist/web/public/vendor/monaco/vs/language/json/json.worker.js +17 -0
- package/dist/web/public/vendor/monaco/vs/language/json/monaco.contribution.js +1 -0
- package/dist/web/public/vendor/monaco/vs/language/typescript/monaco.contribution.js +1 -0
- package/dist/web/public/vendor/monaco/vs/language/typescript/ts.worker.js +67693 -0
- package/dist/web/public/vendor/monaco/vs/less-C0eDYdqa.js +2 -0
- package/dist/web/public/vendor/monaco/vs/lexon-iON-Kj97.js +1 -0
- package/dist/web/public/vendor/monaco/vs/liquid-CLJYelW6.js +1 -0
- package/dist/web/public/vendor/monaco/vs/loader.js +1368 -0
- package/dist/web/public/vendor/monaco/vs/lspLanguageFeatures-BIkJOWLw.js +2 -0
- package/dist/web/public/vendor/monaco/vs/lua-DtygF91M.js +1 -0
- package/dist/web/public/vendor/monaco/vs/m3-CsR4AuFi.js +1 -0
- package/dist/web/public/vendor/monaco/vs/main-BEx-Fmlo.js +15 -0
- package/dist/web/public/vendor/monaco/vs/main-DsK8pnKg.js +3 -0
- package/dist/web/public/vendor/monaco/vs/markdown-C_rD0bIw.js +1 -0
- package/dist/web/public/vendor/monaco/vs/mdx-CpzZIPHF.js +1 -0
- package/dist/web/public/vendor/monaco/vs/mips-CiYP61RB.js +1 -0
- package/dist/web/public/vendor/monaco/vs/monaco.contribution-9cKT3C7t.js +1 -0
- package/dist/web/public/vendor/monaco/vs/monaco.contribution-BE88ZNGY.js +1 -0
- package/dist/web/public/vendor/monaco/vs/monaco.contribution-BPhsneLd.js +1 -0
- package/dist/web/public/vendor/monaco/vs/monaco.contribution-BgRy6xDf.js +1 -0
- package/dist/web/public/vendor/monaco/vs/msdax-C38-sJlp.js +1 -0
- package/dist/web/public/vendor/monaco/vs/mysql-CdtbpvbG.js +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/cs.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/cs.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/de.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/de.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/es.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/es.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/fr.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/fr.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/it.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/it.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/ja.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/ja.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/ko.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/ko.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/pl.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/pl.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/pt-br.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/pt-br.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/ru.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/ru.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/tr.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/tr.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/zh-cn.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/zh-cn.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/zh-tw.d.ts +1 -0
- package/dist/web/public/vendor/monaco/vs/nls/lang/zh-tw.js +9 -0
- package/dist/web/public/vendor/monaco/vs/nls.messages-loader.js +1 -0
- package/dist/web/public/vendor/monaco/vs/objective-c-CntZFaHX.js +1 -0
- package/dist/web/public/vendor/monaco/vs/pascal-r6kuqfl_.js +1 -0
- package/dist/web/public/vendor/monaco/vs/pascaligo-BiXoTmXh.js +1 -0
- package/dist/web/public/vendor/monaco/vs/perl-DABw_TcH.js +1 -0
- package/dist/web/public/vendor/monaco/vs/pgsql-me_jFXeX.js +1 -0
- package/dist/web/public/vendor/monaco/vs/php-D_kh-9LK.js +1 -0
- package/dist/web/public/vendor/monaco/vs/pla-VfZjczW0.js +1 -0
- package/dist/web/public/vendor/monaco/vs/postiats-BBSzz8Pk.js +1 -0
- package/dist/web/public/vendor/monaco/vs/powerquery-Dt-g_2cc.js +1 -0
- package/dist/web/public/vendor/monaco/vs/powershell-B-7ap1zc.js +1 -0
- package/dist/web/public/vendor/monaco/vs/protobuf-BmtuEB1A.js +2 -0
- package/dist/web/public/vendor/monaco/vs/pug-BRpRNeEb.js +1 -0
- package/dist/web/public/vendor/monaco/vs/python-CqWUUgfu.js +1 -0
- package/dist/web/public/vendor/monaco/vs/qsharp-BzsFaUU9.js +1 -0
- package/dist/web/public/vendor/monaco/vs/r-f8dDdrp4.js +1 -0
- package/dist/web/public/vendor/monaco/vs/razor-hok5y9Km.js +1 -0
- package/dist/web/public/vendor/monaco/vs/redis-fvZQY4PI.js +1 -0
- package/dist/web/public/vendor/monaco/vs/redshift-45Et0LQi.js +1 -0
- package/dist/web/public/vendor/monaco/vs/restructuredtext-C7UUFKFD.js +1 -0
- package/dist/web/public/vendor/monaco/vs/ruby-CZO8zYTz.js +1 -0
- package/dist/web/public/vendor/monaco/vs/rust-Bfetafyc.js +1 -0
- package/dist/web/public/vendor/monaco/vs/sb-3GYllVck.js +1 -0
- package/dist/web/public/vendor/monaco/vs/scala-foMgrKo1.js +1 -0
- package/dist/web/public/vendor/monaco/vs/scheme-CHdMtr7p.js +1 -0
- package/dist/web/public/vendor/monaco/vs/scss-C1cmLt9V.js +3 -0
- package/dist/web/public/vendor/monaco/vs/shell-ClXCKCEW.js +1 -0
- package/dist/web/public/vendor/monaco/vs/solidity-MZ6ExpPy.js +1 -0
- package/dist/web/public/vendor/monaco/vs/sophia-DWkuSsPQ.js +1 -0
- package/dist/web/public/vendor/monaco/vs/sparql-AUGFYSyk.js +1 -0
- package/dist/web/public/vendor/monaco/vs/sql-32GpJSV2.js +1 -0
- package/dist/web/public/vendor/monaco/vs/st-CuDFIVZ_.js +1 -0
- package/dist/web/public/vendor/monaco/vs/swift-t-PfMj7W.js +1 -0
- package/dist/web/public/vendor/monaco/vs/systemverilog-Ch4vA8Yt.js +1 -0
- package/dist/web/public/vendor/monaco/vs/tcl-D74tq1nH.js +1 -0
- package/dist/web/public/vendor/monaco/vs/toggleHighContrast-qGX7E9o7.js +61 -0
- package/dist/web/public/vendor/monaco/vs/ts.worker-2QLmBukE.js +1 -0
- package/dist/web/public/vendor/monaco/vs/tsMode-B0S_kp2q.js +11 -0
- package/dist/web/public/vendor/monaco/vs/twig-C6taOxMV.js +1 -0
- package/dist/web/public/vendor/monaco/vs/typescript-_2t_511t.js +1 -0
- package/dist/web/public/vendor/monaco/vs/typespec-8OfoLt6R.js +1 -0
- package/dist/web/public/vendor/monaco/vs/vb-Dyb2648j.js +1 -0
- package/dist/web/public/vendor/monaco/vs/wgsl-BhLXMOR0.js +298 -0
- package/dist/web/public/vendor/monaco/vs/workers-BBttULjf.js +1 -0
- package/dist/web/public/vendor/monaco/vs/xml-cZjNDqDT.js +1 -0
- package/dist/web/public/vendor/monaco/vs/yaml-A1fOIdH6.js +1 -0
- package/dist/web/server.js +1019 -0
- package/dist/web/server.js.map +1 -1
- package/dist/web/task-queue.js +22 -2
- package/dist/web/task-queue.js.map +1 -1
- package/docs/DEPLOYMENT.md +382 -0
- package/docs/MODEL_FINETUNING.md +405 -0
- package/electron/main.js +202 -4
- package/package.json +6 -1
package/dist/tools/shell/exec.js
CHANGED
|
@@ -18,7 +18,7 @@ function containerImage() {
|
|
|
18
18
|
return process.env.FH_SANDBOX_IMAGE || 'node:22-alpine';
|
|
19
19
|
}
|
|
20
20
|
/** 容器模式下应把命令包装成 docker run 执行;镜像不存在时由 docker 自动拉取 */
|
|
21
|
-
function runCommandInContainer(cmd, cwd, timeoutMs =
|
|
21
|
+
function runCommandInContainer(cmd, cwd, timeoutMs = 60000) {
|
|
22
22
|
const image = containerImage();
|
|
23
23
|
// 挂载工作区到 /workspace,容器内 cwd=/workspace;--rm 用完即删
|
|
24
24
|
const dockerArgs = [
|
|
@@ -35,20 +35,35 @@ function runCommandInContainer(cmd, cwd, timeoutMs = 120000) {
|
|
|
35
35
|
];
|
|
36
36
|
return runCommand('docker ' + dockerArgs.map((a) => `"${a.replace(/"/g, '\\"')}"`).join(' '), cwd, timeoutMs);
|
|
37
37
|
}
|
|
38
|
-
function runCommand(cmd, cwd, timeoutMs =
|
|
38
|
+
function runCommand(cmd, cwd, timeoutMs = 60000) {
|
|
39
39
|
return new Promise((resolve) => {
|
|
40
40
|
// 不用内置 timeout 选项:它只杀 shell 进程,不杀 shell 启动的子进程(如 npm/node)。
|
|
41
|
-
// 手动实现超时:先 SIGTERM,宽限期后 SIGKILL
|
|
41
|
+
// 手动实现超时:先 SIGTERM,宽限期后 SIGKILL,并尝试杀整个进程树。
|
|
42
42
|
const child = (0, child_process_1.spawn)(cmd, { cwd, shell: true });
|
|
43
43
|
let stdout = '';
|
|
44
44
|
let stderr = '';
|
|
45
45
|
let settled = false;
|
|
46
|
+
const isWindows = process.platform === 'win32';
|
|
46
47
|
const finish = (result) => {
|
|
47
48
|
if (settled)
|
|
48
49
|
return;
|
|
49
50
|
settled = true;
|
|
50
51
|
clearTimeout(timer);
|
|
51
52
|
clearTimeout(killTimer);
|
|
53
|
+
clearTimeout(forceTimer);
|
|
54
|
+
// 主动销毁 stdio 流,防止子进程持有管道导致 close 事件永不触发
|
|
55
|
+
try {
|
|
56
|
+
child.stdout?.destroy();
|
|
57
|
+
}
|
|
58
|
+
catch { /* ignore */ }
|
|
59
|
+
try {
|
|
60
|
+
child.stderr?.destroy();
|
|
61
|
+
}
|
|
62
|
+
catch { /* ignore */ }
|
|
63
|
+
try {
|
|
64
|
+
child.stdin?.destroy();
|
|
65
|
+
}
|
|
66
|
+
catch { /* ignore */ }
|
|
52
67
|
resolve(result);
|
|
53
68
|
};
|
|
54
69
|
child.stdout?.on('data', (d) => (stdout += d.toString()));
|
|
@@ -59,39 +74,64 @@ function runCommand(cmd, cwd, timeoutMs = 120000) {
|
|
|
59
74
|
finish({ code: 1, stdout, stderr });
|
|
60
75
|
});
|
|
61
76
|
child.on('close', (code) => finish({ code: code ?? 1, stdout, stderr }));
|
|
62
|
-
|
|
63
|
-
|
|
77
|
+
/** Windows 专用:用 taskkill /T /F 杀整个进程树(含子进程),避免 npm/node 子进程残留持有管道 */
|
|
78
|
+
function killProcessTreeWindows(pid) {
|
|
79
|
+
try {
|
|
80
|
+
(0, child_process_1.spawn)('taskkill', ['/PID', String(pid), '/T', '/F'], { detached: true, stdio: 'ignore' }).unref();
|
|
81
|
+
}
|
|
82
|
+
catch { /* 忽略 taskkill 失败,退化为 child.kill */ }
|
|
83
|
+
}
|
|
84
|
+
// 超时处理:先 SIGTERM(Windows 用 taskkill /T),5 秒后 SIGKILL
|
|
64
85
|
const killTimer = setTimeout(() => {
|
|
65
86
|
if (settled)
|
|
66
87
|
return;
|
|
67
88
|
try {
|
|
68
|
-
if (
|
|
89
|
+
if (isWindows && child.pid) {
|
|
90
|
+
killProcessTreeWindows(child.pid);
|
|
91
|
+
}
|
|
92
|
+
else if (!isWindows && child.pid) {
|
|
69
93
|
// Unix: 杀整个进程组(负 pid),确保子进程也被杀
|
|
70
94
|
try {
|
|
71
95
|
process.kill(-child.pid, 'SIGKILL');
|
|
72
96
|
}
|
|
73
97
|
catch { /* 进程组不存在则退化为杀单进程 */ }
|
|
98
|
+
child.kill('SIGKILL');
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
child.kill('SIGKILL');
|
|
74
102
|
}
|
|
75
|
-
child.kill('SIGKILL');
|
|
76
103
|
}
|
|
77
104
|
catch { /* 忽略 kill 失败 */ }
|
|
78
105
|
}, 5000);
|
|
79
106
|
const timer = setTimeout(() => {
|
|
80
107
|
if (settled)
|
|
81
108
|
return;
|
|
82
|
-
stderr += `\n[超时] 命令执行超过 ${timeoutMs}
|
|
109
|
+
stderr += `\n[超时] 命令执行超过 ${Math.round(timeoutMs / 1000)} 秒,正在终止(长时间运行的服务如 dev server 请改用后台启动)…`;
|
|
83
110
|
try {
|
|
84
|
-
if (
|
|
111
|
+
if (isWindows && child.pid) {
|
|
112
|
+
killProcessTreeWindows(child.pid);
|
|
113
|
+
}
|
|
114
|
+
else if (!isWindows && child.pid) {
|
|
85
115
|
try {
|
|
86
116
|
process.kill(-child.pid, 'SIGTERM');
|
|
87
117
|
}
|
|
88
118
|
catch { /* 退化为杀单进程 */ }
|
|
119
|
+
child.kill('SIGTERM');
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
child.kill('SIGTERM');
|
|
89
123
|
}
|
|
90
|
-
child.kill('SIGTERM');
|
|
91
124
|
}
|
|
92
125
|
catch { /* 忽略 */ }
|
|
93
126
|
// killTimer 会在 5 秒后发 SIGKILL
|
|
94
127
|
}, timeoutMs);
|
|
128
|
+
// 最终兜底:超时后 10 秒如果还没 settle(子进程残留持有管道),强制 resolve,避免永久挂起
|
|
129
|
+
const forceTimer = setTimeout(() => {
|
|
130
|
+
if (settled)
|
|
131
|
+
return;
|
|
132
|
+
stderr += '\n[强制结束] 进程树未能正常终止,已强制返回结果。';
|
|
133
|
+
finish({ code: 124, stdout, stderr });
|
|
134
|
+
}, timeoutMs + 10000);
|
|
95
135
|
});
|
|
96
136
|
}
|
|
97
137
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/tools/shell/exec.ts"],"names":[],"mappings":";;AAgBA,wCAEC;AAGD,sDAgBC;AAED,
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/tools/shell/exec.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,10 +69,16 @@ exports.runShellTool = {
|
|
|
69
69
|
const res = ctx.security.sandboxMode === 'container'
|
|
70
70
|
? await (0, exec_1.runCommandInContainer)(command, ctx.cwd)
|
|
71
71
|
: await (0, exec_1.runCommand)(command, ctx.cwd);
|
|
72
|
+
const combined = `${res.stdout}${res.stderr}`;
|
|
73
|
+
const isTimeout = res.code === 124 || /\[超时\]|\[强制结束\]/.test(res.stderr || '');
|
|
72
74
|
return {
|
|
73
75
|
ok: res.code === 0,
|
|
74
|
-
output: smartTruncate(
|
|
75
|
-
error: res.code === 0
|
|
76
|
+
output: smartTruncate(combined),
|
|
77
|
+
error: res.code === 0
|
|
78
|
+
? undefined
|
|
79
|
+
: isTimeout
|
|
80
|
+
? `命令超时(超过60秒未完成)。该命令可能是长时间运行的服务(如 dev server),请改用后台启动方式,或拆分为更短的命令。exit code ${res.code}`
|
|
81
|
+
: `exit code ${res.code}`,
|
|
76
82
|
};
|
|
77
83
|
},
|
|
78
84
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-shell.tool.js","sourceRoot":"","sources":["../../../src/tools/shell/run-shell.tool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-shell.tool.js","sourceRoot":"","sources":["../../../src/tools/shell/run-shell.tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CompletionEvaluator = void 0;
|
|
4
|
+
exports.evaluateCompletion = evaluateCompletion;
|
|
5
|
+
/**
|
|
6
|
+
* 飞虹 Code - 补全模型评估模块 (P3-1)
|
|
7
|
+
*
|
|
8
|
+
* 评估专用补全模型的性能指标:
|
|
9
|
+
* - 精确匹配率(Exact Match)
|
|
10
|
+
* - 编辑相似度(Edit Similarity / Levenshtein)
|
|
11
|
+
* - 前缀匹配率(Prefix Match)
|
|
12
|
+
* - 平均延迟(Latency)
|
|
13
|
+
* - 接受率(Acceptance Rate,需要用户反馈数据)
|
|
14
|
+
*/
|
|
15
|
+
const fs_1 = require("fs");
|
|
16
|
+
/**
|
|
17
|
+
* 计算 Levenshtein 编辑距离
|
|
18
|
+
*/
|
|
19
|
+
function levenshtein(a, b) {
|
|
20
|
+
const m = a.length;
|
|
21
|
+
const n = b.length;
|
|
22
|
+
if (m === 0)
|
|
23
|
+
return n;
|
|
24
|
+
if (n === 0)
|
|
25
|
+
return m;
|
|
26
|
+
const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
|
|
27
|
+
for (let i = 0; i <= m; i++)
|
|
28
|
+
dp[i][0] = i;
|
|
29
|
+
for (let j = 0; j <= n; j++)
|
|
30
|
+
dp[0][j] = j;
|
|
31
|
+
for (let i = 1; i <= m; i++) {
|
|
32
|
+
for (let j = 1; j <= n; j++) {
|
|
33
|
+
const cost = a[i - 1] === b[j - 1] ? 0 : 1;
|
|
34
|
+
dp[i][j] = Math.min(dp[i - 1][j] + 1, dp[i][j - 1] + 1, dp[i - 1][j - 1] + cost);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return dp[m][n];
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* 计算编辑相似度(1 - 编辑距离 / 最大长度)
|
|
41
|
+
*/
|
|
42
|
+
function editSimilarity(a, b) {
|
|
43
|
+
if (a === b)
|
|
44
|
+
return 1;
|
|
45
|
+
const maxLen = Math.max(a.length, b.length);
|
|
46
|
+
if (maxLen === 0)
|
|
47
|
+
return 1;
|
|
48
|
+
const dist = levenshtein(a, b);
|
|
49
|
+
return 1 - dist / maxLen;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* 检查前缀匹配(预测是否以期望的前 N 个字符开头,或反之)
|
|
53
|
+
*/
|
|
54
|
+
function prefixMatchScore(predicted, expected) {
|
|
55
|
+
if (predicted === expected)
|
|
56
|
+
return 1;
|
|
57
|
+
const minLen = Math.min(predicted.length, expected.length);
|
|
58
|
+
if (minLen === 0)
|
|
59
|
+
return 0;
|
|
60
|
+
let match = 0;
|
|
61
|
+
for (let i = 0; i < minLen; i++) {
|
|
62
|
+
if (predicted[i] === expected[i])
|
|
63
|
+
match++;
|
|
64
|
+
else
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
return match / minLen;
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* 检查第一个 token 是否匹配(按空白/符号分割)
|
|
71
|
+
*/
|
|
72
|
+
function firstTokenMatch(predicted, expected) {
|
|
73
|
+
const tokenize = (s) => s.trim().split(/[\s;,.(){}[\]]+/).filter(Boolean);
|
|
74
|
+
const predTokens = tokenize(predicted);
|
|
75
|
+
const expTokens = tokenize(expected);
|
|
76
|
+
if (predTokens.length === 0 || expTokens.length === 0)
|
|
77
|
+
return false;
|
|
78
|
+
return predTokens[0] === expTokens[0];
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* 补全模型评估器
|
|
82
|
+
*/
|
|
83
|
+
class CompletionEvaluator {
|
|
84
|
+
samples = [];
|
|
85
|
+
/**
|
|
86
|
+
* 从 JSONL 文件加载评估样本
|
|
87
|
+
*/
|
|
88
|
+
loadSamples(filePath) {
|
|
89
|
+
if (!(0, fs_1.existsSync)(filePath))
|
|
90
|
+
throw new Error(`评估样本文件不存在: ${filePath}`);
|
|
91
|
+
const content = (0, fs_1.readFileSync)(filePath, 'utf-8');
|
|
92
|
+
const lines = content.split('\n').filter((l) => l.trim());
|
|
93
|
+
this.samples = lines.map((line) => {
|
|
94
|
+
const obj = JSON.parse(line);
|
|
95
|
+
return {
|
|
96
|
+
prefix: obj.prefix,
|
|
97
|
+
suffix: obj.suffix,
|
|
98
|
+
expected: obj.middle,
|
|
99
|
+
file_path: obj.file_path,
|
|
100
|
+
language: obj.language,
|
|
101
|
+
};
|
|
102
|
+
});
|
|
103
|
+
return this.samples.length;
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* 设置评估样本
|
|
107
|
+
*/
|
|
108
|
+
setSamples(samples) {
|
|
109
|
+
this.samples = samples;
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* 运行评估
|
|
113
|
+
*/
|
|
114
|
+
async evaluate(completionFn, maxSamples) {
|
|
115
|
+
const samples = maxSamples ? this.samples.slice(0, maxSamples) : this.samples;
|
|
116
|
+
if (samples.length === 0)
|
|
117
|
+
throw new Error('没有评估样本');
|
|
118
|
+
const details = [];
|
|
119
|
+
const perLanguage = {};
|
|
120
|
+
let exactMatchCount = 0;
|
|
121
|
+
let totalEditSimilarity = 0;
|
|
122
|
+
let totalPrefixMatch = 0;
|
|
123
|
+
let firstTokenMatchCount = 0;
|
|
124
|
+
let totalLatency = 0;
|
|
125
|
+
for (let i = 0; i < samples.length; i++) {
|
|
126
|
+
const sample = samples[i];
|
|
127
|
+
const { text: predicted, latencyMs } = await completionFn(sample.prefix, sample.suffix, sample.language);
|
|
128
|
+
const exact = predicted === sample.expected;
|
|
129
|
+
const editSim = editSimilarity(predicted, sample.expected);
|
|
130
|
+
const prefixMatch = prefixMatchScore(predicted, sample.expected);
|
|
131
|
+
const firstToken = firstTokenMatch(predicted, sample.expected);
|
|
132
|
+
if (exact)
|
|
133
|
+
exactMatchCount++;
|
|
134
|
+
totalEditSimilarity += editSim;
|
|
135
|
+
totalPrefixMatch += prefixMatch;
|
|
136
|
+
if (firstToken)
|
|
137
|
+
firstTokenMatchCount++;
|
|
138
|
+
totalLatency += latencyMs;
|
|
139
|
+
details.push({
|
|
140
|
+
expected: sample.expected,
|
|
141
|
+
predicted,
|
|
142
|
+
exactMatch: exact,
|
|
143
|
+
editSimilarity: editSim,
|
|
144
|
+
latencyMs,
|
|
145
|
+
language: sample.language,
|
|
146
|
+
});
|
|
147
|
+
// 按语言统计
|
|
148
|
+
const lang = sample.language || 'unknown';
|
|
149
|
+
if (!perLanguage[lang]) {
|
|
150
|
+
perLanguage[lang] = { exactMatch: 0, editSimilarity: 0, count: 0 };
|
|
151
|
+
}
|
|
152
|
+
perLanguage[lang].count++;
|
|
153
|
+
if (exact)
|
|
154
|
+
perLanguage[lang].exactMatch++;
|
|
155
|
+
perLanguage[lang].editSimilarity += editSim;
|
|
156
|
+
}
|
|
157
|
+
// 计算百分比
|
|
158
|
+
for (const lang of Object.keys(perLanguage)) {
|
|
159
|
+
const stat = perLanguage[lang];
|
|
160
|
+
stat.exactMatch = stat.exactMatch / stat.count;
|
|
161
|
+
stat.editSimilarity = stat.editSimilarity / stat.count;
|
|
162
|
+
}
|
|
163
|
+
return {
|
|
164
|
+
exactMatch: exactMatchCount / samples.length,
|
|
165
|
+
editSimilarity: totalEditSimilarity / samples.length,
|
|
166
|
+
prefixMatch: totalPrefixMatch / samples.length,
|
|
167
|
+
firstTokenMatch: firstTokenMatchCount / samples.length,
|
|
168
|
+
avgLatencyMs: totalLatency / samples.length,
|
|
169
|
+
totalSamples: samples.length,
|
|
170
|
+
perLanguage,
|
|
171
|
+
details,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
/**
|
|
175
|
+
* 格式化评估结果为可读字符串
|
|
176
|
+
*/
|
|
177
|
+
formatResult(result) {
|
|
178
|
+
const lines = [
|
|
179
|
+
'=== 补全模型评估结果 ===',
|
|
180
|
+
`样本数: ${result.totalSamples}`,
|
|
181
|
+
`精确匹配率: ${(result.exactMatch * 100).toFixed(2)}%`,
|
|
182
|
+
`编辑相似度: ${(result.editSimilarity * 100).toFixed(2)}%`,
|
|
183
|
+
`前缀匹配率: ${(result.prefixMatch * 100).toFixed(2)}%`,
|
|
184
|
+
`首Token匹配率: ${(result.firstTokenMatch * 100).toFixed(2)}%`,
|
|
185
|
+
`平均延迟: ${result.avgLatencyMs.toFixed(2)}ms`,
|
|
186
|
+
'',
|
|
187
|
+
'--- 按语言统计 ---',
|
|
188
|
+
];
|
|
189
|
+
for (const [lang, stat] of Object.entries(result.perLanguage)) {
|
|
190
|
+
lines.push(`${lang}: ${stat.count} 样本, 精确匹配 ${(stat.exactMatch * 100).toFixed(1)}%, 编辑相似度 ${(stat.editSimilarity * 100).toFixed(1)}%`);
|
|
191
|
+
}
|
|
192
|
+
return lines.join('\n');
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* 保存评估结果到 JSON 文件
|
|
196
|
+
*/
|
|
197
|
+
saveResult(result, outputPath) {
|
|
198
|
+
const outputDir = outputPath.includes('/') ? outputPath.slice(0, outputPath.lastIndexOf('/')) : '.';
|
|
199
|
+
if (!(0, fs_1.existsSync)(outputDir))
|
|
200
|
+
(0, fs_1.mkdirSync)(outputDir, { recursive: true });
|
|
201
|
+
(0, fs_1.writeFileSync)(outputPath, JSON.stringify(result, null, 2), 'utf-8');
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
exports.CompletionEvaluator = CompletionEvaluator;
|
|
205
|
+
/**
|
|
206
|
+
* 便捷函数:评估补全模型
|
|
207
|
+
*/
|
|
208
|
+
async function evaluateCompletion(samplesPath, completionFn, maxSamples) {
|
|
209
|
+
const evaluator = new CompletionEvaluator();
|
|
210
|
+
evaluator.loadSamples(samplesPath);
|
|
211
|
+
return evaluator.evaluate(completionFn, maxSamples);
|
|
212
|
+
}
|
|
213
|
+
//# sourceMappingURL=completion-evaluator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"completion-evaluator.js","sourceRoot":"","sources":["../../src/training/completion-evaluator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,248 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FimDataPreparer = void 0;
|
|
4
|
+
exports.prepareFimData = prepareFimData;
|
|
5
|
+
/**
|
|
6
|
+
* 飞虹 Code - FIM (Fill-In-the-Middle) 训练数据准备 (P3-1)
|
|
7
|
+
*
|
|
8
|
+
* 从代码库生成 FIM 格式的训练数据,用于专用补全模型微调。
|
|
9
|
+
* FIM 格式:将代码随机分成 prefix / suffix / middle 三部分,
|
|
10
|
+
* 模型学习根据 prefix 和 suffix 预测 middle(即光标位置的补全)。
|
|
11
|
+
*/
|
|
12
|
+
const fs_1 = require("fs");
|
|
13
|
+
const path_1 = require("path");
|
|
14
|
+
const logger_1 = require("../shared/logger");
|
|
15
|
+
/** 支持的编程语言及其扩展名 */
|
|
16
|
+
const LANGUAGE_EXTENSIONS = {
|
|
17
|
+
typescript: ['.ts', '.tsx'],
|
|
18
|
+
javascript: ['.js', '.jsx', '.mjs', '.cjs'],
|
|
19
|
+
python: ['.py'],
|
|
20
|
+
java: ['.java'],
|
|
21
|
+
go: ['.go'],
|
|
22
|
+
rust: ['.rs'],
|
|
23
|
+
cpp: ['.cpp', '.cc', '.cxx', '.h', '.hpp'],
|
|
24
|
+
c: ['.c', '.h'],
|
|
25
|
+
csharp: ['.cs'],
|
|
26
|
+
php: ['.php'],
|
|
27
|
+
ruby: ['.rb'],
|
|
28
|
+
swift: ['.swift'],
|
|
29
|
+
kotlin: ['.kt', '.kts'],
|
|
30
|
+
html: ['.html', '.htm'],
|
|
31
|
+
css: ['.css', '.scss', '.less'],
|
|
32
|
+
sql: ['.sql'],
|
|
33
|
+
shell: ['.sh', '.bash', '.zsh'],
|
|
34
|
+
yaml: ['.yml', '.yaml'],
|
|
35
|
+
json: ['.json'],
|
|
36
|
+
markdown: ['.md', '.markdown'],
|
|
37
|
+
};
|
|
38
|
+
/** 忽略的目录和文件 */
|
|
39
|
+
const IGNORE_PATTERNS = [
|
|
40
|
+
'node_modules', '.git', 'dist', 'build', 'out',
|
|
41
|
+
'.next', '.nuxt', '.cache', '.turbo',
|
|
42
|
+
'coverage', '.nyc_output',
|
|
43
|
+
'vendor', 'third_party',
|
|
44
|
+
'__pycache__', '.pytest_cache',
|
|
45
|
+
'target', 'bin', 'obj',
|
|
46
|
+
'.idea', '.vscode',
|
|
47
|
+
'package-lock.json', 'yarn.lock', 'pnpm-lock.yaml',
|
|
48
|
+
];
|
|
49
|
+
const DEFAULT_CONFIG = {
|
|
50
|
+
samplesPerFile: 5,
|
|
51
|
+
maxFileSize: 100 * 1024,
|
|
52
|
+
minMiddleLength: 10,
|
|
53
|
+
maxMiddleLength: 200,
|
|
54
|
+
minPrefixLength: 50,
|
|
55
|
+
minSuffixLength: 10,
|
|
56
|
+
languages: [],
|
|
57
|
+
trainRatio: 0.9,
|
|
58
|
+
seed: 42,
|
|
59
|
+
};
|
|
60
|
+
/** 可复现随机数生成器(Mulberry32) */
|
|
61
|
+
function createRng(seed) {
|
|
62
|
+
let a = seed;
|
|
63
|
+
return function () {
|
|
64
|
+
a |= 0;
|
|
65
|
+
a = (a + 0x6d2b79f5) | 0;
|
|
66
|
+
let t = Math.imul(a ^ (a >>> 15), 1 | a);
|
|
67
|
+
t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t;
|
|
68
|
+
return ((t ^ (t >>> 14)) >>> 0) / 4294967296;
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
function detectLanguage(filePath) {
|
|
72
|
+
const ext = (0, path_1.extname)(filePath).toLowerCase();
|
|
73
|
+
for (const [lang, exts] of Object.entries(LANGUAGE_EXTENSIONS)) {
|
|
74
|
+
if (exts.includes(ext))
|
|
75
|
+
return lang;
|
|
76
|
+
}
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
79
|
+
function shouldIgnore(filePath) {
|
|
80
|
+
for (const pattern of IGNORE_PATTERNS) {
|
|
81
|
+
if (filePath.includes(pattern))
|
|
82
|
+
return true;
|
|
83
|
+
}
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
function scanFiles(dir, languages) {
|
|
87
|
+
const results = [];
|
|
88
|
+
function scan(currentDir) {
|
|
89
|
+
let entries;
|
|
90
|
+
try {
|
|
91
|
+
entries = (0, fs_1.readdirSync)(currentDir);
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
for (const entry of entries) {
|
|
97
|
+
const fullPath = (0, path_1.join)(currentDir, entry);
|
|
98
|
+
if (shouldIgnore(fullPath))
|
|
99
|
+
continue;
|
|
100
|
+
let stats;
|
|
101
|
+
try {
|
|
102
|
+
stats = (0, fs_1.statSync)(fullPath);
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
if (stats.isDirectory()) {
|
|
108
|
+
scan(fullPath);
|
|
109
|
+
}
|
|
110
|
+
else if (stats.isFile()) {
|
|
111
|
+
const language = detectLanguage(fullPath);
|
|
112
|
+
if (language && (languages.length === 0 || languages.includes(language))) {
|
|
113
|
+
results.push({ path: fullPath, language });
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
scan(dir);
|
|
119
|
+
return results;
|
|
120
|
+
}
|
|
121
|
+
function generateFimSample(content, rng, config) {
|
|
122
|
+
const totalLength = content.length;
|
|
123
|
+
for (let attempt = 0; attempt < 10; attempt++) {
|
|
124
|
+
const middleLength = Math.floor(config.minMiddleLength + rng() * (config.maxMiddleLength - config.minMiddleLength));
|
|
125
|
+
const minCursor = config.minPrefixLength;
|
|
126
|
+
const maxCursor = totalLength - middleLength - config.minSuffixLength;
|
|
127
|
+
if (maxCursor <= minCursor)
|
|
128
|
+
continue;
|
|
129
|
+
const cursorOffset = Math.floor(minCursor + rng() * (maxCursor - minCursor));
|
|
130
|
+
const prefix = content.slice(0, cursorOffset);
|
|
131
|
+
const middle = content.slice(cursorOffset, cursorOffset + middleLength);
|
|
132
|
+
const suffix = content.slice(cursorOffset + middleLength);
|
|
133
|
+
if (prefix.length < config.minPrefixLength)
|
|
134
|
+
continue;
|
|
135
|
+
if (suffix.length < config.minSuffixLength)
|
|
136
|
+
continue;
|
|
137
|
+
if (middle.length < config.minMiddleLength)
|
|
138
|
+
continue;
|
|
139
|
+
if (middle.trim().length === 0)
|
|
140
|
+
continue;
|
|
141
|
+
return {
|
|
142
|
+
prefix, suffix, middle,
|
|
143
|
+
file_path: '', language: '',
|
|
144
|
+
cursor_offset: cursorOffset,
|
|
145
|
+
middle_length: middleLength,
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
return null;
|
|
149
|
+
}
|
|
150
|
+
class FimDataPreparer {
|
|
151
|
+
config;
|
|
152
|
+
rng;
|
|
153
|
+
constructor(config) {
|
|
154
|
+
this.config = { ...DEFAULT_CONFIG, ...config };
|
|
155
|
+
this.rng = createRng(this.config.seed);
|
|
156
|
+
}
|
|
157
|
+
prepare() {
|
|
158
|
+
const { sourceDir, outputPath, samplesPerFile, maxFileSize, trainRatio } = this.config;
|
|
159
|
+
logger_1.logger.info('开始准备 FIM 训练数据', { sourceDir, outputPath });
|
|
160
|
+
const files = scanFiles(sourceDir, this.config.languages);
|
|
161
|
+
logger_1.logger.info(`扫描到 ${files.length} 个代码文件`);
|
|
162
|
+
if (files.length === 0)
|
|
163
|
+
throw new Error(`未在 ${sourceDir} 中找到任何代码文件`);
|
|
164
|
+
const allSamples = [];
|
|
165
|
+
for (const { path: filePath, language } of files) {
|
|
166
|
+
let stats;
|
|
167
|
+
try {
|
|
168
|
+
stats = (0, fs_1.statSync)(filePath);
|
|
169
|
+
}
|
|
170
|
+
catch {
|
|
171
|
+
continue;
|
|
172
|
+
}
|
|
173
|
+
if (stats.size > maxFileSize)
|
|
174
|
+
continue;
|
|
175
|
+
let content;
|
|
176
|
+
try {
|
|
177
|
+
content = (0, fs_1.readFileSync)(filePath, 'utf-8');
|
|
178
|
+
}
|
|
179
|
+
catch {
|
|
180
|
+
continue;
|
|
181
|
+
}
|
|
182
|
+
if (content.length < this.config.minPrefixLength + this.config.minMiddleLength + this.config.minSuffixLength)
|
|
183
|
+
continue;
|
|
184
|
+
const relPath = (0, path_1.relative)(sourceDir, filePath);
|
|
185
|
+
for (let i = 0; i < samplesPerFile; i++) {
|
|
186
|
+
const sample = generateFimSample(content, this.rng, this.config);
|
|
187
|
+
if (sample) {
|
|
188
|
+
sample.file_path = relPath;
|
|
189
|
+
sample.language = language;
|
|
190
|
+
allSamples.push(sample);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
logger_1.logger.info(`生成 ${allSamples.length} 个 FIM 样本`);
|
|
195
|
+
if (allSamples.length === 0)
|
|
196
|
+
throw new Error('未能生成任何有效样本');
|
|
197
|
+
// 打乱
|
|
198
|
+
for (let i = allSamples.length - 1; i > 0; i--) {
|
|
199
|
+
const j = Math.floor(this.rng() * (i + 1));
|
|
200
|
+
[allSamples[i], allSamples[j]] = [allSamples[j], allSamples[i]];
|
|
201
|
+
}
|
|
202
|
+
const trainCount = Math.floor(allSamples.length * trainRatio);
|
|
203
|
+
const trainSamples = allSamples.slice(0, trainCount);
|
|
204
|
+
const valSamples = allSamples.slice(trainCount);
|
|
205
|
+
const outputDir = outputPath.includes('/') ? outputPath.slice(0, outputPath.lastIndexOf('/')) : '.';
|
|
206
|
+
if (outputDir && !(0, fs_1.existsSync)(outputDir))
|
|
207
|
+
(0, fs_1.mkdirSync)(outputDir, { recursive: true });
|
|
208
|
+
const trainPath = outputPath.replace('.jsonl', '.train.jsonl');
|
|
209
|
+
(0, fs_1.writeFileSync)(trainPath, trainSamples.map((s) => JSON.stringify(s)).join('\n'), 'utf-8');
|
|
210
|
+
const valPath = outputPath.replace('.jsonl', '.val.jsonl');
|
|
211
|
+
(0, fs_1.writeFileSync)(valPath, valSamples.map((s) => JSON.stringify(s)).join('\n'), 'utf-8');
|
|
212
|
+
const metadata = {
|
|
213
|
+
source_dir: sourceDir,
|
|
214
|
+
total_files: files.length,
|
|
215
|
+
total_samples: allSamples.length,
|
|
216
|
+
train_samples: trainSamples.length,
|
|
217
|
+
val_samples: valSamples.length,
|
|
218
|
+
train_ratio: trainRatio,
|
|
219
|
+
config: {
|
|
220
|
+
samples_per_file: samplesPerFile,
|
|
221
|
+
max_file_size: maxFileSize,
|
|
222
|
+
min_middle_length: this.config.minMiddleLength,
|
|
223
|
+
max_middle_length: this.config.maxMiddleLength,
|
|
224
|
+
min_prefix_length: this.config.minPrefixLength,
|
|
225
|
+
min_suffix_length: this.config.minSuffixLength,
|
|
226
|
+
languages: this.config.languages,
|
|
227
|
+
seed: this.config.seed,
|
|
228
|
+
},
|
|
229
|
+
language_distribution: this.countByLanguage(allSamples),
|
|
230
|
+
created_at: new Date().toISOString(),
|
|
231
|
+
};
|
|
232
|
+
const metaPath = outputPath.replace('.jsonl', '.meta.json');
|
|
233
|
+
(0, fs_1.writeFileSync)(metaPath, JSON.stringify(metadata, null, 2), 'utf-8');
|
|
234
|
+
logger_1.logger.info('FIM 训练数据准备完成', { train: trainSamples.length, val: valSamples.length });
|
|
235
|
+
return { trainCount: trainSamples.length, valCount: valSamples.length, totalFiles: files.length, outputPath };
|
|
236
|
+
}
|
|
237
|
+
countByLanguage(samples) {
|
|
238
|
+
const counts = {};
|
|
239
|
+
for (const s of samples)
|
|
240
|
+
counts[s.language] = (counts[s.language] || 0) + 1;
|
|
241
|
+
return counts;
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
exports.FimDataPreparer = FimDataPreparer;
|
|
245
|
+
function prepareFimData(config) {
|
|
246
|
+
return new FimDataPreparer(config).prepare();
|
|
247
|
+
}
|
|
248
|
+
//# sourceMappingURL=fim-data.js.map
|