prompt-language-shell 0.8.4 → 0.8.6

package/dist/ui/Introspect.js

@@ -1,22 +1,35 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { Box, Text } from 'ink';
-import { ComponentStatus } from '../types/components.js';
+import { ComponentStatus, } from '../types/components.js';
 import { Colors, getTextColor } from '../services/colors.js';
 import { createReportDefinition } from '../services/components.js';
-import { DebugLevel } from '../services/configuration.js';
+import { DebugLevel } from '../configuration/types.js';
 import { useInput } from '../services/keyboard.js';
 import { formatErrorMessage } from '../services/messages.js';
 import { ensureMinimumTime } from '../services/timing.js';
 import { Spinner } from './Spinner.js';
 const MIN_PROCESSING_TIME = 1000;
-export function Introspect({ tasks, state: _state, status, service, children, debug = DebugLevel.None, stateHandlers, lifecycleHandlers, queueHandlers, errorHandlers, workflowHandlers, }) {
+export const IntrospectView = ({ state, status, children, }) => {
+    const isActive = status === ComponentStatus.Active;
+    const { error } = state;
+    // Don't render wrapper when done and nothing to show
+    if (!isActive && !error && !children) {
+        return null;
+    }
+    return (_jsxs(Box, { alignSelf: "flex-start", flexDirection: "column", children: [isActive && (_jsxs(Box, { marginLeft: 1, children: [_jsx(Text, { color: getTextColor(isActive), children: "Listing capabilities. " }), _jsx(Spinner, {})] })), error && (_jsx(Box, { marginTop: 1, marginLeft: 1, children: _jsxs(Text, { color: Colors.Status.Error, children: ["Error: ", error] }) })), children] }));
+};
+/**
+ * Introspect controller: Lists capabilities via LLM
+ */
+export function Introspect({ tasks, status, service, children, debug = DebugLevel.None, requestHandlers, lifecycleHandlers, workflowHandlers, }) {
     const isActive = status === ComponentStatus.Active;
-    // isActive passed as prop
     const [error, setError] = useState(null);
+    const [capabilities, setCapabilities] = useState(null);
+    const [message, setMessage] = useState(null);
     useInput((input, key) => {
         if (key.escape && isActive) {
-            errorHandlers?.onAborted('introspection');
+            requestHandlers.onAborted('introspection');
         }
     }, { isActive });
     useEffect(() => {
@@ -36,25 +49,28 @@ export function Introspect({ tasks, state: _state, status, service, children, de
                 if (mounted) {
                     // Add debug components to timeline if present
                     if (result.debug?.length) {
-                        workflowHandlers?.addToTimeline(...result.debug);
+                        workflowHandlers.addToTimeline(...result.debug);
                     }
                     // Capabilities come directly from result - no parsing needed
-                    let capabilities = result.capabilities;
+                    let caps = result.capabilities;
                     // Filter out internal capabilities when not in debug mode
                     if (debug === DebugLevel.None) {
-                        capabilities = capabilities.filter((cap) => cap.name.toUpperCase() !== 'SCHEDULE' &&
+                        caps = caps.filter((cap) => cap.name.toUpperCase() !== 'SCHEDULE' &&
                             cap.name.toUpperCase() !== 'VALIDATE' &&
                             cap.name.toUpperCase() !== 'REPORT');
                     }
-                    // Save state before completing
-                    stateHandlers?.updateState({
-                        capabilities,
+                    setCapabilities(caps);
+                    setMessage(result.message);
+                    const finalState = {
+                        error: null,
+                        capabilities: caps,
                         message: result.message,
-                    });
+                    };
+                    requestHandlers.onCompleted(finalState);
                     // Add Report component to queue
-                    queueHandlers?.addToQueue(createReportDefinition(result.message, capabilities));
+                    workflowHandlers.addToQueue(createReportDefinition(result.message, caps));
                     // Signal completion
-                    lifecycleHandlers?.completeActive();
+                    lifecycleHandlers.completeActive();
                 }
             }
             catch (err) {
@@ -62,11 +78,13 @@ export function Introspect({ tasks, state: _state, status, service, children, de
                 if (mounted) {
                     const errorMessage = formatErrorMessage(err);
                     setError(errorMessage);
-                    // Save error state
-                    stateHandlers?.updateState({
+                    const finalState = {
                         error: errorMessage,
-                    });
-                    errorHandlers?.onError(errorMessage);
+                        capabilities: [],
+                        message: null,
+                    };
+                    requestHandlers.onCompleted(finalState);
+                    requestHandlers.onError(errorMessage);
                 }
             }
         }
@@ -74,10 +92,19 @@ export function Introspect({ tasks, state: _state, status, service, children, de
         return () => {
             mounted = false;
         };
-    }, [tasks, isActive, service, debug]);
-    // Don't render wrapper when done and nothing to show
-    if (!isActive && !error && !children) {
-        return null;
-    }
-    return (_jsxs(Box, { alignSelf: "flex-start", flexDirection: "column", children: [isActive && (_jsxs(Box, { marginLeft: 1, children: [_jsx(Text, { color: getTextColor(isActive), children: "Listing capabilities. " }), _jsx(Spinner, {})] })), error && (_jsx(Box, { marginTop: 1, marginLeft: 1, children: _jsxs(Text, { color: Colors.Status.Error, children: ["Error: ", error] }) })), children] }));
+    }, [
+        tasks,
+        isActive,
+        service,
+        debug,
+        requestHandlers,
+        lifecycleHandlers,
+        workflowHandlers,
+    ]);
+    const state = {
+        error,
+        capabilities: capabilities || [],
+        message,
+    };
+    return (_jsx(IntrospectView, { state: state, status: status, children: children }));
 }

package/dist/ui/Label.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
 import { getTaskColors, getTaskTypeLabel } from '../services/colors.js';
-import { DebugLevel } from '../services/configuration.js';
+import { DebugLevel } from '../configuration/types.js';
 import { Separator } from './Separator.js';
 export function Label({ description, taskType, showType = false, isCurrent = false, debug = DebugLevel.None, }) {
     const colors = getTaskColors(taskType, isCurrent);

package/dist/ui/Main.js

@@ -1,9 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
+import { DebugLevel } from '../configuration/types.js';
 import { FeedbackType } from '../types/types.js';
+import { loadConfig, loadDebugSetting, saveConfig, saveDebugSetting, } from '../configuration/io.js';
+import { getConfigurationRequiredMessage } from '../configuration/messages.js';
+import { getMissingConfigKeys } from '../configuration/schema.js';
+import { unflattenConfig } from '../configuration/transformation.js';
 import { createAnthropicService } from '../services/anthropic.js';
 import { createCommandDefinition, createConfigDefinitionWithKeys, createFeedback, createMessage, createWelcomeDefinition, } from '../services/components.js';
-import { DebugLevel, getConfigurationRequiredMessage, getMissingConfigKeys, loadConfig, loadDebugSetting, saveConfig, saveDebugSetting, unflattenConfig, } from '../services/configuration.js';
 import { registerGlobalShortcut } from '../services/keyboard.js';
 import { initializeLogger, setDebugLevel } from '../services/logger.js';
 import { Workflow } from './Workflow.js';

package/dist/ui/Refinement.js

@@ -4,6 +4,13 @@ import { ComponentStatus } from '../types/components.js';
 import { useInput } from '../services/keyboard.js';
 import { Message } from './Message.js';
 import { Spinner } from './Spinner.js';
+export const RefinementView = ({ text, status }) => {
+    const isActive = status === ComponentStatus.Active;
+    return (_jsxs(Box, { gap: 1, children: [_jsx(Message, { text: text, status: status }), isActive && _jsx(Spinner, {})] }));
+};
+/**
+ * Refinement controller: Handles abort input
+ */
 export const Refinement = ({ text, status, onAborted }) => {
     const isActive = status === ComponentStatus.Active;
     useInput((_, key) => {
@@ -12,5 +19,5 @@ export const Refinement = ({ text, status, onAborted }) => {
             return;
         }
     }, { isActive });
-    return (_jsxs(Box, { gap: 1, children: [_jsx(Message, { text: text }), isActive && _jsx(Spinner, {})] }));
+    return _jsx(RefinementView, { text: text, status: status });
 };

package/dist/ui/Schedule.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { Box } from 'ink';
-import { ComponentStatus } from '../types/components.js';
+import { ComponentStatus, } from '../types/components.js';
 import { TaskType } from '../types/types.js';
 import { getTaskColors, getTaskTypeLabel } from '../services/colors.js';
-import { DebugLevel } from '../services/configuration.js';
+import { DebugLevel } from '../configuration/types.js';
 import { useInput } from '../services/keyboard.js';
 import { Label } from './Label.js';
 import { List } from './List.js';
@@ -71,12 +71,54 @@ function taskToListItem(task, highlightedChildIndex = null, isDefineTaskWithoutS
     }
     return item;
 }
-export function Schedule({ message, tasks, state, status, debug = DebugLevel.None, stateHandlers, lifecycleHandlers, errorHandlers, onSelectionConfirmed, }) {
+export const ScheduleView = ({ message, tasks, state, status, debug = DebugLevel.None, }) => {
     const isActive = status === ComponentStatus.Active;
-    // isActive passed as prop
-    const [highlightedIndex, setHighlightedIndex] = useState(state?.highlightedIndex ?? null);
-    const [currentDefineGroupIndex, setCurrentDefineGroupIndex] = useState(state?.currentDefineGroupIndex ?? 0);
-    const [completedSelections, setCompletedSelections] = useState(state?.completedSelections ?? []);
+    const { highlightedIndex, currentDefineGroupIndex, completedSelections } = state;
+    // Find all Define tasks
+    const defineTaskIndices = tasks
+        .map((t, idx) => (t.type === TaskType.Define ? idx : -1))
+        .filter((idx) => idx !== -1);
+    // Get the current active define task
+    const currentDefineTaskIndex = defineTaskIndices[currentDefineGroupIndex] ?? -1;
+    const listItems = tasks.map((task, idx) => {
+        // Find which define group this task belongs to (if any)
+        const defineGroupIndex = defineTaskIndices.indexOf(idx);
+        const isDefineTask = defineGroupIndex !== -1;
+        // Determine child selection state
+        let childIndex = null;
+        if (isDefineTask) {
+            if (defineGroupIndex < currentDefineGroupIndex) {
+                // Previously completed group - show the selection
+                childIndex = completedSelections[defineGroupIndex] ?? null;
+            }
+            else if (defineGroupIndex === currentDefineGroupIndex) {
+                // Current active group - show live navigation unless not active
+                if (!isActive) {
+                    // If not active, show the completed selection for this group too
+                    childIndex = completedSelections[defineGroupIndex] ?? null;
+                }
+                else {
+                    childIndex = null;
+                }
+            }
+        }
+        // Show arrow on current active define task when no child is highlighted and is active
+        const isDefineWithoutSelection = isDefineTask &&
+            defineGroupIndex === currentDefineGroupIndex &&
+            highlightedIndex === null &&
+            isActive;
+        return taskToListItem(task, childIndex, isDefineWithoutSelection, isActive, debug);
+    });
+    return (_jsxs(Box, { flexDirection: "column", children: [message && (_jsx(Box, { marginBottom: 1, marginLeft: 1, children: _jsx(Label, { description: message, taskType: TaskType.Schedule, showType: debug !== DebugLevel.None, isCurrent: isActive, debug: debug }) })), _jsx(Box, { marginLeft: 1, children: _jsx(List, { items: listItems, highlightedIndex: currentDefineTaskIndex >= 0 ? highlightedIndex : null, highlightedParentIndex: currentDefineTaskIndex, showType: debug !== DebugLevel.None }) })] }));
+};
+/**
+ * Schedule controller: Manages task selection and navigation
+ */
+export function Schedule({ message, tasks, status, debug = DebugLevel.None, requestHandlers, lifecycleHandlers, onSelectionConfirmed, }) {
+    const isActive = status === ComponentStatus.Active;
+    const [highlightedIndex, setHighlightedIndex] = useState(null);
+    const [currentDefineGroupIndex, setCurrentDefineGroupIndex] = useState(0);
+    const [completedSelections, setCompletedSelections] = useState([]);
     // Find all Define tasks
     const defineTaskIndices = tasks
         .map((t, idx) => (t.type === TaskType.Define ? idx : -1))
@@ -93,9 +135,16 @@ export function Schedule({ message, tasks, state, status, debug = DebugLevel.Non
         if (isActive && defineTaskIndices.length === 0 && onSelectionConfirmed) {
             // No selection needed - all tasks are concrete
             const concreteTasks = tasks.filter((task) => task.type !== TaskType.Ignore && task.type !== TaskType.Discard);
+            // Expose final state
+            const finalState = {
+                highlightedIndex,
+                currentDefineGroupIndex,
+                completedSelections,
+            };
+            requestHandlers.onCompleted(finalState);
             // Complete the selection phase - it goes to timeline
             // Callback will create a new Plan showing refined tasks (pending) + Confirm (active)
-            lifecycleHandlers?.completeActive();
+            lifecycleHandlers.completeActive();
             void onSelectionConfirmed(concreteTasks);
         }
     }, [
@@ -104,6 +153,10 @@ export function Schedule({ message, tasks, state, status, debug = DebugLevel.Non
         tasks,
         onSelectionConfirmed,
         lifecycleHandlers,
+        highlightedIndex,
+        currentDefineGroupIndex,
+        completedSelections,
+        requestHandlers,
     ]);
     useInput((input, key) => {
         // Don't handle input if not active or no define task
@@ -111,7 +164,7 @@ export function Schedule({ message, tasks, state, status, debug = DebugLevel.Non
             return;
         }
         if (key.escape) {
-            errorHandlers?.onAborted('task selection');
+            requestHandlers.onAborted('task selection');
             return;
         }
         if (key.downArrow) {
@@ -167,61 +220,31 @@ export function Schedule({ message, tasks, state, status, debug = DebugLevel.Non
                         refinedTasks.push(task);
                     }
                 });
+                // Expose final state
+                const finalState = {
+                    highlightedIndex: null,
+                    currentDefineGroupIndex,
+                    completedSelections: newCompletedSelections,
+                };
+                requestHandlers.onCompleted(finalState);
                 if (onSelectionConfirmed) {
                     // Complete the selection phase - it goes to timeline
                     // Callback will create a new Plan showing refined tasks (pending) + Confirm (active)
-                    lifecycleHandlers?.completeActive();
+                    lifecycleHandlers.completeActive();
                     void onSelectionConfirmed(refinedTasks);
                 }
                 else {
                     // No selection callback, just complete normally
-                    lifecycleHandlers?.completeActive();
+                    lifecycleHandlers.completeActive();
                 }
             }
         }
     }, { isActive: isActive && defineTask !== null });
-    // Sync state back to component definition
-    // This ensures timeline can render historical state and tests can validate behavior
-    useEffect(() => {
-        stateHandlers?.updateState({
-            highlightedIndex,
-            currentDefineGroupIndex,
-            completedSelections,
-        });
-    }, [
+    // Controller always renders View, passing current state
+    const state = {
         highlightedIndex,
         currentDefineGroupIndex,
         completedSelections,
-        stateHandlers,
-    ]);
-    const listItems = tasks.map((task, idx) => {
-        // Find which define group this task belongs to (if any)
-        const defineGroupIndex = defineTaskIndices.indexOf(idx);
-        const isDefineTask = defineGroupIndex !== -1;
-        // Determine child selection state
-        let childIndex = null;
-        if (isDefineTask) {
-            if (defineGroupIndex < currentDefineGroupIndex) {
-                // Previously completed group - show the selection
-                childIndex = completedSelections[defineGroupIndex] ?? null;
-            }
-            else if (defineGroupIndex === currentDefineGroupIndex) {
-                // Current active group - show live navigation unless not active
-                if (!isActive) {
-                    // If not active, show the completed selection for this group too
-                    childIndex = completedSelections[defineGroupIndex] ?? null;
-                }
-                else {
-                    childIndex = null;
-                }
-            }
-        }
-        // Show arrow on current active define task when no child is highlighted and is active
-        const isDefineWithoutSelection = isDefineTask &&
-            defineGroupIndex === currentDefineGroupIndex &&
-            highlightedIndex === null &&
-            isActive;
-        return taskToListItem(task, childIndex, isDefineWithoutSelection, isActive, debug);
-    });
-    return (_jsxs(Box, { flexDirection: "column", children: [message && (_jsx(Box, { marginBottom: 1, marginLeft: 1, children: _jsx(Label, { description: message, taskType: TaskType.Schedule, showType: debug !== DebugLevel.None, isCurrent: isActive, debug: debug }) })), _jsx(Box, { marginLeft: 1, children: _jsx(List, { items: listItems, highlightedIndex: currentDefineTaskIndex >= 0 ? highlightedIndex : null, highlightedParentIndex: currentDefineTaskIndex, showType: debug !== DebugLevel.None }) })] }));
+    };
+    return (_jsx(ScheduleView, { message: message, tasks: tasks, state: state, status: status, debug: debug }));
 }

package/dist/ui/Validate.js

@@ -1,23 +1,35 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { Box, Text } from 'ink';
-import { ComponentStatus } from '../types/components.js';
+import { ComponentStatus, } from '../types/components.js';
 import { TaskType } from '../types/types.js';
+import { saveConfig } from '../configuration/io.js';
+import { unflattenConfig } from '../configuration/transformation.js';
 import { Colors, getTextColor } from '../services/colors.js';
-import { createConfigStepsFromSchema } from '../services/components.js';
-import { DebugLevel, saveConfig, unflattenConfig, } from '../services/configuration.js';
+import { createConfigDefinitionWithKeys, createMessage, } from '../services/components.js';
 import { saveConfigLabels } from '../services/config-labels.js';
 import { useInput } from '../services/keyboard.js';
-import { formatErrorMessage } from '../services/messages.js';
+import { formatErrorMessage, getUnresolvedPlaceholdersMessage, } from '../services/messages.js';
 import { ensureMinimumTime } from '../services/timing.js';
-import { Config } from './Config.js';
 import { Spinner } from './Spinner.js';
 const MIN_PROCESSING_TIME = 1000;
-export function Validate({ missingConfig, userRequest, state, status, service, children, debug = DebugLevel.None, onError, onComplete, onAborted, stateHandlers, lifecycleHandlers, workflowHandlers, }) {
+export const ValidateView = ({ state, status }) => {
     const isActive = status === ComponentStatus.Active;
-    const [error, setError] = useState(state?.error ?? null);
-    const [completionMessage, setCompletionMessage] = useState(state?.completionMessage ?? null);
-    const [configRequirements, setConfigRequirements] = useState(state?.configRequirements ?? null);
+    const { error, completionMessage } = state;
+    // Don't render when not active and nothing to show
+    if (!isActive && !completionMessage && !error) {
+        return null;
+    }
+    return (_jsxs(Box, { alignSelf: "flex-start", flexDirection: "column", children: [isActive && !completionMessage && !error && (_jsxs(Box, { marginLeft: 1, children: [_jsxs(Text, { color: getTextColor(isActive), children: ["Validating configuration requirements.", ' '] }), _jsx(Spinner, {})] })), completionMessage && (_jsx(Box, { marginLeft: 1, children: _jsx(Text, { color: getTextColor(isActive), children: completionMessage }) })), error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: Colors.Status.Error, children: ["Error: ", error] }) }))] }));
+};
+/**
+ * Validate controller: Validates missing config
+ */
+export function Validate({ missingConfig, userRequest, status, service, onError, requestHandlers, onValidationComplete, onAborted, lifecycleHandlers, workflowHandlers, }) {
+    const isActive = status === ComponentStatus.Active;
+    const [error, setError] = useState(null);
+    const [completionMessage, setCompletionMessage] = useState(null);
+    const [configRequirements, setConfigRequirements] = useState([]);
     useInput((_, key) => {
         if (key.escape && isActive) {
             onAborted('validation');
@@ -40,7 +52,7 @@ export function Validate({ missingConfig, userRequest, state, status, service, c
                 if (mounted) {
                     // Add debug components to timeline if present
                     if (result.debug?.length) {
-                        workflowHandlers?.addToTimeline(...result.debug);
+                        workflowHandlers.addToTimeline(...result.debug);
                     }
                     // Extract CONFIG tasks with descriptions from result
                     const configTasks = result.tasks.filter((task) => task.type === TaskType.Config);
@@ -57,25 +69,50 @@ export function Validate({ missingConfig, userRequest, state, status, service, c
                         };
                     });
                     // Build completion message showing which config properties are needed
-                    const count = withDescriptions.length;
-                    const propertyWord = count === 1 ? 'property' : 'properties';
-                    // Shuffle between different message variations
-                    const messages = [
-                        `Additional configuration ${propertyWord} required.`,
-                        `Configuration ${propertyWord} needed.`,
-                        `Missing configuration ${propertyWord} detected.`,
-                        `Setup requires configuration ${propertyWord}.`,
-                    ];
-                    const message = messages[Math.floor(Math.random() * messages.length)];
+                    const message = getUnresolvedPlaceholdersMessage(withDescriptions.length);
                     setCompletionMessage(message);
                     setConfigRequirements(withDescriptions);
-                    // Save state after validation completes
-                    stateHandlers?.updateState({
+                    // Add validation message to timeline before Config component
+                    workflowHandlers.addToTimeline(createMessage(message));
+                    // Create Config component and add to queue
+                    const keys = withDescriptions.map((req) => req.path);
+                    const configDef = createConfigDefinitionWithKeys(keys, (config) => {
+                        // Convert flat dotted keys to nested structure grouped by section
+                        const configBySection = unflattenConfig(config);
+                        // Extract and save labels to cache
+                        const labels = {};
+                        for (const req of withDescriptions) {
+                            if (req.description) {
+                                labels[req.path] = req.description;
+                            }
+                        }
+                        saveConfigLabels(labels);
+                        // Save each section
+                        for (const [section, sectionConfig] of Object.entries(configBySection)) {
+                            saveConfig(section, sectionConfig);
+                        }
+                        // After config is saved, invoke callback to add Execute component to queue
+                        onValidationComplete(withDescriptions);
+                    }, (operation) => {
+                        onAborted(operation);
+                    });
+                    // Override descriptions with LLM-generated ones
+                    if ('props' in configDef && 'steps' in configDef.props) {
+                        configDef.props.steps = configDef.props.steps.map((step, index) => ({
+                            ...step,
+                            description: withDescriptions[index].description ||
+                                withDescriptions[index].path,
+                        }));
+                    }
+                    workflowHandlers.addToQueue(configDef);
+                    lifecycleHandlers.completeActive();
+                    const finalState = {
+                        error: null,
                         completionMessage: message,
                         configRequirements: withDescriptions,
                         validated: true,
-                        error: null,
-                    });
+                    };
+                    requestHandlers.onCompleted(finalState);
                 }
             }
             catch (err) {
@@ -83,13 +120,13 @@ export function Validate({ missingConfig, userRequest, state, status, service, c
                 if (mounted) {
                     const errorMessage = formatErrorMessage(err);
                     setError(errorMessage);
-                    // Save error state
-                    stateHandlers?.updateState({
+                    const finalState = {
                         error: errorMessage,
                         completionMessage: null,
-                        configRequirements: null,
+                        configRequirements: [],
                         validated: false,
-                    });
+                    };
+                    requestHandlers.onCompleted(finalState);
                     onError(errorMessage);
                 }
             }
@@ -103,59 +140,20 @@ export function Validate({ missingConfig, userRequest, state, status, service, c
         userRequest,
         isActive,
         service,
-        onComplete,
+        requestHandlers,
         onError,
         onAborted,
+        onValidationComplete,
+        lifecycleHandlers,
+        workflowHandlers,
     ]);
-    // Don't render when not active and nothing to show
-    if (!isActive && !completionMessage && !error && !children) {
-        return null;
-    }
-    // Create ConfigSteps from requirements using createConfigStepsFromSchema
-    // to load current values from config file, then override descriptions
-    const configSteps = configRequirements
-        ? (() => {
-            const keys = configRequirements.map((req) => req.path);
-            const steps = createConfigStepsFromSchema(keys);
-            // Override descriptions with LLM-generated ones
-            return steps.map((step, index) => ({
-                ...step,
-                description: configRequirements[index].description ||
-                    configRequirements[index].path,
-            }));
-        })()
-        : null;
-    const handleConfigFinished = (config) => {
-        // Convert flat dotted keys to nested structure grouped by section
-        const configBySection = unflattenConfig(config);
-        // Extract and save labels to cache
-        if (configRequirements) {
-            const labels = {};
-            for (const req of configRequirements) {
-                if (req.description) {
-                    labels[req.path] = req.description;
-                }
-            }
-            saveConfigLabels(labels);
-        }
-        // Save each section
-        for (const [section, sectionConfig] of Object.entries(configBySection)) {
-            saveConfig(section, sectionConfig);
-        }
-        // Mark validation component as complete before invoking callback
-        // This allows the workflow to proceed to execution
-        lifecycleHandlers?.completeActive();
-        // Invoke callback which will queue the Execute component
-        if (configRequirements) {
-            onComplete(configRequirements);
-        }
-    };
-    const handleConfigAborted = (operation) => {
-        // Mark validation component as complete when aborted
-        lifecycleHandlers?.completeActive();
-        onAborted(operation);
+    const state = {
+        error,
+        completionMessage,
+        configRequirements,
+        validated: error === null && completionMessage !== null,
     };
-    return (_jsxs(Box, { alignSelf: "flex-start", flexDirection: "column", children: [isActive && !completionMessage && !error && (_jsxs(Box, { marginLeft: 1, children: [_jsxs(Text, { color: getTextColor(isActive), children: ["Validating configuration requirements.", ' '] }), _jsx(Spinner, {})] })), completionMessage && (_jsx(Box, { marginLeft: 1, children: _jsx(Text, { color: getTextColor(isActive), children: completionMessage }) })), error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: Colors.Status.Error, children: ["Error: ", error] }) })), configSteps && configSteps.length > 0 && !error && (_jsx(Box, { marginTop: 1, children: _jsx(Config, { steps: configSteps, status: status, debug: debug, onFinished: handleConfigFinished, onAborted: handleConfigAborted }) })), configSteps && configSteps.length === 0 && !error && (_jsx(Box, { marginTop: 1, marginLeft: 1, children: _jsx(Text, { color: Colors.Status.Error, children: "Error: No configuration steps generated. Please try again." }) })), children] }));
+    return _jsx(ValidateView, { state: state, status: status });
 }
 /**
  * Build prompt for VALIDATE tool