@falai/agent 0.9.2 → 1.0.0

package/dist/cjs/{src/core → core}/RoutingEngine.js

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoutingEngine = void 0;
 const utils_1 = require("../utils");
 const PromptComposer_1 = require("./PromptComposer");
-const event_1 = require("../utils/event");
-const logger_1 = require("../utils/logger");
-const template_1 = require("../utils/template");
 const constants_1 = require("../constants");
+const utils_2 = require("../utils");
 class RoutingEngine {
     constructor(options) {
         this.options = options;
@@ -20,9 +18,9 @@ class RoutingEngine {
             let updatedSession = (0, utils_1.enterRoute)(session, route.id, route.title);
             if (route.initialData) {
                 updatedSession = (0, utils_1.mergeCollected)(updatedSession, route.initialData);
-                logger_1.logger.debug(`[RoutingEngine] Merged initial data for route ${route.title}:`, route.initialData);
+                utils_2.logger.debug(`[RoutingEngine] Merged initial data for route ${route.title}:`, route.initialData);
             }
-            logger_1.logger.debug(`[RoutingEngine] Entered route: ${route.title}`);
+            utils_2.logger.debug(`[RoutingEngine] Entered route: ${route.title}`);
             return updatedSession;
         }
         return session;
@@ -39,21 +37,26 @@ class RoutingEngine {
         const updatedSession = this.enterRouteIfNeeded(session, route);
         // Check if this single route is complete (use updated session data)
         const completedRoutes = route.isComplete(updatedSession.data || {}) ? [route] : [];
-        // Get candidate steps
+        // Get candidate steps using new condition evaluation
+        const templateContext = (0, utils_2.createTemplateContext)({
+            context,
+            session: updatedSession,
+            history,
+            data: updatedSession.data
+        });
         const currentStep = updatedSession.currentStep
             ? route.getStep(updatedSession.currentStep.id)
             : undefined;
-        const candidates = this.getCandidateSteps(route, currentStep, updatedSession.data || {});
+        const candidates = await this.getCandidateStepsWithConditions(route, currentStep, templateContext);
         if (candidates.length === 0) {
-            logger_1.logger.warn(`[RoutingEngine] Single-route: No valid steps found`);
+            utils_2.logger.warn(`[RoutingEngine] Single-route: No valid steps found`);
             return { selectedRoute, session: updatedSession };
         }
-        // If only one candidate, no need for AI selection
+        // If only one candidate, check if it's a completion marker
         if (candidates.length === 1) {
             const candidate = candidates[0];
-            const isRouteComplete = candidate.isRouteComplete;
-            if (isRouteComplete) {
-                logger_1.logger.debug(`[RoutingEngine] Single-route: Route complete - all data collected, END_ROUTE reached`);
+            if (candidate.isRouteComplete) {
+                utils_2.logger.debug(`[RoutingEngine] Single-route: Route complete - all required fields collected or END_ROUTE reached`);
                 // Don't return a selectedStep when route is complete - there's no step to enter
                 return {
                     selectedRoute,
@@ -64,7 +67,7 @@ class RoutingEngine {
                 };
             }
             else {
-                logger_1.logger.debug(`[RoutingEngine] Single-route: Only one valid step: ${candidate.step.id}`);
+                utils_2.logger.debug(`[RoutingEngine] Single-route: Only one valid step: ${candidate.step.id}`);
                 return {
                     selectedRoute,
                     selectedStep: candidate.step,
@@ -76,17 +79,27 @@ class RoutingEngine {
         }
         // No candidates means route is likely complete or has no valid next steps
         if (candidates.length === 0) {
-            logger_1.logger.debug(`[RoutingEngine] Single-route: No valid steps found, route may be complete`);
+            const dataComplete = route.isComplete(updatedSession.data || {});
+            utils_2.logger.debug(`[RoutingEngine] Single-route: No valid steps found - ` +
+                `(data: ${dataComplete ? 'complete' : 'incomplete'}, marking as ${dataComplete ? 'complete' : 'incomplete'})`);
             return {
                 selectedRoute,
                 selectedStep: undefined,
                 session: updatedSession,
-                isRouteComplete: true, // Assume complete if no valid steps
+                isRouteComplete: dataComplete,
                 completedRoutes,
             };
         }
         // Multiple candidates - use AI to select best step
-        const lastUserMessage = (0, event_1.getLastMessageFromHistory)(history);
+        const lastUserMessage = (0, utils_2.getLastMessageFromHistory)(history);
+        // Collect AI context strings from step conditions
+        const stepConditionContext = [];
+        for (const candidate of candidates) {
+            const whenResult = await candidate.step.evaluateWhen(templateContext);
+            stepConditionContext.push(...whenResult.aiContextStrings);
+        }
+        // Check if any candidate is a completion marker (isRouteComplete = true)
+        const hasCompletionOption = candidates.some(c => c.isRouteComplete);
         const stepPrompt = await this.buildStepSelectionPrompt({
             route,
             currentStep,
@@ -97,8 +110,10 @@ class RoutingEngine {
             agentOptions,
             context,
             session: updatedSession,
+            stepConditionContext,
+            includeEndRoute: hasCompletionOption,
         });
-        const stepSchema = this.buildStepSelectionSchema(candidates.map((c) => c.step));
+        const stepSchema = this.buildStepSelectionSchema(candidates.filter(c => !c.isRouteComplete).map((c) => c.step), hasCompletionOption);
         const stepResult = await provider.generateMessage({
             prompt: stepPrompt,
             history,
@@ -110,13 +125,26 @@ class RoutingEngine {
             },
         });
         const selectedStepId = stepResult.structured?.selectedStepId;
+        // Check if AI selected END_ROUTE
+        if (selectedStepId === constants_1.END_ROUTE_ID) {
+            utils_2.logger.debug(`[RoutingEngine] Single-route: AI selected END_ROUTE - completing route`);
+            utils_2.logger.debug(`[RoutingEngine] Single-route: Reasoning: ${stepResult.structured?.reasoning}`);
+            return {
+                selectedRoute,
+                selectedStep: undefined,
+                responseDirectives: stepResult.structured?.responseDirectives,
+                session: updatedSession,
+                isRouteComplete: true,
+                completedRoutes,
+            };
+        }
         const selectedStep = candidates.find((c) => c.step.id === selectedStepId);
         if (selectedStep) {
-            logger_1.logger.debug(`[RoutingEngine] Single-route: AI selected step: ${selectedStep.step.id}`);
-            logger_1.logger.debug(`[RoutingEngine] Single-route: Reasoning: ${stepResult.structured?.reasoning}`);
+            utils_2.logger.debug(`[RoutingEngine] Single-route: AI selected step: ${selectedStep.step.id}`);
+            utils_2.logger.debug(`[RoutingEngine] Single-route: Reasoning: ${stepResult.structured?.reasoning}`);
         }
         else {
-            logger_1.logger.warn(`[RoutingEngine] Single-route: Invalid step ID returned, using first candidate`);
+            utils_2.logger.warn(`[RoutingEngine] Single-route: Invalid step ID returned, using first candidate`);
         }
         return {
             selectedRoute,
@@ -127,16 +155,17 @@ class RoutingEngine {
         };
     }
     /**
-     * Recursively traverse step chain to find first non-skipped step or END_ROUTE
+     * Recursively traverse step chain to find first non-skipped step or END_ROUTE using new condition evaluation
      * @private
      */
-    findFirstValidStepRecursive(currentStep, data, visited) {
+    async findFirstValidStepRecursiveWithConditions(currentStep, templateContext, visited) {
         // Prevent infinite loops
         if (visited.has(currentStep.id)) {
-            return {};
+            return { aiContextStrings: [] };
         }
         visited.add(currentStep.id);
         const transitions = currentStep.getTransitions();
+        const allAiContextStrings = [];
         for (const transition of transitions) {
             const target = transition;
             // Check for END_ROUTE transition
@@ -144,43 +173,72 @@ class RoutingEngine {
                 // Found END_ROUTE - route is complete
                 return {
                     isRouteComplete: true,
+                    aiContextStrings: allAiContextStrings,
                 };
             }
             if (!target)
                 continue;
+            // Evaluate skipIf condition using new system
+            const skipResult = await target.evaluateSkipIf(templateContext);
+            allAiContextStrings.push(...skipResult.aiContextStrings);
             // If target should NOT be skipped, we found our step
-            if (!target.shouldSkip(data)) {
-                logger_1.logger.debug(`[RoutingEngine] Found valid step after skipping: ${target.id}`);
+            if (!skipResult.shouldSkip) {
+                utils_2.logger.debug(`[RoutingEngine] Found valid step after skipping: ${target.id}`);
                 return {
                     step: target,
                     isRouteComplete: false,
+                    aiContextStrings: allAiContextStrings,
                 };
             }
             // Target should be skipped too - recurse deeper
-            logger_1.logger.debug(`[RoutingEngine] Skipping step ${target.id} (skipIf condition met), continuing traversal...`);
-            const result = this.findFirstValidStepRecursive(target, data, visited);
+            utils_2.logger.debug(`[RoutingEngine] Skipping step ${target.id} (skipIf condition met), continuing traversal...`);
+            const result = await this.findFirstValidStepRecursiveWithConditions(target, templateContext, visited);
+            // Collect AI context from recursive call
+            if (result.aiContextStrings) {
+                allAiContextStrings.push(...result.aiContextStrings);
+            }
             // If we found something (a valid step or END_ROUTE), return it
             if (result.step || result.isRouteComplete) {
-                return result;
+                return {
+                    ...result,
+                    aiContextStrings: allAiContextStrings,
+                };
             }
         }
         // No valid steps or END_ROUTE found in this branch
-        return {};
+        return { aiContextStrings: allAiContextStrings };
     }
     /**
-     * Identify valid next candidate steps based on current step and collected data
+     * Identify valid next candidate steps using new condition evaluation system
      * Returns step with isRouteComplete flag if route is complete (all steps skipped + has END_ROUTE transition)
+     *
+     * NEW: Automatically completes route when all required fields are collected
      */
-    getCandidateSteps(route, currentStep, data) {
+    async getCandidateStepsWithConditions(route, currentStep, templateContext) {
         const candidates = [];
+        const data = templateContext.data || {};
+        // Check if all required fields are collected
+        const allRequiredFieldsCollected = route.isComplete(data);
         if (!currentStep) {
+            // Entering route for the first time
+            // If all required fields already collected, route is immediately complete
+            if (allRequiredFieldsCollected) {
+                utils_2.logger.debug(`[RoutingEngine] Route ${route.title} complete on entry: all required fields already collected`);
+                // Return a completion marker - use initial step with completion flag
+                candidates.push({
+                    step: route.initialStep,
+                    isRouteComplete: true,
+                });
+                return candidates;
+            }
             const initialStep = route.initialStep;
-            if (initialStep.shouldSkip(data)) {
+            const skipResult = await initialStep.evaluateSkipIf(templateContext);
+            if (skipResult.shouldSkip) {
                 // Initial step should be skipped - recursively traverse to find first non-skipped step or END_ROUTE
-                const result = this.findFirstValidStepRecursive(initialStep, data, new Set());
+                const result = await this.findFirstValidStepRecursiveWithConditions(initialStep, templateContext, new Set());
                 if (result.isRouteComplete) {
                     // All steps are skipped and we reached END_ROUTE
-                    logger_1.logger.debug(`[RoutingEngine] Route complete on entry: all steps skipped, END_ROUTE reached`);
+                    utils_2.logger.debug(`[RoutingEngine] Route complete on entry: all steps skipped, END_ROUTE reached`);
                     candidates.push({
                         step: initialStep,
                         isRouteComplete: true,
@@ -203,6 +261,55 @@ class RoutingEngine {
             }
             return candidates;
         }
+        // Check if all required fields are now collected (may have been collected during this step)
+        if (allRequiredFieldsCollected) {
+            // Required fields are complete - check if we should continue for optional fields
+            const transitions = currentStep.getTransitions();
+            const optionalFieldCandidates = [];
+            for (const transition of transitions) {
+                const target = transition;
+                // Check for END_ROUTE transition
+                if (target && target.id === constants_1.END_ROUTE_ID) {
+                    continue;
+                }
+                if (!target)
+                    continue;
+                // Check if this step collects only optional fields
+                const collectsOnlyOptional = target.collect && target.collect.length > 0 &&
+                    target.collect.every(field => route.optionalFields?.includes(field));
+                if (collectsOnlyOptional) {
+                    // This step collects optional fields - it's a candidate
+                    const skipResult = await target.evaluateSkipIf(templateContext);
+                    if (!skipResult.shouldSkip) {
+                        optionalFieldCandidates.push({
+                            step: target,
+                            isRouteComplete: false,
+                        });
+                    }
+                }
+            }
+            // If we have optional field candidates, include them along with END_ROUTE option
+            if (optionalFieldCandidates.length > 0) {
+                utils_2.logger.debug(`[RoutingEngine] Required fields complete, but ${optionalFieldCandidates.length} optional field steps available`);
+                // Add optional field steps as candidates
+                candidates.push(...optionalFieldCandidates);
+                // Also add END_ROUTE as a candidate (AI can choose to skip optional fields)
+                candidates.push({
+                    step: currentStep,
+                    isRouteComplete: true,
+                });
+                return candidates;
+            }
+            // No optional fields to collect - route is complete
+            utils_2.logger.debug(`[RoutingEngine] Route ${route.title} complete: all required fields collected, no optional fields remain`);
+            return [
+                {
+                    step: currentStep,
+                    isRouteComplete: true,
+                },
+            ];
+        }
+        // Required fields not yet complete - continue normal step progression
         const transitions = currentStep.getTransitions();
         let hasEndRoute = false;
         for (const transition of transitions) {
@@ -214,10 +321,11 @@ class RoutingEngine {
             }
             if (!target)
                 continue;
-            if (target.shouldSkip(data)) {
-                logger_1.logger.debug(`[RoutingEngine] Skipping step ${target.id} (skipIf condition met)`);
+            const skipResult = await target.evaluateSkipIf(templateContext);
+            if (skipResult.shouldSkip) {
+                utils_2.logger.debug(`[RoutingEngine] Skipping step ${target.id} (skipIf condition met)`);
                 // Recursively traverse to find next valid step or END_ROUTE
-                const result = this.findFirstValidStepRecursive(target, data, new Set([currentStep.id]) // Already visited current step
+                const result = await this.findFirstValidStepRecursiveWithConditions(target, templateContext, new Set([currentStep.id]) // Already visited current step
                 );
                 if (result.isRouteComplete) {
                     hasEndRoute = true;
@@ -240,7 +348,7 @@ class RoutingEngine {
         if (candidates.length === 0) {
             // If current step has END_ROUTE transition, the route is complete
             if (hasEndRoute) {
-                logger_1.logger.debug(`[RoutingEngine] Route complete: all steps processed, END_ROUTE reached`);
+                utils_2.logger.debug(`[RoutingEngine] Route complete: all steps processed, END_ROUTE reached`);
                 // Return current step with completion flag
                 return [
                     {
@@ -250,7 +358,8 @@ class RoutingEngine {
                 ];
             }
             // Otherwise, stay in current step if it's still valid
-            if (!currentStep.shouldSkip(data)) {
+            const currentSkipResult = await currentStep.evaluateSkipIf(templateContext);
+            if (!currentSkipResult.shouldSkip) {
                 candidates.push({
                     step: currentStep,
                     isRouteComplete: hasEndRoute || false,
@@ -275,7 +384,7 @@ class RoutingEngine {
         const completedRoutes = this.evaluateRouteCompletions(routes, session.data || {});
         // Log completed routes
         if (completedRoutes.length > 0) {
-            logger_1.logger.debug(`[RoutingEngine] Found ${completedRoutes.length} completed routes: ${completedRoutes.map(r => r.title).join(', ')}`);
+            utils_2.logger.debug(`[RoutingEngine] Found ${completedRoutes.length} completed routes: ${completedRoutes.map(r => r.title).join(', ')}`);
         }
         // OPTIMIZATION: Single route - skip route scoring, only do step selection
         if (routes.length === 1) {
@@ -293,39 +402,70 @@ class RoutingEngine {
                 completedRoutes,
             };
         }
-        const lastUserMessage = (0, event_1.getLastMessageFromHistory)(history);
+        const lastUserMessage = (0, utils_2.getLastMessageFromHistory)(history);
+        const templateContext = (0, utils_2.createTemplateContext)({
+            context,
+            session,
+            history,
+            data: session.data
+        });
+        // Apply route filtering with new condition evaluation system
+        const skipIfResult = await this.filterRoutesBySkipIf(routes, templateContext);
+        const whenResult = await this.filterRoutesByWhen(skipIfResult.eligibleRoutes, templateContext);
+        // Collect all AI context strings from route conditions
+        const routeConditionContext = [...skipIfResult.aiContextStrings, ...whenResult.aiContextStrings];
+        // Use filtered routes for further processing
+        const eligibleRoutes = whenResult.eligibleRoutes;
+        utils_2.logger.debug(`[RoutingEngine] Route filtering: ${routes.length} total → ${skipIfResult.eligibleRoutes.length} after skipIf → ${eligibleRoutes.length} after when`);
         let activeRouteSteps;
         let activeRoute;
         let isRouteComplete = false;
+        let updatedSession = session;
         if (session.currentRoute) {
-            activeRoute = routes.find((r) => r.id === session.currentRoute?.id);
+            activeRoute = eligibleRoutes.find((r) => r.id === session.currentRoute?.id);
             if (activeRoute) {
                 const currentStep = session.currentStep
                     ? activeRoute.getStep(session.currentStep.id)
                     : undefined;
-                const candidates = this.getCandidateSteps(activeRoute, currentStep, session.data || {});
+                const activeTemplateContext = (0, utils_2.createTemplateContext)({
+                    ...templateContext,
+                    session: updatedSession,
+                    data: updatedSession.data
+                });
+                const candidates = await this.getCandidateStepsWithConditions(activeRoute, currentStep, activeTemplateContext);
                 // Check if route is complete
+                // getCandidateStepsWithConditions now automatically handles completion when required fields are collected
                 if (candidates.length === 1 && candidates[0].isRouteComplete) {
                     isRouteComplete = true;
-                    logger_1.logger.debug(`[RoutingEngine] Route ${activeRoute.title} is complete - all data collected`);
+                    utils_2.logger.debug(`[RoutingEngine] Route ${activeRoute.title} is complete - all required fields collected or END_ROUTE reached`);
                     // Don't include steps in routing if route is complete
                     activeRouteSteps = undefined;
                 }
+                else if (candidates.length === 0) {
+                    // No candidates - check if data is complete
+                    const dataComplete = activeRoute.isComplete(updatedSession.data || {});
+                    isRouteComplete = dataComplete;
+                    utils_2.logger.debug(`[RoutingEngine] Route ${activeRoute.title} has no valid steps - ` +
+                        `marking as ${isRouteComplete ? 'complete' : 'incomplete'}`);
+                    activeRouteSteps = undefined;
+                }
                 else {
+                    // Multiple candidates or single non-complete candidate
                     activeRouteSteps = candidates.map((c) => c.step);
-                    logger_1.logger.debug(`[RoutingEngine] Found ${activeRouteSteps.length} candidate steps for active route`);
+                    utils_2.logger.debug(`[RoutingEngine] Found ${activeRouteSteps.length} candidate steps for active route`);
                 }
             }
         }
-        const routingSchema = this.buildDynamicRoutingSchema(routes, undefined, activeRouteSteps);
+        const routingSchema = this.buildDynamicRoutingSchema(eligibleRoutes, undefined, activeRouteSteps);
         const routingPrompt = await this.buildRoutingPrompt({
             history,
-            routes,
+            routes: eligibleRoutes,
             lastMessage: lastUserMessage,
             agentOptions,
             session,
             activeRouteSteps,
             context,
+            routeConditionContext, // Pass AI context strings from route conditions
         });
         const routingResult = await provider.generateMessage({
             prompt: routingPrompt,
@@ -340,31 +480,38 @@ class RoutingEngine {
         let selectedRoute;
         let selectedStep;
         let responseDirectives;
-        let updatedSession = session;
         if (routingResult.structured?.routes) {
             // Use cross-route completion evaluation to select optimal route
-            const optimalRoute = this.selectOptimalRoute(routes, updatedSession.data || {}, routingResult.structured.routes);
-            // Fall back to traditional scoring if no optimal route found
-            selectedRoute = optimalRoute || (() => {
-                const decision = this.decideRouteFromScores({
-                    context: routingResult.structured.context,
-                    routes: routingResult.structured.routes,
-                    responseDirectives: routingResult.structured.responseDirectives,
-                });
-                return routes.find((r) => r.id === decision.routeId);
-            })();
+            const optimalRoute = this.selectOptimalRoute(eligibleRoutes, updatedSession.data || {}, routingResult.structured.routes);
+            // If no optimal route found, check why
+            if (!optimalRoute) {
+                if (eligibleRoutes.length === 0) {
+                    // No routes passed filtering
+                    utils_2.logger.debug(`[RoutingEngine] No eligible routes available - all routes filtered out`);
+                    selectedRoute = undefined;
+                }
+                else {
+                    // Routes exist but selectOptimalRoute returned undefined
+                    // This means all routes are 100% complete
+                    utils_2.logger.debug(`[RoutingEngine] No optimal route found - all ${eligibleRoutes.length} eligible routes are complete`);
+                    selectedRoute = undefined;
+                }
+            }
+            else {
+                selectedRoute = optimalRoute;
+            }
             responseDirectives = routingResult.structured.responseDirectives;
             if (selectedRoute === activeRoute &&
                 routingResult.structured.selectedStepId &&
                 activeRoute) {
                 selectedStep = activeRoute.getStep(routingResult.structured.selectedStepId);
                 if (selectedStep) {
-                    logger_1.logger.debug(`[RoutingEngine] AI selected step: ${selectedStep.id} in active route`);
-                    logger_1.logger.debug(`[RoutingEngine] Step reasoning: ${routingResult.structured.stepReasoning}`);
+                    utils_2.logger.debug(`[RoutingEngine] AI selected step: ${selectedStep.id} in active route`);
+                    utils_2.logger.debug(`[RoutingEngine] Step reasoning: ${routingResult.structured.stepReasoning}`);
                 }
             }
             if (selectedRoute) {
-                logger_1.logger.debug(`[RoutingEngine] Selected route: ${selectedRoute.title}`);
+                utils_2.logger.debug(`[RoutingEngine] Selected route: ${selectedRoute.title}`);
                 updatedSession = this.enterRouteIfNeeded(updatedSession, selectedRoute);
             }
         }
@@ -377,6 +524,52 @@ class RoutingEngine {
             completedRoutes,
         };
     }
+    /**
+     * Filter routes based on skipIf conditions
+     * @param routes - All available routes
+     * @param templateContext - Context for condition evaluation
+     * @returns Object with eligible routes and collected AI context strings
+     */
+    async filterRoutesBySkipIf(routes, templateContext) {
+        const eligibleRoutes = [];
+        const aiContextStrings = [];
+        for (const route of routes) {
+            const skipResult = await route.evaluateSkipIf(templateContext);
+            // Collect AI context strings from skipIf conditions
+            aiContextStrings.push(...skipResult.aiContextStrings);
+            // If route should not be skipped, it's eligible
+            if (!skipResult.programmaticResult) {
+                eligibleRoutes.push(route);
+            }
+            else {
+                utils_2.logger.debug(`[RoutingEngine] Skipping route ${route.title} (skipIf condition met)`);
+            }
+        }
+        return { eligibleRoutes, aiContextStrings };
+    }
+    /**
+     * Filter routes based on when conditions
+     * @param routes - Routes that passed skipIf filtering
+     * @param templateContext - Context for condition evaluation
+     * @returns Object with eligible routes and collected AI context strings
+     */
+    async filterRoutesByWhen(routes, templateContext) {
+        const eligibleRoutes = [];
+        const aiContextStrings = [];
+        for (const route of routes) {
+            const whenResult = await route.evaluateWhen(templateContext);
+            // Collect AI context strings from when conditions
+            aiContextStrings.push(...whenResult.aiContextStrings);
+            // If route has no programmatic conditions or they evaluate to true, it's eligible
+            if (!whenResult.hasProgrammaticConditions || whenResult.programmaticResult) {
+                eligibleRoutes.push(route);
+            }
+            else {
+                utils_2.logger.debug(`[RoutingEngine] Route ${route.title} not eligible (when condition not met)`);
+            }
+        }
+        return { eligibleRoutes, aiContextStrings };
+    }
     /**
      * Evaluate all routes for completion based on collected data
      * @param routes - All available routes
@@ -403,6 +596,7 @@ class RoutingEngine {
     /**
      * Find the best route to continue based on completion status and user intent
      * Prioritizes routes that are partially complete but not finished
+     * IMPORTANT: Completed routes are excluded to prevent re-entering finished tasks
      * @param routes - All available routes
      * @param data - Currently collected agent-level data
      * @param routeScores - AI-generated route scores from routing decision
@@ -415,8 +609,10 @@ class RoutingEngine {
         for (const route of routes) {
             const aiScore = routeScores[route.id] || 0;
             const completionProgress = completionStatus.get(route.id) || 0;
-            // Skip fully completed routes unless they have very high AI scores
-            if (completionProgress >= 1.0 && aiScore < 80) {
+            // ALWAYS skip fully completed routes to prevent re-entering finished tasks
+            // Users should not be forced back into completed routes
+            if (completionProgress >= 1.0) {
+                utils_2.logger.debug(`[RoutingEngine] Excluding completed route: ${route.title} (100% complete)`);
                 continue;
             }
             // Boost partially complete routes that match user intent
@@ -430,7 +626,7 @@ class RoutingEngine {
         // Sort by weighted score and return the best option
         weightedScores.sort((a, b) => b.score - a.score);
         if (weightedScores.length > 0) {
-            logger_1.logger.debug(`[RoutingEngine] Selected optimal route: ${weightedScores[0].route.title} ` +
+            utils_2.logger.debug(`[RoutingEngine] Selected optimal route: ${weightedScores[0].route.title} ` +
                 `(AI: ${routeScores[weightedScores[0].route.id]}, ` +
                 `Completion: ${(completionStatus.get(weightedScores[0].route.id) || 0) * 100}%, ` +
                 `Weighted: ${weightedScores[0].score})`);
@@ -443,8 +639,8 @@ class RoutingEngine {
      * @private
      */
     async buildStepSelectionPrompt(params) {
-        const { route, currentStep, candidates, data, history, lastMessage, agentOptions, context, session, } = params;
-        const templateContext = { context, session, history };
+        const { route, currentStep, candidates, data, history, lastMessage, agentOptions, context, session, stepConditionContext, includeEndRoute = false, } = params;
+        const templateContext = (0, utils_2.createTemplateContext)({ context, session, history });
         const pc = new PromptComposer_1.PromptComposer(templateContext);
         // Add agent metadata
         if (agentOptions) {
@@ -469,7 +665,7 @@ class RoutingEngine {
         // Add conversation history
         await pc.addInteractionHistory(history);
         await pc.addLastMessage(lastMessage);
-        // Add candidate steps
+        // Add candidate steps with condition context
         const stepDescriptions = [];
         for (const candidate of candidates) {
             const idx = candidates.indexOf(candidate);
@@ -477,9 +673,15 @@ class RoutingEngine {
                 `${idx + 1}. Step ID: ${candidate.step.id}`,
                 `   Description: ${candidate.step.description || "N/A"}`,
             ];
+            // Add when condition context
             if (candidate.step.when) {
-                const renderedWhen = await (0, template_1.render)(candidate.step.when, templateContext);
-                parts.push(`   When this step should be completed: ${renderedWhen}`);
+                const whenResult = await candidate.step.evaluateWhen(templateContext);
+                if (whenResult.aiContextStrings.length > 0) {
+                    parts.push(`   When conditions: ${whenResult.aiContextStrings.join(", ")}`);
+                }
+                else if (typeof candidate.step.when === 'string') {
+                    parts.push(`   When this step should be completed: ${candidate.step.when}`);
+                }
             }
             if (candidate.step.requires && candidate.step.requires.length > 0) {
                 parts.push(`   Required Data: ${candidate.step.requires.join(", ")}`);
@@ -490,8 +692,18 @@ class RoutingEngine {
             stepDescriptions.push(parts.join("\n"));
         }
         await pc.addInstruction(`Available Steps to Transition To:\n${stepDescriptions.join("\n\n")}`);
+        // Add step condition context if available
+        if (stepConditionContext && stepConditionContext.length > 0) {
+            await pc.addInstruction([
+                "",
+                "Additional step context from conditions:",
+                ...stepConditionContext.map(ctx => `- ${ctx}`),
+                "",
+                "Consider this context when selecting the most appropriate step.",
+            ].join("\n"));
+        }
         // Add decision prompt
-        await pc.addInstruction([
+        const decisionRules = [
             "Task: Decide which step to transition to based on:",
             "1. The user's current message and intent",
             "2. The conversation history and context",
@@ -504,16 +716,24 @@ class RoutingEngine {
             "- If a step requires data we don't have, consider if we should collect it now",
             "- Choose the step that makes the most sense for moving the conversation forward",
             "- Steps with skipIf conditions that are met have already been filtered out",
-            "",
-            "Return ONLY JSON matching the provided schema.",
-        ].join("\n"));
+        ];
+        if (includeEndRoute) {
+            decisionRules.push("", `- You can select '${constants_1.END_ROUTE_ID}' to complete this route if:`, "  * All required data has been collected", "  * The user's intent suggests they're done with this task", "  * No further steps are needed to fulfill the user's request");
+        }
+        decisionRules.push("", "Return ONLY JSON matching the provided schema.");
+        await pc.addInstruction(decisionRules.join("\n"));
         return pc.build();
     }
     /**
      * Build schema for step selection
      * @private
      */
-    buildStepSelectionSchema(validSteps) {
+    buildStepSelectionSchema(validSteps, includeEndRoute = false) {
+        const stepIds = validSteps.map((s) => s.id);
+        // Add END_ROUTE as an option if requested (when required fields are complete)
+        if (includeEndRoute) {
+            stepIds.push(constants_1.END_ROUTE_ID);
+        }
         return {
             description: "Step transition decision based on conversation context and collected data",
             type: "object",
@@ -526,8 +746,10 @@ class RoutingEngine {
                 selectedStepId: {
                     type: "string",
                     nullable: false,
-                    description: "The ID of the selected step to transition to",
-                    enum: validSteps.map((s) => s.id),
+                    description: includeEndRoute
+                        ? `The ID of the selected step to transition to, or '${constants_1.END_ROUTE_ID}' to complete the route`
+                        : "The ID of the selected step to transition to",
+                    enum: stepIds,
                 },
                 responseDirectives: {
                     type: "array",
@@ -603,8 +825,8 @@ class RoutingEngine {
         return base;
     }
     async buildRoutingPrompt(params) {
-        const { history, routes, lastMessage, agentOptions, session, activeRouteSteps, context, } = params;
-        const templateContext = { context, session, history };
+        const { history, routes, lastMessage, agentOptions, session, activeRouteSteps, context, routeConditionContext, } = params;
+        const templateContext = (0, utils_2.createTemplateContext)({ context, session, history });
         const pc = new PromptComposer_1.PromptComposer(templateContext);
         if (agentOptions) {
             await pc.addAgentMeta(agentOptions);
@@ -656,15 +878,23 @@ class RoutingEngine {
                     "",
                     "Available steps in active route (choose one to transition to):",
                 ];
+                const activeStepConditionContext = [];
                 for (const step of activeRouteSteps) {
                     const idx = activeRouteSteps.indexOf(step);
                     stepInfo.push(`${idx + 1}. Step: ${step.id}`);
                     if (step.description) {
                         stepInfo.push(`   Description: ${step.description}`);
                     }
-                    const renderedWhen = await (0, template_1.render)(step.when, templateContext);
+                    // Collect AI context from step conditions
                     if (step.when) {
-                        stepInfo.push(`   When this step should be completed: ${renderedWhen}`);
+                        const whenResult = await step.evaluateWhen(templateContext);
+                        if (whenResult.aiContextStrings.length > 0) {
+                            stepInfo.push(`   When conditions: ${whenResult.aiContextStrings.join(", ")}`);
+                            activeStepConditionContext.push(...whenResult.aiContextStrings);
+                        }
+                        else if (typeof step.when === 'string') {
+                            stepInfo.push(`   When this step should be completed: ${step.when}`);
+                        }
                     }
                     if (step.requires && step.requires.length > 0) {
                         stepInfo.push(`   Required data: ${step.requires.join(", ")}`);
@@ -680,11 +910,31 @@ class RoutingEngine {
                 stepInfo.push("- The logical next step in the conversation");
                 stepInfo.push("- Whether conditions for steps are met");
                 await pc.addInstruction(stepInfo.join("\n"));
+                // Add active step condition context if available
+                if (activeStepConditionContext.length > 0) {
+                    await pc.addInstruction([
+                        "",
+                        "Additional context from step conditions:",
+                        ...activeStepConditionContext.map(ctx => `- ${ctx}`),
+                        "",
+                        "Use this context to inform your step selection decision.",
+                    ].join("\n"));
+                }
             }
         }
         await pc.addInteractionHistory(history);
         await pc.addLastMessage(lastMessage);
         await pc.addRoutingOverview(routes);
+        // Add route condition context if available
+        if (routeConditionContext && routeConditionContext.length > 0) {
+            await pc.addInstruction([
+                "",
+                "Additional routing context from route conditions:",
+                ...routeConditionContext.map(ctx => `- ${ctx}`),
+                "",
+                "Consider this context when scoring routes for relevance.",
+            ].join("\n"));
+        }
         await pc.addInstruction([
             "Scoring rules:",
             "- 90-100: explicit keywords + clear intent",