prompt-language-shell 0.7.0 → 0.7.4

package/dist/ui/Command.js

@@ -4,7 +4,7 @@ import { Box, Text } from 'ink';
 import { ComponentStatus, } from '../types/components.js';
 import { TaskType } from '../types/types.js';
 import { Colors } from '../services/colors.js';
-import { createPlanDefinition } from '../services/components.js';
+import { createScheduleDefinition } from '../services/components.js';
 import { formatErrorMessage } from '../services/messages.js';
 import { useInput } from '../services/keyboard.js';
 import { handleRefinement } from '../services/refinement.js';
@@ -36,21 +36,28 @@ export function Command({ command, state, status, service, handlers, onAborted,
         async function process(svc) {
             const startTime = Date.now();
             try {
-                let result = await svc.processWithTool(command, 'plan');
-                // If all tasks are config type, delegate to CONFIG tool
+                let result = await svc.processWithTool(command, 'schedule');
+                // Save schedule debug output before potentially delegating
+                const scheduleDebug = result.debug || [];
+                // If all tasks are configure type, delegate to CONFIGURE tool
                 const allConfig = result.tasks.length > 0 &&
                     result.tasks.every((task) => task.type === TaskType.Config);
                 if (allConfig) {
                     // Extract query from first config task params, default to 'app'
                     const query = result.tasks[0].params?.query || 'app';
-                    // Call CONFIG tool to get specific config keys
-                    result = await svc.processWithTool(query, 'config');
+                    // Call CONFIGURE tool to get specific config keys
+                    result = await svc.processWithTool(query, 'configure');
                 }
                 await ensureMinimumTime(startTime, MIN_PROCESSING_TIME);
                 if (mounted) {
                     // Add debug components to timeline if present
-                    if (result.debug && result.debug.length > 0) {
-                        handlers?.addToTimeline(...result.debug);
+                    // If we delegated to configure, include both schedule and configure debug
+                    // If not, only include schedule debug (result.debug is same as scheduleDebug)
+                    const allDebug = allConfig
+                        ? [...scheduleDebug, ...(result.debug || [])]
+                        : scheduleDebug;
+                    if (allDebug.length > 0) {
+                        handlers?.addToTimeline(...allDebug);
                     }
                     // Save result to state for timeline display
                     handlers?.updateState({
@@ -59,17 +66,17 @@ export function Command({ command, state, status, service, handlers, onAborted,
                     });
                     // Check if tasks contain DEFINE type (variant selection needed)
                     const hasDefineTask = result.tasks.some((task) => task.type === TaskType.Define);
-                    // Create Plan definition
-                    const planDefinition = createPlanDefinition(result.message, result.tasks, hasDefineTask
+                    // Create Schedule definition
+                    const scheduleDefinition = createScheduleDefinition(result.message, result.tasks, hasDefineTask
                         ? async (selectedTasks) => {
                             // Refinement flow for DEFINE tasks
                             await handleRefinement(selectedTasks, svc, command, handlers);
                         }
                         : undefined);
                     if (hasDefineTask) {
-                        // DEFINE tasks: Move Command to timeline, add Plan to queue
+                        // DEFINE tasks: Move Command to timeline, add Schedule to queue
                         handlers?.completeActive();
-                        handlers?.addToQueue(planDefinition);
+                        handlers?.addToQueue(scheduleDefinition);
                     }
                     else {
                         // No DEFINE tasks: Complete Command, then route to Confirm flow

package/dist/ui/Component.js

@@ -10,7 +10,7 @@ import { Execute } from './Execute.js';
 import { Feedback } from './Feedback.js';
 import { Introspect } from './Introspect.js';
 import { Message } from './Message.js';
-import { Plan } from './Plan.js';
+import { Schedule } from './Schedule.js';
 import { Refinement } from './Refinement.js';
 import { Report } from './Report.js';
 import { Validate } from './Validate.js';
@@ -23,8 +23,8 @@ export const Component = memo(function Component({ def, debug, }) {
             return (_jsx(Config, { ...def.props, state: def.state, status: def.status, debug: debug }));
         case ComponentName.Command:
             return _jsx(Command, { ...def.props, state: def.state, status: def.status });
-        case ComponentName.Plan:
-            return (_jsx(Plan, { ...def.props, state: def.state, status: def.status, debug: debug }));
+        case ComponentName.Schedule:
+            return (_jsx(Schedule, { ...def.props, state: def.state, status: def.status, debug: debug }));
         case ComponentName.Feedback:
             return _jsx(Feedback, { ...def.props, status: def.status });
         case ComponentName.Message:

package/dist/ui/Config.js

@@ -3,7 +3,9 @@ import { useState } from 'react';
 import { Box, Text, useFocus } from 'ink';
 import TextInput from 'ink-text-input';
 import { ComponentStatus } from '../types/components.js';
+import { FeedbackType } from '../types/types.js';
 import { Colors } from '../services/colors.js';
+import { createFeedback } from '../services/components.js';
 import { DebugLevel } from '../services/configuration.js';
 import { useInput } from '../services/keyboard.js';
 export var StepType;
@@ -131,9 +133,16 @@ export function Config({ steps, state, status, debug = DebugLevel.None, handlers
                     setValues({ ...values, [configKey]: currentValue });
                 }
             }
+            // Save state before aborting
+            handlers?.updateState({
+                values,
+                completedStep: step,
+            });
             if (onAborted) {
                 onAborted('configuration');
             }
+            // Complete with abort feedback
+            handlers?.completeActive(createFeedback(FeedbackType.Aborted, 'Configuration cancelled.'));
             return;
         }
         // Handle selection step navigation
@@ -190,9 +199,18 @@ export function Config({ steps, state, status, debug = DebugLevel.None, handlers
                 completedStep: steps.length,
             };
             handlers?.updateState(stateUpdate);
-            // Now call onFinished - this may trigger completeActive()
-            if (onFinished) {
-                onFinished(newValues);
+            // Call onFinished callback and handle result
+            try {
+                if (onFinished) {
+                    onFinished(newValues);
+                }
+                // Success - complete with success feedback
+                handlers?.completeActive(createFeedback(FeedbackType.Succeeded, 'Configuration saved successfully.'));
+            }
+            catch (error) {
+                // Failure - complete with error feedback
+                const errorMessage = error instanceof Error ? error.message : 'Configuration failed';
+                handlers?.completeActive(createFeedback(FeedbackType.Failed, errorMessage));
             }
             setStep(steps.length);
         }

package/dist/ui/Debug.js

@@ -1,8 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
-const MIN_CONTENT_WIDTH = 80;
+const CONTENT_WIDTH = 80;
 const HORIZONTAL_PADDING = 2;
-const BORDER_WIDTH = 1;
 export const Debug = ({ title, content, color }) => {
-    return (_jsxs(Box, { flexDirection: "column", paddingX: HORIZONTAL_PADDING, paddingY: 1, borderStyle: "single", borderColor: color, alignSelf: "flex-start", minWidth: MIN_CONTENT_WIDTH + 2 * HORIZONTAL_PADDING + 2 * BORDER_WIDTH, children: [_jsx(Text, { color: color, children: title }), _jsx(Text, { color: color, children: content })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: HORIZONTAL_PADDING, paddingY: 1, borderStyle: "single", borderColor: color, width: CONTENT_WIDTH, children: [_jsx(Text, { color: color, wrap: "wrap", children: title }), _jsx(Text, { color: color, wrap: "wrap", children: content })] }));
 };

package/dist/ui/Introspect.js

@@ -12,14 +12,14 @@ import { Spinner } from './Spinner.js';
 const MIN_PROCESSING_TIME = 1000;
 const BUILT_IN_CAPABILITIES = new Set([
     'CONFIG',
-    'PLAN',
+    'SCHEDULE',
     'INTROSPECT',
     'ANSWER',
     'EXECUTE',
     'VALIDATE',
     'REPORT',
 ]);
-const INDIRECT_CAPABILITIES = new Set(['PLAN', 'VALIDATE', 'REPORT']);
+const INDIRECT_CAPABILITIES = new Set(['SCHEDULE', 'VALIDATE', 'REPORT']);
 function parseCapabilityFromTask(task) {
     // Parse "NAME: Description" format from task.action
     const colonIndex = task.action.indexOf(':');
@@ -85,7 +85,7 @@ export function Introspect({ tasks, state, status, service, children, debug = De
                     let capabilities = result.tasks.map(parseCapabilityFromTask);
                     // Filter out internal capabilities when not in debug mode
                     if (debug === DebugLevel.None) {
-                        capabilities = capabilities.filter((cap) => cap.name.toUpperCase() !== 'PLAN' &&
+                        capabilities = capabilities.filter((cap) => cap.name.toUpperCase() !== 'SCHEDULE' &&
                             cap.name.toUpperCase() !== 'VALIDATE' &&
                             cap.name.toUpperCase() !== 'REPORT');
                     }

package/dist/ui/Label.js

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

package/dist/ui/List.js

@@ -2,13 +2,14 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { Box, Text } from 'ink';
 import { Separator } from './Separator.js';
 export const List = ({ items, level = 0, highlightedIndex = null, highlightedParentIndex = null, showType = false, }) => {
-    const marginLeft = level > 0 ? 4 : 0;
+    const marginLeft = level > 0 ? 2 : 0;
     return (_jsx(Box, { flexDirection: "column", marginLeft: marginLeft, children: items.map((item, index) => {
             // At level 0, track which parent is active for child highlighting
             // At level > 0, only highlight if this parent is the active one
             const shouldHighlightChildren = level === 0 ? highlightedParentIndex === index : false;
             const isHighlighted = item.highlighted || (level > 0 && index === highlightedIndex);
-            const marker = item.marker || (isHighlighted ? '  → ' : '  - ');
+            const defaultMarker = level > 0 ? '  · ' : '  - ';
+            const marker = item.marker || (isHighlighted ? '  → ' : defaultMarker);
             // Use highlighted colors if available and item is highlighted
             const descriptionColor = isHighlighted && item.description.highlightedColor
                 ? item.description.highlightedColor

package/dist/ui/Main.js

@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
 import { FeedbackType } from '../types/types.js';
 import { createAnthropicService, } from '../services/anthropic.js';
 import { createCommandDefinition, createConfigDefinitionWithKeys, createFeedback, createMessage, createWelcomeDefinition, } from '../services/components.js';
-import { DebugLevel, getConfigurationRequiredMessage, getMissingConfigKeys, loadConfig, loadDebugSetting, saveAnthropicConfig, saveDebugSetting, } from '../services/configuration.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';
@@ -69,20 +69,25 @@ export const Main = ({ app, command }) => {
             const handleConfigFinished = (config) => {
                 // Save config and create service
                 try {
-                    const newConfig = saveAnthropicConfig(config);
+                    const configBySection = unflattenConfig(config);
+                    for (const [section, sectionConfig] of Object.entries(configBySection)) {
+                        saveConfig(section, sectionConfig);
+                    }
+                    // Load config and create service
+                    const newConfig = loadConfig();
                     const newService = createAnthropicService(newConfig.anthropic);
                     setService(newService);
                 }
                 catch (error) {
-                    // Config creation failed - show error
+                    // Config save failed
                     const errorMessage = error instanceof Error
                         ? error.message
                         : 'Failed to save configuration';
-                    setInitialQueue([createFeedback(FeedbackType.Failed, errorMessage)]);
+                    throw new Error(errorMessage);
                 }
             };
             const handleConfigAborted = (operation) => {
-                // Config was cancelled - just exit
+                // Config was cancelled
             };
             setInitialQueue([
                 createWelcomeDefinition(app),

package/dist/ui/{Plan.js → Schedule.js}

@@ -4,24 +4,24 @@ import { Box } from 'ink';
 import { ComponentStatus } from '../types/components.js';
 import { TaskType } from '../types/types.js';
 import { DebugLevel } from '../services/configuration.js';
-import { getTaskColors } from '../services/colors.js';
+import { getTaskColors, getTaskTypeLabel } from '../services/colors.js';
 import { useInput } from '../services/keyboard.js';
 import { Label } from './Label.js';
 import { List } from './List.js';
-function taskToListItem(task, highlightedChildIndex = null, isDefineTaskWithoutSelection = false, isCurrent = false) {
+function taskToListItem(task, highlightedChildIndex = null, isDefineTaskWithoutSelection = false, isCurrent = false, debug = DebugLevel.None) {
     const taskColors = getTaskColors(task.type, isCurrent);
     const item = {
         description: {
             text: task.action,
             color: taskColors.description,
         },
-        type: { text: task.type, color: taskColors.type },
+        type: { text: getTaskTypeLabel(task.type, debug), color: taskColors.type },
         children: [],
     };
     // Mark define tasks with right arrow when no selection has been made
     if (isDefineTaskWithoutSelection) {
         item.marker = '  → ';
-        item.markerColor = getTaskColors(TaskType.Plan, isCurrent).type;
+        item.markerColor = getTaskColors(TaskType.Schedule, isCurrent).type;
     }
     // Add children for Define tasks with options
     if (task.type === TaskType.Define && Array.isArray(task.params?.options)) {
@@ -34,7 +34,7 @@ function taskToListItem(task, highlightedChildIndex = null, isDefineTaskWithoutS
                     index === highlightedChildIndex ? TaskType.Execute : TaskType.Discard;
             }
             const colors = getTaskColors(childType, isCurrent);
-            const planColors = getTaskColors(TaskType.Plan, isCurrent);
+            const planColors = getTaskColors(TaskType.Schedule, isCurrent);
             return {
                 description: {
                     text: String(option),
@@ -42,16 +42,36 @@ function taskToListItem(task, highlightedChildIndex = null, isDefineTaskWithoutS
                     highlightedColor: planColors.description,
                 },
                 type: {
-                    text: childType,
+                    text: getTaskTypeLabel(childType, debug),
                     color: colors.type,
                     highlightedColor: planColors.type,
                 },
             };
         });
     }
+    // Add children for Group tasks with subtasks
+    const scheduledTask = task;
+    if (task.type === TaskType.Group &&
+        scheduledTask.subtasks &&
+        Array.isArray(scheduledTask.subtasks) &&
+        scheduledTask.subtasks.length > 0) {
+        item.children = scheduledTask.subtasks.map((subtask) => {
+            const subtaskColors = getTaskColors(subtask.type, isCurrent);
+            return {
+                description: {
+                    text: subtask.action,
+                    color: subtaskColors.description,
+                },
+                type: {
+                    text: getTaskTypeLabel(subtask.type, debug),
+                    color: subtaskColors.type,
+                },
+            };
+        });
+    }
     return item;
 }
-export function Plan({ message, tasks, state, status, debug = DebugLevel.None, handlers, onSelectionConfirmed, }) {
+export function Schedule({ message, tasks, state, status, debug = DebugLevel.None, handlers, onSelectionConfirmed, }) {
     const isActive = status === ComponentStatus.Active;
     // isActive passed as prop
     const [highlightedIndex, setHighlightedIndex] = useState(state?.highlightedIndex ?? null);
@@ -138,6 +158,7 @@ export function Plan({ message, tasks, state, status, debug = DebugLevel.None, h
                         refinedTasks.push({
                             action: selectedOption,
                             type: TaskType.Execute,
+                            config: [],
                         });
                     }
                     else if (task.type !== TaskType.Ignore &&
@@ -200,7 +221,7 @@ export function Plan({ message, tasks, state, status, debug = DebugLevel.None, h
             defineGroupIndex === currentDefineGroupIndex &&
             highlightedIndex === null &&
             isActive;
-        return taskToListItem(task, childIndex, isDefineWithoutSelection, 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.Plan, showType: debug !== DebugLevel.None, isCurrent: isActive }) })), _jsx(Box, { marginLeft: 1, children: _jsx(List, { items: listItems, highlightedIndex: currentDefineTaskIndex >= 0 ? highlightedIndex : null, highlightedParentIndex: currentDefineTaskIndex, showType: debug !== DebugLevel.None }) })] }));
+    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 }) })] }));
 }

package/dist/ui/Validate.js

@@ -139,7 +139,7 @@ export function Validate({ missingConfig, userRequest, state, status, service, c
         handlers?.completeActive();
         onAborted(operation);
     };
-    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 && !error && (_jsx(Box, { marginTop: 1, children: _jsx(Config, { steps: configSteps, status: status, debug: debug, onFinished: handleConfigFinished, onAborted: handleConfigAborted, handlers: handlers }) })), children] }));
+    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, handlers: handlers }) })), 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] }));
 }
 /**
  * Build prompt for VALIDATE tool

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prompt-language-shell",
-  "version": "0.7.0",
+  "version": "0.7.4",
   "description": "Your personal command-line concierge. Ask politely, and it gets things done.",
   "type": "module",
   "main": "dist/index.js",