@aleonnet/healthcare-scheduler 0.1.21 → 0.1.24

package/dist/reconciler/WindowScheduler beta.d.ts

@@ -0,0 +1,32 @@
+import { PlansRepository, OccurrencesRepository } from '../database/repositories';
+import { NotificationDriver } from '../core/types';
+import { EventBus } from '../core/EventBus';
+export declare class WindowScheduler {
+    private plansRepo;
+    private occurrencesRepo;
+    private notificationDriver;
+    private eventBus;
+    private groupSameTime;
+    private snoozeMinutes;
+    private static opQueue;
+    private runSerial;
+    constructor(plansRepo: PlansRepository, occurrencesRepo: OccurrencesRepository, notificationDriver: NotificationDriver, eventBus: EventBus);
+    setGroupSameTime(enabled: boolean): void;
+    setSnoozeMinutes(minutes: number): void;
+    private getReminderOffset;
+    fillWindow(options?: {
+        days?: number;
+    }): Promise<void>;
+    reconcileWithOS(options?: {
+        horizonDays?: number;
+        includePastDay?: boolean;
+    }): Promise<void>;
+    updateWindow(options?: {
+        days?: number;
+    }): Promise<void>;
+    private formatNotificationTitle;
+    private formatNotificationBody;
+    private getItemTypeEmoji;
+    private inferQtyUnit;
+}
+//# sourceMappingURL=WindowScheduler%20beta.d.ts.map

package/dist/reconciler/WindowScheduler beta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WindowScheduler beta.d.ts","sourceRoot":"","sources":["../../src/reconciler/WindowScheduler beta.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGlF,OAAO,EAAE,kBAAkB,EAAc,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAM5C,qBAAa,eAAe;IAWxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,QAAQ;IAblB,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,aAAa,CAAc;IAEnC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAmC;IACzD,OAAO,CAAC,SAAS;gBAMP,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,qBAAqB,EACtC,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,QAAQ;IAM5B,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAOxC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;YAOzB,iBAAiB;IAiBzB,UAAU,CAAC,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA0E1D,eAAe,CAAC,OAAO,GAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA4ShG,YAAY,CAAC,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlE,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,sBAAsB;IAiB9B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,YAAY;CASrB"}

package/dist/reconciler/WindowScheduler beta.js

@@ -0,0 +1,416 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WindowScheduler = void 0;
+const expandPlan_1 = require("../planning/expandPlan");
+const windowPlanner_1 = require("../planning/windowPlanner");
+const timestamp_1 = require("../utils/timestamp");
+class WindowScheduler {
+    runSerial(task) {
+        WindowScheduler.opQueue = WindowScheduler.opQueue.then(task, task);
+        return WindowScheduler.opQueue;
+    }
+    constructor(plansRepo, occurrencesRepo, notificationDriver, eventBus) {
+        this.plansRepo = plansRepo;
+        this.occurrencesRepo = occurrencesRepo;
+        this.notificationDriver = notificationDriver;
+        this.eventBus = eventBus;
+        this.groupSameTime = false;
+        this.snoozeMinutes = 15;
+    }
+    setGroupSameTime(enabled) {
+        this.groupSameTime = enabled;
+    }
+    setSnoozeMinutes(minutes) {
+        this.snoozeMinutes = minutes;
+    }
+    async getReminderOffset(planId) {
+        try {
+            const plan = await this.plansRepo.findById(planId);
+            if (plan && plan.meta && typeof plan.meta.reminder_offset === 'string') {
+                return plan.meta.reminder_offset;
+            }
+        }
+        catch (error) {
+        }
+        return undefined;
+    }
+    async fillWindow(options = {}) {
+        return await this.runSerial(async () => {
+            const { days = 14 } = options;
+            try {
+                const now = new Date();
+                const end = new Date(now.getTime());
+                end.setDate(end.getDate() + Math.max(0, days - 1));
+                const startKey = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
+                const endKey = `${end.getFullYear()}-${String(end.getMonth() + 1).padStart(2, '0')}-${String(end.getDate()).padStart(2, '0')}`;
+                console.log(`📅 Filling window: days=${days} (${startKey} → ${endKey})`);
+                const plans = await this.plansRepo.findActive(now);
+                if (!plans.length) {
+                    console.log('📅 No active plans found');
+                    return;
+                }
+                console.log(`📅 Found ${plans.length} active plans`);
+                for (const plan of plans) {
+                    await this.occurrencesRepo.deleteByPlanIdAfter(plan.id, now.toISOString());
+                }
+                const allOccurrences = [];
+                for (const plan of plans) {
+                    try {
+                        const expanded = (0, expandPlan_1.expandPlan)(plan.schedule_rule, now);
+                        const windowed = (0, windowPlanner_1.selectWindow)(expanded, { windowDays: days, maxPending: 1000 });
+                        const dbOccurrences = windowed.map(occ => ({
+                            id: `${plan.id}:${occ.scheduledAt}`,
+                            plan_id: plan.id,
+                            scheduled_at: occ.scheduledAt,
+                            kind: (plan.item_type || 'MED'),
+                            qty: occ.qty || 1
+                        }));
+                        allOccurrences.push(...dbOccurrences);
+                    }
+                    catch (error) {
+                        console.error(`❌ Error expanding plan ${plan.id}:`, error);
+                    }
+                }
+                if (allOccurrences.length) {
+                    await this.occurrencesRepo.insertMany(allOccurrences);
+                    console.log(`📅 ${allOccurrences.length} occurrences synced`);
+                }
+                this.eventBus.emit('window:filled', { count: allOccurrences.length });
+            }
+            catch (error) {
+                console.error('❌ Error filling window:', error);
+                throw error;
+            }
+        });
+    }
+    async reconcileWithOS(options = {}) {
+        return await this.runSerial(async () => {
+            const { horizonDays = 2, includePastDay = false } = options;
+            try {
+                const pendingOccs = await this.occurrencesRepo.getUpcomingWindow({
+                    days: Math.max(1, horizonDays),
+                    limit: 50,
+                    pastDays: includePastDay ? 1 : 0
+                });
+                const pending = pendingOccs.filter(occ => occ.status === 'PENDING');
+                const scheduledNotifs = await this.notificationDriver.listScheduled();
+                console.log(`🔄 Reconciling (horizon=${horizonDays}d, cap=45, group=${this.groupSameTime ? 'on' : 'off'}): ${pending.length} pending, ${scheduledNotifs.length} scheduled in OS`);
+                const groups = new Map();
+                if (this.groupSameTime) {
+                    for (const occ of pending) {
+                        if (occ.kind !== 'MED')
+                            continue;
+                        const d = (0, timestamp_1.parseUTC)(occ.scheduled_at);
+                        const key = `${occ.kind}:${d.getFullYear()}-${(d.getMonth() + 1).toString().padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')}T${d.getHours().toString().padStart(2, '0')}:${d.getMinutes().toString().padStart(2, '0')}`;
+                        if (!groups.has(key))
+                            groups.set(key, []);
+                        groups.get(key).push(occ);
+                    }
+                }
+                const notifsByOccId = new Map();
+                const notifsByGroupKey = new Map();
+                const occIdsInScheduledGroups = new Set();
+                for (const notif of scheduledNotifs) {
+                    const occId = notif.notification?.data?.occurrenceId;
+                    if (occId) {
+                        notifsByOccId.set(occId, notif.notification.id);
+                    }
+                    const gk = notif.notification?.data?.groupKey;
+                    if (gk) {
+                        let count = 0;
+                        try {
+                            const occIdsRaw = notif.notification?.data?.occurrenceIds;
+                            const occIds = Array.isArray(occIdsRaw) ? occIdsRaw : (typeof occIdsRaw === 'string' ? (JSON.parse(occIdsRaw || '[]') || []) : []);
+                            count = Array.isArray(occIds) ? occIds.length : 0;
+                            if (Array.isArray(occIds)) {
+                                for (const id of occIds)
+                                    occIdsInScheduledGroups.add(String(id));
+                            }
+                        }
+                        catch { }
+                        notifsByGroupKey.set(gk, { id: notif.notification?.id || '', count });
+                    }
+                }
+                let scheduled = 0;
+                let cancelled = 0;
+                const now = new Date();
+                if (this.groupSameTime && groups.size > 0) {
+                    for (const [key, occs] of groups) {
+                        if (!occs || occs.length === 0)
+                            continue;
+                        const occ = occs.sort((a, b) => (0, timestamp_1.parseUTC)(a.scheduled_at).getTime() - (0, timestamp_1.parseUTC)(b.scheduled_at).getTime())[0];
+                        const scheduledTime = (0, timestamp_1.parseUTC)(occ.scheduled_at);
+                        const SAFETY_BUFFER_MS = 2000;
+                        if (scheduledTime.getTime() <= now.getTime() + SAFETY_BUFFER_MS)
+                            continue;
+                        if (occs.length < 2) {
+                            continue;
+                        }
+                        try {
+                            const hh = scheduledTime.getHours().toString().padStart(2, '0');
+                            const mm = scheduledTime.getMinutes().toString().padStart(2, '0');
+                            const groupKey = key;
+                            const legacyDailyKey = `${occ.kind}:HH:${hh}:${mm}`;
+                            const names = occs.map((o) => o.item_name).filter(Boolean);
+                            const namesShort = names.slice(0, 2).join(', ') + (names.length > 2 ? ` +${names.length - 2}` : '');
+                            const title = `💊 ${occs.length} medicamentos agora`;
+                            const body = namesShort ? `${hh}:${mm} • ${namesShort}` : `${hh}:${mm}`;
+                            const existing = notifsByGroupKey.get(groupKey);
+                            if (existing && Number(existing.count || 0) === occs.length) {
+                                continue;
+                            }
+                            try {
+                                await this.notificationDriver.cancelTriggerByGroup(groupKey);
+                            }
+                            catch { }
+                            try {
+                                await this.notificationDriver.cancelTriggerByGroup(legacyDailyKey);
+                            }
+                            catch { }
+                            for (const o of occs) {
+                                try {
+                                    await this.notificationDriver.cancelTriggerByOccurrence(o.id);
+                                }
+                                catch { }
+                            }
+                            await this.notificationDriver.scheduleGroupTrigger({
+                                groupKey,
+                                occurrenceIds: occs.map((o) => o.id),
+                                itemType: occ.kind,
+                                itemId: occ.item_id || occ.plan_id,
+                                title,
+                                body,
+                                scheduledAt: scheduledTime,
+                                snoozeMin: this.snoozeMinutes
+                            });
+                            scheduled++;
+                        }
+                        catch (error) {
+                            console.error(`❌ Error scheduling group ${key}:`, error);
+                        }
+                    }
+                    const groupedOccIds = new Set();
+                    for (const occs of groups.values()) {
+                        if (occs && occs.length >= 2) {
+                            for (const o of occs)
+                                groupedOccIds.add(o.id);
+                        }
+                    }
+                    const remainder = pending.filter((o) => o.kind !== 'MED' || !groupedOccIds.has(o.id));
+                    for (const occ of remainder.slice(0, 45)) {
+                        const occId = occ.id;
+                        const isScheduled = notifsByOccId.has(occId);
+                        const scheduledTime = (0, timestamp_1.parseUTC)(occ.scheduled_at);
+                        if (scheduledTime.getTime() <= now.getTime()) {
+                            continue;
+                        }
+                        if (!isScheduled) {
+                            try {
+                                const reminderOffset = (occ.kind === 'APPT' || occ.kind === 'TEST')
+                                    ? await this.getReminderOffset(occ.plan_id)
+                                    : undefined;
+                                await this.notificationDriver.scheduleTrigger({
+                                    occurrenceId: occId,
+                                    itemType: occ.kind,
+                                    itemId: occ.item_id || occ.plan_id,
+                                    title: this.formatNotificationTitle(occ),
+                                    body: this.formatNotificationBody(occ),
+                                    scheduledAt: scheduledTime,
+                                    snoozeMin: this.snoozeMinutes,
+                                    reminderOffset
+                                });
+                                scheduled++;
+                            }
+                            catch (error) {
+                                console.error(`❌ Error scheduling ${occId}:`, error);
+                            }
+                        }
+                    }
+                }
+                else {
+                    for (const occ of pending.slice(0, 45)) {
+                        const occId = occ.id;
+                        const isScheduled = notifsByOccId.has(occId);
+                        const scheduledTime = (0, timestamp_1.parseUTC)(occ.scheduled_at);
+                        if (scheduledTime.getTime() <= now.getTime())
+                            continue;
+                        if (!isScheduled) {
+                            try {
+                                const reminderOffset = (occ.kind === 'APPT' || occ.kind === 'TEST')
+                                    ? await this.getReminderOffset(occ.plan_id)
+                                    : undefined;
+                                await this.notificationDriver.scheduleTrigger({
+                                    occurrenceId: occId,
+                                    itemType: occ.kind,
+                                    itemId: occ.item_id || occ.plan_id,
+                                    title: this.formatNotificationTitle(occ),
+                                    body: this.formatNotificationBody(occ),
+                                    scheduledAt: scheduledTime,
+                                    snoozeMin: this.snoozeMinutes,
+                                    reminderOffset
+                                });
+                                scheduled++;
+                            }
+                            catch (error) {
+                                console.error(`❌ Error scheduling ${occId}:`, error);
+                            }
+                        }
+                    }
+                }
+                try {
+                    if (this.groupSameTime) {
+                        const validGroupKeys = new Set();
+                        for (const key of groups.keys())
+                            validGroupKeys.add(key);
+                        for (const [gk] of notifsByGroupKey)
+                            validGroupKeys.add(gk);
+                        for (const [gk] of notifsByGroupKey) {
+                            if (!validGroupKeys.has(gk)) {
+                                try {
+                                    await this.notificationDriver.cancelTriggerByGroup(gk);
+                                    cancelled++;
+                                }
+                                catch { }
+                            }
+                        }
+                    }
+                    else {
+                        for (const [gk] of notifsByGroupKey) {
+                            try {
+                                await this.notificationDriver.cancelTriggerByGroup(gk);
+                                cancelled++;
+                            }
+                            catch { }
+                        }
+                    }
+                }
+                catch { }
+                try {
+                    const snoozedToCheck = pendingOccs.filter(o => String(o.last_action || '').toUpperCase() === 'SNOOZED');
+                    for (const occ of snoozedToCheck) {
+                        if (occIdsInScheduledGroups.has(String(occ.id))) {
+                            continue;
+                        }
+                        const lastAt = occ.last_action_at ? (0, timestamp_1.parseUTC)(occ.last_action_at) : null;
+                        let snoozeMin = 0;
+                        try {
+                            const payload = occ.last_action_payload ? JSON.parse(occ.last_action_payload) : null;
+                            snoozeMin = Number(payload?.snoozeMin || 0);
+                        }
+                        catch { }
+                        if (!lastAt || !snoozeMin || Number.isNaN(snoozeMin))
+                            continue;
+                        const snoozeUntil = new Date(lastAt.getTime() + snoozeMin * 60 * 1000);
+                        if (snoozeUntil.getTime() <= now.getTime())
+                            continue;
+                        const isScheduled = notifsByOccId.has(occ.id);
+                        if (!isScheduled) {
+                            try {
+                                await this.notificationDriver.scheduleTrigger({
+                                    occurrenceId: occ.id,
+                                    itemType: occ.kind,
+                                    itemId: occ.item_id || occ.plan_id,
+                                    title: this.formatNotificationTitle(occ),
+                                    body: this.formatNotificationBody(occ),
+                                    scheduledAt: snoozeUntil,
+                                    snoozeMin: this.snoozeMinutes
+                                });
+                                scheduled++;
+                            }
+                            catch (e) {
+                                console.error('❌ Error re-scheduling snooze', occ.id, e);
+                            }
+                        }
+                    }
+                }
+                catch { }
+                const validOccIds = new Set(pending.map(occ => occ.id));
+                try {
+                    const snoozedValid = pendingOccs.filter(o => String(o.last_action || '').toUpperCase() === 'SNOOZED');
+                    for (const occ of snoozedValid) {
+                        const lastAt = occ.last_action_at ? (0, timestamp_1.parseUTC)(occ.last_action_at) : null;
+                        let snoozeMin = 0;
+                        try {
+                            const payload = occ.last_action_payload ? JSON.parse(occ.last_action_payload) : null;
+                            snoozeMin = Number(payload?.snoozeMin || 0);
+                        }
+                        catch { }
+                        if (!lastAt || !snoozeMin || Number.isNaN(snoozeMin))
+                            continue;
+                        const snoozeUntil = new Date(lastAt.getTime() + snoozeMin * 60 * 1000);
+                        if (snoozeUntil.getTime() > now.getTime()) {
+                            validOccIds.add(occ.id);
+                        }
+                    }
+                }
+                catch { }
+                for (const [occId] of notifsByOccId) {
+                    if (!validOccIds.has(occId)) {
+                        try {
+                            await this.notificationDriver.cancelTriggerByOccurrence(occId);
+                            cancelled++;
+                        }
+                        catch (error) {
+                            console.error(`❌ Error canceling ${occId}:`, error);
+                        }
+                    }
+                }
+                console.log(`🔄 Reconciliation complete (horizon=${horizonDays}d, cap=45): ${scheduled} scheduled, ${cancelled} canceled`);
+                this.eventBus.emit('notifications:reconciled', { scheduled, cancelled });
+            }
+            catch (error) {
+                console.error('❌ Error in reconciliation:', error);
+                throw error;
+            }
+        });
+    }
+    async updateWindow(options = {}) {
+        await this.fillWindow(options);
+        await this.reconcileWithOS();
+    }
+    formatNotificationTitle(occ) {
+        const name = occ.item_name || 'Lembrete';
+        const dose = occ?.item_meta?.concentration ? ` ${occ.item_meta.concentration}` : '';
+        if (occ.kind === 'MED')
+            return `${name}${dose}`.trim();
+        return `${this.getItemTypeEmoji(occ.kind)} ${name}`.trim();
+    }
+    formatNotificationBody(occ) {
+        const time = (0, timestamp_1.parseUTC)(occ.scheduled_at).toLocaleTimeString('pt-BR', {
+            hour: '2-digit',
+            minute: '2-digit'
+        });
+        const qtyLabel = occ?.qty && occ.qty > 0 ? `${occ.qty} ${this.inferQtyUnit(occ)}` : null;
+        const parts = [];
+        if (qtyLabel)
+            parts.push(qtyLabel);
+        parts.push(time);
+        return parts.join(' • ');
+    }
+    getItemTypeEmoji(itemType) {
+        switch (itemType) {
+            case 'MED': return '💊';
+            case 'APPT': return '🏥';
+            case 'TEST': return '🔬';
+            case 'METRIC': return '📊';
+            default: return '⏰';
+        }
+    }
+    inferQtyUnit(occ) {
+        const form = String(occ?.item_meta?.form || '').toLowerCase();
+        if (!form)
+            return 'unidade';
+        if (form.includes('comprimido'))
+            return 'comprimido';
+        if (form.includes('cápsula'))
+            return 'cápsula';
+        if (form.includes('gota'))
+            return 'gota';
+        if (form.includes('ml'))
+            return 'ml';
+        return 'unidade';
+    }
+}
+exports.WindowScheduler = WindowScheduler;
+WindowScheduler.opQueue = Promise.resolve();
+//# sourceMappingURL=WindowScheduler%20beta.js.map

package/dist/reconciler/WindowScheduler beta.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WindowScheduler beta.js","sourceRoot":"","sources":["../../src/reconciler/WindowScheduler beta.ts"],"names":[],"mappings":"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"}

package/dist/reconciler/WindowScheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WindowScheduler.d.ts","sourceRoot":"","sources":["../../src/reconciler/WindowScheduler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGlF,OAAO,EAAE,kBAAkB,EAAc,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAM5C,qBAAa,eAAe;IAWxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,QAAQ;IAblB,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,aAAa,CAAc;IAEnC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAmC;IACzD,OAAO,CAAC,SAAS;gBAMP,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,qBAAqB,EACtC,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,QAAQ;IAM5B,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAOxC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;YAOzB,iBAAiB;IAiBzB,UAAU,CAAC,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwE1D,eAAe,CAAC,OAAO,GAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqShG,YAAY,CAAC,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlE,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,sBAAsB;IAiB9B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,YAAY;CASrB"}
+{"version":3,"file":"WindowScheduler.d.ts","sourceRoot":"","sources":["../../src/reconciler/WindowScheduler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGlF,OAAO,EAAE,kBAAkB,EAAc,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAM5C,qBAAa,eAAe;IAWxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,QAAQ;IAblB,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,aAAa,CAAc;IAEnC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAmC;IACzD,OAAO,CAAC,SAAS;gBAMP,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,qBAAqB,EACtC,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,QAAQ;IAM5B,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAOxC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;YAOzB,iBAAiB;IAiBzB,UAAU,CAAC,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA0E1D,eAAe,CAAC,OAAO,GAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA4ShG,YAAY,CAAC,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlE,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,sBAAsB;IAiB9B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,YAAY;CASrB"}

package/dist/reconciler/WindowScheduler.js

@@ -38,8 +38,12 @@ class WindowScheduler {
         return await this.runSerial(async () => {
             const { days = 14 } = options;
             try {
-                console.log(`📅 Filling ${days}-day window...`);
                 const now = new Date();
+                const end = new Date(now.getTime());
+                end.setDate(end.getDate() + Math.max(0, days - 1));
+                const startKey = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
+                const endKey = `${end.getFullYear()}-${String(end.getMonth() + 1).padStart(2, '0')}-${String(end.getDate()).padStart(2, '0')}`;
+                console.log(`📅 Filling window: days=${days} (${startKey} → ${endKey})`);
                 const plans = await this.plansRepo.findActive(now);
                 if (!plans.length) {
                     console.log('📅 No active plans found');
@@ -62,7 +66,6 @@ class WindowScheduler {
                             qty: occ.qty || 1
                         }));
                         allOccurrences.push(...dbOccurrences);
-                        console.log(`📅 Plan ${plan.id}: ${dbOccurrences.length} occurrences`);
                     }
                     catch (error) {
                         console.error(`❌ Error expanding plan ${plan.id}:`, error);
@@ -106,6 +109,7 @@ class WindowScheduler {
                 }
                 const notifsByOccId = new Map();
                 const notifsByGroupKey = new Map();
+                const occIdsInScheduledGroups = new Set();
                 for (const notif of scheduledNotifs) {
                     const occId = notif.notification?.data?.occurrenceId;
                     if (occId) {
@@ -118,6 +122,10 @@ class WindowScheduler {
                             const occIdsRaw = notif.notification?.data?.occurrenceIds;
                             const occIds = Array.isArray(occIdsRaw) ? occIdsRaw : (typeof occIdsRaw === 'string' ? (JSON.parse(occIdsRaw || '[]') || []) : []);
                             count = Array.isArray(occIds) ? occIds.length : 0;
+                            if (Array.isArray(occIds)) {
+                                for (const id of occIds)
+                                    occIdsInScheduledGroups.add(String(id));
+                            }
                         }
                         catch { }
                         notifsByGroupKey.set(gk, { id: notif.notification?.id || '', count });
@@ -254,6 +262,8 @@ class WindowScheduler {
                         const validGroupKeys = new Set();
                         for (const key of groups.keys())
                             validGroupKeys.add(key);
+                        for (const [gk] of notifsByGroupKey)
+                            validGroupKeys.add(gk);
                         for (const [gk] of notifsByGroupKey) {
                             if (!validGroupKeys.has(gk)) {
                                 try {
@@ -278,7 +288,10 @@ class WindowScheduler {
                 try {
                     const snoozedToCheck = pendingOccs.filter(o => String(o.last_action || '').toUpperCase() === 'SNOOZED');
                     for (const occ of snoozedToCheck) {
-                        const lastAt = occ.last_action_at ? new Date(occ.last_action_at) : null;
+                        if (occIdsInScheduledGroups.has(String(occ.id))) {
+                            continue;
+                        }
+                        const lastAt = occ.last_action_at ? (0, timestamp_1.parseUTC)(occ.last_action_at) : null;
                         let snoozeMin = 0;
                         try {
                             const payload = occ.last_action_payload ? JSON.parse(occ.last_action_payload) : null;
@@ -303,7 +316,6 @@ class WindowScheduler {
                                     snoozeMin: this.snoozeMinutes
                                 });
                                 scheduled++;
-                                console.log('🔁 Snooze re-scheduled by reconcile for', occ.id);
                             }
                             catch (e) {
                                 console.error('❌ Error re-scheduling snooze', occ.id, e);
@@ -316,7 +328,7 @@ class WindowScheduler {
                 try {
                     const snoozedValid = pendingOccs.filter(o => String(o.last_action || '').toUpperCase() === 'SNOOZED');
                     for (const occ of snoozedValid) {
-                        const lastAt = occ.last_action_at ? new Date(occ.last_action_at) : null;
+                        const lastAt = occ.last_action_at ? (0, timestamp_1.parseUTC)(occ.last_action_at) : null;
                         let snoozeMin = 0;
                         try {
                             const payload = occ.last_action_payload ? JSON.parse(occ.last_action_payload) : null;
@@ -343,9 +355,7 @@ class WindowScheduler {
                         }
                     }
                 }
-                if (scheduled > 0 || cancelled > 0) {
-                    console.log(`🔄 Reconciliation complete (horizon=${horizonDays}d, cap=45): ${scheduled} scheduled, ${cancelled} canceled`);
-                }
+                console.log(`🔄 Reconciliation complete (horizon=${horizonDays}d, cap=45): ${scheduled} scheduled, ${cancelled} canceled`);
                 this.eventBus.emit('notifications:reconciled', { scheduled, cancelled });
             }
             catch (error) {