loop-task 2.1.4 → 2.1.7

package/dist/{tui/components → widgets/loop-form}/WizardForm.js

@@ -1,17 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useCallback, useMemo, useRef } from "react";
 import { Box, Text, useInput } from "ink";
-import { darkTheme as theme } from "../theme.js";
-import { t } from "../../i18n/index.js";
-import { useLoopFormValidation } from "../../hooks/useLoopFormValidation.js";
+import { darkTheme as theme } from "../../shared/ui/theme.js";
+import { t } from "../../shared/i18n/index.js";
+import { useLoopFormValidation } from "../../shared/hooks/useLoopFormValidation.js";
 import { copyToClipboard } from "../../shared/clipboard.js";
-import { sanitizePaste } from "../utils/paste.js";
-function TextField({ value, hint, isActive, }) {
-    const borderColor = isActive ? theme.accent.brand : theme.border.dim;
-    const backgroundColor = isActive ? theme.bg.input : undefined;
-    const showHint = value.length === 0;
-    return (_jsxs(Box, { borderStyle: "single", borderColor: borderColor, backgroundColor: backgroundColor, paddingLeft: 1, overflow: "hidden", width: "100%", children: [_jsx(Text, { color: showHint ? theme.text.muted : theme.text.primary, children: showHint ? hint : value }), isActive ? _jsx(Text, { inverse: true, children: " " }) : null] }));
-}
+import { sanitizePaste } from "../../shared/utils/paste.js";
+import { TextField } from "./TextField.js";
 export function WizardForm(props) {
     const { title, steps, onComplete, onCancel, disabled = false } = props;
     const [values, setValues] = useState({});

package/dist/widgets/loop-form/useCreateSteps.js

@@ -0,0 +1,107 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useMemo } from "react";
+import { t } from "../../shared/i18n/index.js";
+import { SelectValueField } from "../../shared/ui/SelectModal.js";
+import { CodeEditorPreview } from "../../features/code-editor/CodeEditorPreview.js";
+export function useCreateSteps(params) {
+    const { initial, selectedTaskId, resolvedTaskName, commandValue, projects, setOpenSelect, setTaskPickerOpen, setCommandEditorOpen, fieldCallbacksRef, taskModeInitial, } = params;
+    return useMemo(() => {
+        const list = [
+            {
+                key: "interval",
+                prompt: t("wizard.intervalPrompt"),
+                hint: t("wizard.intervalHint"),
+                required: true,
+                inputType: "text",
+                defaultValue: initial.interval ?? undefined,
+            },
+            {
+                key: "taskMode",
+                prompt: t("wizard.taskModePrompt"),
+                hint: t("board.hintTaskMode"),
+                required: true,
+                defaultValue: taskModeInitial,
+                onActivate: () => setOpenSelect("taskMode"),
+                renderCustom: ({ value, isActive, onChange, onAdvance }) => {
+                    fieldCallbacksRef.current.taskMode = { value, onChange, onAdvance };
+                    return (_jsx(SelectValueField, { label: value || null, placeholder: t("wizard.taskModePrompt"), isActive: isActive }));
+                },
+            },
+            {
+                key: "taskId",
+                prompt: resolvedTaskName
+                    ? t("board.selectedTask", { name: resolvedTaskName })
+                    : t("board.chooseTask"),
+                hint: t("board.hintTask"),
+                required: true,
+                inputType: "text",
+                defaultValue: selectedTaskId ?? initial.taskId ?? undefined,
+                skip: (values) => !values.taskMode?.includes("Existing"),
+                onActivate: () => setTaskPickerOpen(true),
+                renderCustom: ({ isActive }) => (_jsx(SelectValueField, { label: resolvedTaskName, placeholder: t("board.chooseTask"), isActive: isActive })),
+            },
+            {
+                key: "command",
+                prompt: t("wizard.commandPrompt"),
+                hint: t("wizard.commandHint"),
+                required: true,
+                inputType: "text",
+                defaultValue: commandValue || undefined,
+                skip: (values) => !!values.taskMode?.includes("Existing"),
+                onActivate: () => setCommandEditorOpen(true),
+                renderCustom: ({ isActive }) => (_jsx(CodeEditorPreview, { value: commandValue, hint: t("wizard.commandHint"), isActive: isActive, onActivate: () => setCommandEditorOpen(true) })),
+            },
+            {
+                key: "runNow",
+                prompt: t("wizard.runNowPrompt"),
+                hint: t("board.hintRunNow"),
+                required: true,
+                defaultValue: initial.runNow === "true" || initial.runNow === "yes"
+                    ? t("wizard.runNowNow")
+                    : t("wizard.runNowWait"),
+                onActivate: () => setOpenSelect("runNow"),
+                renderCustom: ({ value, isActive, onChange, onAdvance }) => {
+                    fieldCallbacksRef.current.runNow = { value, onChange, onAdvance };
+                    return (_jsx(SelectValueField, { label: value || null, placeholder: t("wizard.runNowPrompt"), isActive: isActive }));
+                },
+            },
+            {
+                key: "cwd",
+                prompt: t("wizard.cwdPrompt"),
+                hint: t("wizard.cwdHint"),
+                required: false,
+                inputType: "text",
+                defaultValue: initial.cwd ?? undefined,
+            },
+            {
+                key: "description",
+                prompt: t("wizard.descriptionPrompt"),
+                hint: t("wizard.descriptionHint"),
+                required: true,
+                inputType: "text",
+                defaultValue: initial.description ?? undefined,
+            },
+            {
+                key: "maxRuns",
+                prompt: t("wizard.maxRunsPrompt"),
+                hint: t("wizard.maxRunsHint"),
+                required: false,
+                inputType: "text",
+                defaultValue: initial.maxRuns ?? undefined,
+            },
+            {
+                key: "project",
+                prompt: t("wizard.projectPrompt"),
+                hint: t("wizard.projectHint"),
+                required: false,
+                defaultValue: projects.find((p) => p.id === (initial.project ?? "default"))?.name ?? projects[0]?.name,
+                onActivate: () => setOpenSelect("project"),
+                renderCustom: ({ value, isActive, onChange, onAdvance }) => {
+                    fieldCallbacksRef.current.project = { value, onChange, onAdvance };
+                    return (_jsx(SelectValueField, { label: value || null, placeholder: t("wizard.projectPrompt"), isActive: isActive }));
+                },
+            },
+        ];
+        return list;
+    }, [taskModeInitial, selectedTaskId, resolvedTaskName, initial, commandValue, projects]);
+}

package/dist/widgets/loop-form/useHandleComplete.js

@@ -0,0 +1,74 @@
+import { useCallback } from "react";
+import { t } from "../../shared/i18n/index.js";
+import { parseDuration } from "../../duration.js";
+import { parseCommandLine, joinCommandLines } from "../../loop-config.js";
+export function useHandleComplete(params) {
+    const { selectedTaskId, mode, editId, currentProjectId, onDone, commandValue, projects, loopService, } = params;
+    return useCallback((values) => {
+        const intervalInput = values.interval ?? "";
+        if (!intervalInput.trim())
+            return;
+        let interval;
+        try {
+            interval = parseDuration(intervalInput.trim());
+        }
+        catch {
+            return;
+        }
+        const intervalHuman = intervalInput.trim();
+        const isExistingTask = !!values.taskMode?.includes("Existing");
+        if (isExistingTask && !selectedTaskId && !values.taskId?.trim())
+            return;
+        const cmdValue = values.command ?? commandValue;
+        if (!isExistingTask && !cmdValue.trim())
+            return;
+        const cmd = isExistingTask
+            ? ""
+            : joinCommandLines(cmdValue);
+        let cmdOnly = "";
+        let args = [];
+        if (cmd.trim()) {
+            try {
+                const tokens = parseCommandLine(cmd.trim());
+                cmdOnly = tokens[0] ?? "";
+                args = tokens.slice(1);
+            }
+            catch {
+                return;
+            }
+        }
+        const runNowValue = values.runNow === t("wizard.runNowNow");
+        const projectName = values.project ?? "";
+        const project = projects.find((p) => p.name === projectName);
+        const projectId = project?.id ?? currentProjectId;
+        const options = {
+            interval,
+            taskId: isExistingTask
+                ? (selectedTaskId ?? values.taskId?.trim() ?? null)
+                : null,
+            command: cmdOnly,
+            commandArgs: args,
+            commandRaw: isExistingTask ? undefined : cmdValue,
+            cwd: (values.cwd ?? "").trim() || process.cwd(),
+            immediate: runNowValue,
+            maxRuns: (values.maxRuns ?? "").trim()
+                ? parseInt(values.maxRuns, 10)
+                : null,
+            verbose: false,
+            description: (values.description ?? "").trim(),
+            projectId,
+            offset: null,
+        };
+        const desc = (values.description ?? "").trim() || [cmdOnly, ...args].join(" ").trim();
+        if (mode === "edit" && editId) {
+            loopService.update(editId, options, intervalHuman)
+                .then((id) => onDone(true, id, desc))
+                .catch(() => { });
+        }
+        else {
+            loopService.create(options, intervalHuman)
+                .then((id) => onDone(false, id, desc))
+                .catch(() => { });
+        }
+    }, [selectedTaskId, mode, editId, currentProjectId, onDone, commandValue, projects]);
+}

package/dist/{tui/components → widgets/project-form}/ProjectForm.js

@@ -1,12 +1,14 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo, useCallback, useState, useRef } from "react";
-import { createProject, updateProject } from "../daemon.js";
-import { t } from "../../i18n/index.js";
-import { WizardForm } from "./WizardForm.js";
-import { SelectModal, SelectValueField } from "./SelectModal.js";
-import { PROJECT_COLORS, PROJECT_COLOR_KEYS } from "../../config/constants.js";
+import { useInject } from "../../shared/hooks/useInject.js";
+import { TYPES } from "../../shared/services/types.js";
+import { t } from "../../shared/i18n/index.js";
+import { WizardForm } from "../loop-form/WizardForm.js";
+import { SelectModal, SelectValueField } from "../../shared/ui/SelectModal.js";
+import { PROJECT_COLORS, PROJECT_COLOR_KEYS } from "../../shared/config/constants.js";
 export function ProjectFormView(props) {
     const { mode, editProject, onCancel, onDone } = props;
+    const projectService = useInject(TYPES.ProjectService);
     const colorKeyFor = (color) => {
         const found = PROJECT_COLOR_KEYS.find((k) => PROJECT_COLORS[k] === color);
         return found ?? "cyan";
@@ -51,12 +53,12 @@ export function ProjectFormView(props) {
         const colorKey = values.color ?? "cyan";
         const color = PROJECT_COLORS[colorKey] ?? PROJECT_COLORS.cyan;
         if (mode === "edit" && editProject) {
-            updateProject(editProject.id, name, color, values.directory?.trim() || undefined)
+            projectService.update(editProject.id, name, color, values.directory?.trim() || undefined)
                 .then(() => onDone(true, name))
                 .catch(() => { });
         }
         else {
-            createProject(name, color, values.directory?.trim() || undefined)
+            projectService.create(name, color, values.directory?.trim() || undefined)
                 .then(() => onDone(false, name))
                 .catch(() => { });
         }

package/dist/{tui/components → widgets/right-panel}/Inspector.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
-import { darkTheme as theme, statusColor } from "../theme.js";
-import { describeLoop, commandLine, timeAgo, timeUntil } from "../format.js";
-import { t } from "../../i18n/index.js";
-import { resolveEffectiveCwd } from "../../core/resolve-cwd.js";
+import { darkTheme as theme, statusColor } from "../../shared/ui/theme.js";
+import { describeLoop, commandLine, timeAgo, timeUntil } from "../../shared/ui/format.js";
+import { t } from "../../shared/i18n/index.js";
+import { resolveEffectiveCwd } from "../../core/command/resolve-cwd.js";
 const LABEL_WIDTH = 11;
 function Field(props) {
     return (_jsxs(Box, { children: [_jsx(Text, { bold: true, color: theme.text.muted, children: props.label.padEnd(LABEL_WIDTH) }), _jsx(Text, { color: theme.text.primary, children: props.children })] }));

package/dist/{tui/components → widgets/right-panel}/RightPanel.js

@@ -1,11 +1,11 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
-import { darkTheme as theme, tabAccentColor } from "../theme.js";
-import { t } from "../../i18n/index.js";
+import { darkTheme as theme, tabAccentColor } from "../../shared/ui/theme.js";
+import { t } from "../../shared/i18n/index.js";
 import { Inspector } from "./Inspector.js";
 import { RunHistory } from "./RunHistory.js";
-import { FocusableButton } from "./FocusableButton.js";
-import { commandLine } from "../format.js";
+import { FocusableButton } from "../../shared/ui/FocusableButton.js";
+import { commandLine } from "../../shared/ui/format.js";
 const DIVIDER = "\u2500".repeat(40);
 export function RightPanel(props) {
     const { isFocused, navActive = true, activeTab, loop, selectedRunIndex, onSelectRun, onOpenRun, selectedTask, allTasks, selectedProject, projectLoopCount, onProjectEdit, onProjectDelete, projects, } = props;

package/dist/{tui/components → widgets/right-panel}/RunHistory.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Text, useInput } from "ink";
 import { ScrollList } from "ink-scroll-list";
-import { darkTheme as theme } from "../theme.js";
-import { formatRunTime, formatRunDuration, formatFileSize } from "../format.js";
-import { t } from "../../i18n/index.js";
+import { darkTheme as theme } from "../../shared/ui/theme.js";
+import { formatRunTime, formatRunDuration, formatFileSize } from "../../shared/ui/format.js";
+import { t } from "../../shared/i18n/index.js";
 function runIcon(run) {
     if (run.status === "running")
         return "\u21bb";
@@ -14,6 +14,54 @@ function runIconColor(run) {
         return theme.accent.loop;
     return run.exitCode === 0 ? theme.semantic.success : theme.semantic.danger;
 }
+const CHAIN_LABEL_MAX = 28;
+function truncateChainLabel(label) {
+    if (label.length <= CHAIN_LABEL_MAX)
+        return label;
+    const ellipsis = "...";
+    const keep = CHAIN_LABEL_MAX - ellipsis.length;
+    return label.slice(0, keep) + ellipsis;
+}
+export function groupRunsByCycle(runs) {
+    const byRun = new Map();
+    for (const r of runs) {
+        const group = byRun.get(r.runNumber);
+        if (group)
+            group.push(r);
+        else
+            byRun.set(r.runNumber, [r]);
+    }
+    const result = [];
+    for (const group of byRun.values()) {
+        if (group.length === 1) {
+            result.push(group[0]);
+            continue;
+        }
+        const first = group[0];
+        const last = group[group.length - 1];
+        const anyRunning = group.some((r) => r.status === "running");
+        const totalDuration = group.reduce((sum, r) => sum + r.duration, 0);
+        const totalLogSize = group.reduce((sum, r) => sum + r.logSize, 0);
+        const chainNames = group
+            .map((r) => r.chainName)
+            .filter((n) => Boolean(n));
+        const chainLabel = chainNames.length > 0
+            ? truncateChainLabel(`\u2192 ${chainNames.join(" \u2192 ")}`)
+            : undefined;
+        result.push({
+            runNumber: first.runNumber,
+            startedAt: first.startedAt,
+            exitCode: anyRunning ? -1 : last.exitCode,
+            duration: totalDuration,
+            logSize: totalLogSize,
+            status: anyRunning ? "running" : "completed",
+            logOffset: first.logOffset,
+            chainGroupId: first.chainGroupId,
+            chainName: chainLabel,
+        });
+    }
+    return result;
+}
 const SPARK_CHARS = ["\u2581", "\u2582", "\u2583", "\u2584", "\u2585", "\u2586", "\u2587", "\u2588"];
 function sparkline(durations) {
     if (durations.length === 0)
@@ -65,7 +113,7 @@ function computeTrends(runs) {
 const LIMIT = 15;
 export function RunHistory(props) {
     const { loop, selectedRunIndex, onSelectRun, onOpenRun, isFocused, navActive = true } = props;
-    const runs = loop?.runHistory ?? [];
+    const runs = groupRunsByCycle(loop?.runHistory ?? []);
     const reversed = [...runs].reverse();
     const n = reversed.length;
     useInput((input, key) => {

package/dist/{tui/components → widgets/task-form}/TaskForm.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useCallback, useState, useRef } from "react";
-import { WizardForm } from "./WizardForm.js";
-import { SelectModal, SelectValueField } from "./SelectModal.js";
-import { CodeEditorPreview } from "./CodeEditorPreview.js";
-import { CodeEditorModal } from "./CodeEditorModal.js";
-import { createTask, updateTask, listTasks } from "../daemon.js";
+import { WizardForm } from "../loop-form/WizardForm.js";
+import { SelectModal, SelectValueField } from "../../shared/ui/SelectModal.js";
+import { CodeEditorPreview } from "../../features/code-editor/CodeEditorPreview.js";
+import { CodeEditorModal } from "../../features/code-editor/CodeEditorModal.js";
+import { useInject } from "../../shared/hooks/useInject.js";
+import { TYPES } from "../../shared/services/types.js";
 import crypto from "node:crypto";
-import { t } from "../../i18n/index.js";
+import { t } from "../../shared/i18n/index.js";
 import { joinCommandLines, parseCommandLine } from "../../loop-config.js";
 function parseArgs(cmd) {
     const tokens = [];
@@ -22,6 +23,7 @@ function joinCommand(task) {
 }
 export function TaskForm(props) {
     const { mode, editTask, onCancel, onDone } = props;
+    const taskService = useInject(TYPES.TaskService);
     const [tasks, setTasks] = useState([]);
     const [commandValue, setCommandValue] = useState(editTask
         ? (editTask.steps?.length
@@ -29,7 +31,7 @@ export function TaskForm(props) {
             : (editTask.commandRaw ?? joinCommand(editTask)))
         : "");
     useEffect(() => {
-        listTasks().then(setTasks).catch(() => setTasks([]));
+        taskService.list().then(setTasks).catch(() => setTasks([]));
     }, []);
     const chainOptions = useMemo(() => [t("wizard.chainNone"), ...tasks.map((task) => task.name)], [tasks]);
     const chainSelectOptions = useMemo(() => chainOptions.map((v) => ({ value: v, label: v })), [chainOptions]);
@@ -147,13 +149,13 @@ export function TaskForm(props) {
             };
         }
         if (mode === "edit" && editTask) {
-            updateTask(editTask.id, payload)
+            taskService.update(editTask.id, payload)
                 .then(() => onDone(true, editTask.id))
                 .catch(() => { });
         }
         else {
             const id = crypto.randomUUID().slice(0, 8);
-            createTask({ id, ...payload })
+            taskService.create({ id, ...payload })
                 .then((result) => onDone(false, result.id))
                 .catch(() => { });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loop-task",
-  "version": "2.1.4",
+  "version": "2.1.7",
   "description": "Loop engineering toolkit. Run any command on a cadence, in the background, managed from a terminal board. Schedule tests, builds, syncs, or agent prompts.",
   "type": "module",
   "bin": {
@@ -56,6 +56,7 @@
     "ink-select-input": "^6.2.0",
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
+    "inversify": "^8.1.1",
     "inversify-hooks": "^4.0.0",
     "ms": "^2.1.3",
     "react": "^19.2.7"