@trevonistrevon/pi-loop 0.5.3 → 0.5.5

package/dist/ui/widget.js

@@ -22,7 +22,7 @@ export class LoopWidget {
         this.uiCtx.setStatus("loops", this.computeStatus());
     }
     computeStatus() {
-        const loops = this.store.list().filter(l => l.status === "active");
+        const loops = this.store.list().filter(isStatusVisibleLoop);
         const monitors = this.monitorManager.list();
         const taskSummary = this.taskSummaryProvider?.() ?? { count: 0 };
         if (loops.length === 0 && monitors.length === 0 && taskSummary.count === 0) {
@@ -47,3 +47,10 @@ export class LoopWidget {
 function formatCount(count, noun) {
     return `${count} ${noun}${count === 1 ? "" : "s"}`;
 }
+function isStatusVisibleLoop(loop) {
+    if (loop.status !== "active")
+        return false;
+    if (loop.recurring)
+        return true;
+    return !(loop.trigger.type === "event" && loop.trigger.source === "monitor:done");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trevonistrevon/pi-loop",
-  "version": "0.5.3",
+  "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/commands/loop-command.ts

@@ -66,7 +66,7 @@ export function registerLoopCommand(options: LoopCommandOptions): void {
   async function viewLoops(ui: ExtensionUIContext) {
     const loops = getStore().list();
     if (loops.length === 0) {
-      await ui.select("No active loops", ["< Back"]);
+      await ui.select("No loops configured", ["< Back"]);
       return;
     }
 
@@ -81,7 +81,7 @@ export function registerLoopCommand(options: LoopCommandOptions): void {
     });
     choices.push("< Back");
 
-    const selected = await ui.select("Active Loops", choices);
+    const selected = await ui.select("Loops", choices);
     if (!selected || selected === "< Back") return;
 
     const match = selected.match(/#(\d+)/);
@@ -136,14 +136,14 @@ export function registerLoopCommand(options: LoopCommandOptions): void {
         const choice = await ui.select("Loop", [
           "Create scheduled loop",
           "Create event-triggered loop",
-          "View active loops",
+          "View loops",
           "Settings",
         ]);
 
         if (!choice) return;
         if (choice.startsWith("Create scheduled")) return scheduleLoop(ui);
         if (choice.startsWith("Create event")) return eventLoop(ui);
-        if (choice.startsWith("View active")) return viewLoops(ui);
+        if (choice.startsWith("View loops")) return viewLoops(ui);
         return settings(ui);
       }
 
@@ -173,7 +173,6 @@ export function registerLoopCommand(options: LoopCommandOptions): void {
       const choice = await ui.select("Loop mode", [
         `Scheduled: "${trimmed.slice(0, 50)}"`,
         `Event-triggered: "${trimmed.slice(0, 50)}"`,
-        `Self-paced: "${trimmed.slice(0, 50)}"`,
       ]);
 
       if (!choice) return;

package/src/commands/tasks-command.ts

@@ -45,7 +45,7 @@ export function registerTasksCommand(options: TasksCommandOptions): void {
     const backlog = await emitCreated(entry);
     ui.notify(`Task #${entry.id} created`, "info");
     if (backlog.created && backlog.entry) {
-      ui.notify(`Worker loop #${backlog.entry.id} auto-created`, "info");
+      ui.notify(`Backlog worker loop #${backlog.entry.id} created`, "info");
     }
   }
 
@@ -64,7 +64,7 @@ export function registerTasksCommand(options: TasksCommandOptions): void {
     choices.unshift("+ Create task");
     choices.push("< Back");
 
-    const selected = await ui.select("Native Tasks", choices);
+    const selected = await ui.select("Tasks", choices);
     if (!selected || selected === "< Back") return;
     if (selected === "+ Create task") {
       await createNativeTaskInteractively(ui);
@@ -125,7 +125,7 @@ export function registerTasksCommand(options: TasksCommandOptions): void {
         const backlog = await emitCreated(entry);
         ctx.ui.notify(`Task #${entry.id} created`, "info");
         if (backlog.created && backlog.entry) {
-          ctx.ui.notify(`Worker loop #${backlog.entry.id} auto-created`, "info");
+          ctx.ui.notify(`Backlog worker loop #${backlog.entry.id} created`, "info");
         }
         return;
       }

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 = {

package/src/goal-store.ts

@@ -1,6 +1,5 @@
-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 { type GoalReducerEvent, reduceGoalState } from "./goal-reducer.js";
 import type {
   GoalCriteria,
@@ -10,120 +9,24 @@ import type {
   GoalScope,
   GoalStoreData,
 } from "./goal-types.js";
+import { ReducerBackedStore } from "./reducer-backed-store.js";
 
 const GOALS_DIR = join(homedir(), ".pi", "goals");
-const LOCK_RETRY_MS = 50;
-const LOCK_MAX_RETRIES = 100;
 const MAX_GOALS = 200;
 
-function acquireLock(lockPath: string): void {
-  for (let i = 0; i < LOCK_MAX_RETRIES; i++) {
-    try {
-      writeFileSync(lockPath, `${process.pid}`, { flag: "wx" });
-      return;
-    } catch (e: any) {
-      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: string): void {
-  try { unlinkSync(lockPath); } catch { /* ignore */ }
-}
-
-function isProcessRunning(pid: number): boolean {
-  try { process.kill(pid, 0); return true; } catch { return false; }
-}
-
-export class GoalStore {
-  private filePath: string | undefined;
-  private lockPath: string | undefined;
-  private lastLoadedSignature: string | undefined;
-
-  private nextId = 1;
-  private goals = new Map<string, GoalEntry>();
-
+export class GoalStore extends ReducerBackedStore<GoalEntry, GoalReducerState, GoalReducerEvent, GoalStoreData> {
   constructor(listIdOrPath?: string) {
-    if (!listIdOrPath) return;
-    const isAbsPath = isAbsolute(listIdOrPath);
-    const filePath = isAbsPath ? listIdOrPath : join(GOALS_DIR, `${listIdOrPath}.json`);
-    mkdirSync(dirname(filePath), { recursive: true });
-    this.filePath = filePath;
-    this.lockPath = filePath + ".lock";
-    this.load();
-  }
-
-  private getFileSignature(): string | undefined {
-    if (!this.filePath || !existsSync(this.filePath)) return undefined;
-    const stat = statSync(this.filePath);
-    return `${stat.mtimeMs}:${stat.size}`;
-  }
-
-  private load(force = false): void {
-    if (!this.filePath) return;
-    const signature = this.getFileSignature();
-    if (!signature) return;
-    if (!force && signature === this.lastLoadedSignature) return;
-    try {
-      const data: GoalStoreData = JSON.parse(readFileSync(this.filePath, "utf-8"));
-      this.nextId = data.nextId;
-      this.goals.clear();
-      for (const goal of data.goals) {
-        this.goals.set(goal.id, goal);
-      }
-      this.lastLoadedSignature = signature;
-    } catch { /* corrupt file — start fresh */ }
-  }
-
-  private save(): void {
-    if (!this.filePath) return;
-    const data: GoalStoreData = {
-      nextId: this.nextId,
-      goals: Array.from(this.goals.values()),
-    };
-    const tmpPath = this.filePath + ".tmp";
-    writeFileSync(tmpPath, JSON.stringify(data, null, 2));
-    renameSync(tmpPath, this.filePath);
-    this.lastLoadedSignature = this.getFileSignature();
-  }
-
-  private withLock<T>(fn: () => T): T {
-    if (!this.lockPath) return fn();
-    acquireLock(this.lockPath);
-    try {
-      this.load(true);
-      const result = fn();
-      this.save();
-      return result;
-    } finally {
-      releaseLock(this.lockPath);
-    }
-  }
-
-  private toReducerState(): GoalReducerState {
-    return {
-      nextId: this.nextId,
-      goalsById: Object.fromEntries(this.goals.entries()),
-    };
-  }
-
-  private applyReducerEvent(event: GoalReducerEvent): void {
-    const result = reduceGoalState(this.toReducerState(), event);
-    this.nextId = result.state.nextId;
-    this.goals = new Map(Object.entries(result.state.goalsById));
+    super(
+      {
+        baseDir: GOALS_DIR,
+        reduce: (state, event) => reduceGoalState(state, event),
+        toReducerState: (nextId, entries) => ({ nextId, goalsById: Object.fromEntries(entries.entries()) }),
+        fromReducerState: (state) => ({ nextId: state.nextId, entries: new Map(Object.entries(state.goalsById)) }),
+        serialize: (nextId, entries) => ({ nextId, goals: Array.from(entries.values()) }),
+        deserialize: (data) => ({ nextId: data.nextId, entries: new Map(data.goals.map((g) => [g.id, g])) }),
+      },
+      listIdOrPath,
+    );
   }
 
   create(
@@ -134,7 +37,7 @@ export class GoalStore {
     metadata?: Record<string, unknown>,
   ): GoalEntry {
     return this.withLock(() => {
-      if (this.goals.size >= MAX_GOALS) {
+      if (this.entries.size >= MAX_GOALS) {
         throw new Error(`Maximum of ${MAX_GOALS} goals reached. Archive some before creating new ones.`);
       }
       this.applyReducerEvent({
@@ -150,23 +53,13 @@ export class GoalStore {
           metadata,
         },
       });
-      return this.goals.get(String(this.nextId - 1))!;
+      return this.entries.get(String(this.nextId - 1))!;
     });
   }
 
-  get(id: string): GoalEntry | undefined {
-    if (this.filePath) this.load();
-    return this.goals.get(id);
-  }
-
-  list(): GoalEntry[] {
-    if (this.filePath) this.load();
-    return Array.from(this.goals.values()).sort((a, b) => Number(a.id) - Number(b.id));
-  }
-
   activate(id: string): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       this.applyReducerEvent({
         type: "GOAL_ACTIVATED",
         at: Date.now(),
@@ -175,13 +68,13 @@ export class GoalStore {
         entityId: id,
         payload: { id },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 
   recordProgress(id: string, progress: GoalProgressSnapshot): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       this.applyReducerEvent({
         type: "GOAL_PROGRESS_RECORDED",
         at: Date.now(),
@@ -190,13 +83,13 @@ export class GoalStore {
         entityId: id,
         payload: { id, progress },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 
   markVerificationStarted(id: string): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       this.applyReducerEvent({
         type: "GOAL_VERIFICATION_STARTED",
         at: Date.now(),
@@ -205,13 +98,13 @@ export class GoalStore {
         entityId: id,
         payload: { id },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 
   markVerified(id: string, reason: string, progress?: GoalProgressSnapshot): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       this.applyReducerEvent({
         type: "GOAL_VERIFICATION_PASSED",
         at: Date.now(),
@@ -220,13 +113,13 @@ export class GoalStore {
         entityId: id,
         payload: { id, reason, progress },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 
   markFailed(id: string, reason: string, progress?: GoalProgressSnapshot): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       this.applyReducerEvent({
         type: "GOAL_FAILED",
         at: Date.now(),
@@ -235,13 +128,13 @@ export class GoalStore {
         entityId: id,
         payload: { id, reason, progress },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 
   markBlocked(id: string, reason: string, progress?: GoalProgressSnapshot): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       this.applyReducerEvent({
         type: "GOAL_BLOCKED",
         at: Date.now(),
@@ -250,13 +143,13 @@ export class GoalStore {
         entityId: id,
         payload: { id, reason, progress },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 
   unblock(id: string): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       this.applyReducerEvent({
         type: "GOAL_UNBLOCKED",
         at: Date.now(),
@@ -265,7 +158,7 @@ export class GoalStore {
         entityId: id,
         payload: { id },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 
@@ -280,7 +173,7 @@ export class GoalStore {
     },
   ): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       if (
         fields.title === undefined
         && fields.description === undefined
@@ -288,7 +181,7 @@ export class GoalStore {
         && fields.criteria === undefined
         && fields.metadata === undefined
       ) {
-        return this.goals.get(id);
+        return this.entries.get(id);
       }
       this.applyReducerEvent({
         type: "GOAL_UPDATED",
@@ -305,13 +198,13 @@ export class GoalStore {
           metadata: fields.metadata,
         },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 
   archive(id: string, reason?: string): GoalEntry | undefined {
     return this.withLock(() => {
-      if (!this.goals.has(id)) return undefined;
+      if (!this.entries.has(id)) return undefined;
       this.applyReducerEvent({
         type: "GOAL_ARCHIVED",
         at: Date.now(),
@@ -320,7 +213,7 @@ export class GoalStore {
         entityId: id,
         payload: { id, reason },
       });
-      return this.goals.get(id);
+      return this.entries.get(id);
     });
   }
 }

package/src/index.ts

@@ -10,13 +10,14 @@
  *   MonitorStop   — Stop a running monitor
  *
  * Commands:
- *   /loop    — Schedule a re-wake loop: /loop [interval] [prompt]
- *   /loops   — Interactive menu: view, create, cancel, settings
+ *   /loop    — Schedule or manage re-wake loops: /loop [interval] [prompt]
+ *   /tasks   — View or manage native fallback tasks when pi-tasks is absent
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { registerLoopCommand } from "./commands/loop-command.js";
 import { registerTasksCommand } from "./commands/tasks-command.js";
+import { atMaxFires } from "./loop-reducer.js";
 import { MonitorManager } from "./monitor-manager.js";
 import { createMonitorOnDoneRuntime } from "./runtime/monitor-ondone-runtime.js";
 import {
@@ -178,7 +179,7 @@ export default function (pi: ExtensionAPI) {
   function onLoopFire(entry: LoopEntry): void {
     debug(`loop:fire #${entry.id}`, { prompt: entry.prompt.slice(0, 50) });
 
-    if (entry.maxFires && (entry.fireCount ?? 0) >= entry.maxFires) {
+    if (atMaxFires(entry)) {
       debug(`loop #${entry.id} — reached maxFires ${entry.maxFires}, expiring`);
       store.delete(entry.id);
       return;

package/src/loop-reducer.ts

@@ -2,6 +2,16 @@ import type { LoopEntry, Trigger } from "./types.js";
 
 export const MAX_LOOP_EXPIRY_MS = 7 * 24 * 60 * 60 * 1000;
 
+/**
+ * Whether a loop has reached its fire cap. Single source of truth for the
+ * `maxFires` check shared by the fire callbacks (`onLoopFire` pre-fire guard and
+ * `TriggerSystem.fireLoop` post-fire cleanup). Each caller keeps its own timing;
+ * only the predicate is shared.
+ */
+export function atMaxFires(loop: Pick<LoopEntry, "maxFires" | "fireCount">): boolean {
+  return !!loop.maxFires && (loop.fireCount ?? 0) >= loop.maxFires;
+}
+
 type ReducerSource = "tool" | "command" | "scheduler" | "eventbus" | "monitor" | "session" | "coordinator" | "system";
 
 export interface LoopReducerState {

package/src/monitor-manager.ts

@@ -128,9 +128,7 @@ export class MonitorManager {
         exitCode: code,
         outputLines: current.outputLines,
       });
-      if (status === "completed") {
-        for (const callback of bp.completionCallbacks) callback();
-      }
+      for (const callback of bp.completionCallbacks) callback();
       bp.completionCallbacks = [];
       for (const resolve of bp.waiters) resolve();
       bp.waiters = [];
@@ -171,6 +169,7 @@ export class MonitorManager {
           monitorId: id,
           error: err.message,
         });
+        for (const callback of bp.completionCallbacks) callback();
         bp.completionCallbacks = [];
         for (const resolve of bp.waiters) resolve();
         bp.waiters = [];