## 概要
仕様ドキュメント `/Users/m_naruse/work/git/takt/task_planning/output-contracts-and-quality-gates.md` に基づき、YAML構造の変更を実装する。
---
## タスク一覧
### 【高】トップレベル構造の変更
- 現在の `output_contracts` を `report_formats` にリネーム
- レポートテンプレート定義として機能させる
### 【高】Movement内の output_contracts 構造変更
- 各 movement の `output_contracts` が直接レポート配列を持つ構造に変更
- `output_contracts.report` の `report` キーを廃止
**変更後の構造:**
```yaml
report_formats: # トップレベル(テンプレート定義)
plan: ...
movements:
- name: plan
output_contracts: # 直接配列(reportキー不要)
- name: 00-plan.md
format: plan
```
### 【中】quality_gates の実装
- エージェントへの通達として機能させる(自動検証は将来実装)
- Movement完了時にエージェントが参照できる形式で定義
---
## 制約(ユーザー明示)
- 後方互換性は不要
---
## 確認方法
- 既存のピース定義YAMLが新構造でパースできること
- テストが通ること
175 lines
6.9 KiB
TypeScript
175 lines
6.9 KiB
TypeScript
/**
|
|
* Executes parallel piece movements concurrently and aggregates results.
|
|
*
|
|
* When onStream is provided, uses ParallelLogger to prefix each
|
|
* sub-movement's output with `[name]` for readable interleaved display.
|
|
*/
|
|
|
|
import type {
|
|
PieceMovement,
|
|
PieceState,
|
|
AgentResponse,
|
|
} from '../../models/types.js';
|
|
import { runAgent } from '../../../agents/runner.js';
|
|
import { ParallelLogger } from './parallel-logger.js';
|
|
import { needsStatusJudgmentPhase, runReportPhase, runStatusJudgmentPhase } from '../phase-runner.js';
|
|
import { detectMatchedRule } from '../evaluation/index.js';
|
|
import { incrementMovementIteration } from './state-manager.js';
|
|
import { createLogger } from '../../../shared/utils/index.js';
|
|
import type { OptionsBuilder } from './OptionsBuilder.js';
|
|
import type { MovementExecutor } from './MovementExecutor.js';
|
|
import type { PieceEngineOptions, PhaseName } from '../types.js';
|
|
|
|
const log = createLogger('parallel-runner');
|
|
|
|
export interface ParallelRunnerDeps {
|
|
readonly optionsBuilder: OptionsBuilder;
|
|
readonly movementExecutor: MovementExecutor;
|
|
readonly engineOptions: PieceEngineOptions;
|
|
readonly getCwd: () => string;
|
|
readonly getReportDir: () => string;
|
|
readonly getInteractive: () => boolean;
|
|
readonly detectRuleIndex: (content: string, movementName: string) => number;
|
|
readonly callAiJudge: (
|
|
agentOutput: string,
|
|
conditions: Array<{ index: number; text: string }>,
|
|
options: { cwd: string }
|
|
) => Promise<number>;
|
|
readonly onPhaseStart?: (step: PieceMovement, phase: 1 | 2 | 3, phaseName: PhaseName, instruction: string) => void;
|
|
readonly onPhaseComplete?: (step: PieceMovement, phase: 1 | 2 | 3, phaseName: PhaseName, content: string, status: string, error?: string) => void;
|
|
}
|
|
|
|
export class ParallelRunner {
|
|
constructor(
|
|
private readonly deps: ParallelRunnerDeps,
|
|
) {}
|
|
|
|
/**
|
|
* Run a parallel movement: execute all sub-movements concurrently, then aggregate results.
|
|
* The aggregated output becomes the parent movement's response for rules evaluation.
|
|
*/
|
|
async runParallelMovement(
|
|
step: PieceMovement,
|
|
state: PieceState,
|
|
task: string,
|
|
maxIterations: number,
|
|
updatePersonaSession: (persona: string, sessionId: string | undefined) => void,
|
|
): Promise<{ response: AgentResponse; instruction: string }> {
|
|
if (!step.parallel) {
|
|
throw new Error(`Movement "${step.name}" has no parallel sub-movements`);
|
|
}
|
|
const subMovements = step.parallel;
|
|
const movementIteration = incrementMovementIteration(state, step.name);
|
|
log.debug('Running parallel movement', {
|
|
movement: step.name,
|
|
subMovements: subMovements.map(s => s.name),
|
|
movementIteration,
|
|
});
|
|
|
|
// Create parallel logger for prefixed output (only when streaming is enabled)
|
|
const parallelLogger = this.deps.engineOptions.onStream
|
|
? new ParallelLogger({
|
|
subMovementNames: subMovements.map((s) => s.name),
|
|
parentOnStream: this.deps.engineOptions.onStream,
|
|
progressInfo: {
|
|
iteration: state.iteration,
|
|
maxIterations,
|
|
},
|
|
})
|
|
: undefined;
|
|
|
|
const ruleCtx = {
|
|
state,
|
|
cwd: this.deps.getCwd(),
|
|
interactive: this.deps.getInteractive(),
|
|
detectRuleIndex: this.deps.detectRuleIndex,
|
|
callAiJudge: this.deps.callAiJudge,
|
|
};
|
|
|
|
// Run all sub-movements concurrently
|
|
const subResults = await Promise.all(
|
|
subMovements.map(async (subMovement, index) => {
|
|
const subIteration = incrementMovementIteration(state, subMovement.name);
|
|
const subInstruction = this.deps.movementExecutor.buildInstruction(subMovement, subIteration, state, task, maxIterations);
|
|
|
|
// Phase 1: main execution (Write excluded if sub-movement has report)
|
|
const baseOptions = this.deps.optionsBuilder.buildAgentOptions(subMovement);
|
|
|
|
// Override onStream with parallel logger's prefixed handler (immutable)
|
|
const agentOptions = parallelLogger
|
|
? { ...baseOptions, onStream: parallelLogger.createStreamHandler(subMovement.name, index) }
|
|
: baseOptions;
|
|
|
|
const subSessionKey = subMovement.persona ?? subMovement.name;
|
|
this.deps.onPhaseStart?.(subMovement, 1, 'execute', subInstruction);
|
|
const subResponse = await runAgent(subMovement.persona, subInstruction, agentOptions);
|
|
updatePersonaSession(subSessionKey, subResponse.sessionId);
|
|
this.deps.onPhaseComplete?.(subMovement, 1, 'execute', subResponse.content, subResponse.status, subResponse.error);
|
|
|
|
// Build phase context for this sub-movement with its lastResponse
|
|
const phaseCtx = this.deps.optionsBuilder.buildPhaseRunnerContext(state, subResponse.content, updatePersonaSession, this.deps.onPhaseStart, this.deps.onPhaseComplete);
|
|
|
|
// Phase 2: report output for sub-movement
|
|
if (subMovement.outputContracts && subMovement.outputContracts.length > 0) {
|
|
await runReportPhase(subMovement, subIteration, phaseCtx);
|
|
}
|
|
|
|
// Phase 3: status judgment for sub-movement
|
|
let subTagContent = '';
|
|
if (needsStatusJudgmentPhase(subMovement)) {
|
|
subTagContent = await runStatusJudgmentPhase(subMovement, phaseCtx);
|
|
}
|
|
|
|
const match = await detectMatchedRule(subMovement, subResponse.content, subTagContent, ruleCtx);
|
|
const finalResponse = match
|
|
? { ...subResponse, matchedRuleIndex: match.index, matchedRuleMethod: match.method }
|
|
: subResponse;
|
|
|
|
state.movementOutputs.set(subMovement.name, finalResponse);
|
|
this.deps.movementExecutor.emitMovementReports(subMovement);
|
|
|
|
return { subMovement, response: finalResponse, instruction: subInstruction };
|
|
}),
|
|
);
|
|
|
|
// Print completion summary
|
|
if (parallelLogger) {
|
|
parallelLogger.printSummary(
|
|
step.name,
|
|
subResults.map((r) => ({
|
|
name: r.subMovement.name,
|
|
condition: r.response.matchedRuleIndex != null && r.subMovement.rules
|
|
? r.subMovement.rules[r.response.matchedRuleIndex]?.condition
|
|
: undefined,
|
|
})),
|
|
);
|
|
}
|
|
|
|
// Aggregate sub-movement outputs into parent movement's response
|
|
const aggregatedContent = subResults
|
|
.map((r) => `## ${r.subMovement.name}\n${r.response.content}`)
|
|
.join('\n\n---\n\n');
|
|
|
|
const aggregatedInstruction = subResults
|
|
.map((r) => r.instruction)
|
|
.join('\n\n');
|
|
|
|
// Parent movement uses aggregate conditions, so tagContent is empty
|
|
const match = await detectMatchedRule(step, aggregatedContent, '', ruleCtx);
|
|
|
|
const aggregatedResponse: AgentResponse = {
|
|
persona: step.name,
|
|
status: 'done',
|
|
content: aggregatedContent,
|
|
timestamp: new Date(),
|
|
...(match && { matchedRuleIndex: match.index, matchedRuleMethod: match.method }),
|
|
};
|
|
|
|
state.movementOutputs.set(step.name, aggregatedResponse);
|
|
state.lastOutput = aggregatedResponse;
|
|
this.deps.movementExecutor.emitMovementReports(step);
|
|
return { response: aggregatedResponse, instruction: aggregatedInstruction };
|
|
}
|
|
|
|
}
|