@jlmarcos99/todos 1.0.1 → 1.1.0

package/README.md

@@ -79,7 +79,8 @@ Configuration is kept separately using each platform's config directory.
 - **History** shows tasks completed more than 24 hours ago.
 
 Press `a` to add a task, `s` to start it, `n` to add a progress note, and Space
-to complete or reopen it. Press `V` to create another vault. `Tab` switches
+to complete or reopen it. Press `d` twice to delete the selected task and its
+activity. Press `V` to create another vault. `Tab` switches
 vaults. Press `r` to synchronize; in local-only mode it prompts for a Git remote
 URL and links the current vault store. Changes are saved locally before Git is
 contacted; an offline remote leaves them saved and marked pending.
@@ -97,6 +98,7 @@ contacted; an offline remote leaves them saved and marked pending.
 | Enter | Read task activity |
 | `[` / `]` | Previous / next Daily window |
 | `t` | Today's Daily |
+| `d` `d` | Delete selected task; the second `d` confirms |
 | `a` / `V` | Add task / create vault |
 | `/` | Search the current view |
 | `r` | Sync, or link a remote in local-only mode |

package/dist/app/src/application/task-service.js

@@ -55,6 +55,32 @@ export class TaskService {
                 await this.applyStatusChange(currentVault, currentTask, 'done', 'completed', date);
         });
     }
+    async deleteTask(vault, task) {
+        await this.runChange(`Deleted task: ${task.name}`, async () => {
+            const currentVault = this.resolveVault(vault);
+            const currentTask = this.resolveTask(currentVault, task);
+            const related = currentVault.activity.filter(item => item.taskId === currentTask.id);
+            const deletedActivity = [];
+            try {
+                if (this.store) {
+                    for (const item of related) {
+                        await this.store.deleteActivity(currentVault.id, item.id);
+                        deletedActivity.push(item);
+                    }
+                    await this.store.deleteTask(currentVault.id, currentTask.id);
+                }
+                currentVault.tasks = currentVault.tasks.filter(item => item.id !== currentTask.id);
+                currentVault.activity = currentVault.activity.filter(item => item.taskId !== currentTask.id);
+            }
+            catch (error) {
+                if (this.store) {
+                    for (const item of deletedActivity)
+                        await this.store.saveActivity(currentVault.id, item).catch(() => undefined);
+                }
+                throw error;
+            }
+        });
+    }
     async addProgressNote(vault, task, note, date) {
         const cleanNote = note.trim();
         if (!cleanNote)

package/dist/app/src/storage/store.js

@@ -1,11 +1,12 @@
 import { randomUUID } from 'node:crypto';
-import { chmod, lstat, mkdir, readdir, readFile, writeFile } from 'node:fs/promises';
+import { chmod, lstat, mkdir, readdir, readFile, rm, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { writeJsonAtomically } from "./atomic-file.js";
 import { decodeActivity, decodeTask, decodeVault, encodeActivity, encodeTask } from "./record-codec.js";
 const FORMAT_VERSION = 1;
 const OWNER_MARKER = '.jmtodos-store';
 const STORE_FILE = 'store.json';
+const RECORD_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 export class StoreRepository {
     root;
     constructor(root) {
@@ -111,6 +112,12 @@ export class StoreRepository {
     async saveActivity(vaultId, activity) {
         await writeJsonAtomically(path.join(this.root, 'vaults', vaultId, 'activity', `${activity.id}.json`), encodeActivity(activity));
     }
+    async deleteTask(vaultId, taskId) {
+        await this.deleteRecord(this.recordPath(vaultId, 'tasks', taskId));
+    }
+    async deleteActivity(vaultId, activityId) {
+        await this.deleteRecord(this.recordPath(vaultId, 'activity', activityId));
+    }
     async assertStoreVersion() {
         const data = await this.readJson(path.join(this.root, STORE_FILE));
         if (typeof data !== 'object' || data === null || !('formatVersion' in data) || data.formatVersion !== FORMAT_VERSION) {
@@ -135,6 +142,28 @@ export class StoreRepository {
             throw new Error(`Could not read Todos data at ${file}: ${error.message}`);
         }
     }
+    recordPath(vaultId, folder, id) {
+        return path.join(this.root, 'vaults', this.assertRecordId(vaultId), folder, `${this.assertRecordId(id)}.json`);
+    }
+    assertRecordId(value) {
+        if (!RECORD_ID.test(value))
+            throw new Error('Refusing to delete a record with an invalid id.');
+        return value;
+    }
+    async deleteRecord(file) {
+        let info;
+        try {
+            info = await lstat(file);
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                return;
+            throw error;
+        }
+        if (!info.isFile() || info.isSymbolicLink())
+            throw new Error(`Refusing to delete a non-regular file: ${file}`);
+        await rm(file);
+    }
     async readRecords(directory, decode) {
         let files;
         try {

package/dist/app/src/sync/git-client.js

@@ -28,7 +28,11 @@ export class GitClient {
     }
     runOnce(args, allowFailure) {
         return new Promise((resolve, reject) => {
-            const child = spawn('git', ['-C', this.directory, ...args], { stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true });
+            const child = spawn('git', ['-C', this.directory, ...args], {
+                stdio: ['ignore', 'pipe', 'pipe'],
+                windowsHide: true,
+                env: { ...process.env, GIT_TERMINAL_PROMPT: '0', GCM_INTERACTIVE: '0' },
+            });
             let stdout = '';
             let stderr = '';
             child.stdout.setEncoding('utf8').on('data', chunk => { stdout += chunk; });

package/dist/app/src/tui/screen.js

@@ -19,6 +19,7 @@ export class TodoScreen {
     noteTaskId;
     viewportWidth = 80;
     previousGTime = 0;
+    pendingDeleteId;
     unsubscribeSync;
     constructor(options) {
         this.options = options;
@@ -54,6 +55,11 @@ export class TodoScreen {
         this.options.redraw();
     }
     handleCommand(command) {
+        const confirmDelete = this.pendingDeleteId !== undefined && command === 'd'
+            && this.session.selectedTask?.id === this.pendingDeleteId;
+        if (this.pendingDeleteId !== undefined && !confirmDelete)
+            this.session.message = 'Delete cancelled.';
+        this.pendingDeleteId = undefined;
         if (command !== 'ctrl+d' && command !== 'ctrl+u')
             this.followDailySelection = true;
         if (command === 'q') {
@@ -73,6 +79,10 @@ export class TodoScreen {
             this.handleActivityCommand(command);
             return;
         }
+        if (confirmDelete) {
+            this.session.deleteSelectedTask();
+            return;
+        }
         switch (command) {
             case 'tab':
                 this.session.switchVault(1);
@@ -145,6 +155,14 @@ export class TodoScreen {
                     this.activityOffset = 0;
                 }
                 break;
+            case 'd': {
+                const task = this.session.selectedTask;
+                if (!task)
+                    break;
+                this.pendingDeleteId = task.id;
+                this.session.message = `Delete "${task.name}"? Press d again to confirm.`;
+                break;
+            }
             case 'a':
                 this.openInput('add');
                 break;

package/dist/app/src/tui/session.js

@@ -79,6 +79,15 @@ export class TodoSession {
         void this.runMutation(() => this.tasksService.startTask(this.vault, task, this.now()));
         this.clampSelection();
     }
+    deleteSelectedTask() {
+        const task = this.selectedTask;
+        if (!task)
+            return;
+        const name = task.name;
+        void this.runMutation(() => this.tasksService.deleteTask(this.vault, task));
+        this.message = `Deleted "${name}".`;
+        this.clampSelection();
+    }
     toggleSelectedTask() {
         const task = this.selectedTask;
         if (!task)

package/dist/app/src/tui/view.js

@@ -223,6 +223,7 @@ function renderHelp() {
         ' [ / ]        Previous / next two-day window',
         ' Ctrl+d/u     Scroll daily notes',
         ' t            Today’s daily',
+        ' d            Delete task; press d again to confirm',
         ' a · V · /     Add task · vault · search',
         ' r            Sync, or link a Git remote if local-only',
         ' Esc · ?      Back / clear · help',
@@ -273,6 +274,6 @@ function renderFooter(session, inputLine, showActivity) {
     return [
         inputLine ?? message,
         ` ${theme.accent('j/k')} move  ${theme.accent('Tab')} vault  ${theme.accent('h/l')} views  ${theme.accent('space')} done`,
-        ` ${theme.accent('s')} start  ${theme.accent('n')} note  ${theme.accent('V')} vault  ${theme.accent('r')} sync/link  ${theme.accent('?')} help`,
+        ` ${theme.accent('s')} start  ${theme.accent('n')} note  ${theme.accent('d')} delete  ${theme.accent('V')} vault  ${theme.accent('r')} sync  ${theme.accent('?')} help`,
     ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jlmarcos99/todos",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "A keyboard-first task manager and daily work log for the terminal",
   "repository": {
     "type": "git",