@dinoxx/dinox-cli 1.0.22 → 1.1.0

package/dist/commands/todo/index.js

@@ -1,20 +1,31 @@
 import { resolveAuthIdentity } from '../../auth/userInfo.js';
 import { registerCommandGroup } from '../descriptor/register.js';
 import { FORMAT_OPTIONS, OFFLINE_OPTIONS, REQUIRE_SYNC_OPTIONS, SYNC_TIMEOUT_OPTIONS } from '../schema/globalOptions.js';
+import { WRITE_DURABILITY_OPTION } from '../writeDurability.js';
 import { readStringOrFile } from '../../utils/argValue.js';
 import { printDryRunPreview } from '../../utils/dryRun.js';
 import { DinoxError } from '../../utils/errors.js';
 import { printSuccess } from '../../utils/output.js';
-import { commandStale, printUploadDisabledWarning, syncBeforeCommand, waitForMutationUpload, withCommandRuntime, } from '../runtime.js';
+import { commandStale, resolveWriteDurabilityForRuntime, syncBeforeCommand, waitForMutationUpload, withCommandRuntime, } from '../runtime.js';
+import { readNoteWriteReceipt } from '../notes/writeReceipt.js';
+import { parseCreatedAtRange } from '../notes/searchTime.js';
 import { buildTodoAppendDryRunPreview, buildTodoCreateDryRunPreview, buildTodoUpdateDryRunPreview, } from './dryRun.js';
-import { appendTodoTasks, createTodoNote, normalizeTaskTexts, searchTodoTasks, updateTodoTaskStatus, } from './repo.js';
-const DATE_ONLY_RE = /^(\d{4})-(\d{2})-(\d{2})$/;
-const DAY_MS = 24 * 60 * 60 * 1000;
+import { appendTodoTasks, createTodoNote, executeTodoSearch, normalizeTaskTexts, toTodoSearchWire, updateTodoTaskStatus, } from './repo.js';
+import { routeRead } from '../../daemon/route.js';
 const DEFAULT_TASK_LIMIT = 50;
 const DEFAULT_NOTE_SCAN_LIMIT = 200;
 const MAX_TASK_LIMIT = 500;
 const MAX_NOTE_SCAN_LIMIT = 5000;
 const TODO_GLOBAL_OPTIONS = [...FORMAT_OPTIONS, ...OFFLINE_OPTIONS, ...REQUIRE_SYNC_OPTIONS, ...SYNC_TIMEOUT_OPTIONS];
+const TODO_WRITE_RECEIPT_FIELDS = [
+    'durability',
+    'upload_queue_remaining',
+    'version',
+    'updated_at',
+    'content_hash',
+    'changed',
+    'stale',
+];
 function parseTaskStatus(value) {
     const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
     if (normalized === 'all' || normalized === 'completed' || normalized === 'uncompleted') {
@@ -56,85 +67,14 @@ function parsePositiveIntegerOption(value, optionName, fallback, max) {
     }
     return Math.trunc(parsed);
 }
-function parseLocalDateOnly(value) {
-    const match = value.match(DATE_ONLY_RE);
-    if (!match) {
-        return null;
-    }
-    const year = Number(match[1]);
-    const month = Number(match[2]);
-    const day = Number(match[3]);
-    const parsed = new Date(year, month - 1, day, 0, 0, 0, 0);
-    if (parsed.getFullYear() !== year ||
-        parsed.getMonth() !== month - 1 ||
-        parsed.getDate() !== day) {
-        return null;
-    }
-    return parsed;
-}
-function parseDateInput(value, optionName) {
-    if (typeof value !== 'string') {
-        return undefined;
-    }
-    const raw = value.trim();
-    if (!raw) {
-        throw new DinoxError(`${optionName} requires a non-empty date value`);
-    }
-    const isDateOnly = DATE_ONLY_RE.test(raw);
-    const dateOnly = parseLocalDateOnly(raw);
-    if (dateOnly) {
-        return dateOnly;
-    }
-    if (isDateOnly) {
-        throw new DinoxError(`${optionName} must be a valid date (YYYY-MM-DD or ISO datetime)`);
-    }
-    const parsed = new Date(raw);
-    if (Number.isNaN(parsed.getTime())) {
-        throw new DinoxError(`${optionName} must be a valid date (YYYY-MM-DD or ISO datetime)`);
-    }
-    return parsed;
-}
-function parseDaysInput(value) {
-    if (value === undefined || value === null || value === '') {
-        return undefined;
-    }
-    if (typeof value !== 'string') {
-        throw new DinoxError('--days must be a positive integer');
-    }
-    const trimmed = value.trim();
-    if (!/^\d+$/.test(trimmed)) {
-        throw new DinoxError('--days must be a positive integer');
-    }
-    const parsed = Number(trimmed);
-    if (!Number.isFinite(parsed) || parsed <= 0) {
-        throw new DinoxError('--days must be a positive integer');
-    }
-    return Math.trunc(parsed);
-}
-function parseTaskDateRange(input, now = new Date()) {
-    const from = parseDateInput(input.from, '--from');
-    const to = parseDateInput(input.to, '--to');
-    const days = parseDaysInput(input.days);
-    if (days !== undefined && (from || to)) {
-        throw new DinoxError('--days cannot be used together with --from/--to');
-    }
-    if (days !== undefined) {
-        const end = new Date(now);
-        const start = new Date(now.getTime() - (days - 1) * DAY_MS);
-        return {
-            startDate: start,
-            endDate: end,
-        };
-    }
-    if (!from && !to) {
+export function parseTaskDateRange(input, now = new Date()) {
+    const { createdAtFrom, createdAtTo } = parseCreatedAtRange(input, now);
+    if (!createdAtFrom && !createdAtTo) {
         return undefined;
     }
-    if (from && to && from.getTime() > to.getTime()) {
-        throw new DinoxError('--from must be earlier than or equal to --to');
-    }
     return {
-        startDate: from,
-        endDate: to,
+        startDate: createdAtFrom ? new Date(createdAtFrom) : undefined,
+        endDate: createdAtTo ? new Date(createdAtTo) : undefined,
     };
 }
 function parseListInput(raw, optionName) {
@@ -190,41 +130,45 @@ async function parseTaskInput(args) {
     return normalizeTaskTexts(merged);
 }
 async function withTodoDatabase(globals, run) {
-    await withCommandRuntime(globals, run);
+    return withCommandRuntime(globals, run);
 }
 async function runTodoSearch({ args, globals, options }) {
     const searchOptions = options;
-    await withTodoDatabase(globals, async (runtime) => {
-        const { db } = runtime;
-        await syncBeforeCommand(runtime);
-        const keyword = args.query?.trim() ?? '';
-        const taskStatus = parseTaskStatus(searchOptions.status);
-        const taskTagFilter = typeof searchOptions.tags === 'string'
-            ? await parseTagFilterInput(searchOptions.tags)
-            : [];
-        const taskDateRange = parseTaskDateRange({
-            from: searchOptions.from,
-            to: searchOptions.to,
-            days: searchOptions.days,
-        });
-        const limit = parsePositiveIntegerOption(searchOptions.limit, '--limit', DEFAULT_TASK_LIMIT, MAX_TASK_LIMIT);
-        const scanLimit = parsePositiveIntegerOption(searchOptions.scanLimit, '--scan-limit', DEFAULT_NOTE_SCAN_LIMIT, MAX_NOTE_SCAN_LIMIT);
-        const result = await searchTodoTasks(db, keyword, {
-            includeDeleted: Boolean(searchOptions.includeDeleted),
-            taskStatus,
-            taskTagFilter,
-            taskDateRange,
-            limit,
-            scanLimit,
-        });
-        printSuccess({ stale: commandStale(runtime), ...result });
+    // Parse here; the db-touching scan runs through executeTodoSearch — locally or on the daemon.
+    const keyword = args.query?.trim() ?? '';
+    const taskStatus = parseTaskStatus(searchOptions.status);
+    const taskTagFilter = typeof searchOptions.tags === 'string'
+        ? await parseTagFilterInput(searchOptions.tags)
+        : [];
+    const taskDateRange = parseTaskDateRange({
+        from: searchOptions.from,
+        to: searchOptions.to,
+        days: searchOptions.days,
+    });
+    const limit = parsePositiveIntegerOption(searchOptions.limit, '--limit', DEFAULT_TASK_LIMIT, MAX_TASK_LIMIT);
+    const scanLimit = parsePositiveIntegerOption(searchOptions.scanLimit, '--scan-limit', DEFAULT_NOTE_SCAN_LIMIT, MAX_NOTE_SCAN_LIMIT);
+    const wire = toTodoSearchWire(keyword, {
+        includeDeleted: Boolean(searchOptions.includeDeleted),
+        taskStatus,
+        taskTagFilter,
+        taskDateRange,
+        limit,
+        scanLimit,
     });
+    const result = await routeRead(globals, 'todo.search', wire, () => withTodoDatabase(globals, async (runtime) => {
+        await syncBeforeCommand(runtime);
+        const local = await executeTodoSearch(runtime.db, wire);
+        return { ...local, stale: commandStale(runtime) };
+    }));
+    const { stale, ...response } = result;
+    printSuccess({ stale: stale ?? false, ...response });
 }
 async function runTodoAppend({ args, globals, options }) {
     const appendOptions = options;
     await withTodoDatabase(globals, async (runtime) => {
         const { db, config, offline } = runtime;
         await syncBeforeCommand(runtime);
+        const durability = resolveWriteDurabilityForRuntime(runtime, appendOptions.durability);
         const taskTexts = await parseTaskInput({
             positionalTask: args.task,
             tasksOption: typeof appendOptions.tasks === 'string' ? appendOptions.tasks : undefined,
@@ -245,9 +189,13 @@ async function runTodoAppend({ args, globals, options }) {
             noteId: typeof appendOptions.noteId === 'string' ? appendOptions.noteId : undefined,
             taskTexts,
         });
-        printUploadDisabledWarning(runtime);
-        await waitForMutationUpload(runtime);
-        printSuccess({ ok: true, stale: commandStale(runtime), ...result });
+        const upload = await waitForMutationUpload(runtime, { durability });
+        const receipt = await readNoteWriteReceipt(db, result.note_id, {
+            changed: ['content_json', 'image_detail', 'content_md', 'content_text'],
+            upload,
+            stale: commandStale(runtime),
+        });
+        printSuccess({ ok: true, ...receipt, ...result });
     });
 }
 async function runTodoCreate({ args, globals, options }) {
@@ -255,6 +203,7 @@ async function runTodoCreate({ args, globals, options }) {
     await withTodoDatabase(globals, async (runtime) => {
         const { db, config, offline } = runtime;
         await syncBeforeCommand(runtime);
+        const durability = resolveWriteDurabilityForRuntime(runtime, createOptions.durability);
         const taskTexts = await parseTaskInput({
             positionalTask: args.task,
             tasksOption: typeof createOptions.tasks === 'string' ? createOptions.tasks : undefined,
@@ -276,9 +225,13 @@ async function runTodoCreate({ args, globals, options }) {
             title: typeof createOptions.title === 'string' ? createOptions.title : undefined,
             userId: identity.userId,
         });
-        printUploadDisabledWarning(runtime);
-        await waitForMutationUpload(runtime);
-        printSuccess({ ok: true, stale: commandStale(runtime), ...result });
+        const upload = await waitForMutationUpload(runtime, { durability });
+        const receipt = await readNoteWriteReceipt(db, result.note_id, {
+            changed: ['title', 'type', 'content_json', 'image_detail', 'content_md', 'content_text'],
+            upload,
+            stale: commandStale(runtime),
+        });
+        printSuccess({ ok: true, ...receipt, ...result });
     });
 }
 async function runTodoUpdate({ args, globals, options }) {
@@ -286,6 +239,7 @@ async function runTodoUpdate({ args, globals, options }) {
     await withTodoDatabase(globals, async (runtime) => {
         const { db, config, offline } = runtime;
         await syncBeforeCommand(runtime);
+        const durability = resolveWriteDurabilityForRuntime(runtime, updateOptions.durability);
         const taskId = args.taskId;
         if (!taskId) {
             throw new DinoxError('taskId is required');
@@ -297,6 +251,7 @@ async function runTodoUpdate({ args, globals, options }) {
                 config,
                 offline,
                 taskId,
+                noteId: typeof updateOptions.noteId === 'string' ? updateOptions.noteId : undefined,
                 checked,
             });
             printDryRunPreview(preview);
@@ -304,11 +259,18 @@ async function runTodoUpdate({ args, globals, options }) {
         }
         const result = await updateTodoTaskStatus(db, {
             taskId,
+            noteId: typeof updateOptions.noteId === 'string' ? updateOptions.noteId : undefined,
             checked,
         });
-        printUploadDisabledWarning(runtime);
-        await waitForMutationUpload(runtime);
-        printSuccess({ ok: true, stale: commandStale(runtime), ...result });
+        const upload = await waitForMutationUpload(runtime, { durability });
+        const receipt = await readNoteWriteReceipt(db, result.note_id, {
+            changed: result.updated
+                ? ['content_json', 'image_detail', 'content_md', 'content_text']
+                : [],
+            upload,
+            stale: commandStale(runtime),
+        });
+        printSuccess({ ok: true, ...receipt, ...result });
     });
 }
 const todoSearchCommand = {
@@ -339,7 +301,7 @@ const todoSearchCommand = {
             type: 'structured',
             summary: 'Todo search payload with metadata and task list',
             fields: ['tasks.task_id', 'tasks.task_key', 'tasks.note_id', 'tasks.note_title', 'tasks.status', 'tasks.depth', 'tasks.parent_id', 'tasks.tags'],
-            metaFields: ['stale', 'meta.query', 'meta.returned_count', 'meta.limit', 'meta.task_status', 'meta.task_tag_filter', 'meta.task_date_range', 'meta.scanned_note_count'],
+            metaFields: ['stale', 'meta.query', 'meta.returned_count', 'meta.total_count', 'meta.total_count_is_lower_bound', 'meta.matched_note_count', 'meta.limit', 'meta.scan_limit', 'meta.scanned_note_count', 'meta.scan_truncated', 'meta.truncated', 'meta.applied_filters.status', 'meta.applied_filters.tags', 'meta.applied_filters.include_deleted', 'meta.applied_filters.date_range'],
         },
         examples: ['dino todo search "报销" --status uncompleted --format json', 'dino todo search --days 7 --format json'],
     },
@@ -363,6 +325,7 @@ const todoAppendCommand = {
         },
         { flags: '--tasks <string|@file>', description: 'Task list (JSON array or comma/newline-separated)' },
         { flags: '--note-id <id>', description: 'Target note id; omitted means latest eligible note' },
+        WRITE_DURABILITY_OPTION,
         { flags: '--dry-run', description: 'Preview the write without executing it' },
     ],
     schema: {
@@ -372,10 +335,10 @@ const todoAppendCommand = {
         globalOptions: TODO_GLOBAL_OPTIONS,
         output: {
             type: 'structured',
-            summary: 'Append result with target note and appended task ids',
-            fields: ['noteId', 'appendedCount', 'taskIds', 'stale'],
+            summary: 'Append result with target note, appended task count, and write receipt',
+            fields: ['note_id', 'appended_count', 'source', ...TODO_WRITE_RECEIPT_FIELDS],
         },
-        examples: ['dino todo append --note-id <id> --task "补交报销单" --format json'],
+        examples: ['dino todo append --note-id <id> --task "补交报销单" --durability uploaded --format json'],
     },
     action: runTodoAppend,
 };
@@ -397,6 +360,7 @@ const todoCreateCommand = {
         },
         { flags: '--tasks <string|@file>', description: 'Task list (JSON array or comma/newline-separated)' },
         { flags: '--title <string>', description: 'Optional note title' },
+        WRITE_DURABILITY_OPTION,
         { flags: '--dry-run', description: 'Preview the write without executing it' },
     ],
     schema: {
@@ -406,8 +370,8 @@ const todoCreateCommand = {
         globalOptions: TODO_GLOBAL_OPTIONS,
         output: {
             type: 'structured',
-            summary: 'Creation result with new note id and task ids',
-            fields: ['noteId', 'taskIds', 'title', 'stale'],
+            summary: 'Creation result with new note id, created task count, and write receipt',
+            fields: ['note_id', 'created_count', 'title', ...TODO_WRITE_RECEIPT_FIELDS],
         },
         examples: ['dino todo create --task "补交报销单" --task "整理发票" --format json'],
     },
@@ -428,6 +392,8 @@ const todoUpdateCommand = {
             description: 'Target status: completed|uncompleted|done|undone|true|false|1|0',
             required: true,
         },
+        { flags: '--note-id <id>', description: 'Restrict task lookup to one exact note id' },
+        WRITE_DURABILITY_OPTION,
         { flags: '--dry-run', description: 'Preview the write without executing it' },
     ],
     schema: {
@@ -437,10 +403,10 @@ const todoUpdateCommand = {
         globalOptions: TODO_GLOBAL_OPTIONS,
         output: {
             type: 'structured',
-            summary: 'Mutation result with updated status and target note id',
-            fields: ['taskId', 'checked', 'updated', 'noteId', 'stale'],
+            summary: 'Mutation result with updated status, target note id, and write receipt',
+            fields: ['task_id', 'checked', 'updated', 'note_id', ...TODO_WRITE_RECEIPT_FIELDS],
         },
-        examples: ['dino todo update <taskId> --status completed --format json'],
+        examples: ['dino todo update <taskId> --note-id <noteId> --status completed --format json'],
     },
     action: runTodoUpdate,
 };

package/dist/commands/todo/repo.d.ts

@@ -1,4 +1,5 @@
 import type { AbstractPowerSyncDatabase } from '@powersync/common';
+import { parseTiptapDocFromDb } from './contentModel.js';
 import { type TaskDateRangeFilter, type TaskStatusFilter, type TaskTimePoint } from './taskModel.js';
 export type SearchTodoOptions = {
     includeDeleted: boolean;
@@ -31,6 +32,7 @@ export type CreateTodoNoteResult = {
 export type UpdateTodoTaskStatusOptions = {
     taskId: string;
     checked: boolean;
+    noteId?: string;
 };
 export type UpdateTodoTaskStatusResult = {
     note_id: string;
@@ -64,6 +66,9 @@ export type SearchedTodoResponse = {
         matched_note_count: number;
         limit: number;
         scan_limit: number;
+        scanned_note_count: number;
+        scan_truncated: boolean;
+        total_count_is_lower_bound: boolean;
         truncated: boolean;
         applied_filters: {
             status: TaskStatusFilter;
@@ -86,11 +91,41 @@ type TodoMutableNoteRow = {
     content_md: string | null;
     is_del: number | null;
     created_at?: string | null;
+    version: number | string | null;
+};
+export declare function validateTodoAppendTarget(target: TodoMutableNoteRow): {
+    currentDoc: ReturnType<typeof parseTiptapDocFromDb>;
+    noteId: string;
+    expectedVersion: number;
 };
+/**
+ * JSON-safe todo-search request. {@link SearchTodoOptions.taskDateRange} carries `Date`
+ * objects, which cannot cross the daemon wire intact, so the range is transported as ISO
+ * strings here and reconstructed inside {@link executeTodoSearch}.
+ */
+export type TodoSearchWire = {
+    query: string;
+    includeDeleted: boolean;
+    taskStatus: TaskStatusFilter;
+    taskTagFilter: string[];
+    limit: number;
+    scanLimit: number;
+    startDate?: string;
+    endDate?: string;
+};
+/** Serialize parsed todo-search options into a JSON-safe wire payload. */
+export declare function toTodoSearchWire(query: string, options: SearchTodoOptions): TodoSearchWire;
+/**
+ * Run a todo search from a wire payload. Shared by the local command path and the daemon
+ * RPC handler so both produce identical results from one implementation.
+ */
+export declare function executeTodoSearch(db: AbstractPowerSyncDatabase, wire: TodoSearchWire): Promise<SearchedTodoResponse>;
 export declare function searchTodoTasks(db: AbstractPowerSyncDatabase, query: string, options: SearchTodoOptions): Promise<SearchedTodoResponse>;
 export declare function appendTodoTasks(db: AbstractPowerSyncDatabase, options: AppendTodoTasksOptions): Promise<AppendTodoTasksResult>;
 export declare function createTodoNote(db: AbstractPowerSyncDatabase, options: CreateTodoNoteOptions): Promise<CreateTodoNoteResult>;
 export declare function updateTodoTaskStatus(db: AbstractPowerSyncDatabase, options: UpdateTodoTaskStatusOptions): Promise<UpdateTodoTaskStatusResult>;
 export declare function getTodoAppendTargetById(db: AbstractPowerSyncDatabase, noteId: string): Promise<TodoMutableNoteRow | null>;
 export declare function getLatestTodoAppendTarget(db: AbstractPowerSyncDatabase): Promise<TodoMutableNoteRow | null>;
-export declare function loadTodoTaskCandidatesByTaskId(db: AbstractPowerSyncDatabase, taskId: string): Promise<TodoMutableNoteRow[]>;
+export declare function loadTodoTaskCandidatesByTaskId(db: AbstractPowerSyncDatabase, taskId: string, options?: {
+    noteId?: string;
+}): Promise<TodoMutableNoteRow[]>;