@allpepper/task-orchestrator-tui 1.2.1 → 2.0.0

package/src/tui/screens/project-view.tsx

@@ -4,13 +4,14 @@ import { useProjectTree } from '../../ui/hooks/use-data';
 import { useAdapter } from '../../ui/context/adapter-context';
 import { useTheme } from '../../ui/context/theme-context';
 import { TreeView, type TreeRow } from '../components/tree-view';
-import { StatusBadge } from '../components/status-badge';
 import { ViewModeChips } from '../components/view-mode-chips';
 import { ConfirmDialog } from '../components/confirm-dialog';
 import { FormDialog } from '../components/form-dialog';
 import { ErrorMessage } from '../components/error-message';
 import { EmptyState } from '../components/empty-state';
-import type { FeatureStatus, Priority } from '@allpepper/task-orchestrator';
+import { StatusActions } from '../components/status-actions';
+import type { Priority } from '@allpepper/task-orchestrator';
+import type { WorkflowState } from '../../ui/adapters/types';
 
 interface ProjectViewProps {
   projectId: string;
@@ -34,8 +35,8 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
   const { project, features, unassignedTasks, taskCounts, statusGroupedRows, featureStatusGroupedRows, loading, error, refresh } = useProjectTree(projectId, expandedGroups);
   const [mode, setMode] = useState<'idle' | 'create-feature' | 'edit-feature' | 'delete-feature' | 'create-task' | 'edit-task' | 'delete-task' | 'feature-status'>('idle');
   const [localError, setLocalError] = useState<string | null>(null);
-  const [featureTransitions, setFeatureTransitions] = useState<string[]>([]);
-  const [featureTransitionIndex, setFeatureTransitionIndex] = useState(0);
+  const [featureWorkflowState, setFeatureWorkflowState] = useState<WorkflowState | null>(null);
+  const [isUpdatingStatus, setIsUpdatingStatus] = useState(false);
 
   // Build flat list of rows - switch based on view mode
   const rows = useMemo(() => {
@@ -83,6 +84,20 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
     return result;
   }, [viewMode, statusGroupedRows, featureStatusGroupedRows, features, unassignedTasks, expandedFeatures]);
 
+  // Helper: get feature from current row
+  const getFeatureFromRow = (row: TreeRow | undefined) => {
+    if (!row) return undefined;
+    const featureId =
+      row.type === 'feature'
+        ? row.feature.id
+        : row.type === 'group'
+          ? row.featureId
+          : row.type === 'task'
+            ? row.task.featureId
+            : undefined;
+    return featureId ? features.find((f) => f.id === featureId) : undefined;
+  };
+
   // Handle keyboard
   useInput((input, key) => {
     if (mode !== 'idle') return;
@@ -92,7 +107,6 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
     if (input === 'r') {
       refresh();
     }
-    // Cycle view mode with 'v': features → status → feature-status → features
     if (input === 'v') {
       const next = viewMode === 'features' ? 'status' : viewMode === 'status' ? 'feature-status' : 'features';
       onViewModeChange(next);
@@ -106,7 +120,6 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
     if (input === 't') {
       setMode('create-task');
     }
-    // Navigate to feature detail screen
     if (input === 'f') {
       const currentRow = rows[selectedIndex];
       const featureId =
@@ -137,21 +150,11 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
       }
     }
     if (input === 's') {
-      const currentRow = rows[selectedIndex];
-      const featureId =
-        currentRow?.type === 'feature'
-          ? currentRow.feature.id
-          : currentRow?.type === 'group'
-            ? currentRow.featureId
-            : currentRow?.type === 'task'
-              ? currentRow.task.featureId
-              : undefined;
-      const feature = featureId ? features.find((f) => f.id === featureId) : undefined;
+      const feature = getFeatureFromRow(rows[selectedIndex]);
       if (feature) {
-        adapter.getAllowedTransitions('FEATURE', feature.status).then((result) => {
+        adapter.getWorkflowState('feature', feature.id).then((result) => {
           if (result.success) {
-            setFeatureTransitions(result.data);
-            setFeatureTransitionIndex(0);
+            setFeatureWorkflowState(result.data);
             setMode('feature-status');
           }
         });
@@ -159,48 +162,55 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
     }
   });
 
-  useInput((input, key) => {
+  useInput((_input, key) => {
     if (mode !== 'feature-status') return;
-    if (input === 'j' || key.downArrow) {
-      setFeatureTransitionIndex((prev) => (prev + 1) % Math.max(1, featureTransitions.length));
-      return;
-    }
-    if (input === 'k' || key.upArrow) {
-      setFeatureTransitionIndex((prev) => (prev - 1 + Math.max(1, featureTransitions.length)) % Math.max(1, featureTransitions.length));
-      return;
-    }
     if (key.escape) {
       setMode('idle');
-      return;
-    }
-    if (key.return) {
-      const currentRow = rows[selectedIndex];
-      const featureId =
-        currentRow?.type === 'feature'
-          ? currentRow.feature.id
-          : currentRow?.type === 'group'
-            ? currentRow.featureId
-            : currentRow?.type === 'task'
-              ? currentRow.task.featureId
-              : undefined;
-      const feature = featureId ? features.find((f) => f.id === featureId) : undefined;
-      const nextStatus = featureTransitions[featureTransitionIndex] as FeatureStatus | undefined;
-      if (feature && nextStatus) {
-        adapter.setFeatureStatus(feature.id, nextStatus, feature.version).then((result) => {
-          if (!result.success) setLocalError(result.error);
-          refresh();
-          setMode('idle');
-        });
-      }
     }
   }, { isActive: mode === 'feature-status' });
 
+  // Pipeline operations for feature status
+  const handleFeatureAdvance = async () => {
+    const feature = getFeatureFromRow(rows[selectedIndex]);
+    if (!feature) return;
+    setIsUpdatingStatus(true);
+    setLocalError(null);
+    const result = await adapter.advance('feature', feature.id, feature.version);
+    if (!result.success) setLocalError(result.error);
+    await refresh();
+    setIsUpdatingStatus(false);
+    setMode('idle');
+  };
+
+  const handleFeatureRevert = async () => {
+    const feature = getFeatureFromRow(rows[selectedIndex]);
+    if (!feature) return;
+    setIsUpdatingStatus(true);
+    setLocalError(null);
+    const result = await adapter.revert('feature', feature.id, feature.version);
+    if (!result.success) setLocalError(result.error);
+    await refresh();
+    setIsUpdatingStatus(false);
+    setMode('idle');
+  };
+
+  const handleFeatureTerminate = async () => {
+    const feature = getFeatureFromRow(rows[selectedIndex]);
+    if (!feature) return;
+    setIsUpdatingStatus(true);
+    setLocalError(null);
+    const result = await adapter.terminate('feature', feature.id, feature.version);
+    if (!result.success) setLocalError(result.error);
+    await refresh();
+    setIsUpdatingStatus(false);
+    setMode('idle');
+  };
+
   // Toggle feature expansion
   const handleToggleFeature = (featureId: string) => {
     const next = new Set(expandedFeatures);
     if (next.has(featureId)) {
       next.delete(featureId);
-      // Clamp selectedIndex if it was on a child task
       const featureIndex = rows.findIndex(r => r.type === 'feature' && r.feature.id === featureId);
       if (featureIndex >= 0 && selectedIndex > featureIndex) {
         const nextFeatureIndex = rows.findIndex((r, i) => i > featureIndex && r.type === 'feature');
@@ -252,11 +262,9 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
 
   return (
     <Box flexDirection="column" padding={1}>
-      {/* Project Header */}
+      {/* Project Header (no status - projects are stateless in v2) */}
       <Box marginBottom={1}>
         <Text bold>{project.name}</Text>
-        <Text> </Text>
-        <StatusBadge status={project.status} />
         <Text dimColor> — {taskCounts.completed}/{taskCounts.total} tasks completed</Text>
       </Box>
 
@@ -318,14 +326,7 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
 
       {mode === 'edit-feature' ? (
         (() => {
-          const currentRow = rows[selectedIndex];
-          const featureId =
-            currentRow?.type === 'feature'
-              ? currentRow.feature.id
-              : currentRow?.type === 'group'
-                ? currentRow.featureId
-                : undefined;
-          const feature = featureId ? features.find((f) => f.id === featureId) : undefined;
+          const feature = getFeatureFromRow(rows[selectedIndex]);
           if (!feature) return null;
           return (
             <FormDialog
@@ -357,14 +358,7 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
 
       {mode === 'delete-feature' ? (
         (() => {
-          const currentRow = rows[selectedIndex];
-          const featureId =
-            currentRow?.type === 'feature'
-              ? currentRow.feature.id
-              : currentRow?.type === 'group'
-                ? currentRow.featureId
-                : undefined;
-          const feature = featureId ? features.find((f) => f.id === featureId) : undefined;
+          const feature = getFeatureFromRow(rows[selectedIndex]);
           if (!feature) return null;
           return (
             <ConfirmDialog
@@ -479,17 +473,19 @@ export function ProjectView({ projectId, expandedFeatures, onExpandedFeaturesCha
 
       {mode === 'feature-status' ? (
         <Box flexDirection="column" borderStyle="round" borderColor={theme.colors.highlight} paddingX={1} marginTop={1}>
-          <Text bold>Set Feature Status</Text>
-          {featureTransitions.length === 0 ? (
-            <Text dimColor>No transitions available</Text>
-          ) : (
-            featureTransitions.map((status, idx) => (
-              <Text key={status} inverse={idx === featureTransitionIndex}>
-                {idx === featureTransitionIndex ? '>' : ' '} {status}
-              </Text>
-            ))
-          )}
-          <Text dimColor>Enter apply • Esc cancel</Text>
+          <StatusActions
+            currentStatus={featureWorkflowState?.currentStatus ?? ''}
+            nextStatus={featureWorkflowState?.nextStatus ?? null}
+            prevStatus={featureWorkflowState?.prevStatus ?? null}
+            isBlocked={featureWorkflowState?.isBlocked ?? false}
+            isTerminal={featureWorkflowState?.isTerminal ?? false}
+            isActive={true}
+            loading={isUpdatingStatus}
+            onAdvance={handleFeatureAdvance}
+            onRevert={handleFeatureRevert}
+            onTerminate={handleFeatureTerminate}
+          />
+          <Text dimColor>Esc: cancel</Text>
         </Box>
       ) : null}
     </Box>

package/src/tui/screens/task-detail.tsx

@@ -9,7 +9,8 @@ import { SectionList } from '../components/section-list';
 import { DependencyList } from '../components/dependency-list';
 import { StatusActions } from '../components/status-actions';
 import { timeAgo } from '../../ui/lib/format';
-import type { TaskStatus, Priority } from '@allpepper/task-orchestrator';
+import type { Priority } from '@allpepper/task-orchestrator';
+import type { WorkflowState } from '../../ui/adapters/types';
 import { FormDialog } from '../components/form-dialog';
 import { ConfirmDialog } from '../components/confirm-dialog';
 import { ErrorMessage } from '../components/error-message';
@@ -27,18 +28,18 @@ export function TaskDetail({ taskId, onSelectTask, onBack }: TaskDetailProps) {
   const { adapter } = useAdapter();
   const { theme } = useTheme();
   const [activePanel, setActivePanel] = useState<ActivePanel>('sections');
-  const [allowedTransitions, setAllowedTransitions] = useState<string[]>([]);
+  const [workflowState, setWorkflowState] = useState<WorkflowState | null>(null);
   const [statusError, setStatusError] = useState<string | null>(null);
   const [isUpdatingStatus, setIsUpdatingStatus] = useState(false);
   const [selectedSectionIndex, setSelectedSectionIndex] = useState(0);
   const [mode, setMode] = useState<'idle' | 'edit' | 'delete'>('idle');
 
-  // Fetch allowed transitions when task loads
+  // Fetch workflow state when task loads
   useEffect(() => {
     if (task) {
-      adapter.getAllowedTransitions('TASK', task.status).then(result => {
+      adapter.getWorkflowState('task', task.id).then(result => {
         if (result.success) {
-          setAllowedTransitions(result.data);
+          setWorkflowState(result.data);
         }
       });
     }
@@ -61,11 +62,9 @@ export function TaskDetail({ taskId, onSelectTask, onBack }: TaskDetailProps) {
       refresh();
     }
     if (key.tab) {
-      // Cycle through panels (skip sections if none exist)
       setActivePanel(current => {
         if (current === 'sections') return 'dependencies';
         if (current === 'dependencies') return 'status';
-        // From status, go to sections only if they exist
         return sections.length > 0 ? 'sections' : 'dependencies';
       });
     }
@@ -77,22 +76,40 @@ export function TaskDetail({ taskId, onSelectTask, onBack }: TaskDetailProps) {
     }
   });
 
-  // Handle status change
-  const handleStatusChange = async (newStatus: string) => {
+  // Pipeline operations
+  const handleAdvance = async () => {
     if (!task) return;
-
     setIsUpdatingStatus(true);
     setStatusError(null);
+    const result = await adapter.advance('task', taskId, task.version);
+    if (!result.success) {
+      setStatusError(result.error);
+    }
+    await refresh();
+    setIsUpdatingStatus(false);
+  };
 
-    const result = await adapter.setTaskStatus(taskId, newStatus as TaskStatus, task.version);
-
-    if (result.success) {
-      // Refresh task data to get updated version
-      await refresh();
-    } else {
+  const handleRevert = async () => {
+    if (!task) return;
+    setIsUpdatingStatus(true);
+    setStatusError(null);
+    const result = await adapter.revert('task', taskId, task.version);
+    if (!result.success) {
       setStatusError(result.error);
     }
+    await refresh();
+    setIsUpdatingStatus(false);
+  };
 
+  const handleTerminate = async () => {
+    if (!task) return;
+    setIsUpdatingStatus(true);
+    setStatusError(null);
+    const result = await adapter.terminate('task', taskId, task.version);
+    if (!result.success) {
+      setStatusError(result.error);
+    }
+    await refresh();
     setIsUpdatingStatus(false);
   };
 
@@ -127,6 +144,9 @@ export function TaskDetail({ taskId, onSelectTask, onBack }: TaskDetailProps) {
         <Text bold>{task.title}</Text>
         <Text> </Text>
         <StatusBadge status={task.status} />
+        {task.blockedBy.length > 0 && (
+          <Text color={theme.colors.blocked}> [BLOCKED]</Text>
+        )}
       </Box>
 
       {/* Divider */}
@@ -140,6 +160,8 @@ export function TaskDetail({ taskId, onSelectTask, onBack }: TaskDetailProps) {
         <PriorityBadge priority={task.priority} />
         <Text>  Modified: </Text>
         <Text dimColor>{timeAgo(new Date(task.modifiedAt))}</Text>
+        <Text>  ID: </Text>
+        <Text dimColor>{task.id}</Text>
       </Box>
 
       {/* Divider */}
@@ -181,7 +203,7 @@ export function TaskDetail({ taskId, onSelectTask, onBack }: TaskDetailProps) {
         <Text dimColor>{'─'.repeat(40)}</Text>
       </Box>
 
-      {/* Sections Panel - only show if there are sections */}
+      {/* Sections Panel */}
       {sections.length > 0 && (
         <Box flexDirection="column" marginBottom={1}>
           <Box marginBottom={0}>
@@ -221,10 +243,15 @@ export function TaskDetail({ taskId, onSelectTask, onBack }: TaskDetailProps) {
         </Box>
         <StatusActions
           currentStatus={task.status}
-          allowedTransitions={allowedTransitions}
+          nextStatus={workflowState?.nextStatus ?? null}
+          prevStatus={workflowState?.prevStatus ?? null}
+          isBlocked={task.blockedBy.length > 0}
+          isTerminal={workflowState?.isTerminal ?? false}
           isActive={activePanel === 'status'}
           loading={isUpdatingStatus}
-          onTransition={handleStatusChange}
+          onAdvance={handleAdvance}
+          onRevert={handleRevert}
+          onTerminate={handleTerminate}
         />
         {statusError && (
           <Box marginTop={1}>