@trevonistrevon/pi-loop 0.5.4 → 0.5.5

package/dist/store.js

@@ -1,136 +1,23 @@
-import { existsSync, mkdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, isAbsolute, join } from "node:path";
+import { join } from "node:path";
 import { reduceLoopState } from "./loop-reducer.js";
+import { ReducerBackedStore } from "./reducer-backed-store.js";
 const LOOPS_DIR = join(homedir(), ".pi", "loops");
-const LOCK_RETRY_MS = 50;
-const LOCK_MAX_RETRIES = 100;
 const MAX_LOOPS = 25;
-function acquireLock(lockPath) {
-    mkdirSync(dirname(lockPath), { recursive: true });
-    for (let i = 0; i < LOCK_MAX_RETRIES; i++) {
-        try {
-            writeFileSync(lockPath, `${process.pid}`, { flag: "wx" });
-            return;
-        }
-        catch (e) {
-            if (e.code === "EEXIST") {
-                try {
-                    const pid = parseInt(readFileSync(lockPath, "utf-8"), 10);
-                    if (!pid || !isProcessRunning(pid)) {
-                        try {
-                            unlinkSync(lockPath);
-                        }
-                        catch { /* ignore */ }
-                        continue;
-                    }
-                }
-                catch { /* ignore read errors */ }
-                const start = Date.now();
-                while (Date.now() - start < LOCK_RETRY_MS) { /* busy wait */ }
-                continue;
-            }
-            throw e;
-        }
-    }
-    throw new Error(`Failed to acquire lock: ${lockPath}`);
-}
-function releaseLock(lockPath) {
-    try {
-        unlinkSync(lockPath);
-    }
-    catch { /* ignore */ }
-}
-function isProcessRunning(pid) {
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-export class LoopStore {
-    filePath;
-    lockPath;
-    lastLoadedSignature;
-    nextId = 1;
-    loops = new Map();
+export class LoopStore extends ReducerBackedStore {
     constructor(listIdOrPath) {
-        if (!listIdOrPath)
-            return;
-        const isAbsPath = isAbsolute(listIdOrPath);
-        const filePath = isAbsPath ? listIdOrPath : join(LOOPS_DIR, `${listIdOrPath}.json`);
-        mkdirSync(dirname(filePath), { recursive: true });
-        this.filePath = filePath;
-        this.lockPath = filePath + ".lock";
-        this.load();
-    }
-    getFileSignature() {
-        if (!this.filePath || !existsSync(this.filePath))
-            return undefined;
-        const stat = statSync(this.filePath);
-        return `${stat.mtimeMs}:${stat.size}`;
-    }
-    load(force = false) {
-        if (!this.filePath)
-            return;
-        const signature = this.getFileSignature();
-        if (!signature)
-            return;
-        if (!force && signature === this.lastLoadedSignature)
-            return;
-        try {
-            const data = JSON.parse(readFileSync(this.filePath, "utf-8"));
-            this.nextId = data.nextId;
-            this.loops.clear();
-            for (const loop of data.loops) {
-                this.loops.set(loop.id, loop);
-            }
-            this.lastLoadedSignature = signature;
-        }
-        catch { /* corrupt file — start fresh */ }
-    }
-    save() {
-        if (!this.filePath)
-            return;
-        const data = {
-            nextId: this.nextId,
-            loops: Array.from(this.loops.values()),
-        };
-        const tmpPath = this.filePath + ".tmp";
-        writeFileSync(tmpPath, JSON.stringify(data, null, 2));
-        renameSync(tmpPath, this.filePath);
-        this.lastLoadedSignature = this.getFileSignature();
-    }
-    withLock(fn) {
-        if (!this.lockPath)
-            return fn();
-        acquireLock(this.lockPath);
-        try {
-            this.load(true);
-            const result = fn();
-            this.save();
-            return result;
-        }
-        finally {
-            releaseLock(this.lockPath);
-        }
-    }
-    toReducerState() {
-        return {
-            nextId: this.nextId,
-            loopsById: Object.fromEntries(this.loops.entries()),
-        };
-    }
-    applyReducerEvent(event) {
-        const result = reduceLoopState(this.toReducerState(), event);
-        this.nextId = result.state.nextId;
-        this.loops = new Map(Object.entries(result.state.loopsById));
+        super({
+            baseDir: LOOPS_DIR,
+            reduce: (state, event) => reduceLoopState(state, event),
+            toReducerState: (nextId, entries) => ({ nextId, loopsById: Object.fromEntries(entries.entries()) }),
+            fromReducerState: (state) => ({ nextId: state.nextId, entries: new Map(Object.entries(state.loopsById)) }),
+            serialize: (nextId, entries) => ({ nextId, loops: Array.from(entries.values()) }),
+            deserialize: (data) => ({ nextId: data.nextId, entries: new Map(data.loops.map((l) => [l.id, l])) }),
+        }, listIdOrPath);
     }
     create(trigger, prompt, opts) {
         return this.withLock(() => {
-            if (this.loops.size >= MAX_LOOPS) {
+            if (this.entries.size >= MAX_LOOPS) {
                 throw new Error(`Maximum of ${MAX_LOOPS} loops reached. Delete some before creating new ones.`);
             }
             const now = Date.now();
@@ -149,22 +36,12 @@ export class LoopStore {
                     maxFires: opts.maxFires,
                 },
             });
-            return this.loops.get(String(this.nextId - 1));
+            return this.entries.get(String(this.nextId - 1));
         });
     }
-    get(id) {
-        if (this.filePath)
-            this.load();
-        return this.loops.get(id);
-    }
-    list() {
-        if (this.filePath)
-            this.load();
-        return Array.from(this.loops.values()).sort((a, b) => Number(a.id) - Number(b.id));
-    }
     pause(id) {
         return this.withLock(() => {
-            const entry = this.loops.get(id);
+            const entry = this.entries.get(id);
             if (!entry)
                 return undefined;
             this.applyReducerEvent({
@@ -175,12 +52,12 @@ export class LoopStore {
                 entityId: id,
                 payload: { id },
             });
-            return this.loops.get(id);
+            return this.entries.get(id);
         });
     }
     resume(id) {
         return this.withLock(() => {
-            const entry = this.loops.get(id);
+            const entry = this.entries.get(id);
             if (!entry)
                 return undefined;
             this.applyReducerEvent({
@@ -191,12 +68,12 @@ export class LoopStore {
                 entityId: id,
                 payload: { id },
             });
-            return this.loops.get(id);
+            return this.entries.get(id);
         });
     }
     fire(id) {
         return this.withLock(() => {
-            const entry = this.loops.get(id);
+            const entry = this.entries.get(id);
             if (!entry)
                 return undefined;
             this.applyReducerEvent({
@@ -207,12 +84,12 @@ export class LoopStore {
                 entityId: id,
                 payload: { id },
             });
-            return this.loops.get(id);
+            return this.entries.get(id);
         });
     }
     updateMetadata(id, fields) {
         return this.withLock(() => {
-            const current = this.loops.get(id);
+            const current = this.entries.get(id);
             if (!current)
                 return { entry: undefined, changedFields: [] };
             const changedFields = [];
@@ -228,12 +105,12 @@ export class LoopStore {
             if (changedFields.length > 0) {
                 current.updatedAt = now;
             }
-            return { entry: this.loops.get(id), changedFields };
+            return { entry: this.entries.get(id), changedFields };
         });
     }
     delete(id) {
         return this.withLock(() => {
-            if (!this.loops.has(id))
+            if (!this.entries.has(id))
                 return false;
             this.applyReducerEvent({
                 type: "LOOP_DELETED",
@@ -250,7 +127,7 @@ export class LoopStore {
         return this.withLock(() => {
             const now = Date.now();
             let count = 0;
-            for (const [id, entry] of [...this.loops.entries()]) {
+            for (const [id, entry] of [...this.entries.entries()]) {
                 if (now < entry.expiresAt)
                     continue;
                 this.applyReducerEvent({
@@ -269,7 +146,7 @@ export class LoopStore {
     expireEventLoops(sessionStartedAt) {
         return this.withLock(() => {
             let count = 0;
-            for (const [id, entry] of [...this.loops.entries()]) {
+            for (const [id, entry] of [...this.entries.entries()]) {
                 if (entry.status !== "active")
                     continue;
                 if (entry.trigger.type !== "event" && entry.trigger.type !== "hybrid")
@@ -291,7 +168,7 @@ export class LoopStore {
     }
     clearAll() {
         return this.withLock(() => {
-            const ids = [...this.loops.keys()];
+            const ids = [...this.entries.keys()];
             for (const id of ids) {
                 this.applyReducerEvent({
                     type: "LOOP_DELETED",
@@ -305,13 +182,4 @@ export class LoopStore {
             return ids.length;
         });
     }
-    deleteFileIfEmpty() {
-        if (!this.filePath || this.loops.size > 0)
-            return false;
-        try {
-            unlinkSync(this.filePath);
-        }
-        catch { /* ignore */ }
-        return true;
-    }
 }

package/dist/task-reducer.js

@@ -60,6 +60,9 @@ export function reduceTaskState(state, event) {
     if (event.type === "TASK_REOPENED") {
         task.status = "pending";
         task.updatedAt = event.at;
+        // `completedAt` is intentionally retained: it records the most recent
+        // completion, not "is currently complete" (use `status` for that). A
+        // reopened task keeps the timestamp of when it was last completed.
     }
     if (event.type === "TASK_UPDATED") {
         if (event.payload.subject !== undefined)

package/dist/task-store.d.ts

@@ -1,20 +1,9 @@
-import type { TaskEntry } from "./task-types.js";
-export declare class TaskStore {
-    private filePath;
-    private lockPath;
-    private lastLoadedSignature;
-    private nextId;
-    private tasks;
+import { ReducerBackedStore } from "./reducer-backed-store.js";
+import { type TaskReducerEvent, type TaskReducerState } from "./task-reducer.js";
+import type { TaskEntry, TaskStoreData } from "./task-types.js";
+export declare class TaskStore extends ReducerBackedStore<TaskEntry, TaskReducerState, TaskReducerEvent, TaskStoreData> {
     constructor(listIdOrPath?: string);
-    private getFileSignature;
-    private load;
-    private save;
-    private withLock;
-    private toReducerState;
-    private applyReducerEvent;
     create(subject: string, description: string, metadata?: Record<string, unknown>): TaskEntry;
-    get(id: string): TaskEntry | undefined;
-    list(): TaskEntry[];
     start(id: string): TaskEntry | undefined;
     complete(id: string): TaskEntry | undefined;
     reopen(id: string): TaskEntry | undefined;

package/dist/task-store.js

@@ -1,136 +1,23 @@
-import { existsSync, mkdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, isAbsolute, join } from "node:path";
+import { join } from "node:path";
+import { ReducerBackedStore } from "./reducer-backed-store.js";
 import { reduceTaskState } from "./task-reducer.js";
 const TASKS_DIR = join(homedir(), ".pi", "tasks");
-const LOCK_RETRY_MS = 50;
-const LOCK_MAX_RETRIES = 100;
 const MAX_TASKS = 200;
-function acquireLock(lockPath) {
-    mkdirSync(dirname(lockPath), { recursive: true });
-    for (let i = 0; i < LOCK_MAX_RETRIES; i++) {
-        try {
-            writeFileSync(lockPath, `${process.pid}`, { flag: "wx" });
-            return;
-        }
-        catch (e) {
-            if (e.code === "EEXIST") {
-                try {
-                    const pid = parseInt(readFileSync(lockPath, "utf-8"), 10);
-                    if (!pid || !isProcessRunning(pid)) {
-                        try {
-                            unlinkSync(lockPath);
-                        }
-                        catch { /* ignore */ }
-                        continue;
-                    }
-                }
-                catch { /* ignore read errors */ }
-                const start = Date.now();
-                while (Date.now() - start < LOCK_RETRY_MS) { /* busy wait */ }
-                continue;
-            }
-            throw e;
-        }
-    }
-    throw new Error(`Failed to acquire lock: ${lockPath}`);
-}
-function releaseLock(lockPath) {
-    try {
-        unlinkSync(lockPath);
-    }
-    catch { /* ignore */ }
-}
-function isProcessRunning(pid) {
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-export class TaskStore {
-    filePath;
-    lockPath;
-    lastLoadedSignature;
-    nextId = 1;
-    tasks = new Map();
+export class TaskStore extends ReducerBackedStore {
     constructor(listIdOrPath) {
-        if (!listIdOrPath)
-            return;
-        const isAbsPath = isAbsolute(listIdOrPath);
-        const filePath = isAbsPath ? listIdOrPath : join(TASKS_DIR, `${listIdOrPath}.json`);
-        mkdirSync(dirname(filePath), { recursive: true });
-        this.filePath = filePath;
-        this.lockPath = filePath + ".lock";
-        this.load();
-    }
-    getFileSignature() {
-        if (!this.filePath || !existsSync(this.filePath))
-            return undefined;
-        const stat = statSync(this.filePath);
-        return `${stat.mtimeMs}:${stat.size}`;
-    }
-    load(force = false) {
-        if (!this.filePath)
-            return;
-        const signature = this.getFileSignature();
-        if (!signature)
-            return;
-        if (!force && signature === this.lastLoadedSignature)
-            return;
-        try {
-            const data = JSON.parse(readFileSync(this.filePath, "utf-8"));
-            this.nextId = data.nextId;
-            this.tasks.clear();
-            for (const task of data.tasks) {
-                this.tasks.set(task.id, task);
-            }
-            this.lastLoadedSignature = signature;
-        }
-        catch { /* corrupt file — start fresh */ }
-    }
-    save() {
-        if (!this.filePath)
-            return;
-        const data = {
-            nextId: this.nextId,
-            tasks: Array.from(this.tasks.values()),
-        };
-        const tmpPath = this.filePath + ".tmp";
-        writeFileSync(tmpPath, JSON.stringify(data, null, 2));
-        renameSync(tmpPath, this.filePath);
-        this.lastLoadedSignature = this.getFileSignature();
-    }
-    withLock(fn) {
-        if (!this.lockPath)
-            return fn();
-        acquireLock(this.lockPath);
-        try {
-            this.load(true);
-            const result = fn();
-            this.save();
-            return result;
-        }
-        finally {
-            releaseLock(this.lockPath);
-        }
-    }
-    toReducerState() {
-        return {
-            nextId: this.nextId,
-            tasksById: Object.fromEntries(this.tasks.entries()),
-        };
-    }
-    applyReducerEvent(event) {
-        const result = reduceTaskState(this.toReducerState(), event);
-        this.nextId = result.state.nextId;
-        this.tasks = new Map(Object.entries(result.state.tasksById));
+        super({
+            baseDir: TASKS_DIR,
+            reduce: (state, event) => reduceTaskState(state, event),
+            toReducerState: (nextId, entries) => ({ nextId, tasksById: Object.fromEntries(entries.entries()) }),
+            fromReducerState: (state) => ({ nextId: state.nextId, entries: new Map(Object.entries(state.tasksById)) }),
+            serialize: (nextId, entries) => ({ nextId, tasks: Array.from(entries.values()) }),
+            deserialize: (data) => ({ nextId: data.nextId, entries: new Map(data.tasks.map((t) => [t.id, t])) }),
+        }, listIdOrPath);
     }
     create(subject, description, metadata) {
         return this.withLock(() => {
-            if (this.tasks.size >= MAX_TASKS) {
+            if (this.entries.size >= MAX_TASKS) {
                 throw new Error(`Maximum of ${MAX_TASKS} tasks reached. Delete some before creating new ones.`);
             }
             const now = Date.now();
@@ -141,22 +28,12 @@ export class TaskStore {
                 entityType: "task",
                 payload: { subject, description, metadata },
             });
-            return this.tasks.get(String(this.nextId - 1));
+            return this.entries.get(String(this.nextId - 1));
         });
     }
-    get(id) {
-        if (this.filePath)
-            this.load();
-        return this.tasks.get(id);
-    }
-    list() {
-        if (this.filePath)
-            this.load();
-        return Array.from(this.tasks.values()).sort((a, b) => Number(a.id) - Number(b.id));
-    }
     start(id) {
         return this.withLock(() => {
-            const entry = this.tasks.get(id);
+            const entry = this.entries.get(id);
             if (!entry)
                 return undefined;
             this.applyReducerEvent({
@@ -167,12 +44,12 @@ export class TaskStore {
                 entityId: id,
                 payload: { id },
             });
-            return this.tasks.get(id);
+            return this.entries.get(id);
         });
     }
     complete(id) {
         return this.withLock(() => {
-            const entry = this.tasks.get(id);
+            const entry = this.entries.get(id);
             if (!entry)
                 return undefined;
             this.applyReducerEvent({
@@ -183,12 +60,12 @@ export class TaskStore {
                 entityId: id,
                 payload: { id },
             });
-            return this.tasks.get(id);
+            return this.entries.get(id);
         });
     }
     reopen(id) {
         return this.withLock(() => {
-            const entry = this.tasks.get(id);
+            const entry = this.entries.get(id);
             if (!entry)
                 return undefined;
             this.applyReducerEvent({
@@ -199,12 +76,12 @@ export class TaskStore {
                 entityId: id,
                 payload: { id },
             });
-            return this.tasks.get(id);
+            return this.entries.get(id);
         });
     }
     updateDetails(id, fields) {
         return this.withLock(() => {
-            const entry = this.tasks.get(id);
+            const entry = this.entries.get(id);
             if (!entry)
                 return undefined;
             if (fields.subject === undefined && fields.description === undefined)
@@ -221,12 +98,12 @@ export class TaskStore {
                     description: fields.description,
                 },
             });
-            return this.tasks.get(id);
+            return this.entries.get(id);
         });
     }
     delete(id) {
         return this.withLock(() => {
-            if (!this.tasks.has(id))
+            if (!this.entries.has(id))
                 return false;
             this.applyReducerEvent({
                 type: "TASK_DELETED",
@@ -241,7 +118,7 @@ export class TaskStore {
     }
     pendingCount() {
         let count = 0;
-        for (const t of this.tasks.values()) {
+        for (const t of this.entries.values()) {
             if (t.status === "pending" || t.status === "in_progress")
                 count++;
         }
@@ -249,7 +126,7 @@ export class TaskStore {
     }
     pruneCompleted() {
         return this.withLock(() => {
-            const before = this.tasks.size;
+            const before = this.entries.size;
             this.applyReducerEvent({
                 type: "TASKS_PRUNED",
                 at: Date.now(),
@@ -257,7 +134,7 @@ export class TaskStore {
                 entityType: "task",
                 payload: { reason: "manual" },
             });
-            return before - this.tasks.size;
+            return before - this.entries.size;
         });
     }
 }

package/dist/tools/monitor-tools.js

@@ -52,6 +52,15 @@ Pass onDone with a prompt and the monitor auto-creates a one-shot loop that fire
             updateWidget();
             let onDoneMsg = "";
             if (params.onDone) {
+                // onDone delivery is callback-only: the loop below is delivered solely
+                // via MonitorManager.onComplete (see handleMonitorDoneLoop →
+                // monitor-ondone-runtime), so it fires exactly once by construction.
+                // The event-typed trigger is metadata, NOT a live subscription — this
+                // loop is deliberately NOT passed to triggerSystem.add(). The "event"
+                // type lets expireEventLoops() prune it if orphaned across a session
+                // and lets the widget render it as a monitor-completion wake. Do not
+                // triggerSystem.add() this loop, or the monitor:done event would fire it
+                // a second time.
                 const doneTrigger = { type: "event", source: "monitor:done", filter: JSON.stringify({ monitorId: entry.id }) };
                 const doneLoop = getStore().create(doneTrigger, params.onDone, { recurring: false });
                 handleMonitorDoneLoop(doneLoop, entry.id);

package/dist/trigger-system.js

@@ -1,3 +1,4 @@
+import { atMaxFires } from "./loop-reducer.js";
 export class TriggerSystem {
     pi;
     scheduler;
@@ -103,7 +104,7 @@ export class TriggerSystem {
             this.remove(entry.id);
             return;
         }
-        if (fresh.recurring && fresh.maxFires && (fresh.fireCount ?? 0) >= fresh.maxFires) {
+        if (fresh.recurring && atMaxFires(fresh)) {
             this.remove(fresh.id);
             this.store.delete(fresh.id);
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trevonistrevon/pi-loop",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "A pi extension for cron/event-based agent re-wake loops and background process monitoring.",
   "author": "trevonistrevon",
   "license": "MIT",
@@ -28,7 +28,9 @@
     "build": "tsc",
     "prepublishOnly": "npm run lint && npm run typecheck && npm run test && npm run build",
     "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
     "test:watch": "vitest",
+    "test:e2e": "bash test/e2e/reminder-injection.sh",
     "typecheck": "tsc --noEmit",
     "lint": "biome check src/ test/",
     "lint:fix": "biome check --fix src/ test/"
@@ -36,6 +38,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.4.13",
     "@types/node": "^25.0.0",
+    "@vitest/coverage-v8": "^4.1.8",
     "typescript": "^6.0.0",
     "vitest": "^4.1.5"
   },

package/src/goal-reducer.ts

@@ -82,6 +82,15 @@ export type GoalReducerEffect =
     entityType: "goal";
     entityId: string;
     payload: { id: string };
+  }
+  | {
+    // Diagnostic: a transition was dropped because the goal is in a terminal
+    // state. Surfaced (rather than silently ignored) so the effect sink can log
+    // it. Carries no state change.
+    type: "GOAL_TRANSITION_REJECTED";
+    entityType: "goal";
+    entityId: string;
+    payload: { id: string; status: GoalEntry["status"]; attempted: string };
   };
 
 export interface GoalReduceResult {
@@ -160,7 +169,17 @@ export function reduceGoalState(state: GoalReducerState, event: GoalReducerEvent
   const id = event.payload.id;
   const current = state.goalsById[id];
   if (!current) return { state, effects: [] };
-  if (isTerminal(current) && event.type !== "GOAL_ARCHIVED") return { state, effects: [] };
+  if (isTerminal(current) && event.type !== "GOAL_ARCHIVED") {
+    return {
+      state,
+      effects: [{
+        type: "GOAL_TRANSITION_REJECTED",
+        entityType: "goal",
+        entityId: id,
+        payload: { id, status: current.status, attempted: event.type },
+      }],
+    };
+  }
 
   const next = cloneState(state);
   const goal: GoalEntry = {