@todu/cli 0.1.1 → 0.2.0

package/dist/commands/recurring.js

@@ -1,6 +1,6 @@
-import { createProjectId, createRecurringId } from "@todu/core";
 import { describeSchedule } from "@todu/engine";
-import { colorPriority, formatError, formatJSON, formatTable } from "../format.js";
+import { formatDaemonCommandError } from "../daemon-command-client.js";
+import { colorPriority, formatJSON, formatTable } from "../format.js";
 const TEMPLATE_COLUMNS = [
     { key: "id", label: "ID" },
     { key: "title", label: "Title" },
@@ -46,48 +46,57 @@ function templateDetail(t, projectName) {
     lines.push(`Updated:     ${t.updatedAt}`);
     return lines.join("\n");
 }
-async function resolveTemplate(todu, ref) {
-    // Try as ID first
-    const getResult = await todu.recurring.get(ref);
-    if (getResult.ok)
-        return { ok: true, value: getResult.value };
-    // Try by name
-    const listResult = await todu.recurring.list();
-    if (!listResult.ok)
-        return { ok: false, message: formatError(listResult.error) };
+async function resolveTemplate(invokeDaemon, ref) {
+    const byId = await invokeDaemon("recurring.get", { id: ref });
+    if (byId.ok) {
+        return { ok: true, value: byId.value };
+    }
+    if (byId.error.code !== "NOT_FOUND") {
+        return { ok: false, message: formatDaemonCommandError(byId.error) };
+    }
+    const listResult = await invokeDaemon("recurring.list", {});
+    if (!listResult.ok) {
+        return { ok: false, message: formatDaemonCommandError(listResult.error) };
+    }
     const byName = listResult.value.filter((t) => t.title.toLowerCase() === ref.toLowerCase());
-    if (byName.length === 1)
+    if (byName.length === 1) {
         return { ok: true, value: byName[0] };
+    }
     if (byName.length > 1) {
         return { ok: false, message: `Multiple templates match "${ref}". Use the template ID.` };
     }
     return { ok: false, message: `Recurring template not found: ${ref}` };
 }
-async function getProjectName(todu, projectId) {
-    const result = await todu.project.list();
-    if (!result.ok)
+async function getProjectName(invokeDaemon, projectId) {
+    const result = await invokeDaemon("project.list", {});
+    if (!result.ok) {
         return projectId;
+    }
     const project = result.value.find((p) => p.id === projectId);
     return project?.name ?? projectId;
 }
-async function resolveProjectId(todu, ref) {
-    const result = await todu.project.list();
-    if (!result.ok)
-        return { ok: false, message: formatError(result.error) };
-    // Try by ID
-    const byId = result.value.find((p) => p.id === ref);
-    if (byId)
-        return { ok: true, value: byId.id };
-    // Try by name
+async function resolveProjectId(invokeDaemon, ref) {
+    const byId = await invokeDaemon("project.get", { id: ref });
+    if (byId.ok) {
+        return { ok: true, value: byId.value.id };
+    }
+    if (byId.error.code !== "NOT_FOUND") {
+        return { ok: false, message: formatDaemonCommandError(byId.error) };
+    }
+    const result = await invokeDaemon("project.list", {});
+    if (!result.ok) {
+        return { ok: false, message: formatDaemonCommandError(result.error) };
+    }
     const byName = result.value.filter((p) => p.name.toLowerCase() === ref.toLowerCase());
-    if (byName.length === 1)
+    if (byName.length === 1) {
         return { ok: true, value: byName[0].id };
+    }
     if (byName.length > 1) {
         return { ok: false, message: `Multiple projects match "${ref}". Use the project ID.` };
     }
     return { ok: false, message: `Project not found: ${ref}` };
 }
-export function registerRecurringCommands(program, getTodu) {
+export function registerRecurringCommands(program, invokeDaemon) {
     const recurring = program.command("recurring").description("Manage recurring task templates");
     recurring
         .command("create")
@@ -102,42 +111,38 @@ export function registerRecurringCommands(program, getTodu) {
         .option("--description <text>", "template description")
         .option("--label <labels...>", "labels to apply to generated tasks")
         .action(async (opts) => {
-        const todu = await getTodu();
-        try {
-            const projectRes = await resolveProjectId(todu, opts.project);
-            if (!projectRes.ok) {
-                console.error(projectRes.message);
-                process.exitCode = 1;
-                return;
-            }
-            const result = await todu.recurring.create({
+        const projectRes = await resolveProjectId(invokeDaemon, opts.project);
+        if (!projectRes.ok) {
+            console.error(projectRes.message);
+            process.exitCode = 1;
+            return;
+        }
+        const result = await invokeDaemon("recurring.create", {
+            input: {
                 title: opts.title,
                 schedule: opts.schedule,
                 timezone: opts.timezone,
                 startDate: opts.startDate,
-                projectId: createProjectId(projectRes.value),
+                projectId: projectRes.value,
                 description: opts.description,
                 priority: opts.priority,
                 endDate: opts.endDate,
                 labels: opts.label,
-            });
-            if (!result.ok) {
-                console.error(formatError(result.error));
-                process.exitCode = 1;
-                return;
-            }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON(result.value));
-            }
-            else {
-                const projectName = await getProjectName(todu, result.value.projectId);
-                console.log(`Created recurring template: ${result.value.id}`);
-                console.log(templateDetail(result.value, projectName));
-            }
+            },
+        });
+        if (!result.ok) {
+            console.error(formatDaemonCommandError(result.error));
+            process.exitCode = 1;
+            return;
+        }
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON(result.value));
         }
-        finally {
-            await todu.close();
+        else {
+            const projectName = await getProjectName(invokeDaemon, result.value.projectId);
+            console.log(`Created recurring template: ${result.value.id}`);
+            console.log(templateDetail(result.value, projectName));
         }
     });
     recurring
@@ -147,74 +152,61 @@ export function registerRecurringCommands(program, getTodu) {
         .option("--paused", "show only paused templates")
         .option("--project <project>", "filter by project")
         .action(async (opts) => {
-        const todu = await getTodu();
-        try {
-            let projectId;
-            if (opts.project) {
-                const res = await resolveProjectId(todu, opts.project);
-                if (!res.ok) {
-                    console.error(res.message);
-                    process.exitCode = 1;
-                    return;
-                }
-                projectId = res.value;
-            }
-            const filter = {};
-            if (opts.active)
-                filter.paused = false;
-            if (opts.paused)
-                filter.paused = true;
-            if (projectId)
-                filter.projectId = createProjectId(projectId);
-            const result = await todu.recurring.list(filter);
-            if (!result.ok) {
-                console.error(formatError(result.error));
+        let projectId;
+        if (opts.project) {
+            const res = await resolveProjectId(invokeDaemon, opts.project);
+            if (!res.ok) {
+                console.error(res.message);
                 process.exitCode = 1;
                 return;
             }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON(result.value));
-                return;
-            }
-            // Get project names for display
-            const projects = await todu.project.list();
-            const projectNames = {};
-            if (projects.ok) {
-                for (const p of projects.value) {
-                    projectNames[p.id] = p.name;
-                }
-            }
-            const rows = result.value.map((t) => templateToRow(t, projectNames[t.projectId]));
-            console.log(formatTable(rows, TEMPLATE_COLUMNS));
+            projectId = res.value;
+        }
+        const filter = {};
+        if (opts.active)
+            filter.paused = false;
+        if (opts.paused)
+            filter.paused = true;
+        if (projectId)
+            filter.projectId = projectId;
+        const result = await invokeDaemon("recurring.list", { filter });
+        if (!result.ok) {
+            console.error(formatDaemonCommandError(result.error));
+            process.exitCode = 1;
+            return;
+        }
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON(result.value));
+            return;
         }
-        finally {
-            await todu.close();
+        const projects = await invokeDaemon("project.list", {});
+        const projectNames = {};
+        if (projects.ok) {
+            for (const p of projects.value) {
+                projectNames[p.id] = p.name;
+            }
         }
+        const rows = result.value.map((t) => templateToRow(t, projectNames[t.projectId]));
+        console.log(formatTable(rows, TEMPLATE_COLUMNS));
     });
     recurring
         .command("show <id>")
         .description("Show recurring template details")
         .action(async (ref) => {
-        const todu = await getTodu();
-        try {
-            const resolved = await resolveTemplate(todu, ref);
-            if (!resolved.ok) {
-                console.error(resolved.message);
-                process.exitCode = 1;
-                return;
-            }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON(resolved.value));
-                return;
-            }
-            const projectName = await getProjectName(todu, resolved.value.projectId);
-            console.log(templateDetail(resolved.value, projectName));
+        const resolved = await resolveTemplate(invokeDaemon, ref);
+        if (!resolved.ok) {
+            console.error(resolved.message);
+            process.exitCode = 1;
+            return;
         }
-        finally {
-            await todu.close();
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON(resolved.value));
+            return;
         }
+        const projectName = await getProjectName(invokeDaemon, resolved.value.projectId);
+        console.log(templateDetail(resolved.value, projectName));
     });
     recurring
         .command("update <id>")
@@ -228,144 +220,127 @@ export function registerRecurringCommands(program, getTodu) {
         .option("--label <labels...>", "replace labels")
         .option("--project <project>", "move to different project")
         .action(async (ref, opts) => {
-        const todu = await getTodu();
-        try {
-            const resolved = await resolveTemplate(todu, ref);
-            if (!resolved.ok) {
-                console.error(resolved.message);
-                process.exitCode = 1;
-                return;
-            }
-            const input = {};
-            if (opts.title)
-                input.title = opts.title;
-            if (opts.schedule)
-                input.schedule = opts.schedule;
-            if (opts.timezone)
-                input.timezone = opts.timezone;
-            if (opts.priority)
-                input.priority = opts.priority;
-            if (opts.description)
-                input.description = opts.description;
-            if (opts.endDate)
-                input.endDate = opts.endDate;
-            if (opts.label)
-                input.labels = opts.label;
-            if (opts.project) {
-                const projectRes = await resolveProjectId(todu, opts.project);
-                if (!projectRes.ok) {
-                    console.error(projectRes.message);
-                    process.exitCode = 1;
-                    return;
-                }
-                input.projectId = createProjectId(projectRes.value);
-            }
-            const result = await todu.recurring.update(resolved.value.id, input);
-            if (!result.ok) {
-                console.error(formatError(result.error));
+        const resolved = await resolveTemplate(invokeDaemon, ref);
+        if (!resolved.ok) {
+            console.error(resolved.message);
+            process.exitCode = 1;
+            return;
+        }
+        const input = {};
+        if (opts.title)
+            input.title = opts.title;
+        if (opts.schedule)
+            input.schedule = opts.schedule;
+        if (opts.timezone)
+            input.timezone = opts.timezone;
+        if (opts.priority)
+            input.priority = opts.priority;
+        if (opts.description)
+            input.description = opts.description;
+        if (opts.endDate)
+            input.endDate = opts.endDate;
+        if (opts.label)
+            input.labels = opts.label;
+        if (opts.project) {
+            const projectRes = await resolveProjectId(invokeDaemon, opts.project);
+            if (!projectRes.ok) {
+                console.error(projectRes.message);
                 process.exitCode = 1;
                 return;
             }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON(result.value));
-            }
-            else {
-                console.log(`Updated recurring template: ${result.value.id}`);
-            }
+            input.projectId = projectRes.value;
         }
-        finally {
-            await todu.close();
+        const result = await invokeDaemon("recurring.update", {
+            id: resolved.value.id,
+            input,
+        });
+        if (!result.ok) {
+            console.error(formatDaemonCommandError(result.error));
+            process.exitCode = 1;
+            return;
+        }
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON(result.value));
+        }
+        else {
+            console.log(`Updated recurring template: ${result.value.id}`);
         }
     });
     recurring
         .command("delete <id>")
         .description("Delete a recurring template")
         .action(async (ref) => {
-        const todu = await getTodu();
-        try {
-            const resolved = await resolveTemplate(todu, ref);
-            if (!resolved.ok) {
-                console.error(resolved.message);
-                process.exitCode = 1;
-                return;
-            }
-            const result = await todu.recurring.delete(resolved.value.id);
-            if (!result.ok) {
-                console.error(formatError(result.error));
-                process.exitCode = 1;
-                return;
-            }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON({ deleted: resolved.value.id }));
-            }
-            else {
-                console.log(`Deleted recurring template: ${resolved.value.id}`);
-            }
+        const resolved = await resolveTemplate(invokeDaemon, ref);
+        if (!resolved.ok) {
+            console.error(resolved.message);
+            process.exitCode = 1;
+            return;
+        }
+        const result = await invokeDaemon("recurring.delete", { id: resolved.value.id });
+        if (!result.ok) {
+            console.error(formatDaemonCommandError(result.error));
+            process.exitCode = 1;
+            return;
+        }
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON({ deleted: resolved.value.id }));
         }
-        finally {
-            await todu.close();
+        else {
+            console.log(`Deleted recurring template: ${resolved.value.id}`);
         }
     });
     recurring
         .command("pause <id>")
         .description("Pause a recurring template")
         .action(async (ref) => {
-        const todu = await getTodu();
-        try {
-            const resolved = await resolveTemplate(todu, ref);
-            if (!resolved.ok) {
-                console.error(resolved.message);
-                process.exitCode = 1;
-                return;
-            }
-            const result = await todu.recurring.pause(resolved.value.id);
-            if (!result.ok) {
-                console.error(formatError(result.error));
-                process.exitCode = 1;
-                return;
-            }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON(result.value));
-            }
-            else {
-                console.log(`Paused recurring template: ${resolved.value.id}`);
-            }
+        const resolved = await resolveTemplate(invokeDaemon, ref);
+        if (!resolved.ok) {
+            console.error(resolved.message);
+            process.exitCode = 1;
+            return;
+        }
+        const result = await invokeDaemon("recurring.pause", {
+            id: resolved.value.id,
+        });
+        if (!result.ok) {
+            console.error(formatDaemonCommandError(result.error));
+            process.exitCode = 1;
+            return;
         }
-        finally {
-            await todu.close();
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON(result.value));
+        }
+        else {
+            console.log(`Paused recurring template: ${resolved.value.id}`);
         }
     });
     recurring
         .command("resume <id>")
         .description("Resume a recurring template")
         .action(async (ref) => {
-        const todu = await getTodu();
-        try {
-            const resolved = await resolveTemplate(todu, ref);
-            if (!resolved.ok) {
-                console.error(resolved.message);
-                process.exitCode = 1;
-                return;
-            }
-            const result = await todu.recurring.resume(resolved.value.id);
-            if (!result.ok) {
-                console.error(formatError(result.error));
-                process.exitCode = 1;
-                return;
-            }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON(result.value));
-            }
-            else {
-                console.log(`Resumed recurring template: ${resolved.value.id}`);
-            }
+        const resolved = await resolveTemplate(invokeDaemon, ref);
+        if (!resolved.ok) {
+            console.error(resolved.message);
+            process.exitCode = 1;
+            return;
         }
-        finally {
-            await todu.close();
+        const result = await invokeDaemon("recurring.resume", {
+            id: resolved.value.id,
+        });
+        if (!result.ok) {
+            console.error(formatDaemonCommandError(result.error));
+            process.exitCode = 1;
+            return;
+        }
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON(result.value));
+        }
+        else {
+            console.log(`Resumed recurring template: ${resolved.value.id}`);
         }
     });
     recurring
@@ -374,75 +349,66 @@ export function registerRecurringCommands(program, getTodu) {
         .option("--days <days>", "number of days to look ahead", "14")
         .option("--template <id>", "filter by template ID")
         .action(async (opts) => {
-        const todu = await getTodu();
-        try {
-            const options = {
-                days: Number.parseInt(opts.days, 10),
-            };
-            if (opts.template) {
-                options.templateId = createRecurringId(opts.template);
-            }
-            const result = await todu.recurring.upcoming(options);
-            if (!result.ok) {
-                console.error(formatError(result.error));
-                process.exitCode = 1;
-                return;
-            }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON(result.value));
-                return;
-            }
-            if (result.value.length === 0) {
-                console.log("No upcoming occurrences.");
-                return;
-            }
-            const upcomingColumns = [
-                { key: "date", label: "Date" },
-                { key: "title", label: "Title" },
-                { key: "priority", label: "Priority", colorize: colorPriority },
-                { key: "schedule", label: "Schedule" },
-            ];
-            const rows = result.value.map((o) => ({
-                date: o.date,
-                title: o.title,
-                priority: o.priority,
-                schedule: o.schedule,
-            }));
-            console.log(formatTable(rows, upcomingColumns));
-        }
-        finally {
-            await todu.close();
+        const options = {
+            days: Number.parseInt(opts.days, 10),
+        };
+        if (opts.template) {
+            options.templateId = opts.template;
+        }
+        const result = await invokeDaemon("recurring.upcoming", { options });
+        if (!result.ok) {
+            console.error(formatDaemonCommandError(result.error));
+            process.exitCode = 1;
+            return;
+        }
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON(result.value));
+            return;
         }
+        if (result.value.length === 0) {
+            console.log("No upcoming occurrences.");
+            return;
+        }
+        const upcomingColumns = [
+            { key: "date", label: "Date" },
+            { key: "title", label: "Title" },
+            { key: "priority", label: "Priority", colorize: colorPriority },
+            { key: "schedule", label: "Schedule" },
+        ];
+        const rows = result.value.map((o) => ({
+            date: o.date,
+            title: o.title,
+            priority: o.priority,
+            schedule: o.schedule,
+        }));
+        console.log(formatTable(rows, upcomingColumns));
     });
     recurring
         .command("generate <id> <date>")
         .description("Create a task for a specific future date (early materialization)")
         .action(async (ref, date) => {
-        const todu = await getTodu();
-        try {
-            const resolved = await resolveTemplate(todu, ref);
-            if (!resolved.ok) {
-                console.error(resolved.message);
-                process.exitCode = 1;
-                return;
-            }
-            const result = await todu.recurring.generate(resolved.value.id, date);
-            if (!result.ok) {
-                console.error(formatError(result.error));
-                process.exitCode = 1;
-                return;
-            }
-            const format = program.opts().format;
-            if (format === "json") {
-                console.log(formatJSON(result.value));
-            }
-            else {
-                console.log(`Generated task: ${result.value.id} (${result.value.title} on ${date})`);
-            }
+        const resolved = await resolveTemplate(invokeDaemon, ref);
+        if (!resolved.ok) {
+            console.error(resolved.message);
+            process.exitCode = 1;
+            return;
+        }
+        const result = await invokeDaemon("recurring.generate", {
+            templateId: resolved.value.id,
+            date,
+        });
+        if (!result.ok) {
+            console.error(formatDaemonCommandError(result.error));
+            process.exitCode = 1;
+            return;
+        }
+        const format = program.opts().format;
+        if (format === "json") {
+            console.log(formatJSON(result.value));
         }
-        finally {
-            await todu.close();
+        else {
+            console.log(`Generated task: ${result.value.id} (${result.value.title} on ${date})`);
         }
     });
 }