@femtomc/mu-server 26.2.73 → 26.2.74

package/dist/cron_programs.js

@@ -6,43 +6,6 @@ const CRON_PROGRAMS_FILENAME = "cron.jsonl";
 function defaultNowMs() {
     return Date.now();
 }
-function normalizeTarget(input) {
-    if (!input || typeof input !== "object" || Array.isArray(input)) {
-        return null;
-    }
-    const record = input;
-    const kind = typeof record.kind === "string" ? record.kind.trim().toLowerCase() : "";
-    if (kind === "run") {
-        const jobId = typeof record.job_id === "string" ? record.job_id.trim() : "";
-        const rootIssueId = typeof record.root_issue_id === "string" ? record.root_issue_id.trim() : "";
-        if (!jobId && !rootIssueId) {
-            return null;
-        }
-        return {
-            kind: "run",
-            job_id: jobId || null,
-            root_issue_id: rootIssueId || null,
-        };
-    }
-    if (kind === "activity") {
-        const activityId = typeof record.activity_id === "string" ? record.activity_id.trim() : "";
-        if (!activityId) {
-            return null;
-        }
-        return {
-            kind: "activity",
-            activity_id: activityId,
-        };
-    }
-    return null;
-}
-function normalizeWakeMode(value) {
-    if (typeof value !== "string") {
-        return "immediate";
-    }
-    const normalized = value.trim().toLowerCase().replaceAll("-", "_");
-    return normalized === "next_heartbeat" ? "next_heartbeat" : "immediate";
-}
 function sanitizeMetadata(value) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
         return {};
@@ -56,7 +19,6 @@ function normalizeProgram(row) {
     const record = row;
     const programId = typeof record.program_id === "string" ? record.program_id.trim() : "";
     const title = typeof record.title === "string" ? record.title.trim() : "";
-    const target = normalizeTarget(record.target);
     const createdAt = typeof record.created_at_ms === "number" && Number.isFinite(record.created_at_ms)
         ? Math.trunc(record.created_at_ms)
         : defaultNowMs();
@@ -64,7 +26,7 @@ function normalizeProgram(row) {
         nowMs: createdAt,
         defaultEveryAnchorMs: createdAt,
     });
-    if (!programId || !title || !target || !schedule) {
+    if (!programId || !title || !schedule) {
         return null;
     }
     const updatedAt = typeof record.updated_at_ms === "number" && Number.isFinite(record.updated_at_ms)
@@ -77,14 +39,8 @@ function normalizeProgram(row) {
         ? Math.trunc(record.last_triggered_at_ms)
         : null;
     const lastResultRaw = typeof record.last_result === "string" ? record.last_result.trim().toLowerCase() : null;
-    const lastResult = lastResultRaw === "ok" ||
-        lastResultRaw === "not_found" ||
-        lastResultRaw === "not_running" ||
-        lastResultRaw === "failed"
-        ? lastResultRaw
-        : null;
+    const lastResult = lastResultRaw === "ok" || lastResultRaw === "coalesced" || lastResultRaw === "failed" ? lastResultRaw : null;
     const reason = typeof record.reason === "string" && record.reason.trim().length > 0 ? record.reason.trim() : "scheduled";
-    const wakeMode = normalizeWakeMode(record.wake_mode);
     return {
         v: 1,
         program_id: programId,
@@ -92,8 +48,6 @@ function normalizeProgram(row) {
         enabled: record.enabled !== false,
         schedule,
         reason,
-        wake_mode: wakeMode,
-        target,
         metadata: sanitizeMetadata(record.metadata),
         created_at_ms: createdAt,
         updated_at_ms: updatedAt,
@@ -112,17 +66,13 @@ function sortPrograms(programs) {
     });
 }
 function shouldRetry(result) {
-    if (result.status === "failed") {
-        return true;
-    }
-    return result.status === "skipped" && result.reason === "requests-in-flight";
+    return result.status === "failed";
 }
 export class CronProgramRegistry {
     #store;
     #heartbeatScheduler;
     #timer;
-    #runHeartbeat;
-    #activityHeartbeat;
+    #dispatchWake;
     #onTickEvent;
     #onLifecycleEvent;
     #nowMs;
@@ -130,8 +80,7 @@ export class CronProgramRegistry {
     #loaded = null;
     constructor(opts) {
         this.#heartbeatScheduler = opts.heartbeatScheduler;
-        this.#runHeartbeat = opts.runHeartbeat;
-        this.#activityHeartbeat = opts.activityHeartbeat;
+        this.#dispatchWake = opts.dispatchWake;
         this.#onTickEvent = opts.onTickEvent;
         this.#onLifecycleEvent = opts.onLifecycleEvent;
         this.#nowMs = opts.nowMs ?? defaultNowMs;
@@ -149,7 +98,6 @@ export class CronProgramRegistry {
         return {
             ...program,
             schedule: { ...program.schedule },
-            target: program.target.kind === "run" ? { ...program.target } : { ...program.target },
             metadata: { ...program.metadata },
         };
     }
@@ -251,50 +199,39 @@ export class CronProgramRegistry {
         const nowMs = Math.trunc(this.#nowMs());
         program.last_triggered_at_ms = nowMs;
         program.updated_at_ms = nowMs;
-        let heartbeatResult;
+        let dispatchResult;
         let eventStatus = "ok";
         let eventReason = triggerReason;
-        let eventMessage = `cron program tick: ${program.title}`;
+        let eventMessage = `cron program dispatched wake: ${program.title}`;
         try {
-            const executionResult = program.target.kind === "run"
-                ? await this.#runHeartbeat({
-                    jobId: program.target.job_id,
-                    rootIssueId: program.target.root_issue_id,
-                    reason: triggerReason,
-                    wakeMode: program.wake_mode,
-                })
-                : await this.#activityHeartbeat({
-                    activityId: program.target.activity_id,
-                    reason: triggerReason,
-                });
-            if (executionResult.ok) {
+            const executionResult = await this.#dispatchWake({
+                programId: program.program_id,
+                title: program.title,
+                reason: triggerReason,
+                metadata: { ...program.metadata },
+                triggeredAtMs: nowMs,
+                schedule: { ...program.schedule },
+            });
+            if (executionResult.status === "ok") {
                 program.last_result = "ok";
                 program.last_error = null;
-                heartbeatResult = { status: "ran" };
+                dispatchResult = { status: "ran" };
             }
-            else if (executionResult.reason === "not_running") {
-                program.last_result = "not_running";
+            else if (executionResult.status === "coalesced") {
+                program.last_result = "coalesced";
                 program.last_error = null;
-                eventStatus = "not_running";
-                eventReason = executionResult.reason;
-                eventMessage = `cron program skipped (not running): ${program.title}`;
-                heartbeatResult = { status: "skipped", reason: "not_running" };
-            }
-            else if (executionResult.reason === "not_found") {
-                program.last_result = "not_found";
-                program.last_error = null;
-                eventStatus = "not_found";
-                eventReason = executionResult.reason;
-                eventMessage = `cron program skipped (not found): ${program.title}`;
-                heartbeatResult = { status: "skipped", reason: "not_found" };
+                eventStatus = "coalesced";
+                eventReason = executionResult.reason ?? "coalesced";
+                eventMessage = `cron program coalesced wake: ${program.title}`;
+                dispatchResult = { status: "skipped", reason: "coalesced" };
             }
             else {
                 program.last_result = "failed";
-                program.last_error = executionResult.reason ?? "cron_program_tick_failed";
+                program.last_error = executionResult.reason;
                 eventStatus = "failed";
-                eventReason = program.last_error;
+                eventReason = executionResult.reason;
                 eventMessage = `cron program failed: ${program.title}`;
-                heartbeatResult = { status: "failed", reason: program.last_error };
+                dispatchResult = { status: "failed", reason: executionResult.reason };
             }
         }
         catch (err) {
@@ -303,9 +240,9 @@ export class CronProgramRegistry {
             eventStatus = "failed";
             eventReason = program.last_error;
             eventMessage = `cron program failed: ${program.title}`;
-            heartbeatResult = { status: "failed", reason: program.last_error };
+            dispatchResult = { status: "failed", reason: program.last_error };
         }
-        if (opts.advanceSchedule && !shouldRetry(heartbeatResult)) {
+        if (opts.advanceSchedule && !shouldRetry(dispatchResult)) {
             if (program.schedule.kind === "at") {
                 program.enabled = false;
                 program.next_run_at_ms = null;
@@ -336,7 +273,7 @@ export class CronProgramRegistry {
         }).catch(() => {
             // best effort only
         });
-        return heartbeatResult;
+        return dispatchResult;
     }
     async list(opts = {}) {
         await this.#ensureLoaded();
@@ -346,9 +283,6 @@ export class CronProgramRegistry {
             if (typeof opts.enabled === "boolean" && program.enabled !== opts.enabled) {
                 return false;
             }
-            if (opts.targetKind && program.target.kind !== opts.targetKind) {
-                return false;
-            }
             if (opts.scheduleKind && program.schedule.kind !== opts.scheduleKind) {
                 return false;
             }
@@ -379,10 +313,6 @@ export class CronProgramRegistry {
         if (!title) {
             throw new Error("cron_program_title_required");
         }
-        const target = normalizeTarget(opts.target);
-        if (!target) {
-            throw new Error("cron_program_invalid_target");
-        }
         const nowMs = Math.trunc(this.#nowMs());
         const schedule = normalizeCronSchedule(opts.schedule, {
             nowMs,
@@ -398,8 +328,6 @@ export class CronProgramRegistry {
             enabled: opts.enabled !== false,
             schedule,
             reason: opts.reason?.trim() || "scheduled",
-            wake_mode: normalizeWakeMode(opts.wakeMode),
-            target,
             metadata: sanitizeMetadata(opts.metadata),
             created_at_ms: nowMs,
             updated_at_ms: nowMs,
@@ -438,23 +366,14 @@ export class CronProgramRegistry {
         if (typeof opts.reason === "string") {
             program.reason = opts.reason.trim() || "scheduled";
         }
-        if (typeof opts.wakeMode === "string") {
-            program.wake_mode = normalizeWakeMode(opts.wakeMode);
-        }
         if (typeof opts.enabled === "boolean") {
             program.enabled = opts.enabled;
         }
-        if (opts.target) {
-            const target = normalizeTarget(opts.target);
-            if (!target) {
-                return { ok: false, reason: "invalid_target", program: this.#snapshot(program) };
-            }
-            program.target = target;
-        }
         if (opts.schedule) {
+            const nowMs = Math.trunc(this.#nowMs());
             const normalizedSchedule = normalizeCronSchedule(opts.schedule, {
-                nowMs: Math.trunc(this.#nowMs()),
-                defaultEveryAnchorMs: program.schedule.kind === "every" ? program.schedule.anchor_ms : Math.trunc(this.#nowMs()),
+                nowMs,
+                defaultEveryAnchorMs: program.schedule.kind === "every" ? program.schedule.anchor_ms : nowMs,
             });
             if (!normalizedSchedule) {
                 return { ok: false, reason: "invalid_schedule", program: this.#snapshot(program) };

package/dist/cron_request.d.ts

@@ -1,8 +1,2 @@
-import type { CronProgramTarget } from "./cron_programs.js";
-export type ParsedCronTarget = {
-    target: CronProgramTarget | null;
-    error: string | null;
-};
-export declare function parseCronTarget(body: Record<string, unknown>): ParsedCronTarget;
 export declare function hasCronScheduleInput(body: Record<string, unknown>): boolean;
 export declare function cronScheduleInputFromBody(body: Record<string, unknown>): Record<string, unknown>;

package/dist/cron_request.js

@@ -1,44 +1,3 @@
-export function parseCronTarget(body) {
-    const targetKind = typeof body.target_kind === "string" ? body.target_kind.trim().toLowerCase() : "";
-    if (targetKind === "run") {
-        const jobId = typeof body.run_job_id === "string" ? body.run_job_id.trim() : "";
-        const rootIssueId = typeof body.run_root_issue_id === "string" ? body.run_root_issue_id.trim() : "";
-        if (!jobId && !rootIssueId) {
-            return {
-                target: null,
-                error: "run target requires run_job_id or run_root_issue_id",
-            };
-        }
-        return {
-            target: {
-                kind: "run",
-                job_id: jobId || null,
-                root_issue_id: rootIssueId || null,
-            },
-            error: null,
-        };
-    }
-    if (targetKind === "activity") {
-        const activityId = typeof body.activity_id === "string" ? body.activity_id.trim() : "";
-        if (!activityId) {
-            return {
-                target: null,
-                error: "activity target requires activity_id",
-            };
-        }
-        return {
-            target: {
-                kind: "activity",
-                activity_id: activityId,
-            },
-            error: null,
-        };
-    }
-    return {
-        target: null,
-        error: "target_kind must be run or activity",
-    };
-}
 export function hasCronScheduleInput(body) {
     return (body.schedule != null ||
         body.schedule_kind != null ||

package/dist/heartbeat_programs.d.ts

@@ -1,14 +1,5 @@
 import type { JsonlStore } from "@femtomc/mu-core";
 import type { ActivityHeartbeatScheduler } from "./heartbeat_scheduler.js";
-export type HeartbeatProgramTarget = {
-    kind: "run";
-    job_id: string | null;
-    root_issue_id: string | null;
-} | {
-    kind: "activity";
-    activity_id: string;
-};
-export type HeartbeatProgramWakeMode = "immediate" | "next_heartbeat";
 export type HeartbeatProgramSnapshot = {
     v: 1;
     program_id: string;
@@ -16,49 +7,48 @@ export type HeartbeatProgramSnapshot = {
     enabled: boolean;
     every_ms: number;
     reason: string;
-    wake_mode: HeartbeatProgramWakeMode;
-    target: HeartbeatProgramTarget;
     metadata: Record<string, unknown>;
     created_at_ms: number;
     updated_at_ms: number;
     last_triggered_at_ms: number | null;
-    last_result: "ok" | "not_found" | "not_running" | "failed" | null;
+    last_result: "ok" | "coalesced" | "failed" | null;
     last_error: string | null;
 };
 export type HeartbeatProgramOperationResult = {
     ok: boolean;
-    reason: "not_found" | "missing_target" | "invalid_target" | "not_running" | "failed" | null;
+    reason: "not_found" | "missing_target" | "not_running" | "failed" | null;
     program: HeartbeatProgramSnapshot | null;
 };
 export type HeartbeatProgramTickEvent = {
     ts_ms: number;
     program_id: string;
     message: string;
-    status: "ok" | "not_found" | "not_running" | "failed";
+    status: "ok" | "coalesced" | "failed";
     reason: string | null;
     program: HeartbeatProgramSnapshot;
 };
+export type HeartbeatProgramDispatchResult = {
+    status: "ok";
+    reason?: string | null;
+} | {
+    status: "coalesced";
+    reason?: string | null;
+} | {
+    status: "failed";
+    reason: string;
+};
 export type HeartbeatProgramRegistryOpts = {
     repoRoot: string;
     heartbeatScheduler: ActivityHeartbeatScheduler;
     nowMs?: () => number;
     store?: JsonlStore<HeartbeatProgramSnapshot>;
-    runHeartbeat: (opts: {
-        jobId?: string | null;
-        rootIssueId?: string | null;
-        reason?: string | null;
-        wakeMode?: HeartbeatProgramWakeMode;
-    }) => Promise<{
-        ok: boolean;
-        reason: "not_found" | "not_running" | "missing_target" | null;
-    }>;
-    activityHeartbeat: (opts: {
-        activityId?: string | null;
-        reason?: string | null;
-    }) => Promise<{
-        ok: boolean;
-        reason: "not_found" | "not_running" | "missing_target" | null;
-    }>;
+    dispatchWake: (opts: {
+        programId: string;
+        title: string;
+        reason: string;
+        metadata: Record<string, unknown>;
+        triggeredAtMs: number;
+    }) => Promise<HeartbeatProgramDispatchResult>;
     onTickEvent?: (event: HeartbeatProgramTickEvent) => void | Promise<void>;
 };
 export declare class HeartbeatProgramRegistry {
@@ -66,16 +56,13 @@ export declare class HeartbeatProgramRegistry {
     constructor(opts: HeartbeatProgramRegistryOpts);
     list(opts?: {
         enabled?: boolean;
-        targetKind?: "run" | "activity";
         limit?: number;
     }): Promise<HeartbeatProgramSnapshot[]>;
     get(programId: string): Promise<HeartbeatProgramSnapshot | null>;
     create(opts: {
         title: string;
-        target: HeartbeatProgramTarget;
         everyMs?: number;
         reason?: string;
-        wakeMode?: HeartbeatProgramWakeMode;
         enabled?: boolean;
         metadata?: Record<string, unknown>;
     }): Promise<HeartbeatProgramSnapshot>;
@@ -84,9 +71,7 @@ export declare class HeartbeatProgramRegistry {
         title?: string;
         everyMs?: number;
         reason?: string;
-        wakeMode?: HeartbeatProgramWakeMode;
         enabled?: boolean;
-        target?: HeartbeatProgramTarget;
         metadata?: Record<string, unknown>;
     }): Promise<HeartbeatProgramOperationResult>;
     remove(programId: string): Promise<HeartbeatProgramOperationResult>;