donebear 0.3.5 → 0.3.6

package/dist/cli.mjs

@@ -435,6 +435,8 @@ const TASK_FIELDS = `
   teamId
   assigneeId
   headingId
+  repeatRule
+  repeatTemplateId
 `;
 const TASKS_QUERY = `
   query DonebearTasks($first: Int!, $after: String, $workspaceId: ID!) {
@@ -641,6 +643,8 @@ const toTaskRecord = (value) => {
 		headingId: typeof row.headingId === "string" ? row.headingId : null,
 		id: row.id,
 		projectId: typeof row.projectId === "string" ? row.projectId : null,
+		repeatRule: typeof row.repeatRule === "string" ? row.repeatRule : null,
+		repeatTemplateId: typeof row.repeatTemplateId === "string" ? row.repeatTemplateId : null,
 		start: row.start,
 		startBucket: row.startBucket,
 		startDate: toNullableNumber(row.startDate),
@@ -666,6 +670,8 @@ const toTaskRecordFromGraphqlNode = (node) => ({
 	headingId: node.headingId,
 	id: node.id,
 	projectId: node.projectId,
+	repeatRule: node.repeatRule,
+	repeatTemplateId: node.repeatTemplateId,
 	start: node.start,
 	startBucket: node.startBucket,
 	startDate: parseApiDateOnlyToEpoch(node.startDate),
@@ -1626,14 +1632,24 @@ const getTaskState = (task) => {
 	if (task.completedAt !== null) return "done";
 	return "open";
 };
+/**
+* Determine which view a task belongs to.
+* Matches the frontend logic in manage-frontend/lib/tasks/task-status.ts
+*/
 const resolveTaskView = (task) => {
-	if (task.start === "not_started") return "inbox";
-	if (task.start === "someday") return "someday";
-	if (task.startDate !== null) {
-		if (task.startDate <= dateOnlyEpochFromLocalDate()) return "today";
-		return "upcoming";
-	}
-	return "anytime";
+	if (task.repeatRule !== null && task.repeatTemplateId === null) return null;
+	if (task.archivedAt !== null) return "trash";
+	if (task.completedAt !== null) return "logbook";
+	const { start, startDate, deadlineAt } = task;
+	const today = dateOnlyEpochFromLocalDate();
+	const tomorrow = today + DAY_MS;
+	const hasDeadlineToday = deadlineAt !== null && deadlineAt >= today && deadlineAt < tomorrow;
+	if (start === "not_started") return hasDeadlineToday ? "today" : "inbox";
+	if (start === "someday") return hasDeadlineToday ? "today" : "someday";
+	if (start !== "started") return null;
+	if (startDate === null) return hasDeadlineToday ? "today" : "anytime";
+	if (startDate < tomorrow || hasDeadlineToday) return "today";
+	return "upcoming";
 };
 const formatEpochDate = (epochMs) => formatInstantEpoch(epochMs);
 //#endregion
@@ -4297,7 +4313,9 @@ const VALID_TASK_VIEWS = new Set([
 	"anytime",
 	"today",
 	"upcoming",
-	"someday"
+	"someday",
+	"logbook",
+	"trash"
 ]);
 const parseTaskView = (value) => {
 	const normalized = value.trim().toLowerCase();
@@ -4338,7 +4356,10 @@ const resolveTaskReference = async (context, options) => {
 	throw new Error(`Task prefix "${taskRef}" is ambiguous (${matches.length} matches). Use the full id.`);
 };
 const filterTasks = (tasks, options) => {
-	const stateFiltered = options.state === "all" ? tasks : tasks.filter((task) => getTaskState(task) === options.state);
+	let effectiveState = options.state;
+	if (options.view === "logbook") effectiveState = "done";
+	else if (options.view === "trash") effectiveState = "archived";
+	const stateFiltered = effectiveState === "all" ? tasks : tasks.filter((task) => getTaskState(task) === effectiveState);
 	const viewFiltered = options.view ? stateFiltered.filter((task) => resolveTaskView(task) === options.view) : stateFiltered;
 	if (!options.search) return viewFiltered;
 	const query = options.search.trim().toLowerCase();
@@ -4795,7 +4816,7 @@ Agent tip: run "donebear spec task add" for full option reference
 			}, workspaceOverride);
 		});
 	});
-	task.command("list").alias("ls").description("List tasks").option("-w, --workspace <workspace>", "Workspace id, slug, or exact name").option("-s, --state <state>", "open|done|archived|all", "open").option("-n, --limit <count>", "Maximum number of tasks", (value) => parsePositiveInteger(value, "Limit"), DEFAULT_TASK_LIST_LIMIT).option("-q, --search <query>", "Filter by title or notes").option("-v, --view <view>", "Filter by view bucket (inbox|anytime|today|upcoming|someday)").addHelpText("after", `
+	task.command("list").alias("ls").description("List tasks").option("-w, --workspace <workspace>", "Workspace id, slug, or exact name").option("-s, --state <state>", "open|done|archived|all", "open").option("-n, --limit <count>", "Maximum number of tasks", (value) => parsePositiveInteger(value, "Limit"), DEFAULT_TASK_LIST_LIMIT).option("-q, --search <query>", "Filter by title or notes").option("-v, --view <view>", "Filter by view (inbox|anytime|today|upcoming|someday|logbook|trash)").addHelpText("after", `
 Examples:
   donebear task list --json
   donebear task list --state done --json
@@ -4803,7 +4824,7 @@ Examples:
   donebear task list --search "login" --limit 50 --json
 
 States: open (default) | done | archived | all
-Views:  inbox | anytime | today | upcoming | someday
+Views:  inbox | anytime | today | upcoming | someday | logbook | trash
 `).action(async (options, command) => {
 		const context = contextFromCommand(command);
 		await runWithErrorHandling(context, async () => {
@@ -6191,7 +6212,7 @@ Examples:
 //#endregion
 //#region src/commands/today.ts
 const DEFAULT_TODAY_LIMIT = 20;
-const filterToday = (tasks) => tasks.filter((task) => task.todayIndexReferenceDate !== null && task.completedAt === null && task.archivedAt === null);
+const filterToday = (tasks) => tasks.filter((task) => resolveTaskView(task) === "today");
 const runToday = async (context, options, workspaceOverride) => {
 	const commandContext = await resolveCommandContext(context);
 	const scope = await resolveWorkspaceScope(context, {