@upnextapp/core 0.17.2 → 0.19.0

package/dist/index.d.ts

@@ -1,5 +1,7 @@
-export type { ReminderStatus, ScheduledReminder, RecurrenceType, ResponsibilityDef, AppSettings, StoreSchema } from './types.js';
-export { calculateNextTrigger, calculateNextTriggerFromNow, firstSlotForDay, isWithinActiveHours, matchesRecurrenceInterval, shouldTriggerOnDay, isStaleActive, isOccurrenceOverdue, STALE_ACTIVE_THRESHOLD_MS, HOURLY_STALE_THRESHOLD_MS } from './scheduling.js';
+export type { ReminderStatus, ScheduledReminder, RecurrenceType, ResponsibilityDef, AppSettings, StoreSchema, WriteKind } from './types.js';
+export { authorityOverride } from './writeAuthority.js';
+export type { AuthorityRow } from './writeAuthority.js';
+export { calculateNextTrigger, calculateNextTriggerFromNow, firstSlotForDay, isWithinActiveHours, matchesRecurrenceInterval, shouldTriggerOnDay, isStaleActive, isOccurrenceOverdue, STALE_ACTIVE_THRESHOLD_MS } from './scheduling.js';
 export { isTimeOfDayOutsideActiveHours } from './activeHours.js';
 export { coarsenIdleTime, IDLE_TIME_BUCKET_SECONDS } from './coarsenIdleTime.js';
 export { formatNextTrigger } from './formatNextTrigger.js';

package/dist/index.js

@@ -1,4 +1,5 @@
-export { calculateNextTrigger, calculateNextTriggerFromNow, firstSlotForDay, isWithinActiveHours, matchesRecurrenceInterval, shouldTriggerOnDay, isStaleActive, isOccurrenceOverdue, STALE_ACTIVE_THRESHOLD_MS, HOURLY_STALE_THRESHOLD_MS } from './scheduling.js';
+export { authorityOverride } from './writeAuthority.js';
+export { calculateNextTrigger, calculateNextTriggerFromNow, firstSlotForDay, isWithinActiveHours, matchesRecurrenceInterval, shouldTriggerOnDay, isStaleActive, isOccurrenceOverdue, STALE_ACTIVE_THRESHOLD_MS } from './scheduling.js';
 export { isTimeOfDayOutsideActiveHours } from './activeHours.js';
 export { coarsenIdleTime, IDLE_TIME_BUCKET_SECONDS } from './coarsenIdleTime.js';
 export { formatNextTrigger } from './formatNextTrigger.js';

package/dist/scheduling.d.ts

@@ -1,6 +1,5 @@
 import { type ResponsibilityDef, type ScheduledReminder } from './types.js';
 export declare const STALE_ACTIVE_THRESHOLD_MS: number;
-export declare const HOURLY_STALE_THRESHOLD_MS: number;
 export declare function shouldTriggerOnDay(def: ResponsibilityDef, date: Date): boolean;
 export declare function isWithinActiveHours(now: number, startTime: string, endTime: string): boolean;
 export declare function matchesRecurrenceInterval(def: ResponsibilityDef, day: Date, startDate: Date, anchorDayStartMs: number): boolean;

package/dist/scheduling.js

@@ -1,5 +1,4 @@
 export const STALE_ACTIVE_THRESHOLD_MS = 48 * 60 * 60 * 1000;
-export const HOURLY_STALE_THRESHOLD_MS = 24 * 60 * 60 * 1000;
 export function shouldTriggerOnDay(def, date) {
     if (!def.daysOfWeek || def.daysOfWeek.length === 0)
         return true;
@@ -173,10 +172,18 @@ export function calculateNextTriggerFromNow(def, fromTime, activeStart, activeEn
     return calculateNextTrigger(def, fromTime, activeStart, activeEnd);
 }
 export function isStaleActive(reminder, now, def) {
-    if (!reminder.activatedAt)
+    // Single 48h threshold for every recurrence type, aligned with the server's P3
+    // progression floor (sync_lww_guard) and writeAuthority.ts — the sweep fires only
+    // when the server would accept the dismissal, so attempts succeed first try.
+    // Keyed to activated_at — the alive-as-active clock — because updated_at is
+    // re-stamped by every plugin tick, which starved the sweep on ticking rows (Obs 3).
+    // Legacy rows with a null activated_at fall back to updated_at (server COALESCE).
+    // def is retained for signature compatibility.
+    void def;
+    const aliveAsActiveAt = reminder.activatedAt ?? reminder.updatedAt;
+    if (aliveAsActiveAt == null)
         return true;
-    const threshold = def?.recurrenceType === 'hourly' ? HOURLY_STALE_THRESHOLD_MS : STALE_ACTIVE_THRESHOLD_MS;
-    return (now - reminder.activatedAt) > threshold;
+    return (now - aliveAsActiveAt) > STALE_ACTIVE_THRESHOLD_MS;
 }
 export function isOccurrenceOverdue(def, reminder, now, activeStart, activeEnd) {
     // Auto-advance only when the next due slot is on a NEW calendar day than the

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 export type ReminderStatus = 'scheduled' | 'active' | 'delayed' | 'completed';
+export type WriteKind = 'user' | 'auto';
 export interface ScheduledReminder {
     defId: string;
     status: ReminderStatus;
@@ -7,6 +8,8 @@ export interface ScheduledReminder {
     delayUntil?: number;
     lastCompletedAt?: number;
     pluginData?: Record<string, unknown>;
+    writeKind?: WriteKind;
+    updatedAt?: number;
 }
 export type RecurrenceType = 'once' | 'hourly' | 'daily' | 'weekly' | 'monthly' | 'yearly';
 export interface ResponsibilityDef {
@@ -21,6 +24,7 @@ export interface ResponsibilityDef {
     pluginId?: string;
     reminderType?: string;
     pluginData?: Record<string, unknown>;
+    writeKind?: WriteKind;
 }
 export interface AppSettings {
     activeStartTime: string;

package/dist/writeAuthority.d.ts

@@ -0,0 +1,9 @@
+export interface AuthorityRow {
+    writeKind?: string | null;
+    status?: string | null;
+    delayUntil?: number | string | null;
+    nextTriggerTime?: number | string | null;
+    activatedAt?: number | string | null;
+    updatedAt?: number | string | null;
+}
+export declare function authorityOverride(local: AuthorityRow, incoming: AuthorityRow, now: number): boolean | null;

package/dist/writeAuthority.js

@@ -0,0 +1,42 @@
+import { STALE_ACTIVE_THRESHOLD_MS } from './scheduling.js';
+// Matches the server's jsonb BIGINT casts: NULL/missing coerces to 0.
+function stamp(value) {
+    return Number(value) || 0;
+}
+// Client mirror of sync_lww_guard (supabase/migrations/20260920200000_p3_staleness_activation.sql):
+// incoming user over local auto always wins; incoming auto over local user wins only via a
+// progression rule — the user's own data says it's time:
+//   P1 delayed -> active once the user-set delay_until has passed
+//   P2 completed -> scheduled/active with a strictly LATER next_trigger_time (forward rebook only)
+//   P3 active -> scheduled/completed once the row is 48h stale by activated_at — the
+//      alive-as-active clock, falling back to updated_at when activated_at is NULL (legacy
+//      rows). updated_at alone is wrong: ticking plugins re-stamp it every tick, which
+//      starved the sweep on actively-ticking rows (Obs 3).
+//   P4 scheduled -> active once the user-scheduled next_trigger_time has arrived (the fire)
+// Returns null when kinds match so the caller falls back to updated_at comparison.
+// Missing kinds default to 'auto' (S9: pre-migration rows, old clients).
+export function authorityOverride(local, incoming, now) {
+    const localKind = local.writeKind ?? 'auto';
+    const incomingKind = incoming.writeKind ?? 'auto';
+    if (localKind === incomingKind)
+        return null;
+    if (incomingKind === 'user')
+        return true;
+    if (local.status === 'delayed'
+        && incoming.status === 'active'
+        && stamp(local.delayUntil) <= now)
+        return true;
+    if (local.status === 'completed'
+        && (incoming.status === 'scheduled' || incoming.status === 'active')
+        && stamp(incoming.nextTriggerTime) > stamp(local.nextTriggerTime))
+        return true;
+    if (local.status === 'active'
+        && (incoming.status === 'scheduled' || incoming.status === 'completed')
+        && stamp(local.activatedAt ?? local.updatedAt) <= now - STALE_ACTIVE_THRESHOLD_MS)
+        return true;
+    if (local.status === 'scheduled'
+        && incoming.status === 'active'
+        && stamp(local.nextTriggerTime) <= now)
+        return true;
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upnextapp/core",
-  "version": "0.17.2",
+  "version": "0.19.0",
   "type": "module",
   "description": "Platform-agnostic core for UpNext: domain types, scheduling math, integrity payloads",
   "license": "MIT",