@emiliosp/pi-maestro 0.13.1 → 0.15.0

package/src/workflow/builder/prepareBuilderRun.ts

@@ -3,15 +3,17 @@
  * Used: Before Maestro runs a builder pass.
  */
 
+import type { MaestroConfig } from '#config/schema.ts';
 import maestroSessionState from '#maestro/session/MaestroSessionState.ts';
 import type { MaestroPaths } from '#MaestroPaths.ts';
 import { pathExists } from '#utils/path-exists.ts';
 import { readWorkflowState } from '#workflow/state/readWorkflowState.ts';
-import { WORKFLOW_EVENTS, WORKFLOW_PHASES } from '#workflow/state/schema.ts';
+import { WORKFLOW_EVENTS, WORKFLOW_PHASES, type WorkflowState } from '#workflow/state/schema.ts';
 import { writeWorkflowState } from '#workflow/state/writeWorkflowState.ts';
 import { transitionWorkflow } from '#workflow/transitions.ts';
 
 export type BuilderRun = {
+  state: WorkflowState;
   specId: string;
   projectRoot: string;
 };
@@ -38,11 +40,13 @@ async function assertBuilderRunBase({ paths, specId }: AssertBuilderRunBaseInput
 }
 
 type PrepareBuilderRunInput = {
+  config: MaestroConfig;
   paths: MaestroPaths;
   specId: string;
 };
 
 export const prepareBuilderRun = async ({
+  config,
   paths,
   specId,
 }: PrepareBuilderRunInput): Promise<BuilderRun> => {
@@ -60,6 +64,7 @@ export const prepareBuilderRun = async ({
   const currentState = await readWorkflowState(workflowPath);
 
   const nextState = transitionWorkflow({
+    config,
     state: currentState,
     event: WORKFLOW_EVENTS.RUN_BUILDER,
   });
@@ -70,6 +75,7 @@ export const prepareBuilderRun = async ({
   });
 
   return {
+    state: nextState,
     specId,
     projectRoot: paths.getProjectRoot(),
   };

package/src/workflow/builder/resolveEscalations.ts

@@ -10,6 +10,7 @@ import {
   type EscalationResolution,
 } from '#artifacts/builder-handoff/schema.ts';
 import { writeBuilderHandoff } from '#artifacts/builder-handoff/writeBuilderHandoff.ts';
+import type { MaestroConfig } from '#config/schema.ts';
 import type { MaestroPaths } from '#MaestroPaths.ts';
 import { getWorkflowEventBySpecChangeRequired } from '#workflow/builder/utils/getWorkflowEventBySpecChangeRequired.ts';
 import { readWorkflowState } from '#workflow/state/readWorkflowState.ts';
@@ -57,6 +58,7 @@ const applyEscalationDecisions = ({ escalations, decisions }: ApplyEscalationDec
 };
 
 type ResolveEscalationsInput = {
+  config: MaestroConfig;
   paths: MaestroPaths;
   specId: string;
   specChangeRequired: boolean;
@@ -64,6 +66,7 @@ type ResolveEscalationsInput = {
 };
 
 export const resolveEscalations = async ({
+  config,
   paths,
   specId,
   specChangeRequired,
@@ -95,6 +98,7 @@ export const resolveEscalations = async ({
   const nextHandoff = { ...handoff, escalations };
 
   const nextState = transitionWorkflow({
+    config,
     state,
     event: getWorkflowEventBySpecChangeRequired(specChangeRequired),
   });

package/src/workflow/simplifier/completeSimplifierPass.ts

@@ -7,6 +7,7 @@ import { mkdir } from 'node:fs/promises';
 import { dirname } from 'node:path';
 
 import { assertSimplifierHandoff } from '#artifacts/simplifier-handoff/assertSimplifierHandoff.ts';
+import type { MaestroConfig } from '#config/schema.ts';
 import type { MaestroPaths } from '#MaestroPaths.ts';
 import { writeJson } from '#utils/write-json.ts';
 import { readWorkflowState } from '#workflow/state/readWorkflowState.ts';
@@ -15,12 +16,14 @@ import { writeWorkflowState } from '#workflow/state/writeWorkflowState.ts';
 import { transitionWorkflow } from '#workflow/transitions.ts';
 
 type CompleteSimplifierPassInput = {
+  config: MaestroConfig;
   paths: MaestroPaths;
   specId: string;
   handoff: unknown;
 };
 
 export const completeSimplifierPass = async ({
+  config,
   paths,
   specId,
   handoff,
@@ -46,6 +49,7 @@ export const completeSimplifierPass = async ({
   await writeJson({ path: handoffPath, data: input.handoff });
 
   const nextState = transitionWorkflow({
+    config,
     state,
     event: WORKFLOW_EVENTS.SIMPLIFIER_DONE,
   });

package/src/workflow/spec/markSpecReady.ts

@@ -5,6 +5,7 @@
 
 import { readFile } from 'node:fs/promises';
 
+import type { MaestroConfig } from '#config/schema.ts';
 import type { MaestroPaths } from '#MaestroPaths.ts';
 import { pathExists } from '#utils/path-exists.ts';
 import { readWorkflowState } from '#workflow/state/readWorkflowState.ts';
@@ -22,12 +23,14 @@ function assertAcceptanceCriterionOrdering(markdown: string): void {
 }
 
 type MarkSpecReadyInput = {
+  config: MaestroConfig;
   paths: MaestroPaths;
   specId: string;
   activeWorkflowSpecId: string | null;
 };
 
 export const markSpecReady = async ({
+  config,
   paths,
   specId,
   activeWorkflowSpecId,
@@ -62,6 +65,7 @@ export const markSpecReady = async ({
   }
 
   const state = transitionWorkflow({
+    config,
     state: current,
     event: WORKFLOW_EVENTS.MARK_SPEC_READY,
   });

package/src/workflow/transitions.ts

@@ -3,6 +3,7 @@
  * Used: When a workflow event moves Maestro to its next phase.
  */
 
+import type { MaestroConfig } from '#config/schema.ts';
 import {
   assertWorkflowState,
   WORKFLOW_EVENTS,
@@ -14,13 +15,26 @@ import {
 
 type WorkflowTransition = {
   from: WorkflowPhase[];
-  to: WorkflowPhase;
+  to: WorkflowPhase | ((config: MaestroConfig) => WorkflowPhase);
 };
 
+const hasDynamicDestinationBasedOnConfig = (
+  destination: WorkflowTransition['to'],
+): destination is (config: MaestroConfig) => WorkflowPhase => typeof destination === 'function';
+
+const getSimplifierDestination = (config: MaestroConfig): WorkflowPhase =>
+  config.simplifier.required ? WORKFLOW_PHASES.SIMPLIFIER_RUNNING : WORKFLOW_PHASES.CANDIDATE_READY;
+
+const getSpecReadyDestination = (config: MaestroConfig): WorkflowPhase =>
+  config.builder.required ? WORKFLOW_PHASES.READY_FOR_BUILDER : WORKFLOW_PHASES.CANDIDATE_READY;
+
+const getBuilderDoneDestination = (config: MaestroConfig): WorkflowPhase =>
+  config.verifier.required ? WORKFLOW_PHASES.READY_FOR_VERIFIER : getSimplifierDestination(config);
+
 export const WORKFLOW_TRANSITIONS: Record<WorkflowEvent, WorkflowTransition> = {
   [WORKFLOW_EVENTS.MARK_SPEC_READY]: {
     from: [WORKFLOW_PHASES.DRAFTING_SPEC],
-    to: WORKFLOW_PHASES.READY_FOR_BUILDER,
+    to: getSpecReadyDestination,
   },
   [WORKFLOW_EVENTS.RUN_BUILDER]: {
     from: [WORKFLOW_PHASES.READY_FOR_BUILDER],
@@ -40,7 +54,7 @@ export const WORKFLOW_TRANSITIONS: Record<WorkflowEvent, WorkflowTransition> = {
   },
   [WORKFLOW_EVENTS.BUILDER_DONE]: {
     from: [WORKFLOW_PHASES.BUILDER_RUNNING],
-    to: WORKFLOW_PHASES.READY_FOR_VERIFIER,
+    to: getBuilderDoneDestination,
   },
   [WORKFLOW_EVENTS.RUN_VERIFIER]: {
     from: [WORKFLOW_PHASES.READY_FOR_VERIFIER],
@@ -52,11 +66,11 @@ export const WORKFLOW_TRANSITIONS: Record<WorkflowEvent, WorkflowTransition> = {
   },
   [WORKFLOW_EVENTS.VERIFIER_DONE]: {
     from: [WORKFLOW_PHASES.VERIFIER_RUNNING],
-    to: WORKFLOW_PHASES.SIMPLIFIER_RUNNING,
+    to: getSimplifierDestination,
   },
   [WORKFLOW_EVENTS.OWNER_REJECT_FINDINGS]: {
     from: [WORKFLOW_PHASES.FINDING_DECISIONS],
-    to: WORKFLOW_PHASES.SIMPLIFIER_RUNNING,
+    to: getSimplifierDestination,
   },
   [WORKFLOW_EVENTS.SIMPLIFIER_DONE]: {
     from: [WORKFLOW_PHASES.SIMPLIFIER_RUNNING],
@@ -75,9 +89,14 @@ export const WORKFLOW_TRANSITIONS: Record<WorkflowEvent, WorkflowTransition> = {
 type TransitionWorkflowInput = {
   state: WorkflowState;
   event: WorkflowEvent;
+  config: MaestroConfig;
 };
 
-export const transitionWorkflow = ({ state, event }: TransitionWorkflowInput): WorkflowState => {
+export const transitionWorkflow = ({
+  state,
+  event,
+  config,
+}: TransitionWorkflowInput): WorkflowState => {
   assertWorkflowState(state);
   const transition = WORKFLOW_TRANSITIONS[event];
 
@@ -92,6 +111,8 @@ export const transitionWorkflow = ({ state, event }: TransitionWorkflowInput): W
   return {
     version: state.version,
     specId: state.specId,
-    phase: transition.to,
+    phase: hasDynamicDestinationBasedOnConfig(transition.to)
+      ? transition.to(config)
+      : transition.to,
   };
 };

package/src/workflow/verifier/completeVerifierPass.ts

@@ -8,6 +8,7 @@ import { mkdir, readFile } from 'node:fs/promises';
 import { assertVerifierHandoff } from '#artifacts/verifier-handoff/assertVerifierHandoff.ts';
 import type { VerifierHandoff } from '#artifacts/verifier-handoff/schema.ts';
 import { writeVerifierHandoff } from '#artifacts/verifier-handoff/writeVerifierHandoff.ts';
+import type { MaestroConfig } from '#config/schema.ts';
 import type { MaestroPaths } from '#MaestroPaths.ts';
 import { readWorkflowState } from '#workflow/state/readWorkflowState.ts';
 import { WORKFLOW_PHASES, type WorkflowState } from '#workflow/state/schema.ts';
@@ -24,12 +25,14 @@ export type CompletedVerifierPass = {
 };
 
 type CompleteVerifierPassInput = {
+  config: MaestroConfig;
   paths: MaestroPaths;
   specId: string;
   handoff: unknown;
 };
 
 export const completeVerifierPass = async ({
+  config,
   paths,
   specId,
   handoff: draftHandoff,
@@ -64,6 +67,7 @@ export const completeVerifierPass = async ({
   });
 
   const nextState = transitionWorkflow({
+    config,
     state: currentState,
     event: getWorkflowEventByVerifierHandoff(handoff),
   });

package/src/workflow/verifier/prepareVerifierRun.ts

@@ -3,23 +3,27 @@
  * Used: When Maestro starts a verifier pass.
  */
 
+import type { MaestroConfig } from '#config/schema.ts';
 import type { MaestroPaths } from '#MaestroPaths.ts';
 import { readWorkflowState } from '#workflow/state/readWorkflowState.ts';
-import { WORKFLOW_EVENTS, WORKFLOW_PHASES } from '#workflow/state/schema.ts';
+import { WORKFLOW_EVENTS, WORKFLOW_PHASES, type WorkflowState } from '#workflow/state/schema.ts';
 import { writeWorkflowState } from '#workflow/state/writeWorkflowState.ts';
 import { transitionWorkflow } from '#workflow/transitions.ts';
 
 export type VerifierRun = {
+  state: WorkflowState;
   specId: string;
   projectRoot: string;
 };
 
 type PrepareVerifierRunInput = {
+  config: MaestroConfig;
   paths: MaestroPaths;
   specId: string;
 };
 
 export const prepareVerifierRun = async ({
+  config,
   paths,
   specId,
 }: PrepareVerifierRunInput): Promise<VerifierRun> => {
@@ -40,6 +44,7 @@ export const prepareVerifierRun = async ({
   }
 
   const nextState = transitionWorkflow({
+    config,
     state: currentState,
     event: WORKFLOW_EVENTS.RUN_VERIFIER,
   });
@@ -50,6 +55,7 @@ export const prepareVerifierRun = async ({
   });
 
   return {
+    state: nextState,
     specId,
     projectRoot,
   };

package/src/workflow/verifier/resolveFindings.ts

@@ -7,6 +7,7 @@ import { assertVerifierHandoff } from '#artifacts/verifier-handoff/assertVerifie
 import { readVerifierHandoff } from '#artifacts/verifier-handoff/readVerifierHandoff.ts';
 import type { VerifierFinding, VerifierHandoff } from '#artifacts/verifier-handoff/schema.ts';
 import { FINDING_DECISIONS } from '#artifacts/verifier-handoff/schema.ts';
+import type { MaestroConfig } from '#config/schema.ts';
 import type { MaestroPaths } from '#MaestroPaths.ts';
 import { writeJson } from '#utils/write-json.ts';
 import { readWorkflowState } from '#workflow/state/readWorkflowState.ts';
@@ -127,12 +128,14 @@ const getSavedFindingDecision = (decision: FindingDecision | undefined): SavedFi
 };
 
 type ResolveFindingsInput = {
+  config: MaestroConfig;
   paths: MaestroPaths;
   specId: string;
   decisions: FindingDecision[];
 };
 
 export const resolveFindings = async ({
+  config,
   paths,
   specId,
   decisions,
@@ -147,6 +150,7 @@ export const resolveFindings = async ({
   const nextHandoff = { ...handoff, findings };
 
   const nextState = transitionWorkflow({
+    config,
     state,
     event: getWorkflowEventByVerifierHandoff(nextHandoff),
   });