@winspan/claude-forge 2.2.0 → 2.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/README.md +48 -4
- package/dist/convention/types.d.ts +2 -0
- package/dist/convention/types.d.ts.map +1 -1
- package/dist/daemon/engine-registry.d.ts.map +1 -1
- package/dist/daemon/engine-registry.js +5 -0
- package/dist/daemon/engine-registry.js.map +1 -1
- package/dist/daemon/handlers/pre-tool-use-handler.d.ts.map +1 -1
- package/dist/daemon/handlers/pre-tool-use-handler.js +28 -5
- package/dist/daemon/handlers/pre-tool-use-handler.js.map +1 -1
- package/dist/pipeline/aggregator.d.ts +10 -0
- package/dist/pipeline/aggregator.d.ts.map +1 -1
- package/dist/pipeline/aggregator.js.map +1 -1
- package/dist/pipeline/dynamic-aggregator.d.ts +24 -0
- package/dist/pipeline/dynamic-aggregator.d.ts.map +1 -1
- package/dist/pipeline/dynamic-aggregator.js +111 -0
- package/dist/pipeline/dynamic-aggregator.js.map +1 -1
- package/dist/pipeline/dynamic-node-executor.d.ts +49 -0
- package/dist/pipeline/dynamic-node-executor.d.ts.map +1 -1
- package/dist/pipeline/dynamic-node-executor.js +295 -4
- package/dist/pipeline/dynamic-node-executor.js.map +1 -1
- package/dist/pipeline/dynamic-node-types.d.ts +37 -0
- package/dist/pipeline/dynamic-node-types.d.ts.map +1 -1
- package/dist/pipeline/events.d.ts +72 -2
- package/dist/pipeline/events.d.ts.map +1 -1
- package/dist/pipeline/events.js +7 -0
- package/dist/pipeline/events.js.map +1 -1
- package/dist/pipeline/index.d.ts +16 -0
- package/dist/pipeline/index.d.ts.map +1 -1
- package/dist/pipeline/index.js +104 -0
- package/dist/pipeline/index.js.map +1 -1
- package/dist/pipeline/node-type-registry.js +2 -2
- package/dist/pipeline/semantic-validator.d.ts.map +1 -1
- package/dist/pipeline/semantic-validator.js +12 -1
- package/dist/pipeline/semantic-validator.js.map +1 -1
- package/dist/pipeline/step-gate-keeper.d.ts +28 -0
- package/dist/pipeline/step-gate-keeper.d.ts.map +1 -0
- package/dist/pipeline/step-gate-keeper.js +47 -0
- package/dist/pipeline/step-gate-keeper.js.map +1 -0
- package/dist/pipeline/step-orchestrator.d.ts +66 -0
- package/dist/pipeline/step-orchestrator.d.ts.map +1 -0
- package/dist/pipeline/step-orchestrator.js +183 -0
- package/dist/pipeline/step-orchestrator.js.map +1 -0
- package/dist/pipeline/step-prompt-builder.d.ts +32 -0
- package/dist/pipeline/step-prompt-builder.d.ts.map +1 -0
- package/dist/pipeline/step-prompt-builder.js +111 -0
- package/dist/pipeline/step-prompt-builder.js.map +1 -0
- package/dist/pipeline/step-types.d.ts +141 -0
- package/dist/pipeline/step-types.d.ts.map +1 -0
- package/dist/pipeline/step-types.js +7 -0
- package/dist/pipeline/step-types.js.map +1 -0
- package/dist/pipeline/step-validator.d.ts +29 -0
- package/dist/pipeline/step-validator.d.ts.map +1 -0
- package/dist/pipeline/step-validator.js +173 -0
- package/dist/pipeline/step-validator.js.map +1 -0
- package/dist/pipeline/store.d.ts +4 -0
- package/dist/pipeline/store.d.ts.map +1 -1
- package/dist/pipeline/store.js +11 -0
- package/dist/pipeline/store.js.map +1 -1
- package/dist/storage/repositories/dynamic-pipeline-repository.d.ts.map +1 -1
- package/dist/storage/repositories/dynamic-pipeline-repository.js +22 -0
- package/dist/storage/repositories/dynamic-pipeline-repository.js.map +1 -1
- package/dist/storage/sqlite.d.ts.map +1 -1
- package/dist/storage/sqlite.js +36 -1
- package/dist/storage/sqlite.js.map +1 -1
- package/dist/web-static/assets/index-BuH39IBL.js +76 -0
- package/dist/web-static/assets/index-CEtt07F4.css +1 -0
- package/dist/web-static/index.html +2 -2
- package/package.json +1 -1
- package/dist/web-static/assets/index-80ChCYXd.css +0 -1
- package/dist/web-static/assets/index-aOMxJsSz.js +0 -76
|
@@ -27,6 +27,16 @@ export class SemanticValidator {
|
|
|
27
27
|
try {
|
|
28
28
|
// 1. 提取执行上下文摘要
|
|
29
29
|
const contextSummary = await this.extractContextSummary(recentEvents, nodeDescription);
|
|
30
|
+
// 无调研事件时跳过语义比对,直接通过
|
|
31
|
+
if (contextSummary === '__NO_RESEARCH_EVENTS__') {
|
|
32
|
+
logger.info('[SemanticValidator] 无调研事件,跳过语义比对,默认通过');
|
|
33
|
+
return {
|
|
34
|
+
consistent: true,
|
|
35
|
+
coverage: 100,
|
|
36
|
+
missing_points: [],
|
|
37
|
+
summary: '无调研事件,跳过语义比对',
|
|
38
|
+
};
|
|
39
|
+
}
|
|
30
40
|
// 2. 提取产物文档摘要
|
|
31
41
|
const artifactSummary = await this.extractArtifactSummary(artifact, projectPath);
|
|
32
42
|
// 3. 语义比对
|
|
@@ -54,7 +64,8 @@ export class SemanticValidator {
|
|
|
54
64
|
e.tool_name === 'Grep' ||
|
|
55
65
|
e.tool_name === 'Agent');
|
|
56
66
|
if (meaningfulEvents.length === 0) {
|
|
57
|
-
|
|
67
|
+
// 无调研事件时直接返回空标记,调用方据此跳过语义比对
|
|
68
|
+
return '__NO_RESEARCH_EVENTS__';
|
|
58
69
|
}
|
|
59
70
|
// 构建上下文摘要 prompt
|
|
60
71
|
const eventsSummary = meaningfulEvents.slice(-10).map(e => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semantic-validator.js","sourceRoot":"","sources":["../../src/pipeline/semantic-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,IAAI,CAAC;AAgBpB,MAAM,OAAO,iBAAiB;IAGR;IAFZ,MAAM,CAAU,gBAAgB,GAAG,EAAE,CAAC;IAE9C,YAAoB,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;IAAG,CAAC;IAEvC;;;;;;;;OAQG;IACH,KAAK,CAAC,QAAQ,CACZ,QAAkB,EAClB,YAA0B,EAC1B,eAAuB,EACvB,WAAmB,EACnB,WAAoB;QAEpB,IAAI,CAAC;YACH,eAAe;YACf,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;YAEvF,cAAc;YACd,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAEjF,UAAU;YACV,MAAM,iBAAiB,GAAG,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;YACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;YAElH,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;YACjD,mBAAmB;YACnB,OAAO;gBACL,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,GAAG;gBACb,cAAc,EAAE,EAAE;gBAClB,OAAO,EAAE,aAAa;aACvB,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,qBAAqB,CAAC,MAAoB,EAAE,eAAuB;QAC/E,iCAAiC;QACjC,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACzC,CAAC,CAAC,SAAS,KAAK,MAAM;YACtB,CAAC,CAAC,SAAS,KAAK,MAAM;YACtB,CAAC,CAAC,SAAS,KAAK,OAAO,CACxB,CAAC;QAEF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"semantic-validator.js","sourceRoot":"","sources":["../../src/pipeline/semantic-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* StepGateKeeper - 步骤门禁守卫
|
|
3
|
+
*
|
|
4
|
+
* 职责:
|
|
5
|
+
* 1. 在 PreToolUse Hook 中检查工具是否在当前 Step 的白名单内
|
|
6
|
+
* 2. 拦截不允许的工具调用
|
|
7
|
+
* 3. 集成 deniedTools 机制(与现有机制一致)
|
|
8
|
+
*/
|
|
9
|
+
import type { ForgeEvent } from '../types/index.js';
|
|
10
|
+
import type { NodeStepExecution } from './dynamic-node-types.js';
|
|
11
|
+
import type { StepDefinition } from './step-types.js';
|
|
12
|
+
import type { HandlerContext } from '../daemon/handler-context.js';
|
|
13
|
+
export declare class StepGateKeeper {
|
|
14
|
+
private ctx;
|
|
15
|
+
constructor(ctx: HandlerContext);
|
|
16
|
+
/**
|
|
17
|
+
* 检查工具是否在当前 Step 的白名单内
|
|
18
|
+
*/
|
|
19
|
+
checkTool(event: ForgeEvent, currentStep: NodeStepExecution, stepDef: StepDefinition): {
|
|
20
|
+
allowed: boolean;
|
|
21
|
+
reason?: string;
|
|
22
|
+
};
|
|
23
|
+
/**
|
|
24
|
+
* 检查是否有活跃的 Step 门禁(用于 PreToolUse 快速判断)
|
|
25
|
+
*/
|
|
26
|
+
hasActiveStepGate(projectPath: string): boolean;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=step-gate-keeper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-gate-keeper.d.ts","sourceRoot":"","sources":["../../src/pipeline/step-gate-keeper.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,qBAAa,cAAc;IAEvB,OAAO,CAAC,GAAG;gBAAH,GAAG,EAAE,cAAc;IAG7B;;OAEG;IACH,SAAS,CACP,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EAAE,cAAc,GACtB;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAyBD;;OAEG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;CAKhD"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* StepGateKeeper - 步骤门禁守卫
|
|
3
|
+
*
|
|
4
|
+
* 职责:
|
|
5
|
+
* 1. 在 PreToolUse Hook 中检查工具是否在当前 Step 的白名单内
|
|
6
|
+
* 2. 拦截不允许的工具调用
|
|
7
|
+
* 3. 集成 deniedTools 机制(与现有机制一致)
|
|
8
|
+
*/
|
|
9
|
+
import { logger } from '../utils/logger.js';
|
|
10
|
+
export class StepGateKeeper {
|
|
11
|
+
ctx;
|
|
12
|
+
constructor(ctx) {
|
|
13
|
+
this.ctx = ctx;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* 检查工具是否在当前 Step 的白名单内
|
|
17
|
+
*/
|
|
18
|
+
checkTool(event, currentStep, stepDef) {
|
|
19
|
+
// 如果白名单为空,允许所有工具
|
|
20
|
+
const allowed_tools = stepDef.allowed_tools;
|
|
21
|
+
if (allowed_tools.length === 0) {
|
|
22
|
+
return { allowed: true };
|
|
23
|
+
}
|
|
24
|
+
// 检查工具是否在白名单内
|
|
25
|
+
const toolName = event.tool_name || '';
|
|
26
|
+
if (!allowed_tools.includes(toolName)) {
|
|
27
|
+
// 记录到 deniedTools(与现有机制一致)
|
|
28
|
+
const denyKey = `${event.session_id}:${event.project_path}:${toolName}:${JSON.stringify(event.tool_input ?? {})}`;
|
|
29
|
+
this.ctx.deniedTools.set(denyKey, (this.ctx.deniedTools.get(denyKey) ?? 0) + 1);
|
|
30
|
+
logger.warn(`[StepGateKeeper] 工具被拦截:${toolName} | Step: ${stepDef.name}`);
|
|
31
|
+
return {
|
|
32
|
+
allowed: false,
|
|
33
|
+
reason: `[Forge:StepGate] 当前步骤 "${stepDef.name}" 只允许使用:${allowed_tools.join(', ')}。\n\n你尝试使用的工具 "${toolName}" 不在白名单内。请使用允许的工具完成当前步骤。`,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
return { allowed: true };
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* 检查是否有活跃的 Step 门禁(用于 PreToolUse 快速判断)
|
|
40
|
+
*/
|
|
41
|
+
hasActiveStepGate(projectPath) {
|
|
42
|
+
// TODO: 这里需要从 PipelineEngine 获取当前 Pipeline 和 Node
|
|
43
|
+
// 暂时返回 false,避免阻塞现有流程
|
|
44
|
+
return false;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
//# sourceMappingURL=step-gate-keeper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-gate-keeper.js","sourceRoot":"","sources":["../../src/pipeline/step-gate-keeper.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,OAAO,cAAc;IAEf;IADV,YACU,GAAmB;QAAnB,QAAG,GAAH,GAAG,CAAgB;IAC1B,CAAC;IAEJ;;OAEG;IACH,SAAS,CACP,KAAiB,EACjB,WAA8B,EAC9B,OAAuB;QAKvB,iBAAiB;QACjB,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,cAAc;QACd,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,2BAA2B;YAC3B,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,YAAY,IAAI,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;YAClH,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAEhF,MAAM,CAAC,IAAI,CAAC,0BAA0B,QAAQ,YAAY,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YAE1E,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,0BAA0B,OAAO,CAAC,IAAI,WAAW,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,QAAQ,0BAA0B;aACtI,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,WAAmB;QACnC,kDAAkD;QAClD,sBAAsB;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* StepOrchestrator - 步骤编排器
|
|
3
|
+
*
|
|
4
|
+
* 职责:
|
|
5
|
+
* 1. 管理 Step 序列的加载和状态推进
|
|
6
|
+
* 2. 决定下一个要执行的 Step
|
|
7
|
+
* 3. 处理 Step 失败和重试逻辑
|
|
8
|
+
* 4. 集成 PendingPromptsManager 实现自动推进
|
|
9
|
+
*/
|
|
10
|
+
import type { DynamicPipeline, DynamicNode, NodeStepExecution } from './dynamic-node-types.js';
|
|
11
|
+
import type { StepDefinition } from './step-types.js';
|
|
12
|
+
export declare class StepOrchestrator {
|
|
13
|
+
/**
|
|
14
|
+
* 获取当前应执行的 Step
|
|
15
|
+
*/
|
|
16
|
+
getCurrentStep(pipeline: DynamicPipeline, node: DynamicNode): NodeStepExecution | null;
|
|
17
|
+
/**
|
|
18
|
+
* 获取下一个待执行的 Step(用于推进)
|
|
19
|
+
*/
|
|
20
|
+
getNextPendingStep(pipeline: DynamicPipeline, node: DynamicNode): NodeStepExecution | null;
|
|
21
|
+
/**
|
|
22
|
+
* 初始化 Node 的 Step 执行状态(Node 首次启动时调用)
|
|
23
|
+
*/
|
|
24
|
+
initializeSteps(pipeline: DynamicPipeline, node: DynamicNode): NodeStepExecution[];
|
|
25
|
+
/**
|
|
26
|
+
* 推进到下一个 Step
|
|
27
|
+
*/
|
|
28
|
+
advanceToNextStep(pipeline: DynamicPipeline, node: DynamicNode, currentStepExecution: NodeStepExecution): void;
|
|
29
|
+
/**
|
|
30
|
+
* 标记当前 Step 完成
|
|
31
|
+
*/
|
|
32
|
+
markStepCompleted(stepExecution: NodeStepExecution, outputs: Record<string, string>): void;
|
|
33
|
+
/**
|
|
34
|
+
* 标记当前 Step 失败
|
|
35
|
+
*/
|
|
36
|
+
markStepFailed(stepExecution: NodeStepExecution, reason: string): void;
|
|
37
|
+
/**
|
|
38
|
+
* 重试当前 Step
|
|
39
|
+
*/
|
|
40
|
+
retryStep(stepExecution: NodeStepExecution): void;
|
|
41
|
+
/**
|
|
42
|
+
* Step 完成后,将下一个 Step 的 prompt 注入队列(自动推进)
|
|
43
|
+
*/
|
|
44
|
+
injectNextStepPrompt(pipeline: DynamicPipeline, node: DynamicNode, sessionId: string, promptBuilder: any): void;
|
|
45
|
+
/**
|
|
46
|
+
* 收集 Step 的输入产物
|
|
47
|
+
*/
|
|
48
|
+
collectStepInputs(stepExecution: NodeStepExecution, node: DynamicNode): Record<string, string>;
|
|
49
|
+
/**
|
|
50
|
+
* 加载节点类型定义
|
|
51
|
+
*/
|
|
52
|
+
private loadNodeType;
|
|
53
|
+
/**
|
|
54
|
+
* 加载 Step 定义
|
|
55
|
+
*/
|
|
56
|
+
loadStepDefinition(nodeTypeId: string, stepDefinitionId: string): StepDefinition | null;
|
|
57
|
+
/**
|
|
58
|
+
* 检查 Node 是否启用了 Step 模式
|
|
59
|
+
*/
|
|
60
|
+
isStepModeEnabled(node: DynamicNode): boolean;
|
|
61
|
+
/**
|
|
62
|
+
* 获取 Node 的所有 Step 定义
|
|
63
|
+
*/
|
|
64
|
+
getStepDefinitions(nodeTypeId: string): StepDefinition[];
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=step-orchestrator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-orchestrator.d.ts","sourceRoot":"","sources":["../../src/pipeline/step-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAuB,MAAM,yBAAyB,CAAC;AACpH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAOtD,qBAAa,gBAAgB;IAC3B;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,GAAG,iBAAiB,GAAG,IAAI;IAoBtF;;OAEG;IACH,kBAAkB,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,GAAG,iBAAiB,GAAG,IAAI;IAW1F;;OAEG;IACH,eAAe,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,GAAG,iBAAiB,EAAE;IAmBlF;;OAEG;IACH,iBAAiB,CACf,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,WAAW,EACjB,oBAAoB,EAAE,iBAAiB,GACtC,IAAI;IAmBP;;OAEG;IACH,iBAAiB,CACf,aAAa,EAAE,iBAAiB,EAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,IAAI;IAQP;;OAEG;IACH,cAAc,CACZ,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,MAAM,GACb,IAAI;IAOP;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,iBAAiB,GAAG,IAAI;IAQjD;;OAEG;IACH,oBAAoB,CAClB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,GAAG,GACjB,IAAI;IAqBP;;OAEG;IACH,iBAAiB,CACf,aAAa,EAAE,iBAAiB,EAChC,IAAI,EAAE,WAAW,GAChB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAgBzB;;OAEG;IACH,OAAO,CAAC,YAAY;IAKpB;;OAEG;IACH,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;IAOvF;;OAEG;IACH,iBAAiB,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO;IAK7C;;OAEG;IACH,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,EAAE;CAIzD"}
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* StepOrchestrator - 步骤编排器
|
|
3
|
+
*
|
|
4
|
+
* 职责:
|
|
5
|
+
* 1. 管理 Step 序列的加载和状态推进
|
|
6
|
+
* 2. 决定下一个要执行的 Step
|
|
7
|
+
* 3. 处理 Step 失败和重试逻辑
|
|
8
|
+
* 4. 集成 PendingPromptsManager 实现自动推进
|
|
9
|
+
*/
|
|
10
|
+
import { NodeTypeRegistry } from './node-type-registry.js';
|
|
11
|
+
import { pendingPromptsManager } from '../daemon/pending-prompts.js';
|
|
12
|
+
import { logger } from '../utils/logger.js';
|
|
13
|
+
export class StepOrchestrator {
|
|
14
|
+
/**
|
|
15
|
+
* 获取当前应执行的 Step
|
|
16
|
+
*/
|
|
17
|
+
getCurrentStep(pipeline, node) {
|
|
18
|
+
const nodeType = this.loadNodeType(node.nodeTypeId);
|
|
19
|
+
if (!nodeType?.steps || nodeType.steps.length === 0) {
|
|
20
|
+
return null; // 无 steps,走传统模式
|
|
21
|
+
}
|
|
22
|
+
// 从 node.stepExecutions 中找到当前正在执行的 Step
|
|
23
|
+
const currentExecution = node.stepExecutions?.find(se => se.status === 'running' || se.status === 'validating');
|
|
24
|
+
if (currentExecution) {
|
|
25
|
+
return currentExecution;
|
|
26
|
+
}
|
|
27
|
+
// 没有正在执行的 Step,找下一个 pending Step
|
|
28
|
+
const nextPendingExecution = node.stepExecutions?.find(se => se.status === 'pending');
|
|
29
|
+
return nextPendingExecution || null;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* 获取下一个待执行的 Step(用于推进)
|
|
33
|
+
*/
|
|
34
|
+
getNextPendingStep(pipeline, node) {
|
|
35
|
+
const nodeType = this.loadNodeType(node.nodeTypeId);
|
|
36
|
+
if (!nodeType?.steps || nodeType.steps.length === 0) {
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
// 找第一个 pending 状态的 Step
|
|
40
|
+
const nextPending = node.stepExecutions?.find(se => se.status === 'pending');
|
|
41
|
+
return nextPending || null;
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* 初始化 Node 的 Step 执行状态(Node 首次启动时调用)
|
|
45
|
+
*/
|
|
46
|
+
initializeSteps(pipeline, node) {
|
|
47
|
+
const nodeType = this.loadNodeType(node.nodeTypeId);
|
|
48
|
+
if (!nodeType?.steps || nodeType.steps.length === 0) {
|
|
49
|
+
return [];
|
|
50
|
+
}
|
|
51
|
+
const now = new Date().toISOString();
|
|
52
|
+
return nodeType.steps.map((stepDef, index) => ({
|
|
53
|
+
id: `${pipeline.id}_${node.id}_step_${index}`,
|
|
54
|
+
stepDefinitionId: stepDef.id,
|
|
55
|
+
stepName: stepDef.name,
|
|
56
|
+
status: 'pending',
|
|
57
|
+
attempts: 0,
|
|
58
|
+
outputs: {},
|
|
59
|
+
createdAt: now,
|
|
60
|
+
updatedAt: now,
|
|
61
|
+
}));
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* 推进到下一个 Step
|
|
65
|
+
*/
|
|
66
|
+
advanceToNextStep(pipeline, node, currentStepExecution) {
|
|
67
|
+
if (!node.stepExecutions)
|
|
68
|
+
return;
|
|
69
|
+
// 找到当前 Step 在列表中的索引
|
|
70
|
+
const currentIndex = node.stepExecutions.findIndex(se => se.id === currentStepExecution.id);
|
|
71
|
+
if (currentIndex === -1)
|
|
72
|
+
return;
|
|
73
|
+
// 下一个 Step
|
|
74
|
+
const nextStep = node.stepExecutions[currentIndex + 1];
|
|
75
|
+
if (nextStep) {
|
|
76
|
+
nextStep.status = 'running';
|
|
77
|
+
nextStep.startedAt = new Date().toISOString();
|
|
78
|
+
nextStep.updatedAt = new Date().toISOString();
|
|
79
|
+
logger.info(`[StepOrchestrator] 推进到下一步:${nextStep.stepDefinitionId}`);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
logger.info(`[StepOrchestrator] 所有 Step 已完成`);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* 标记当前 Step 完成
|
|
87
|
+
*/
|
|
88
|
+
markStepCompleted(stepExecution, outputs) {
|
|
89
|
+
stepExecution.status = 'passed';
|
|
90
|
+
stepExecution.outputs = outputs;
|
|
91
|
+
stepExecution.completedAt = new Date().toISOString();
|
|
92
|
+
stepExecution.updatedAt = new Date().toISOString();
|
|
93
|
+
logger.info(`[StepOrchestrator] Step 完成:${stepExecution.stepDefinitionId}`);
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* 标记当前 Step 失败
|
|
97
|
+
*/
|
|
98
|
+
markStepFailed(stepExecution, reason) {
|
|
99
|
+
stepExecution.status = 'failed';
|
|
100
|
+
stepExecution.failureReason = reason;
|
|
101
|
+
stepExecution.updatedAt = new Date().toISOString();
|
|
102
|
+
logger.warn(`[StepOrchestrator] Step 失败:${stepExecution.stepDefinitionId} | ${reason}`);
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* 重试当前 Step
|
|
106
|
+
*/
|
|
107
|
+
retryStep(stepExecution) {
|
|
108
|
+
stepExecution.status = 'running';
|
|
109
|
+
stepExecution.attempts += 1;
|
|
110
|
+
stepExecution.failureReason = undefined;
|
|
111
|
+
stepExecution.updatedAt = new Date().toISOString();
|
|
112
|
+
logger.info(`[StepOrchestrator] Step 重试:${stepExecution.stepDefinitionId}(第 ${stepExecution.attempts} 次)`);
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Step 完成后,将下一个 Step 的 prompt 注入队列(自动推进)
|
|
116
|
+
*/
|
|
117
|
+
injectNextStepPrompt(pipeline, node, sessionId, promptBuilder // StepPromptBuilder,避免循环依赖
|
|
118
|
+
) {
|
|
119
|
+
const nextStep = this.getNextPendingStep(pipeline, node);
|
|
120
|
+
if (!nextStep) {
|
|
121
|
+
logger.info(`[StepOrchestrator] 无下一步,Node 完成`);
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
124
|
+
const stepDef = this.loadStepDefinition(node.nodeTypeId, nextStep.stepDefinitionId);
|
|
125
|
+
if (!stepDef) {
|
|
126
|
+
logger.warn(`[StepOrchestrator] Step 定义未找到:${nextStep.stepDefinitionId}`);
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
const inputs = this.collectStepInputs(nextStep, node);
|
|
130
|
+
const prompt = promptBuilder.buildPrompt(stepDef, inputs);
|
|
131
|
+
// 注入到待执行队列
|
|
132
|
+
pendingPromptsManager.add(prompt, sessionId);
|
|
133
|
+
logger.info(`[StepOrchestrator] 已注入下一步提示:${stepDef.name}`);
|
|
134
|
+
}
|
|
135
|
+
/**
|
|
136
|
+
* 收集 Step 的输入产物
|
|
137
|
+
*/
|
|
138
|
+
collectStepInputs(stepExecution, node) {
|
|
139
|
+
const inputs = {};
|
|
140
|
+
// 从前序 Step 的 outputs 中收集
|
|
141
|
+
if (node.stepExecutions) {
|
|
142
|
+
for (const prevStep of node.stepExecutions) {
|
|
143
|
+
if (prevStep.id === stepExecution.id)
|
|
144
|
+
break; // 只收集前序 Step
|
|
145
|
+
if (prevStep.status === 'passed' && prevStep.outputs) {
|
|
146
|
+
Object.assign(inputs, prevStep.outputs);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return inputs;
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* 加载节点类型定义
|
|
154
|
+
*/
|
|
155
|
+
loadNodeType(nodeTypeId) {
|
|
156
|
+
const registry = NodeTypeRegistry.getInstance();
|
|
157
|
+
return registry.resolve(nodeTypeId);
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* 加载 Step 定义
|
|
161
|
+
*/
|
|
162
|
+
loadStepDefinition(nodeTypeId, stepDefinitionId) {
|
|
163
|
+
const nodeType = this.loadNodeType(nodeTypeId);
|
|
164
|
+
if (!nodeType?.steps)
|
|
165
|
+
return null;
|
|
166
|
+
return nodeType.steps.find(s => s.id === stepDefinitionId) || null;
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* 检查 Node 是否启用了 Step 模式
|
|
170
|
+
*/
|
|
171
|
+
isStepModeEnabled(node) {
|
|
172
|
+
const nodeType = this.loadNodeType(node.nodeTypeId);
|
|
173
|
+
return !!(nodeType?.steps && nodeType.steps.length > 0);
|
|
174
|
+
}
|
|
175
|
+
/**
|
|
176
|
+
* 获取 Node 的所有 Step 定义
|
|
177
|
+
*/
|
|
178
|
+
getStepDefinitions(nodeTypeId) {
|
|
179
|
+
const nodeType = this.loadNodeType(nodeTypeId);
|
|
180
|
+
return nodeType?.steps || [];
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
//# sourceMappingURL=step-orchestrator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-orchestrator.js","sourceRoot":"","sources":["../../src/pipeline/step-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* StepPromptBuilder - 步骤提示构造器
|
|
3
|
+
*
|
|
4
|
+
* 职责:
|
|
5
|
+
* 1. 根据当前 Step 构造精准的 prompt
|
|
6
|
+
* 2. 只包含当前步骤的信息,不泄露后续步骤
|
|
7
|
+
* 3. 注入输入产物和完成信号说明
|
|
8
|
+
*/
|
|
9
|
+
import type { StepDefinition } from './step-types.js';
|
|
10
|
+
export declare class StepPromptBuilder {
|
|
11
|
+
/**
|
|
12
|
+
* 构造 Step 专用 prompt
|
|
13
|
+
*/
|
|
14
|
+
buildPrompt(step: StepDefinition, inputs: Record<string, string>): string;
|
|
15
|
+
/**
|
|
16
|
+
* 格式化工具白名单说明
|
|
17
|
+
*/
|
|
18
|
+
formatToolConstraints(allowed_tools: string[]): string;
|
|
19
|
+
/**
|
|
20
|
+
* 格式化完成信号说明
|
|
21
|
+
*/
|
|
22
|
+
formatDoneSignal(done_definition: StepDefinition['done_definition']): string;
|
|
23
|
+
/**
|
|
24
|
+
* 格式化单个检查项
|
|
25
|
+
*/
|
|
26
|
+
private formatCheck;
|
|
27
|
+
/**
|
|
28
|
+
* 格式化输入产物列表
|
|
29
|
+
*/
|
|
30
|
+
private formatInputs;
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=step-prompt-builder.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-prompt-builder.d.ts","sourceRoot":"","sources":["../../src/pipeline/step-prompt-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,qBAAa,iBAAiB;IAC5B;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAoDzE;;OAEG;IACH,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM;IAOtD;;OAEG;IACH,gBAAgB,CAAC,eAAe,EAAE,cAAc,CAAC,iBAAiB,CAAC,GAAG,MAAM;IAa5E;;OAEG;IACH,OAAO,CAAC,WAAW;IAenB;;OAEG;IACH,OAAO,CAAC,YAAY;CAQrB"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* StepPromptBuilder - 步骤提示构造器
|
|
3
|
+
*
|
|
4
|
+
* 职责:
|
|
5
|
+
* 1. 根据当前 Step 构造精准的 prompt
|
|
6
|
+
* 2. 只包含当前步骤的信息,不泄露后续步骤
|
|
7
|
+
* 3. 注入输入产物和完成信号说明
|
|
8
|
+
*/
|
|
9
|
+
import { logger } from '../utils/logger.js';
|
|
10
|
+
export class StepPromptBuilder {
|
|
11
|
+
/**
|
|
12
|
+
* 构造 Step 专用 prompt
|
|
13
|
+
*/
|
|
14
|
+
buildPrompt(step, inputs) {
|
|
15
|
+
let prompt = `[Forge:Step] 当前步骤:${step.name}\n\n`;
|
|
16
|
+
// 1. 目标
|
|
17
|
+
prompt += `目标:${step.goal}\n\n`;
|
|
18
|
+
// 2. 输入产物
|
|
19
|
+
if (Object.keys(inputs).length > 0) {
|
|
20
|
+
prompt += `输入产物:\n`;
|
|
21
|
+
for (const [key, value] of Object.entries(inputs)) {
|
|
22
|
+
prompt += `- ${key}: ${value}\n`;
|
|
23
|
+
}
|
|
24
|
+
prompt += `\n`;
|
|
25
|
+
}
|
|
26
|
+
// 3. 工具约束
|
|
27
|
+
if (step.allowed_tools.length > 0) {
|
|
28
|
+
prompt += `工具约束:\n`;
|
|
29
|
+
prompt += `本步骤只允许使用以下工具:${step.allowed_tools.join(', ')}\n`;
|
|
30
|
+
prompt += `(其他工具调用将被拦截)\n\n`;
|
|
31
|
+
}
|
|
32
|
+
// 4. 完成信号
|
|
33
|
+
const signal = step.done_definition.signal || 'FORGE_STEP_DONE';
|
|
34
|
+
prompt += `完成信号:\n`;
|
|
35
|
+
prompt += `完成后请执行:echo "${signal}"\n\n`;
|
|
36
|
+
// 5. 验证标准
|
|
37
|
+
if (step.checks.length > 0) {
|
|
38
|
+
prompt += `验证标准:\n`;
|
|
39
|
+
for (const check of step.checks) {
|
|
40
|
+
const severity = check.severity ? `[${check.severity}] ` : '';
|
|
41
|
+
prompt += `- ${severity}${this.formatCheck(check)}\n`;
|
|
42
|
+
}
|
|
43
|
+
prompt += `\n`;
|
|
44
|
+
}
|
|
45
|
+
// 6. 期望产物
|
|
46
|
+
if (step.expected_artifacts && step.expected_artifacts.length > 0) {
|
|
47
|
+
prompt += `期望产物:\n`;
|
|
48
|
+
for (const artifact of step.expected_artifacts) {
|
|
49
|
+
const required = artifact.required !== false ? '(必需)' : '(可选)';
|
|
50
|
+
const pathHint = artifact.path_pattern ? ` - 路径:${artifact.path_pattern}` : '';
|
|
51
|
+
prompt += `- ${artifact.description}${required}${pathHint}\n`;
|
|
52
|
+
}
|
|
53
|
+
prompt += `\n`;
|
|
54
|
+
}
|
|
55
|
+
logger.debug(`[StepPromptBuilder] 构造 Step prompt:${step.name}`);
|
|
56
|
+
return prompt;
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* 格式化工具白名单说明
|
|
60
|
+
*/
|
|
61
|
+
formatToolConstraints(allowed_tools) {
|
|
62
|
+
if (allowed_tools.length === 0) {
|
|
63
|
+
return '无工具限制';
|
|
64
|
+
}
|
|
65
|
+
return `只允许:${allowed_tools.join(', ')}`;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* 格式化完成信号说明
|
|
69
|
+
*/
|
|
70
|
+
formatDoneSignal(done_definition) {
|
|
71
|
+
if (done_definition.signal) {
|
|
72
|
+
return `执行:echo "${done_definition.signal}"`;
|
|
73
|
+
}
|
|
74
|
+
if (done_definition.required_artifacts) {
|
|
75
|
+
return `生成必需产物:${done_definition.required_artifacts.join(', ')}`;
|
|
76
|
+
}
|
|
77
|
+
if (done_definition.custom_detector) {
|
|
78
|
+
return `自定义检测:${done_definition.custom_detector}`;
|
|
79
|
+
}
|
|
80
|
+
return '执行:echo "FORGE_STEP_DONE"';
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* 格式化单个检查项
|
|
84
|
+
*/
|
|
85
|
+
formatCheck(check) {
|
|
86
|
+
switch (check.type) {
|
|
87
|
+
case 'command':
|
|
88
|
+
return `执行命令:${check.config.command}`;
|
|
89
|
+
case 'file_exists':
|
|
90
|
+
return `文件存在:${check.config.path}`;
|
|
91
|
+
case 'content_match':
|
|
92
|
+
return `内容匹配:${check.config.path} 包含 ${check.config.pattern}`;
|
|
93
|
+
case 'semantic':
|
|
94
|
+
return `语义校验:${check.config.prompt}(覆盖率 >= ${check.config.min_coverage || 70}%)`;
|
|
95
|
+
default:
|
|
96
|
+
return `未知检查类型:${check.type}`;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* 格式化输入产物列表
|
|
101
|
+
*/
|
|
102
|
+
formatInputs(inputs) {
|
|
103
|
+
if (Object.keys(inputs).length === 0) {
|
|
104
|
+
return '无输入产物';
|
|
105
|
+
}
|
|
106
|
+
return Object.entries(inputs)
|
|
107
|
+
.map(([key, value]) => `- ${key}: ${value}`)
|
|
108
|
+
.join('\n');
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=step-prompt-builder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-prompt-builder.js","sourceRoot":"","sources":["../../src/pipeline/step-prompt-builder.ts"],"names":[],"mappings":"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"}
|