@haibun/core 3.0.3 → 3.1.0

package/build/steps/activities-stepper.js

@@ -1,131 +1,234 @@
 import { AStepper } from '../lib/astepper.js';
-import { OK } from '../lib/defs.js';
-import { executeSubFeatureSteps, findFeatureStepsFromStatement } from '../lib/util/featureStep-executor.js';
-import { ExecMode } from '../lib/defs.js';
+import { OK, CycleWhen } from '../lib/defs.js';
 import { actionOK, actionNotOK, getActionable } from '../lib/util/index.js';
 import { DOMAIN_STATEMENT } from '../lib/domain-types.js';
 import { EExecutionMessageType } from '../lib/interfaces/logger.js';
+import { FlowRunner } from '../lib/core/flow-runner.js';
 /**
  * Stepper that dynamically builds virtual steps from `waypoint` statements.
  * implements this logic: P ∨ (¬P ∧ [A]P)
  */
 export class ActivitiesStepper extends AStepper {
-    steppers = [];
-    // Track which outcome patterns were defined in backgrounds vs features
+    runner;
     backgroundOutcomePatterns = new Set();
     featureOutcomePatterns = new Set();
-    // Track which feature each feature-scoped outcome belongs to (for proper cleanup)
     outcomeToFeaturePath = new Map();
-    // Track the currently running feature path
+    featureSteps = new Map();
     currentFeaturePath = '';
-    // Track the last feature path to clear outcomes from it when starting a new feature
     lastFeaturePath = '';
-    // Track ensured waypoint instances with their interpolated proofs
+    lastResolutionPath = '';
     ensuredInstances = new Map();
+    ensureAttempts = new Map();
+    registeredOutcomeMetadata = new Map();
+    inActivityBlock = false;
+    cycles = {
+        startExecution: () => {
+            this.sendGraphLinkMessages();
+        },
+        startFeature: (startFeature) => {
+            this.getWorld().logger.debug(`ActivitiesStepper.startFeature: starting feature at path "${startFeature.resolvedFeature.path}"`);
+            if (this.lastFeaturePath && this.lastFeaturePath !== startFeature.resolvedFeature.path) {
+                this.getWorld().logger.debug(`ActivitiesStepper.startFeature: clearing outcomes from previous feature "${this.lastFeaturePath}"`);
+                const previousSteps = this.featureSteps.get(this.lastFeaturePath);
+                if (previousSteps) {
+                    for (const outcome of Object.keys(previousSteps)) {
+                        delete this.steps[outcome];
+                    }
+                }
+            }
+            const currentSteps = this.featureSteps.get(startFeature.resolvedFeature.path);
+            if (currentSteps) {
+                for (const [outcome, step] of Object.entries(currentSteps)) {
+                    this.steps[outcome] = step;
+                }
+            }
+            this.currentFeaturePath = startFeature.resolvedFeature.path;
+            this.sendGraphLinkMessages();
+        },
+        endFeature: () => {
+            this.lastFeaturePath = this.currentFeaturePath;
+            this.ensuredInstances.clear();
+            return Promise.resolve();
+        }
+    };
+    cyclesWhen = {
+        startExecution: CycleWhen.FIRST,
+        startFeature: CycleWhen.FIRST,
+    };
     baseSteps = {
         activity: {
             gwta: 'Activity: {activity}',
-            action: () => OK
-        },
-        waypoint: {
-            gwta: `waypoint {outcome} with {proof:${DOMAIN_STATEMENT}}`,
-            resolveFeatureLine: (line, path, stepper, _backgrounds, allLines, lineIndex) => {
-                // Simple regex match to check if this is a waypoint statement
-                if (!line.match(/^waypoint\s+.+?\s+with\s+/i)) {
-                    return false;
-                }
-                const activitiesStepper = stepper;
-                // Extract outcome name
-                const match = line.match(/^waypoint\s+(.+?)\s+with\s+(.+?)$/i);
-                if (!match) {
-                    return false;
+            action: () => OK,
+            resolveFeatureLine: (line, path, _stepper, _backgrounds, allLines, lineIndex) => {
+                if (this.lastResolutionPath && this.lastResolutionPath !== path) {
+                    const previousSteps = this.featureSteps.get(this.lastResolutionPath);
+                    if (previousSteps) {
+                        for (const outcome of Object.keys(previousSteps)) {
+                            delete this.steps[outcome];
+                        }
+                    }
                 }
-                const outcome = match[1].trim();
-                // Skip if this outcome pattern is already registered
-                // This prevents infinite loops if resolveFeatureLine is called multiple times
-                if (activitiesStepper.backgroundOutcomePatterns.has(outcome) || activitiesStepper.featureOutcomePatterns.has(outcome)) {
-                    return true;
+                this.lastResolutionPath = path;
+                if (line.match(/^Activity:/i)) {
+                    this.inActivityBlock = true;
+                    return true; // Skip the Activity definition line itself
                 }
-                const isBackground = path.includes('backgrounds/');
-                const proofRaw = match[2].trim();
-                // Parse the proof statements from the waypoint clause (DOMAIN_STATEMENT)
-                const proofFromRemember = proofRaw.split('\n').map(s => s.trim()).filter(s => s.length > 0);
-                // Check if we're in an activity block by scanning backwards through allLines
-                let activityBlockSteps;
-                if (allLines && lineIndex !== undefined) {
-                    // Scan backwards from current line to find the Activity: marker
-                    let activityStartLine = -1;
-                    for (let i = lineIndex - 1; i >= 0; i--) {
-                        const prevLine = getActionable(allLines[i]);
-                        if (prevLine.match(/^Activity:/i)) {
-                            activityStartLine = i;
-                            break;
-                        }
-                        // Stop if we hit another major section marker
-                        if (prevLine.match(/^(Feature|Scenario|Background):/i)) {
-                            break;
-                        }
+                if (this.inActivityBlock) {
+                    // Check for block terminators
+                    if (line.match(/^(Feature|Scenario|Background|Activity):/i)) {
+                        this.inActivityBlock = false;
+                        return false; // Process this line normally
                     }
-                    if (activityStartLine !== -1) {
-                        // Collect ALL steps in the activity block up to and including the current waypoint statement
-                        const blockLines = [];
-                        for (let i = activityStartLine + 1; i < lineIndex; i++) { // Use < instead of <= to exclude waypoint line
-                            const stepLine = getActionable(allLines[i]);
-                            if (stepLine) {
-                                blockLines.push(stepLine);
+                    if (line.match(/^waypoint\s+/i)) {
+                        this.resolveWaypointCommon(line, path, allLines, lineIndex, line.includes(' with '));
+                        // Check if this is the last waypoint in the block
+                        let hasMoreWaypoints = false;
+                        if (allLines && lineIndex !== undefined) {
+                            for (let i = lineIndex + 1; i < allLines.length; i++) {
+                                const nextLine = allLines[i].trim();
+                                if (nextLine.match(/^(Feature|Scenario|Background|Activity):/i)) {
+                                    break;
+                                }
+                                if (nextLine.match(/^waypoint\s+/i)) {
+                                    hasMoreWaypoints = true;
+                                    break;
+                                }
                             }
                         }
-                        activityBlockSteps = blockLines;
+                        if (!hasMoreWaypoints) {
+                            this.inActivityBlock = false;
+                        }
+                        return true; // Skip the waypoint definition line
                     }
+                    // Inside block
+                    return true; // Skip lines inside the block
                 }
-                // Register the outcome with its proof from the DOMAIN_STATEMENT
-                activitiesStepper.registerOutcome(outcome, proofFromRemember, path, isBackground, activityBlockSteps);
-                return true; // Skip normal step resolution since we've registered the outcome
-            },
+                return false;
+            }
+        },
+        waypointWithProof: {
+            gwta: `waypoint {outcome} with {proof:${DOMAIN_STATEMENT}}`,
+            precludes: ['ActivitiesStepper.waypointLabel'],
             action: async ({ proof }, featureStep) => {
-                // Execute the proof statements to satisfy this outcome
                 this.getWorld().logger.debug(`waypoint action: executing ${proof?.length || 0} proof steps`);
-                const result = await executeSubFeatureSteps(featureStep, proof, this.steppers, this.getWorld(), ExecMode.NO_CYCLES);
-                if (!result.ok) {
-                    return actionNotOK(`waypoint: failed to execute proof steps`);
+                try {
+                    const result = await this.runner.runSteps(proof, { intent: { mode: 'authoritative' }, parentStep: featureStep });
+                    if (result.kind !== 'ok') {
+                        return actionNotOK(`waypoint: failed to execute proof steps: ${result.message}`);
+                    }
+                    return actionOK();
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    this.getWorld().logger.debug(`waypoint action: exception executing proof steps: ${msg}`);
+                    const messageContext = {
+                        incident: EExecutionMessageType.ACTION,
+                        incidentDetails: { error: msg }
+                    };
+                    return actionNotOK(`waypoint: failed to execute proof steps: ${msg}`, { messageContext });
                 }
-                return actionOK();
             },
         },
+        waypointLabel: {
+            gwta: `waypoint {outcome}`,
+            action: async () => actionOK(),
+        },
         ensure: {
-            description: 'Ensure a waypoint condition by always running the proof. If proof passes, waypoint is already satisfied. If proof fails, run the full activity to satisfy it.',
+            description: 'Ensure a waypoint condition by always running the proof. If proof passes, waypoint is already satisfied. If proof fails, run the full activity, then try the proof again',
             gwta: `ensure {outcome:${DOMAIN_STATEMENT}}`,
+            unique: true, // Ensure takes priority over dynamically registered outcomes
             action: async ({ outcome }, featureStep) => {
-                // Build outcome key from the resolved outcome steps
                 const outcomeKey = outcome.map(step => step.in).join(' ');
+                // Guard: prevent infinite ensure retry loops by counting attempts per outcome+seq
+                const attemptKey = outcomeKey; // key by outcome only to avoid differing seqPaths
+                const prevAttempts = this.ensureAttempts.get(attemptKey) ?? 0;
+                const MAX_ENSURE_ATTEMPTS = 10;
+                this.ensureAttempts.set(attemptKey, prevAttempts + 1);
+                if (prevAttempts + 1 > MAX_ENSURE_ATTEMPTS) {
+                    this.getWorld().logger.warn(`ensure: exceeded max attempts (${MAX_ENSURE_ATTEMPTS}) for ${outcomeKey}`);
+                    if (this.getWorld().runtime) {
+                        this.getWorld().runtime.exhaustionError = 'ensure max attempts exceeded';
+                    }
+                    const messageContext = {
+                        incident: EExecutionMessageType.ACTION,
+                        incidentDetails: { waypoint: outcomeKey, satisfied: false, error: 'max ensure attempts exceeded', terminal: true }
+                    };
+                    return actionNotOK(`ensure: max attempts exceeded for waypoint "${outcomeKey}"`, { messageContext });
+                }
+                // Log ENSURE_START
+                const startMessageContext = {
+                    incident: EExecutionMessageType.ENSURE_START,
+                    incidentDetails: { waypoint: outcomeKey, step: featureStep }
+                };
+                this.getWorld().logger.log(`⏳ Ensuring ${outcomeKey}`, startMessageContext);
                 this.getWorld().logger.debug(`ensure: verifying waypoint "${outcomeKey}"`);
-                // Get the pattern from the first outcome step's action
                 const pattern = outcome[0]?.action?.actionName || outcomeKey;
-                // Get the registered waypoint to access its proof
                 const registeredWaypoint = this.steps[pattern];
                 if (!registeredWaypoint) {
-                    const messageContext = {
-                        incident: EExecutionMessageType.ACTION,
-                        incidentDetails: { waypoint: outcomeKey, error: 'waypoint not registered' }
-                    };
-                    return actionNotOK(`ensure: waypoint "${outcomeKey}" (pattern "${pattern}") is not registered`, { messageContext });
+                    return actionNotOK(`ensure: "${outcomeKey}" is not a registered waypoint. ensure can only be used with waypoints.`);
+                }
+                const metadata = this.registeredOutcomeMetadata.get(pattern);
+                if (!metadata || metadata.proofStatements.length === 0) {
+                    return actionNotOK(`ensure: waypoint "${outcomeKey}" has no proof. ensure can only be used with waypoints that have a proof.`);
+                }
+                // Extract args from the outcome step(s) to pass to the activity
+                // This ensures that variables (e.g. {name}) defined in the waypoint are available in the activity
+                const activityArgs = {};
+                for (const step of outcome) {
+                    if (step.action.stepValuesMap) {
+                        for (const [key, val] of Object.entries(step.action.stepValuesMap)) {
+                            // Use the value if available (it should be resolved), otherwise term
+                            const value = val.value !== undefined ? String(val.value) : val.term;
+                            if (value !== undefined) {
+                                activityArgs[key] = value;
+                            }
+                        }
+                    }
                 }
-                // Always execute the full waypoint (which includes the proof verification)
-                const result = await executeSubFeatureSteps(featureStep, outcome, this.steppers, this.getWorld(), ExecMode.NO_CYCLES);
-                if (!result.ok) {
+                let proofStatements;
+                try {
+                    // Use FlowRunner for the proof execution
+                    // Pass activityArgs so they are available to the Outcome Action
+                    const flowResult = await this.runner.runSteps(outcome, { intent: { mode: 'authoritative', usage: featureStep.intent?.usage, stepperOptions: { isEnsure: true } }, parentStep: featureStep });
+                    if (flowResult.kind !== 'ok') {
+                        // Log ENSURE_END for failure
+                        const endMessageContext = {
+                            incident: EExecutionMessageType.ENSURE_END,
+                            incidentDetails: { waypoint: outcomeKey, satisfied: false, error: flowResult.message, actionResult: { ok: false } }
+                        };
+                        this.getWorld().logger.log(`❌ Failed ensuring ${outcomeKey}`, endMessageContext);
+                        const messageContext = {
+                            incident: EExecutionMessageType.ACTION,
+                            incidentDetails: { waypoint: outcomeKey, satisfied: false, error: flowResult.message }
+                        };
+                        return actionNotOK(`ensure: waypoint "${outcomeKey}" proof failed: ${flowResult.message}`, { messageContext });
+                    }
+                    proofStatements = flowResult.payload?.messageContext?.incidentDetails?.proofStatements;
+                    if (!proofStatements) {
+                        return actionNotOK(`ensure: waypoint "${outcomeKey}" succeeded but returned no proofStatements`);
+                    }
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    this.getWorld().logger.debug(`ensure: exception while executing proof for ${outcomeKey}: ${msg}`);
                     const messageContext = {
                         incident: EExecutionMessageType.ACTION,
-                        incidentDetails: { waypoint: outcomeKey, satisfied: false, error: result }
+                        incidentDetails: { waypoint: outcomeKey, satisfied: false, error: msg }
                     };
-                    return actionNotOK(`ensure: waypoint "${outcomeKey}" could not be satisfied`, { messageContext });
-                }
-                // Extract the interpolated proof statements from the result
-                const proofStatements = result.stepActionResult?.messageContext?.incidentDetails?.proofStatements;
-                // Track this ensured instance
-                if (proofStatements) {
-                    this.ensuredInstances.set(outcomeKey, { proof: proofStatements, valid: true });
+                    return actionNotOK(`ensure: waypoint "${outcomeKey}" proof execution error: ${msg}`, { messageContext });
                 }
+                // FIXME: We don't have easy access to proofStatements from FlowRunner result yet unless we pass them back
+                // For now, we assume if it passed, it passed.
+                this.ensuredInstances.set(outcomeKey, { proof: proofStatements, valid: true });
+                // On success or after one ensure action completes, reset attempt counter for this outcome
+                this.ensureAttempts.delete(attemptKey);
                 this.getWorld().logger.debug(`ensure: waypoint "${outcomeKey}" verified and satisfied`);
+                // Log ENSURE_END for success at trace level (just to hide the ENSURE_START)
+                const endMessageContext = {
+                    incident: EExecutionMessageType.ENSURE_END,
+                    incidentDetails: { waypoint: outcomeKey, satisfied: true, proofStatements, actionResult: { ok: true } }
+                };
+                this.getWorld().logger.trace(`✓ Ensured ${outcomeKey}`, endMessageContext);
                 const messageContext = {
                     incident: EExecutionMessageType.ACTION,
                     incidentDetails: {
@@ -137,52 +240,18 @@ export class ActivitiesStepper extends AStepper {
                 return actionOK({ messageContext });
             },
         },
-        forget: {
-            description: 'Deprecated: forget is no longer needed since ensure always re-verifies outcomes',
-            gwta: `forget {outcome:${DOMAIN_STATEMENT}}`,
-            action: ({ outcome }, featureStep) => {
-                const outcomeKey = outcome.map(step => step.in).join(' ');
-                this.getWorld().logger.debug(`forget: deprecated no-op for outcome "${outcomeKey}" (from ${featureStep.in}). Outcomes are no longer cached, so forget is unnecessary.`);
-                const messageContext = { incident: EExecutionMessageType.ACTION, incidentDetails: { outcome: outcomeKey, deprecated: true } };
-                return actionOK({ messageContext });
-            },
-        },
-        waypointed: {
-            description: 'Deprecated: waypointed is no longer meaningful since outcomes are not cached',
-            gwta: `waypointed {outcome:${DOMAIN_STATEMENT}}`,
-            action: ({ outcome }) => {
-                const outcomeKey = outcome.map(step => step.in).join(' ');
-                this.getWorld().logger.debug(`waypointed: deprecated for outcome "${outcomeKey}". Outcomes are verified on each ensure, not cached.`);
-                const messageContext = { incident: EExecutionMessageType.ACTION, incidentDetails: { outcome: outcomeKey, deprecated: true } };
-                return actionOK({ messageContext });
-            },
-        },
         showWaypoints: {
             exact: 'show waypoints',
             action: async (_args, featureStep) => {
-                // Show ensured waypoint instances with their current validity
                 const waypointResults = {};
-                // Check validity of all ensured instances
                 for (const [instanceKey, instanceData] of this.ensuredInstances.entries()) {
                     this.getWorld().logger.debug(`show waypoints: verifying "${instanceKey}"`);
                     try {
-                        // Re-verify the proof for this instance
-                        const resolvedSteps = [];
-                        for (let i = 0; i < instanceData.proof.length; i++) {
-                            const statement = instanceData.proof[i];
-                            const resolved = findFeatureStepsFromStatement(statement, this.steppers, this.getWorld(), featureStep.path, [...featureStep.seqPath, i], 1);
-                            // Add waypoint context to each proof step
-                            const contextualizedSteps = resolved.map(step => ({
-                                ...step,
-                                in: `[${instanceKey} proof] ${step.in}`
-                            }));
-                            resolvedSteps.push(...contextualizedSteps);
-                        }
-                        // Execute the proof statements with NO_CYCLES to check current validity
-                        const result = await executeSubFeatureSteps(featureStep, resolvedSteps, this.steppers, this.getWorld(), ExecMode.NO_CYCLES);
+                        // Use FlowRunner to run the proof statements directly
+                        const result = await this.runner.runStatements(instanceData.proof, { intent: { mode: 'speculative' }, parentStep: featureStep });
                         waypointResults[instanceKey] = {
                             proof: instanceData.proof.join('; '),
-                            currentlyValid: result.ok
+                            currentlyValid: result.kind === 'ok'
                         };
                     }
                     catch (error) {
@@ -200,38 +269,9 @@ export class ActivitiesStepper extends AStepper {
     };
     typedSteps = this.baseSteps;
     steps = { ...this.baseSteps };
-    cycles = {
-        startFeature: (startFeature) => {
-            this.getWorld().logger.debug(`ActivitiesStepper.startFeature: starting feature at path "${startFeature.resolvedFeature.path}"`);
-            // If we were running a different feature before, clear its outcomes
-            if (this.lastFeaturePath && this.lastFeaturePath !== startFeature.resolvedFeature.path) {
-                this.getWorld().logger.debug(`ActivitiesStepper.startFeature: clearing outcomes from previous feature "${this.lastFeaturePath}"`);
-                const outcomesToClear = [];
-                for (const [outcome, featurePath] of this.outcomeToFeaturePath.entries()) {
-                    if (featurePath === this.lastFeaturePath) {
-                        outcomesToClear.push(outcome);
-                        delete this.steps[outcome];
-                        this.featureOutcomePatterns.delete(outcome);
-                    }
-                }
-                for (const outcome of outcomesToClear) {
-                    this.outcomeToFeaturePath.delete(outcome);
-                }
-                this.getWorld().logger.debug(`ActivitiesStepper.startFeature: cleared ${outcomesToClear.length} outcomes from previous feature`);
-            }
-            this.currentFeaturePath = startFeature.resolvedFeature.path;
-        },
-        endFeature: async () => {
-            // Track this feature path so we can clean it up when the next feature starts
-            this.lastFeaturePath = this.currentFeaturePath;
-            // Clear ensured instances for next feature
-            this.ensuredInstances.clear();
-            return Promise.resolve();
-        }
-    };
     async setWorld(world, steppers) {
         await super.setWorld(world, steppers);
-        this.steppers = steppers;
+        this.runner = new FlowRunner(world, steppers);
     }
     /**
      * Register a dynamic outcome step.
@@ -248,6 +288,15 @@ export class ActivitiesStepper extends AStepper {
         if (this.steps[outcome]) {
             throw new Error(`Outcome "${outcome}" is already registered. Each outcome can only be defined once.`);
         }
+        // Normalize activity steps (split multiline strings)
+        const normalizedActivitySteps = activityBlockSteps?.flatMap(s => s.split('\n')).map(s => s.trim()).filter(s => s.length > 0) ?? [];
+        // Store metadata for runtime re-emission via TEST_LINKS messages
+        this.registeredOutcomeMetadata.set(outcome, {
+            proofStatements,
+            proofPath,
+            isBackground: isBackground ?? false,
+            activityBlockSteps: normalizedActivitySteps,
+        });
         // Track whether this is a background or feature outcome
         if (isBackground) {
             this.backgroundOutcomePatterns.add(outcome);
@@ -259,84 +308,170 @@ export class ActivitiesStepper extends AStepper {
         }
         this.getWorld().logger.debug(`ActivitiesStepper: registerOutcome called with ${proofStatements.length} proof steps for "${outcome}"`);
         this.getWorld().logger.debug(`ActivitiesStepper: outcome is background=${isBackground}, will be added to ${isBackground ? 'backgroundOutcomePatterns' : 'featureOutcomePatterns'}`);
-        // Store proofStatements for later retrieval
-        const outcomeProofStatements = proofStatements;
-        this.steps[outcome] = {
+        // FIXME: maybe we don't care if normalizedActivitySteps is empty
+        const step = {
             gwta: outcome,
             virtual: true, // Dynamically registered outcomes are virtual
+            handlesUndefined: true, // FIXME they should not need to handle undefined at the virtual stepper level
             description: `Outcome: ${outcome}. Proof: ${proofStatements.join('; ')}`,
             action: async (args, featureStep) => {
-                this.getWorld().logger.debug(`ActivitiesStepper: executing recipe for outcome "${outcome}" with args ${JSON.stringify(args)}`);
-                // Helper to expand variables in statements
-                const expandStatements = (statements) => statements.map(statement => {
-                    let expanded = statement;
-                    for (const [key, value] of Object.entries(args)) {
-                        expanded = expanded.replace(new RegExp(`\\{${key}\\}`, 'g'), String(value));
+                // Reconstruct args to include unresolved terms (skipped by strict populateActionArgs)
+                const robustArgs = { ...args };
+                if (featureStep.action.stepValuesMap) {
+                    for (const [key, val] of Object.entries(featureStep.action.stepValuesMap)) {
+                        if (robustArgs[key] === undefined && val.term !== undefined) {
+                            robustArgs[key] = val.term;
+                        }
                     }
-                    return expanded;
-                });
-                // Helper to resolve and execute statements
-                const resolveAndExecute = async (statements, stepOffset = 0, execMode = ExecMode.NO_CYCLES) => {
-                    const expandedStatements = expandStatements(statements);
-                    const resolvedSteps = [];
-                    for (let i = 0; i < expandedStatements.length; i++) {
-                        const statement = expandedStatements[i];
-                        this.getWorld().logger.debug(`ActivitiesStepper: resolving statement ${i}: "${statement}"`);
-                        const resolved = findFeatureStepsFromStatement(statement, this.steppers, this.getWorld(), proofPath, [...featureStep.seqPath, stepOffset + i], 1);
-                        resolvedSteps.push(...resolved);
+                }
+                this.getWorld().logger.debug(`ActivitiesStepper: executing recipe for outcome "${outcome}" with args ${JSON.stringify(robustArgs)}`);
+                // 1. Check Proof (Speculative)
+                if (proofStatements.length > 0) {
+                    const proof = await this.runner.runStatements(proofStatements, { args: robustArgs, intent: { mode: 'speculative' }, parentStep: featureStep });
+                    if (proof.kind === 'ok') {
+                        this.getWorld().logger.debug(`ActivitiesStepper: proof passed for outcome "${outcome}", skipping activity body`);
+                        return actionOK({
+                            messageContext: {
+                                incident: EExecutionMessageType.ACTION,
+                                incidentDetails: { proofStatements, proofSatisfied: true }
+                            }
+                        });
                     }
-                    return await executeSubFeatureSteps(featureStep, resolvedSteps, this.steppers, this.getWorld(), execMode);
-                };
-                // ALWAYS-VERIFY SEMANTICS: Try proof first
-                // Use NO_CYCLES for proof checking to avoid triggering hooks
-                this.getWorld().logger.debug(`ActivitiesStepper: checking proof for outcome "${outcome}"`);
-                this.getWorld().logger.debug(`ActivitiesStepper: proof statements: ${JSON.stringify(proofStatements)}`);
-                const proofResult = await resolveAndExecute(proofStatements, 0, ExecMode.NO_CYCLES);
-                // If proof passes, we're done (waypoint already satisfied)
-                if (proofResult.ok) {
-                    this.getWorld().logger.debug(`ActivitiesStepper: proof passed for outcome "${outcome}", skipping activity body`);
-                    const interpolatedProof = expandStatements(outcomeProofStatements);
-                    return actionOK({
-                        messageContext: {
-                            incident: EExecutionMessageType.ACTION,
-                            incidentDetails: { proofStatements: interpolatedProof, proofSatisfied: true }
+                }
+                // 2. Proof Failed or not present
+                if (!featureStep.intent?.stepperOptions?.isEnsure) {
+                    if (normalizedActivitySteps && normalizedActivitySteps.length > 0) {
+                        this.getWorld().logger.debug(`ActivitiesStepper: running activity body for outcome "${outcome}" (no ensure)`);
+                        const mode = featureStep.intent?.mode === 'speculative' ? 'speculative' : 'authoritative';
+                        const act = await this.runner.runStatements(normalizedActivitySteps, { args: robustArgs, intent: { mode, usage: featureStep.intent?.usage }, parentStep: featureStep });
+                        if (act.kind !== 'ok') {
+                            return actionNotOK(`ActivitiesStepper: activity body failed for outcome "${outcome}": ${act.message}`);
                         }
-                    });
+                        return actionOK();
+                    }
+                    if (proofStatements.length > 0) {
+                        return actionNotOK(`ActivitiesStepper: proof failed for outcome "${outcome}"`);
+                    }
+                    // No proof (waypointLabel) and not ensure: do nothing.
+                    return actionOK();
                 }
-                // Proof failed - execute activity body (WITHOUT waypoint line), then verify proof
-                // Flow: 1) Execute activity body steps, 2) Execute proof to verify, 3) Success or fail
-                if (activityBlockSteps && activityBlockSteps.length > 0) {
+                // 3. Ensure Mode: Run Activity Body
+                if (normalizedActivitySteps && normalizedActivitySteps.length > 0) {
                     this.getWorld().logger.debug(`ActivitiesStepper: proof failed for outcome "${outcome}", running activity body`);
-                    // Step 1: Execute activity body (does NOT include the waypoint line to avoid recursion)
-                    // Use WITH_CYCLES so that activity body steps can trigger hooks
-                    const activityResult = await resolveAndExecute(activityBlockSteps, 100, ExecMode.WITH_CYCLES);
-                    if (!activityResult.ok) {
-                        return actionNotOK(`ActivitiesStepper: activity body failed for outcome "${outcome}"`);
+                    const mode = featureStep.intent?.mode === 'speculative' ? 'speculative' : 'authoritative';
+                    const act = await this.runner.runStatements(normalizedActivitySteps, { args: robustArgs, intent: { mode, usage: featureStep.intent?.usage }, parentStep: featureStep });
+                    if (act.kind !== 'ok') {
+                        return actionNotOK(`ActivitiesStepper: activity body failed for outcome "${outcome}": ${act.message}`);
                     }
-                    // Step 2: Activity body succeeded - now verify the proof passes
-                    // Use NO_CYCLES for proof verification to avoid triggering hooks
+                    // 4. Verify Proof After Activity
                     this.getWorld().logger.debug(`ActivitiesStepper: verifying proof after activity body for outcome "${outcome}"`);
-                    const verifyResult = await resolveAndExecute(proofStatements, 200, ExecMode.NO_CYCLES);
-                    if (!verifyResult.ok) {
-                        return actionNotOK(`ActivitiesStepper: proof verification failed after activity body for outcome "${outcome}"`);
+                    if (proofStatements.length > 0) {
+                        const verify = await this.runner.runStatements(proofStatements, { args: robustArgs, intent: { mode, usage: featureStep.intent?.usage }, parentStep: featureStep });
+                        if (verify.kind !== 'ok') {
+                            return actionNotOK(`ActivitiesStepper: proof verification failed after activity body for outcome "${outcome}": ${verify.message}`);
+                        }
                     }
-                    // Step 3: Success - proof now passes
-                    const interpolatedProof = expandStatements(outcomeProofStatements);
                     return actionOK({
                         messageContext: {
                             incident: EExecutionMessageType.ACTION,
-                            incidentDetails: { proofStatements: interpolatedProof }
+                            incidentDetails: { proofStatements, proofSatisfied: true }
                         }
                     });
                 }
-                else {
-                    // No activity body, just proof - and it failed
-                    return actionNotOK(`ActivitiesStepper: proof failed and no activity body available for outcome "${outcome}"`);
-                }
+                return actionNotOK(`ActivitiesStepper: no activity body for outcome "${outcome}"`);
             }
         };
+        this.steps[outcome] = step;
+        if (!isBackground) {
+            if (!this.featureSteps.has(proofPath)) {
+                this.featureSteps.set(proofPath, {});
+            }
+            this.featureSteps.get(proofPath)[outcome] = step;
+        }
         this.getWorld().logger.debug(`ActivitiesStepper: registered outcome pattern "${outcome}" with ${proofStatements.length} proof steps`);
     }
+    /**
+     * Re-emit GRAPH_LINK messages for waypoint metadata.
+     * MonitorHandler subscribes after resolution, so we retransmit stored metadata.
+     */
+    sendGraphLinkMessages() {
+        for (const [outcome, metadata] of this.registeredOutcomeMetadata.entries()) {
+            const messageContext = {
+                incident: EExecutionMessageType.GRAPH_LINK,
+                incidentDetails: {
+                    outcome,
+                    proofStatements: metadata.proofStatements,
+                    proofPath: metadata.proofPath,
+                    isBackground: metadata.isBackground,
+                    activityBlockSteps: metadata.activityBlockSteps ?? null,
+                }
+            };
+            this.getWorld().logger.debug(`waypoint registered: "${outcome}"`, messageContext);
+        }
+    }
+    resolveWaypointCommon(line, path, allLines, lineIndex, requireProof) {
+        if (!line.match(/^waypoint\s+/i)) {
+            return false;
+        }
+        let outcome;
+        let proofStatements = [];
+        if (requireProof) {
+            if (!line.match(/^waypoint\s+.+?\s+with\s+/i)) {
+                return false;
+            }
+            // Find the LAST occurrence of ' with ' to separate outcome from proof
+            // This allows 'with' to appear in outcome names (e.g., "{name} agreed with {concern}")
+            const withoutPrefix = line.replace(/^waypoint\s+/i, '');
+            const lastWithIndex = withoutPrefix.lastIndexOf(' with ');
+            if (lastWithIndex === -1)
+                return false;
+            outcome = withoutPrefix.substring(0, lastWithIndex).trim();
+            const proofRaw = withoutPrefix.substring(lastWithIndex + 6).trim(); // ' with ' is 6 chars
+            proofStatements = proofRaw.split('\n').map(s => s.trim()).filter(s => s.length > 0);
+        }
+        else {
+            if (line.match(/^waypoint\s+.+?\s+with\s+/i)) {
+                return false;
+            }
+            const match = line.match(/^waypoint\s+(.+?)$/i);
+            if (!match)
+                return false;
+            outcome = match[1].trim();
+        }
+        // Skip if already registered (prevents infinite loops)
+        if (this.backgroundOutcomePatterns.has(outcome) || this.featureOutcomePatterns.has(outcome)) {
+            return true;
+        }
+        const isBackground = path.includes('backgrounds/');
+        // Scan backwards to find containing Activity block
+        let activityBlockSteps;
+        if (allLines && lineIndex !== undefined) {
+            let activityStartLine = -1;
+            for (let i = lineIndex - 1; i >= 0; i--) {
+                const prevLine = getActionable(allLines[i]);
+                if (prevLine.match(/^Activity:/i)) {
+                    activityStartLine = i;
+                    break;
+                }
+                if (prevLine.match(/^(Feature|Scenario|Background):/i)) {
+                    break;
+                }
+            }
+            if (activityStartLine !== -1) {
+                // Collect steps between Activity: and waypoint (excluding waypoint itself)
+                const blockLines = [];
+                for (let i = activityStartLine + 1; i < lineIndex; i++) {
+                    const stepLine = getActionable(allLines[i]);
+                    if (stepLine && !stepLine.match(/^waypoint\s+/i)) {
+                        blockLines.push(stepLine);
+                    }
+                }
+                activityBlockSteps = blockLines;
+            }
+        }
+        this.registerOutcome(outcome, proofStatements, path, isBackground, activityBlockSteps);
+        return true;
+    }
 }
 export default ActivitiesStepper;
 //# sourceMappingURL=activities-stepper.js.map