pulseed 0.6.4 → 0.6.6

package/dist/runtime/daemon/wait-deadline-resolver.js

@@ -1,10 +1,12 @@
 import { normalizeWaitMetadata, parseStrategy, } from "../../base/types/strategy.js";
 import { isWaitStrategy } from "../../orchestrator/strategy/portfolio-allocation.js";
-import { ScheduleEntryListSchema } from "../types/schedule.js";
+import { ScheduleEntryStore } from "../schedule/entry-store.js";
 export class WaitDeadlineResolver {
     stateManager;
-    constructor(stateManager) {
+    options;
+    constructor(stateManager, options = {}) {
         this.stateManager = stateManager;
+        this.options = options;
     }
     async resolve(goalIds) {
         const waitingGoals = await this.resolveFromInternalSchedules(goalIds);
@@ -18,12 +20,13 @@ export class WaitDeadlineResolver {
         return clampIntervalToNextWaitDeadline(intervalMs, resolution.next_observe_at, nowMs);
     }
     async resolveFromInternalSchedules(goalIds) {
-        const rawSchedules = await this.stateManager.readRaw("schedules.json");
-        const parsedSchedules = ScheduleEntryListSchema.safeParse(rawSchedules);
-        if (!parsedSchedules.success) {
+        const baseDir = this.options.baseDir ?? this.stateManager.getBaseDir?.();
+        if (!baseDir) {
             return [];
         }
-        const waitingGoals = await Promise.all(parsedSchedules.data
+        const entryStore = new ScheduleEntryStore(baseDir, { warn: () => { } });
+        const schedules = await entryStore.readEntries();
+        const waitingGoals = await Promise.all(schedules
             .filter((entry) => entry.enabled
             && entry.metadata?.internal === true
             && entry.metadata.activation_kind === "wait_resume"
@@ -40,7 +43,7 @@ export class WaitDeadlineResolver {
             return null;
         const waitStrategy = await this.loadWaitStrategy(goalId, strategyId);
         const metadata = waitStrategy
-            ? normalizeWaitMetadataFailSoft(waitStrategy, await this.stateManager.readRaw(`strategies/${goalId}/wait-meta/${strategyId}.json`))
+            ? normalizeWaitMetadataFailSoft(waitStrategy, await this.stateManager.loadWaitMetadata(goalId, strategyId))
             : null;
         return {
             goal_id: goalId,
@@ -54,12 +57,10 @@ export class WaitDeadlineResolver {
         };
     }
     async loadWaitStrategy(goalId, strategyId) {
-        const rawPortfolio = await this.stateManager.readRaw(`strategies/${goalId}/portfolio.json`);
-        if (!rawPortfolio || typeof rawPortfolio !== "object")
-            return null;
-        const strategies = rawPortfolio["strategies"];
-        if (!Array.isArray(strategies))
+        const portfolio = await this.stateManager.loadStrategyPortfolio(goalId);
+        if (!portfolio)
             return null;
+        const strategies = portfolio.strategies;
         const match = strategies
             .map((candidate) => parseStrategy(candidate))
             .find((candidate) => candidate.id === strategyId);

package/dist/runtime/daemon/wait-deadline-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait-deadline-resolver.js","sourceRoot":"","sources":["../../../src/runtime/daemon/wait-deadline-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wait-deadline-resolver.js","sourceRoot":"","sources":["../../../src/runtime/daemon/wait-deadline-resolver.ts"],"names":[],"mappings":"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"}