soloforge 1.1.48 → 1.1.50
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/README.md +4 -4
- package/dist/cli/scope_check.d.ts.map +1 -1
- package/dist/cli/scope_check.js +10 -0
- package/dist/cli/scope_check.js.map +1 -1
- package/dist/context/adapters/shared/integration_guide.d.ts +3 -3
- package/dist/context/adapters/shared/integration_guide.js +4 -4
- package/dist/core/adversarial_review_store.d.ts +44 -44
- package/dist/core/adversarial_review_store.d.ts.map +1 -1
- package/dist/core/adversarial_review_store.js +43 -43
- package/dist/core/adversarial_review_store.js.map +1 -1
- package/dist/core/gate_record_store.d.ts.map +1 -1
- package/dist/core/gate_record_store.js +9 -4
- package/dist/core/gate_record_store.js.map +1 -1
- package/dist/core/git_utils.d.ts.map +1 -1
- package/dist/core/git_utils.js +7 -3
- package/dist/core/git_utils.js.map +1 -1
- package/dist/core/task_context/constants.d.ts.map +1 -1
- package/dist/core/task_context/constants.js +3 -1
- package/dist/core/task_context/constants.js.map +1 -1
- package/dist/core/task_context/manager.d.ts +0 -4
- package/dist/core/task_context/manager.d.ts.map +1 -1
- package/dist/core/task_context/manager.js +21 -32
- package/dist/core/task_context/manager.js.map +1 -1
- package/dist/core/task_context/stage_fact_ownership.js +1 -1
- package/dist/core/task_context/stage_fact_ownership.js.map +1 -1
- package/dist/core/task_context/status_transitions.js +5 -5
- package/dist/core/task_context/status_transitions.js.map +1 -1
- package/dist/core/types.d.ts +10 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/waiver_store.d.ts +100 -0
- package/dist/core/waiver_store.d.ts.map +1 -0
- package/dist/core/waiver_store.js +185 -0
- package/dist/core/waiver_store.js.map +1 -0
- package/dist/domain/asset_registry/derived_registry.d.ts +10 -0
- package/dist/domain/asset_registry/derived_registry.d.ts.map +1 -1
- package/dist/domain/asset_registry/derived_registry.js +10 -0
- package/dist/domain/asset_registry/derived_registry.js.map +1 -1
- package/dist/domain/asset_registry/derived_types.d.ts +10 -0
- package/dist/domain/asset_registry/derived_types.d.ts.map +1 -1
- package/dist/domain/asset_registry/derived_types.js +10 -0
- package/dist/domain/asset_registry/derived_types.js.map +1 -1
- package/dist/gate/certainty_gate.d.ts +10 -0
- package/dist/gate/certainty_gate.d.ts.map +1 -1
- package/dist/gate/certainty_gate.js.map +1 -1
- package/dist/gate/contracts/tool_actions.d.ts +10 -1
- package/dist/gate/contracts/tool_actions.d.ts.map +1 -1
- package/dist/gate/contracts/tool_actions.js +11 -1
- package/dist/gate/contracts/tool_actions.js.map +1 -1
- package/dist/gate/contracts/tool_invocation_contract_registry.d.ts.map +1 -1
- package/dist/gate/contracts/tool_invocation_contract_registry.js +11 -1
- package/dist/gate/contracts/tool_invocation_contract_registry.js.map +1 -1
- package/dist/gate/executors/executors_annotation.d.ts +33 -10
- package/dist/gate/executors/executors_annotation.d.ts.map +1 -1
- package/dist/gate/executors/executors_annotation.js +119 -64
- package/dist/gate/executors/executors_annotation.js.map +1 -1
- package/dist/gate/executors/executors_artifact.d.ts +1 -1
- package/dist/gate/executors/executors_artifact.d.ts.map +1 -1
- package/dist/gate/executors/executors_artifact.js +1 -138
- package/dist/gate/executors/executors_artifact.js.map +1 -1
- package/dist/gate/executors/executors_build.d.ts +2 -2
- package/dist/gate/executors/executors_build.d.ts.map +1 -1
- package/dist/gate/executors/executors_build.js +11 -111
- package/dist/gate/executors/executors_build.js.map +1 -1
- package/dist/gate/executors/executors_deploy.d.ts.map +1 -1
- package/dist/gate/executors/executors_deploy.js +35 -7
- package/dist/gate/executors/executors_deploy.js.map +1 -1
- package/dist/gate/executors/executors_external_command.d.ts.map +1 -1
- package/dist/gate/executors/executors_external_command.js +25 -5
- package/dist/gate/executors/executors_external_command.js.map +1 -1
- package/dist/gate/executors/executors_field_mapping.d.ts.map +1 -1
- package/dist/gate/executors/executors_field_mapping.js +78 -66
- package/dist/gate/executors/executors_field_mapping.js.map +1 -1
- package/dist/gate/executors/executors_jacoco.d.ts +3 -0
- package/dist/gate/executors/executors_jacoco.d.ts.map +1 -0
- package/dist/gate/executors/executors_jacoco.js +70 -0
- package/dist/gate/executors/executors_jacoco.js.map +1 -0
- package/dist/gate/executors/executors_prerequisite.d.ts +1 -1
- package/dist/gate/executors/executors_prerequisite.d.ts.map +1 -1
- package/dist/gate/executors/executors_prerequisite.js +1 -61
- package/dist/gate/executors/executors_prerequisite.js.map +1 -1
- package/dist/gate/executors/executors_probe.d.ts +1 -0
- package/dist/gate/executors/executors_probe.d.ts.map +1 -1
- package/dist/gate/executors/executors_probe.js +1 -0
- package/dist/gate/executors/executors_probe.js.map +1 -1
- package/dist/gate/executors/executors_scope.d.ts +7 -3
- package/dist/gate/executors/executors_scope.d.ts.map +1 -1
- package/dist/gate/executors/executors_scope.js +18 -171
- package/dist/gate/executors/executors_scope.js.map +1 -1
- package/dist/gate/executors/executors_trace.d.ts.map +1 -1
- package/dist/gate/executors/executors_trace.js +111 -1
- package/dist/gate/executors/executors_trace.js.map +1 -1
- package/dist/gate/executors/index.js +2 -2
- package/dist/gate/executors/index.js.map +1 -1
- package/dist/gate/gate_engine.d.ts +11 -0
- package/dist/gate/gate_engine.d.ts.map +1 -1
- package/dist/gate/gate_engine.js +43 -6
- package/dist/gate/gate_engine.js.map +1 -1
- package/dist/gate/gate_registry_bridge.d.ts +10 -0
- package/dist/gate/gate_registry_bridge.d.ts.map +1 -1
- package/dist/gate/gate_registry_bridge.js +2 -3
- package/dist/gate/gate_registry_bridge.js.map +1 -1
- package/dist/gate/release/gate_checks/checkAssetAntiBloat.d.ts.map +1 -1
- package/dist/gate/release/gate_checks/checkAssetAntiBloat.js +3 -0
- package/dist/gate/release/gate_checks/checkAssetAntiBloat.js.map +1 -1
- package/dist/server/tools/index.d.ts.map +1 -1
- package/dist/server/tools/index.js +4 -2
- package/dist/server/tools/index.js.map +1 -1
- package/dist/server/tools/middleware.d.ts.map +1 -1
- package/dist/server/tools/middleware.js +1 -0
- package/dist/server/tools/middleware.js.map +1 -1
- package/dist/server/tools/schemas.d.ts +10 -0
- package/dist/server/tools/schemas.d.ts.map +1 -1
- package/dist/server/tools/schemas.js +10 -0
- package/dist/server/tools/schemas.js.map +1 -1
- package/dist/server/tools/sf_doctor.d.ts +7 -0
- package/dist/server/tools/sf_doctor.d.ts.map +1 -1
- package/dist/server/tools/sf_doctor.js +38 -2
- package/dist/server/tools/sf_doctor.js.map +1 -1
- package/dist/server/tools/sf_waiver.d.ts +31 -0
- package/dist/server/tools/sf_waiver.d.ts.map +1 -0
- package/dist/server/tools/sf_waiver.js +139 -0
- package/dist/server/tools/sf_waiver.js.map +1 -0
- package/dist/server/tools/sf_work.d.ts +28 -37
- package/dist/server/tools/sf_work.d.ts.map +1 -1
- package/dist/server/tools/sf_work.js +155 -83
- package/dist/server/tools/sf_work.js.map +1 -1
- package/dist/shared/paths.d.ts +4 -0
- package/dist/shared/paths.d.ts.map +1 -1
- package/dist/shared/paths.js +6 -0
- package/dist/shared/paths.js.map +1 -1
- package/dist/types/pipeline_types.d.ts +4 -1
- package/dist/types/pipeline_types.d.ts.map +1 -1
- package/dist/verify/audit/probe_executor.d.ts +4 -1
- package/dist/verify/audit/probe_executor.d.ts.map +1 -1
- package/dist/verify/audit/probe_executor.js +4 -1
- package/dist/verify/audit/probe_executor.js.map +1 -1
- package/dist/verify/audit/probe_rule.d.ts +3 -0
- package/dist/verify/audit/probe_rule.d.ts.map +1 -1
- package/dist/verify/audit/probe_rule.js +3 -0
- package/dist/verify/audit/probe_rule.js.map +1 -1
- package/dist/verify/contracts/runtime_state_recovery_registry.d.ts.map +1 -1
- package/dist/verify/contracts/runtime_state_recovery_registry.js +0 -1
- package/dist/verify/contracts/runtime_state_recovery_registry.js.map +1 -1
- package/dist/verify/oda/probes/index.d.ts.map +1 -1
- package/dist/verify/oda/probes/index.js +2 -0
- package/dist/verify/oda/probes/index.js.map +1 -1
- package/dist/verify/oda/probes/slice_progress_probe.d.ts +4 -0
- package/dist/verify/oda/probes/slice_progress_probe.d.ts.map +1 -0
- package/dist/verify/oda/probes/slice_progress_probe.js +144 -0
- package/dist/verify/oda/probes/slice_progress_probe.js.map +1 -0
- package/package.json +1 -1
- package/templates/build/enforced.md +30 -22
- package/templates/build//346/265/213/350/257/225/344/274/230/345/205/210/347/274/226/347/240/201.md +1 -0
- package/templates/build//347/274/226/347/240/201/347/272/252/345/276/213.md +2 -1
- package/templates/design//345/205/250/347/224/237/345/221/275/345/221/250/346/234/237/345/267/245/344/275/234/346/265/201/345/257/274/350/210/252.md +5 -5
- package/templates/design//345/210/207/347/211/207/350/247/204/345/210/222.md +3 -1
- package/templates/design//345/274/200/345/217/221/345/210/207/347/211/207/350/256/241/345/210/222.md +2 -1
- package/templates/operate/UI/350/247/206/350/247/211/351/252/214/346/224/266/347/272/252/345/276/213.md +13 -2
- package/templates/operate/enforced.md +2 -2
- package/templates/shared/enforced.md +1 -1
- package/templates/shared//345/267/245/344/275/234/346/265/201/347/241/254/350/247/204/345/210/231/345/245/221/347/272/246.md +2 -2
- package/templates/verify/enforced.md +11 -2
- package/templates/verify//344/273/243/347/240/201/345/256/241/346/237/245/346/212/245/345/221/212.md +2 -2
- package/templates/verify//345/256/241/346/237/245/346/270/205/345/215/225.md +3 -1
- package/dist/gate/executors/executors_openapi_sync.d.ts +0 -23
- package/dist/gate/executors/executors_openapi_sync.d.ts.map +0 -1
- package/dist/gate/executors/executors_openapi_sync.js +0 -145
- package/dist/gate/executors/executors_openapi_sync.js.map +0 -1
|
@@ -2,19 +2,19 @@
|
|
|
2
2
|
* 构建类执行器 — TypeScript 编译、单元测试、覆盖率阈值、测试场景计数。
|
|
3
3
|
*
|
|
4
4
|
* 职责边界:
|
|
5
|
-
* - 负责:tsc_compile、vitest_run、coverage_threshold
|
|
5
|
+
* - 负责:tsc_compile、vitest_run、coverage_threshold
|
|
6
6
|
* - 不负责:不涉及部署/产物/追踪/范围/前置条件类 executor
|
|
7
7
|
*
|
|
8
8
|
* 被谁调用:index.ts(registerAllExecutors)
|
|
9
|
-
* 调用谁:shared.ts(
|
|
9
|
+
* 调用谁:shared.ts(findWorkspaceTsconfigs、gateExecutors 等)
|
|
10
10
|
*
|
|
11
11
|
* 数据流:GateCheck + EvaluationContext → 运行构建工具(tsc/vitest) → 解析输出 → CheckResult
|
|
12
12
|
* 持久化:无直接持久化(通过 execa 调用 tsc/vitest,读取 coverage/ 输出)
|
|
13
13
|
*/
|
|
14
14
|
import { execa } from "execa";
|
|
15
|
-
import { existsSync,
|
|
15
|
+
import { existsSync, readFileSync } from "node:fs";
|
|
16
16
|
import { join } from "node:path";
|
|
17
|
-
import {
|
|
17
|
+
import { findWorkspaceTsconfigs } from "./shared.js";
|
|
18
18
|
import { gateExecutors } from "../gate_executors.js";
|
|
19
19
|
/** 注册构建类执行器 */
|
|
20
20
|
export function registerBuildExecutors() {
|
|
@@ -206,11 +206,13 @@ export function registerBuildExecutors() {
|
|
|
206
206
|
// 读取 coverage summary
|
|
207
207
|
const summaryPath = join(ctx.projectRoot, "coverage", "coverage-summary.json");
|
|
208
208
|
if (!existsSync(summaryPath)) {
|
|
209
|
+
// fail-closed:项目已装 vitest 但跑 coverage 无 summary 产出 = coverage 配置异常或测试 crash,
|
|
210
|
+
// 不得静默放行(否则覆盖率门禁形同虚设)。与同文件 tsc_compile/vitest_run 的异常策略一致。
|
|
209
211
|
return {
|
|
210
212
|
check_id: check.id,
|
|
211
213
|
executed_by: "code",
|
|
212
|
-
passed:
|
|
213
|
-
|
|
214
|
+
passed: false,
|
|
215
|
+
error: "无 coverage/coverage-summary.json。项目已装 vitest 但 coverage 未产出(未配 coverage.reporter=json-summary 或测试 crash)——fail-closed 不放行",
|
|
214
216
|
};
|
|
215
217
|
}
|
|
216
218
|
const summaryContent = readFileSync(summaryPath, "utf-8");
|
|
@@ -218,11 +220,12 @@ export function registerBuildExecutors() {
|
|
|
218
220
|
// 提取行覆盖率
|
|
219
221
|
const total = summary?.total;
|
|
220
222
|
if (!total || !total.lines) {
|
|
223
|
+
// fail-closed:summary 存在但结构错乱 = coverage reporter 配置异常,不得放行
|
|
221
224
|
return {
|
|
222
225
|
check_id: check.id,
|
|
223
226
|
executed_by: "code",
|
|
224
|
-
passed:
|
|
225
|
-
|
|
227
|
+
passed: false,
|
|
228
|
+
error: "coverage-summary.json 格式不符预期(缺 total.lines)——coverage reporter 配置异常,fail-closed 不放行",
|
|
226
229
|
};
|
|
227
230
|
}
|
|
228
231
|
const lineCoverage = total.lines.pct ?? 0;
|
|
@@ -253,77 +256,6 @@ export function registerBuildExecutors() {
|
|
|
253
256
|
};
|
|
254
257
|
}
|
|
255
258
|
});
|
|
256
|
-
// ═══════════════════════════════════════════
|
|
257
|
-
// 13. 测试场景计数检查 — 验证新增测试场景数量
|
|
258
|
-
// 替代 vitest_run 在 SLICE-E02 上的不足
|
|
259
|
-
// ═══════════════════════════════════════════
|
|
260
|
-
gateExecutors.register("test_count_check", async (check, ctx) => {
|
|
261
|
-
if (!isJsToolAvailable(ctx.projectRoot, "vitest")) {
|
|
262
|
-
return { check_id: check.id, executed_by: "code", passed: true, evidence: "项目未安装 vitest,test_count_check 跳过(不适用本技术栈)" };
|
|
263
|
-
}
|
|
264
|
-
// 从 rule 提取最小场景数
|
|
265
|
-
// rule 格式: "新增测试场景 ≥9 个" / "独立审查新增测试场景 ≥9 个"
|
|
266
|
-
const countMatch = check.rule.match(/[≥>=]+\s*(\d+)\s*个/);
|
|
267
|
-
const minCount = countMatch ? parseInt(countMatch[1], 10) : 9;
|
|
268
|
-
try {
|
|
269
|
-
// 运行 vitest 并收集测试结果
|
|
270
|
-
const { stdout, stderr } = await execa("npx", ["vitest", "run", "--reporter=json"], {
|
|
271
|
-
cwd: ctx.projectRoot,
|
|
272
|
-
timeout: 120_000,
|
|
273
|
-
reject: false,
|
|
274
|
-
});
|
|
275
|
-
const output = stdout || stderr;
|
|
276
|
-
// 尝试解析 JSON 输出
|
|
277
|
-
let testCount = 0;
|
|
278
|
-
try {
|
|
279
|
-
const result = JSON.parse(output);
|
|
280
|
-
// vitest JSON reporter 格式
|
|
281
|
-
const tests = result?.testResults ?? result?.numPassedTests;
|
|
282
|
-
if (typeof tests === "number") {
|
|
283
|
-
testCount = tests;
|
|
284
|
-
}
|
|
285
|
-
else if (Array.isArray(tests)) {
|
|
286
|
-
testCount = tests.length;
|
|
287
|
-
}
|
|
288
|
-
}
|
|
289
|
-
catch {
|
|
290
|
-
// JSON 解析失败,从文本输出中提取测试数
|
|
291
|
-
const passMatch = output.match(/(\d+)\s*(?:passed|tests?\s+passed)/i)
|
|
292
|
-
?? output.match(/Tests:\s+(\d+)\s+passed/i);
|
|
293
|
-
if (passMatch) {
|
|
294
|
-
testCount = parseInt(passMatch[1], 10);
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
// 没有测试或解析失败时,从测试文件直接计数 describe/it/test 块
|
|
298
|
-
if (testCount === 0) {
|
|
299
|
-
testCount = countTestBlocks(ctx.projectRoot);
|
|
300
|
-
}
|
|
301
|
-
if (testCount === 0) {
|
|
302
|
-
return {
|
|
303
|
-
check_id: check.id,
|
|
304
|
-
executed_by: "code",
|
|
305
|
-
passed: false,
|
|
306
|
-
error: `未检测到任何测试场景。要求至少 ${minCount} 个测试场景。`,
|
|
307
|
-
};
|
|
308
|
-
}
|
|
309
|
-
const passed = testCount >= minCount;
|
|
310
|
-
return {
|
|
311
|
-
check_id: check.id,
|
|
312
|
-
executed_by: "code",
|
|
313
|
-
passed,
|
|
314
|
-
evidence: `检测到 ${testCount} 个测试场景(要求 ≥${minCount})`,
|
|
315
|
-
error: passed ? undefined : `测试场景 ${testCount} 个不足 ${minCount} 个`,
|
|
316
|
-
};
|
|
317
|
-
}
|
|
318
|
-
catch (err) {
|
|
319
|
-
return {
|
|
320
|
-
check_id: check.id,
|
|
321
|
-
executed_by: "code",
|
|
322
|
-
passed: true,
|
|
323
|
-
evidence: degradeLog("test_count_check", `异常: ${err instanceof Error ? err.message : String(err)}`),
|
|
324
|
-
};
|
|
325
|
-
}
|
|
326
|
-
});
|
|
327
259
|
}
|
|
328
260
|
// ── 本模块私有辅助函数 ──
|
|
329
261
|
/**
|
|
@@ -345,36 +277,4 @@ function isJsToolAvailable(projectRoot, tool) {
|
|
|
345
277
|
return false;
|
|
346
278
|
}
|
|
347
279
|
}
|
|
348
|
-
/**
|
|
349
|
-
* 从测试文件中计数 it/test/describe 块数量。
|
|
350
|
-
* 当 vitest JSON 输出不可用时作为兜底。
|
|
351
|
-
*/
|
|
352
|
-
function countTestBlocks(projectRoot) {
|
|
353
|
-
const testDirs = ["tests", "test", "__tests__", "src"];
|
|
354
|
-
let totalBlocks = 0;
|
|
355
|
-
function walkDir(dir) {
|
|
356
|
-
if (!existsSync(dir))
|
|
357
|
-
return;
|
|
358
|
-
const entries = readdirSync(dir, { withFileTypes: true });
|
|
359
|
-
for (const entry of entries) {
|
|
360
|
-
const fullPath = join(dir, entry.name);
|
|
361
|
-
if (entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "node_modules") {
|
|
362
|
-
walkDir(fullPath);
|
|
363
|
-
}
|
|
364
|
-
else if (/\.(test|spec)\.(ts|tsx|js|jsx)$/.test(entry.name)) {
|
|
365
|
-
try {
|
|
366
|
-
const content = readFileSync(fullPath, "utf-8");
|
|
367
|
-
// 计数 it( / test( / it.skip( / test.skip( 等
|
|
368
|
-
const matches = content.match(/\b(?:it|test)\s*\(/g);
|
|
369
|
-
totalBlocks += matches ? matches.length : 0;
|
|
370
|
-
}
|
|
371
|
-
catch { /* 忽略读取失败 */ }
|
|
372
|
-
}
|
|
373
|
-
}
|
|
374
|
-
}
|
|
375
|
-
for (const d of testDirs) {
|
|
376
|
-
walkDir(join(projectRoot, d));
|
|
377
|
-
}
|
|
378
|
-
return totalBlocks;
|
|
379
|
-
}
|
|
380
280
|
//# sourceMappingURL=executors_build.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executors_build.js","sourceRoot":"","sources":["../../../src/gate/executors/executors_build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"executors_build.js","sourceRoot":"","sources":["../../../src/gate/executors/executors_build.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executors_deploy.d.ts","sourceRoot":"","sources":["../../../src/gate/executors/executors_deploy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAWH,eAAe;AACf,wBAAgB,uBAAuB,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"executors_deploy.d.ts","sourceRoot":"","sources":["../../../src/gate/executors/executors_deploy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAWH,eAAe;AACf,wBAAgB,uBAAuB,IAAI,IAAI,CA8J9C"}
|
|
@@ -25,12 +25,27 @@ export function registerDeployExecutors() {
|
|
|
25
25
|
// ═══════════════════════════════════════════
|
|
26
26
|
gateExecutors.register("docker_deployment", async (check, ctx) => {
|
|
27
27
|
const projectRoot = ctx.projectRoot;
|
|
28
|
-
// 无 docker-compose.yml
|
|
28
|
+
// 无 docker-compose.yml:统一前置条件检查(根 + config/deploy/docker/compose 子目录,
|
|
29
|
+
// 对齐 SLICE-BUILD 的 executors_external_command 子目录搜索——commit 8bba01ac 漏修此处)
|
|
29
30
|
const composeFiles = ["docker-compose.yml", "docker-compose.yaml", "compose.yml", "compose.yaml"];
|
|
30
|
-
const
|
|
31
|
-
|
|
31
|
+
const composeDirs = ["", "config", "deploy", "docker", "compose"];
|
|
32
|
+
let composeRel = null;
|
|
33
|
+
for (const d of composeDirs) {
|
|
34
|
+
for (const f of composeFiles) {
|
|
35
|
+
const rel = d ? `${d}/${f}` : f;
|
|
36
|
+
if (existsSync(join(projectRoot, rel))) {
|
|
37
|
+
composeRel = rel;
|
|
38
|
+
break;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
if (composeRel)
|
|
42
|
+
break;
|
|
43
|
+
}
|
|
44
|
+
const prereq = checkPrerequisite(check, !composeRel, "docker_deployment", "项目缺少 docker-compose.yml(根及 config/deploy/docker/compose 子目录均无),无法部署验证");
|
|
32
45
|
if (prereq)
|
|
33
46
|
return prereq;
|
|
47
|
+
// compose 在子目录 → docker compose 命令加 -f <rel>(up/ps 都要,否则找不到 compose)
|
|
48
|
+
const composeArgs = composeRel.includes("/") ? ["-f", composeRel] : [];
|
|
34
49
|
// 先检查 docker 是否安装且可用
|
|
35
50
|
try {
|
|
36
51
|
await execa("docker", ["--version"], { cwd: projectRoot, timeout: 5_000 });
|
|
@@ -45,12 +60,12 @@ export function registerDeployExecutors() {
|
|
|
45
60
|
}
|
|
46
61
|
try {
|
|
47
62
|
// 执行 docker compose up -d --build
|
|
48
|
-
await execa("docker", ["compose", "up", "-d", "--build"], {
|
|
63
|
+
await execa("docker", ["compose", ...composeArgs, "up", "-d", "--build"], {
|
|
49
64
|
cwd: projectRoot,
|
|
50
65
|
timeout: 120_000,
|
|
51
66
|
});
|
|
52
67
|
// docker compose ps → 检查容器 Running
|
|
53
|
-
const { stdout } = await execa("docker", ["compose", "ps", "--format", "json"], {
|
|
68
|
+
const { stdout } = await execa("docker", ["compose", ...composeArgs, "ps", "--format", "json"], {
|
|
54
69
|
cwd: projectRoot,
|
|
55
70
|
timeout: 15_000,
|
|
56
71
|
});
|
|
@@ -100,9 +115,22 @@ export function registerDeployExecutors() {
|
|
|
100
115
|
// 防止 AI 提交造假截图(截图存在 ≠ 服务可访问)。确定性证据。
|
|
101
116
|
// ═══════════════════════════════════════════
|
|
102
117
|
gateExecutors.register("local_http_acceptance", async (check, ctx) => {
|
|
118
|
+
// 根 + config/deploy/docker/compose 子目录搜索(对齐 SLICE-BUILD/UP,commit 8bba01ac 漏修此处)
|
|
103
119
|
const composeFiles = ["docker-compose.yml", "docker-compose.yaml", "compose.yml", "compose.yaml"];
|
|
104
|
-
const
|
|
105
|
-
|
|
120
|
+
const composeDirs = ["", "config", "deploy", "docker", "compose"];
|
|
121
|
+
let composePath = null;
|
|
122
|
+
for (const d of composeDirs) {
|
|
123
|
+
for (const f of composeFiles) {
|
|
124
|
+
const rel = d ? `${d}/${f}` : f;
|
|
125
|
+
if (existsSync(join(ctx.projectRoot, rel))) {
|
|
126
|
+
composePath = rel;
|
|
127
|
+
break;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
if (composePath)
|
|
131
|
+
break;
|
|
132
|
+
}
|
|
133
|
+
const prereq = checkPrerequisite(check, !composePath, "local_http_acceptance", "无 docker-compose.yml(根及 config/deploy/docker/compose 子目录均无),无法 HTTP 验收");
|
|
106
134
|
if (prereq)
|
|
107
135
|
return prereq;
|
|
108
136
|
// 解析 docker-compose.yml,提取 services.*.ports 的 host 端口映射
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executors_deploy.js","sourceRoot":"","sources":["../../../src/gate/executors/executors_deploy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,eAAe;AACf,MAAM,UAAU,uBAAuB;IACrC,8CAA8C;IAC9C,iBAAiB;IACjB,8CAA8C;IAE9C,aAAa,CAAC,QAAQ,CAAC,mBAAmB,EAAE,KAAK,EAAE,KAAgB,EAAE,GAAsB,EAAwB,EAAE;QACnH,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;QAEpC,
|
|
1
|
+
{"version":3,"file":"executors_deploy.js","sourceRoot":"","sources":["../../../src/gate/executors/executors_deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executors_external_command.d.ts","sourceRoot":"","sources":["../../../src/gate/executors/executors_external_command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAmBH,gBAAgB;AAChB,wBAAgB,+BAA+B,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"executors_external_command.d.ts","sourceRoot":"","sources":["../../../src/gate/executors/executors_external_command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAmBH,gBAAgB;AAChB,wBAAgB,+BAA+B,IAAI,IAAI,CAsHtD"}
|
|
@@ -43,6 +43,7 @@ export function registerExternalCommandExecutor() {
|
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
const args = check.args ?? [];
|
|
46
|
+
let execArgs = args; // docker compose 子目录时可能加 -f 指定
|
|
46
47
|
// 前置产物存在性检查:args 里的 docs/ 产物文件未产出时跳过(避免"缺文件 warning"噪音),
|
|
47
48
|
// 产出后本检查自动生效。语义同 regex_scan 的 tech_stack 跳过(passed=true + skipped=true 不阻断)。
|
|
48
49
|
const missingProduct = args.find((a) => a.startsWith("docs/") && !existsSync(join(ctx.projectRoot, a)));
|
|
@@ -56,13 +57,32 @@ export function registerExternalCommandExecutor() {
|
|
|
56
57
|
};
|
|
57
58
|
}
|
|
58
59
|
// command 特定前置(能跑则硬验 error,不能跑放行引导 skipped——与 docker_deployment 同模式):
|
|
59
|
-
// docker compose →
|
|
60
|
+
// docker compose → 递归找 compose(根 + 子目录 config/deploy/docker/compose);子目录找到则加 -f 指定
|
|
61
|
+
// (治 compose 在子目录时根找不到 → 误放行 skipped → docker 没启动;两项目 compose 在 config//deploy/)
|
|
60
62
|
// npx playwright test → 判 playwright 配置(无=Claude Code 未装放行;有=跑 e2e,失败 error)
|
|
61
63
|
if (check.command === "docker" && args.some((a) => a === "compose")) {
|
|
62
64
|
const composeFiles = ["docker-compose.yml", "docker-compose.yaml", "compose.yml", "compose.yaml"];
|
|
63
|
-
|
|
65
|
+
const composeDirs = ["", "config", "deploy", "docker", "compose"];
|
|
66
|
+
let composeRel = null;
|
|
67
|
+
for (const d of composeDirs) {
|
|
68
|
+
for (const f of composeFiles) {
|
|
69
|
+
const rel = d ? `${d}/${f}` : f;
|
|
70
|
+
if (existsSync(join(ctx.projectRoot, rel))) {
|
|
71
|
+
composeRel = rel;
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
if (composeRel)
|
|
76
|
+
break;
|
|
77
|
+
}
|
|
78
|
+
if (!composeRel) {
|
|
64
79
|
return { check_id: check.id, executed_by: "code", passed: true, skipped: true,
|
|
65
|
-
evidence: "项目无 docker-compose.yml
|
|
80
|
+
evidence: "项目无 docker-compose.yml(根及 config/deploy/docker/compose 子目录均无),docker compose 跳过(产 compose 后自动生效)" };
|
|
81
|
+
}
|
|
82
|
+
// compose 在子目录 → 在 "compose" 后插 -f <rel>,让 docker compose 找到
|
|
83
|
+
if (composeRel.includes("/")) {
|
|
84
|
+
const ci = execArgs.indexOf("compose");
|
|
85
|
+
execArgs = [...execArgs.slice(0, ci + 1), "-f", composeRel, ...execArgs.slice(ci + 1)];
|
|
66
86
|
}
|
|
67
87
|
}
|
|
68
88
|
if (check.command === "npx" && args.some((a) => a === "playwright")) {
|
|
@@ -73,9 +93,9 @@ export function registerExternalCommandExecutor() {
|
|
|
73
93
|
evidence: "项目无 playwright.config,playwright 跳过(Claude Code: npx playwright install + 加配置后生效,新项目放行)" };
|
|
74
94
|
}
|
|
75
95
|
}
|
|
76
|
-
const cmdLine = `${check.command} ${
|
|
96
|
+
const cmdLine = `${check.command} ${execArgs.join(" ")}`.trim();
|
|
77
97
|
try {
|
|
78
|
-
const result = await execa(check.command,
|
|
98
|
+
const result = await execa(check.command, execArgs, {
|
|
79
99
|
cwd: ctx.projectRoot,
|
|
80
100
|
timeout: DEFAULT_TIMEOUT,
|
|
81
101
|
reject: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executors_external_command.js","sourceRoot":"","sources":["../../../src/gate/executors/executors_external_command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,+CAA+C;AAC/C,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,0BAA0B;AAC1B,MAAM,eAAe,GAAG,OAAO,CAAC;AAEhC,sBAAsB;AACtB,SAAS,QAAQ,CAAC,CAAS,EAAE,GAAW;IACtC,OAAO,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,+BAA+B;IAC7C,aAAa,CAAC,QAAQ,CACpB,kBAAkB,EAClB,KAAK,EAAE,KAAgB,EAAE,GAAsB,EAAwB,EAAE;QACvE,4DAA4D;QAC5D,kDAAkD;QAClD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;gBACL,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAClB,WAAW,EAAE,MAAM;gBACnB,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,+CAA+C;aACvD,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"executors_external_command.js","sourceRoot":"","sources":["../../../src/gate/executors/executors_external_command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executors_field_mapping.d.ts","sourceRoot":"","sources":["../../../src/gate/executors/executors_field_mapping.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executors_field_mapping.d.ts","sourceRoot":"","sources":["../../../src/gate/executors/executors_field_mapping.ts"],"names":[],"mappings":"AA0FA;;;;mCAImC;AACnC,wBAAgB,4BAA4B,IAAI,IAAI,CAgGnD"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* 调用谁:executors_trace.resolveCrossValidationArtifact(产物定位)
|
|
10
10
|
*
|
|
11
11
|
* 数据流:required_artifact=数据库设计(§3/§7)+ evidence_required[0]=schema.sql → 解析比对 → CheckResult
|
|
12
|
+
* 持久化:无
|
|
12
13
|
*/
|
|
13
14
|
import { gateExecutors } from "../gate_executors.js";
|
|
14
15
|
import { readFileSync, existsSync } from "node:fs";
|
|
@@ -97,83 +98,94 @@ function parseSchemaSqlTables(content) {
|
|
|
97
98
|
* - rule:声明校验模式(一致性/覆盖率/both) */
|
|
98
99
|
export function registerFieldMappingExecutor() {
|
|
99
100
|
gateExecutors.register("field_mapping_validation", async (check, ctx) => {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
const schemaFields = parseSchemaSqlTables(readFileSync(schemaPath, "utf-8"));
|
|
134
|
-
// 空集防御:§3 无字段 = 数据库设计未落地,fail-closed 防误判
|
|
135
|
-
if (dbFields.size === 0) {
|
|
136
|
-
return {
|
|
137
|
-
check_id: check.id,
|
|
138
|
-
executed_by: "code",
|
|
139
|
-
passed: false,
|
|
140
|
-
error: "数据库设计 §3 表字段表无字段(未填真实字段,或产物未落地)",
|
|
141
|
-
};
|
|
142
|
-
}
|
|
143
|
-
// 4. 比对:§3 表.字段 ↔ schema.sql(一致性+覆盖率)
|
|
144
|
-
const problems = [];
|
|
145
|
-
for (const [table, fields] of dbFields) {
|
|
146
|
-
const schemaTableFields = schemaFields.get(table);
|
|
147
|
-
if (!schemaTableFields) {
|
|
148
|
-
problems.push(`表「${table}」在 schema.sql 中不存在`);
|
|
149
|
-
continue;
|
|
101
|
+
try {
|
|
102
|
+
// 1. 定位数据库设计产物
|
|
103
|
+
const dbPaths = resolveCrossValidationArtifact(check.required_artifact, ctx.projectRoot);
|
|
104
|
+
if (dbPaths.length === 0) {
|
|
105
|
+
return {
|
|
106
|
+
check_id: check.id,
|
|
107
|
+
executed_by: "code",
|
|
108
|
+
passed: false,
|
|
109
|
+
error: `数据库设计产物不存在: ${check.required_artifact ?? "(未配置)"}`,
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
// 2. 解析数据库 §3 字段表 + §7 映射
|
|
113
|
+
const dbContent = readFileSync(dbPaths[0], "utf-8");
|
|
114
|
+
const dbFields = parseDbSection3Fields(dbContent);
|
|
115
|
+
const mappings = parseDbSection7Mappings(dbContent);
|
|
116
|
+
// 3. 定位 schema.sql
|
|
117
|
+
const schemaRel = check.evidence_required[0];
|
|
118
|
+
if (!schemaRel) {
|
|
119
|
+
return {
|
|
120
|
+
check_id: check.id,
|
|
121
|
+
executed_by: "code",
|
|
122
|
+
passed: false,
|
|
123
|
+
error: "缺 evidence_required[0](schema.sql 相对路径)",
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
const schemaPath = join(ctx.projectRoot, schemaRel);
|
|
127
|
+
if (!existsSync(schemaPath)) {
|
|
128
|
+
return {
|
|
129
|
+
check_id: check.id,
|
|
130
|
+
executed_by: "code",
|
|
131
|
+
passed: false,
|
|
132
|
+
error: `schema.sql 不存在: ${schemaRel}`,
|
|
133
|
+
};
|
|
150
134
|
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
135
|
+
const schemaFields = parseSchemaSqlTables(readFileSync(schemaPath, "utf-8"));
|
|
136
|
+
// 空集防御:§3 无字段 = 数据库设计未落地,fail-closed 防误判
|
|
137
|
+
if (dbFields.size === 0) {
|
|
138
|
+
return {
|
|
139
|
+
check_id: check.id,
|
|
140
|
+
executed_by: "code",
|
|
141
|
+
passed: false,
|
|
142
|
+
error: "数据库设计 §3 表字段表无字段(未填真实字段,或产物未落地)",
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
// 4. 比对:§3 表.字段 ↔ schema.sql(一致性+覆盖率)
|
|
146
|
+
const problems = [];
|
|
147
|
+
for (const [table, fields] of dbFields) {
|
|
148
|
+
const schemaTableFields = schemaFields.get(table);
|
|
149
|
+
if (!schemaTableFields) {
|
|
150
|
+
problems.push(`表「${table}」在 schema.sql 中不存在`);
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
for (const f of fields) {
|
|
154
|
+
if (!schemaTableFields.has(f)) {
|
|
155
|
+
problems.push(`字段「${table}.${f}」在 schema.sql 中不存在`);
|
|
156
|
+
}
|
|
154
157
|
}
|
|
155
158
|
}
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
159
|
+
// schema.sql 有但 §3 没有的表(覆盖率:schema 多出的表,提示)
|
|
160
|
+
for (const table of schemaFields.keys()) {
|
|
161
|
+
if (!dbFields.has(table)) {
|
|
162
|
+
problems.push(`表「${table}」在 schema.sql 存在但数据库设计 §3 未记录`);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
if (problems.length > 0) {
|
|
166
|
+
return {
|
|
167
|
+
check_id: check.id,
|
|
168
|
+
executed_by: "code",
|
|
169
|
+
passed: false,
|
|
170
|
+
error: `字段映射不一致/遗漏(${problems.length}): ${problems.slice(0, 5).join(";")}${problems.length > 5 ? " ..." : ""}`,
|
|
171
|
+
};
|
|
161
172
|
}
|
|
173
|
+
return {
|
|
174
|
+
check_id: check.id,
|
|
175
|
+
executed_by: "code",
|
|
176
|
+
passed: true,
|
|
177
|
+
evidence: `字段映射一致:数据库 §3 共 ${dbFields.size} 表,§7 映射 ${mappings.size} 项,schema.sql ${schemaFields.size} 表`,
|
|
178
|
+
};
|
|
162
179
|
}
|
|
163
|
-
|
|
180
|
+
catch (err) {
|
|
181
|
+
// O-06 修复:原无外层 try-catch,readFileSync 抛 EISDIR/EACCES 等会冒泡到 gate_engine(虽 fail-closed 兜住,但错误信息原始不友好)。此处返回友好 fail-closed。
|
|
164
182
|
return {
|
|
165
183
|
check_id: check.id,
|
|
166
184
|
executed_by: "code",
|
|
167
185
|
passed: false,
|
|
168
|
-
error:
|
|
186
|
+
error: `field_mapping_validation 执行异常(fail-closed):${err instanceof Error ? err.message : String(err)}`,
|
|
169
187
|
};
|
|
170
188
|
}
|
|
171
|
-
return {
|
|
172
|
-
check_id: check.id,
|
|
173
|
-
executed_by: "code",
|
|
174
|
-
passed: true,
|
|
175
|
-
evidence: `字段映射一致:数据库 §3 共 ${dbFields.size} 表,§7 映射 ${mappings.size} 项,schema.sql ${schemaFields.size} 表`,
|
|
176
|
-
};
|
|
177
189
|
});
|
|
178
190
|
}
|
|
179
191
|
//# sourceMappingURL=executors_field_mapping.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executors_field_mapping.js","sourceRoot":"","sources":["../../../src/gate/executors/executors_field_mapping.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"executors_field_mapping.js","sourceRoot":"","sources":["../../../src/gate/executors/executors_field_mapping.ts"],"names":[],"mappings":"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"}
|