@monotykamary/localterm-server 2.80.3 → 2.81.0

package/dist/automation-dispatcher.js

@@ -0,0 +1,195 @@
+import { randomUUID } from "node:crypto";
+import { MAX_AUTOMATION_CONCURRENT_RUNS } from "./constants.js";
+import { isActiveAutomationRun } from "./utils/is-active-automation-run.js";
+import { trimAutomationRuns } from "./utils/trim-automation-runs.js";
+export class AutomationDispatcher {
+    options;
+    exclusive = new Set();
+    disposed = false;
+    constructor(options) {
+        this.options = options;
+    }
+    request(id, trigger, scheduledFor = this.now(), skippedReason) {
+        if (this.disposed)
+            return null;
+        const automation = this.options.store.get(id);
+        if (!automation)
+            return null;
+        if (trigger !== "manual" && (!automation.enabled || automation.lifecycle === "finished"))
+            return null;
+        if (trigger === "schedule" && scheduledFor <= (automation.lastScheduledAt ?? -1)) {
+            return (automation.runs.find((run) => run.trigger === trigger && run.scheduledFor === scheduledFor)
+                ?.runId ?? null);
+        }
+        const active = automation.runs.filter(isActiveAutomationRun);
+        const thread = automation.runner.kind === "agent" && automation.runner.sessionMode === "thread";
+        const policy = thread && automation.concurrencyPolicy === "allow"
+            ? "queue-latest"
+            : (automation.concurrencyPolicy ?? "skip");
+        const busy = active.length > 0 || this.exclusive.has(id);
+        const reason = skippedReason ??
+            (busy && policy === "skip"
+                ? "overlap"
+                : policy === "allow" && active.length >= MAX_AUTOMATION_CONCURRENT_RUNS
+                    ? "capacity"
+                    : undefined);
+        const now = this.now();
+        const run = {
+            runId: randomUUID(),
+            scheduledFor,
+            startedAt: null,
+            finishedAt: reason ? now : null,
+            status: reason ? "skipped" : "queued",
+            reason,
+            exitCode: null,
+            trigger,
+            countsTowardLimit: false,
+            findings: null,
+            changedFiles: [],
+            unread: false,
+            log: null,
+            execution: {
+                cwd: automation.cwd,
+                runner: structuredClone(automation.runner),
+                requestedSecrets: [...automation.requestedSecrets],
+                redactOutput: automation.redactOutput ?? false,
+                closeOnFinish: automation.closeOnFinish,
+            },
+        };
+        this.options.store.transact(id, (current) => ({
+            ...current,
+            ...(trigger === "schedule" ? { lastScheduledAt: scheduledFor } : {}),
+            runs: trimAutomationRuns([
+                run,
+                ...current.runs.map((previous) => !reason && policy === "queue-latest" && previous.status === "queued"
+                    ? { ...previous, status: "skipped", reason: "superseded", finishedAt: now }
+                    : previous),
+            ]),
+        }));
+        this.options.changed();
+        if (!reason)
+            this.drain(id);
+        return run.runId;
+    }
+    // Only accepted but unstarted work is replayable. Once launch was committed,
+    // external side effects may have happened; never rerun an interrupted command.
+    recover() {
+        const now = this.now();
+        for (const automation of this.options.store.list()) {
+            if (!automation.runs.some((run) => run.status === "running" || run.status === "launched"))
+                continue;
+            this.options.store.transact(automation.id, (current) => ({
+                ...current,
+                runs: current.runs.map((run) => run.status === "running" || run.status === "launched"
+                    ? { ...run, status: "interrupted", reason: "restart", finishedAt: now }
+                    : run),
+            }));
+        }
+        this.options.changed();
+        for (const automation of this.options.store.list())
+            this.drain(automation.id);
+    }
+    drain(id) {
+        if (this.disposed || this.exclusive.has(id))
+            return;
+        let automation = this.options.store.get(id);
+        if (!automation)
+            return;
+        for (const pending of [...automation.runs].reverse()) {
+            if (pending.status !== "queued")
+                continue;
+            automation = this.options.store.get(id);
+            if (!automation)
+                return;
+            const run = automation.runs.find((entry) => entry.runId === pending.runId);
+            if (!run || run.status !== "queued")
+                continue;
+            if (run.trigger !== "manual" &&
+                (!automation.enabled || automation.lifecycle === "finished")) {
+                this.finish(id, run.runId, "cancelled", automation.enabled ? "limit" : "disabled");
+                continue;
+            }
+            const active = automation.runs.filter((entry) => entry.status === "running" || entry.status === "launched");
+            const currentRunner = automation.runner;
+            const runner = run.execution?.runner ?? currentRunner;
+            const sharedThread = (runner.kind === "agent" && runner.sessionMode === "thread") ||
+                active.some((entry) => {
+                    const activeRunner = entry.execution?.runner ?? currentRunner;
+                    return activeRunner.kind === "agent" && activeRunner.sessionMode === "thread";
+                });
+            if (active.length >= MAX_AUTOMATION_CONCURRENT_RUNS ||
+                (active.length > 0 && (sharedThread || automation.concurrencyPolicy !== "allow")))
+                continue;
+            const now = this.now();
+            const counts = run.trigger !== "manual";
+            const status = runner.kind === "agent" ? "running" : "launched";
+            const updated = this.options.store.transact(id, (current) => {
+                const runCount = current.runCount + (counts ? 1 : 0);
+                return {
+                    ...current,
+                    runCount,
+                    lifecycle: current.limit.kind === "count" && runCount >= current.limit.max
+                        ? "finished"
+                        : current.lifecycle,
+                    runs: current.runs.map((entry) => entry.runId === run.runId
+                        ? { ...entry, status, startedAt: now, countsTowardLimit: counts }
+                        : entry),
+                };
+            });
+            if (!updated)
+                return;
+            const started = updated.runs.find((entry) => entry.runId === run.runId);
+            if (!started)
+                continue;
+            this.options.changed();
+            try {
+                const result = this.options.launch({ ...updated, ...started.execution }, started);
+                void Promise.resolve(result).catch(() => this.launchFailed(id, run.runId));
+            }
+            catch {
+                this.launchFailed(id, run.runId);
+            }
+        }
+    }
+    cancel(id, runId) {
+        const run = this.options.store.get(id)?.runs.find((entry) => entry.runId === runId);
+        if (run?.status !== "queued")
+            return false;
+        this.finish(id, runId, "cancelled", "cancelled");
+        return true;
+    }
+    isBusy(id) {
+        return (this.exclusive.has(id) ||
+            (this.options.store.get(id)?.runs.some(isActiveAutomationRun) ?? false));
+    }
+    acquireExclusive(id) {
+        if (this.isBusy(id))
+            return false;
+        this.exclusive.add(id);
+        return true;
+    }
+    releaseExclusive(id) {
+        this.exclusive.delete(id);
+        this.drain(id);
+    }
+    dispose() {
+        this.disposed = true;
+    }
+    finish(id, runId, status, reason) {
+        this.options.store.updateRun(id, runId, { status, reason, finishedAt: this.now() });
+        this.options.changed();
+    }
+    launchFailed(id, runId) {
+        if (this.disposed)
+            return;
+        const run = this.options.store.get(id)?.runs.find((entry) => entry.runId === runId);
+        if (!run || !isActiveAutomationRun(run))
+            return;
+        this.finish(id, runId, "failed", "launch-failed");
+        this.drain(id);
+    }
+    now() {
+        return this.options.now?.() ?? Date.now();
+    }
+}
+//# sourceMappingURL=automation-dispatcher.js.map

package/dist/automation-dispatcher.js.map

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

package/dist/automation-run-tracker.d.ts

@@ -1,7 +1,7 @@
 import type { Automation, PendingAutomationRun } from "./types.js";
 export declare class AutomationRunTracker {
     private readonly pendingRuns;
-    create(automation: Automation, now?: number): PendingAutomationRun;
+    create(automation: Automation, now?: number, runId?: string): PendingAutomationRun;
     claim(runId: string): PendingAutomationRun | null;
     setEnv(runId: string, env: Record<string, string>): void;
     setRedactionValues(runId: string, values: readonly string[]): void;

package/dist/automation-run-tracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"automation-run-tracker.d.ts","sourceRoot":"","sources":["../src/automation-run-tracker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEnE,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2C;IAEvE,MAAM,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,GAAE,MAAmB,GAAG,oBAAoB,CAU7E;IAED,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CAKhD;IAKD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAIvD;IAOD,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAIjE;IAED,YAAY,CAAC,GAAG,GAAE,MAAmB,GAAG,oBAAoB,EAAE,CAS7D;IAED,IAAI,IAAI,MAAM,CAEb;CACF"}
+{"version":3,"file":"automation-run-tracker.d.ts","sourceRoot":"","sources":["../src/automation-run-tracker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEnE,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2C;IAEvE,MAAM,CACJ,UAAU,EAAE,UAAU,EACtB,GAAG,GAAE,MAAmB,EACxB,KAAK,GAAE,MAAqB,GAC3B,oBAAoB,CAUtB;IAED,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CAKhD;IAKD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAIvD;IAOD,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAIjE;IAED,YAAY,CAAC,GAAG,GAAE,MAAmB,GAAG,oBAAoB,EAAE,CAS7D;IAED,IAAI,IAAI,MAAM,CAEb;CACF"}

package/dist/automation-run-tracker.js

@@ -2,9 +2,9 @@ import { randomUUID } from "node:crypto";
 import { AUTOMATION_PENDING_RUN_EXPIRY_MS } from "./constants.js";
 export class AutomationRunTracker {
     pendingRuns = new Map();
-    create(automation, now = Date.now()) {
+    create(automation, now = Date.now(), runId = randomUUID()) {
         const run = {
-            runId: randomUUID(),
+            runId,
             automationId: automation.id,
             cwd: automation.cwd,
             runner: automation.runner,

package/dist/automation-run-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"automation-run-tracker.js","sourceRoot":"","sources":["../src/automation-run-tracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAC;AAGlE,MAAM,OAAO,oBAAoB;IACd,WAAW,GAAG,IAAI,GAAG,EAAgC,CAAC;IAEvE,MAAM,CAAC,UAAsB,EAAE,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QACrD,MAAM,GAAG,GAAyB;YAChC,KAAK,EAAE,UAAU,EAAE;YACnB,YAAY,EAAE,UAAU,CAAC,EAAE;YAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,GAAG;SACf,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,sEAAsE;IACtE,2EAA2E;IAC3E,oEAAoE;IACpE,MAAM,CAAC,KAAa,EAAE,GAA2B;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC;IAChB,CAAC;IAED,wEAAwE;IACxE,2EAA2E;IAC3E,uEAAuE;IACvE,0EAA0E;IAC1E,uCAAuC;IACvC,kBAAkB,CAAC,KAAa,EAAE,MAAyB;QACzD,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;IAC/B,CAAC;IAED,YAAY,CAAC,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QACnC,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC5C,IAAI,GAAG,GAAG,GAAG,CAAC,SAAS,IAAI,gCAAgC;gBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjF,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;CACF"}
+{"version":3,"file":"automation-run-tracker.js","sourceRoot":"","sources":["../src/automation-run-tracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAC;AAGlE,MAAM,OAAO,oBAAoB;IACd,WAAW,GAAG,IAAI,GAAG,EAAgC,CAAC;IAEvE,MAAM,CACJ,UAAsB,EACtB,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE,EACxB,KAAK,GAAW,UAAU,EAAE;QAE5B,MAAM,GAAG,GAAyB;YAChC,KAAK;YACL,YAAY,EAAE,UAAU,CAAC,EAAE;YAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,GAAG;SACf,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,sEAAsE;IACtE,2EAA2E;IAC3E,oEAAoE;IACpE,MAAM,CAAC,KAAa,EAAE,GAA2B;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC;IAChB,CAAC;IAED,wEAAwE;IACxE,2EAA2E;IAC3E,uEAAuE;IACvE,0EAA0E;IAC1E,uCAAuC;IACvC,kBAAkB,CAAC,KAAa,EAAE,MAAyB;QACzD,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;IAC/B,CAAC;IAED,YAAY,CAAC,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE;QACnC,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC5C,IAAI,GAAG,GAAG,GAAG,CAAC,SAAS,IAAI,gCAAgC;gBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjF,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;CACF"}

package/dist/automation-scheduler.d.ts

@@ -2,16 +2,19 @@ import { EventEmitter } from "node:events";
 import type { AutomationStore } from "./automation-store.js";
 import type { Automation } from "./types.js";
 interface AutomationSchedulerEvents {
-    due: [automation: Automation];
-    tick: [now: Date];
+    due: [automation: Automation, scheduledFor: number];
+    skipped: [automation: Automation, scheduledFor: number];
+    tick: [now: Date, healthy: boolean];
+    fault: [error: unknown];
 }
 export declare class AutomationScheduler extends EventEmitter<AutomationSchedulerEvents> {
     private readonly store;
     private tickTimer;
     private disposed;
-    private readonly lastFiredMinuteByAutomationId;
+    private lastTickAt;
     constructor(store: AutomationStore);
-    start(): void;
+    start(lastAliveAt?: number | null): void;
+    refresh(): void;
     dispose(): void;
     runTick(now?: Date): void;
     private scheduleNextTick;

package/dist/automation-scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"automation-scheduler.d.ts","sourceRoot":"","sources":["../src/automation-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,UAAU,yBAAyB;IACjC,GAAG,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC9B,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;CACnB;AAED,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,yBAAyB,CAAC;IAKlE,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJlC,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAA6B;IAE3E,YAA6B,KAAK,EAAE,eAAe,EAElD;IAED,KAAK,IAAI,IAAI,CAGZ;IAED,OAAO,IAAI,IAAI,CAOd;IAED,OAAO,CAAC,GAAG,GAAE,IAAiB,GAAG,IAAI,CAyBpC;IAED,OAAO,CAAC,gBAAgB;CAWzB"}
+{"version":3,"file":"automation-scheduler.d.ts","sourceRoot":"","sources":["../src/automation-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAM7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAI7C,UAAU,yBAAyB;IACjC,GAAG,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IACxD,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACpC,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;CACzB;AAED,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,yBAAyB,CAAC;IAKlE,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJlC,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAuB;IAEzC,YAA6B,KAAK,EAAE,eAAe,EAElD;IAED,KAAK,CAAC,WAAW,GAAE,MAAM,GAAG,IAAW,GAAG,IAAI,CAK7C;IAED,OAAO,IAAI,IAAI,CAKd;IAED,OAAO,IAAI,IAAI,CAKd;IAED,OAAO,CAAC,GAAG,GAAE,IAAiB,GAAG,IAAI,CAkCpC;IAED,OAAO,CAAC,gBAAgB;CAwBzB"}

package/dist/automation-scheduler.js

@@ -1,72 +1,92 @@
 import { EventEmitter } from "node:events";
-import { AUTOMATION_TICK_ALIGNMENT_DELAY_MS, MS_PER_MINUTE } from "./constants.js";
-import { cronMatchesDate, parseCronExpression } from "./cron-expression.js";
-import { compileScheduleAll } from "./utils/compile-schedule.js";
+import { AUTOMATION_RECONCILE_MIN_DOWNTIME_MS, AUTOMATION_TICK_ALIGNMENT_DELAY_MS, MS_PER_MINUTE, } from "./constants.js";
+import { computeNextAutomationRunAt } from "./utils/compute-next-automation-run-at.js";
+import { enumerateMissedOccurrences } from "./utils/reconcile-downtime.js";
 export class AutomationScheduler extends EventEmitter {
     store;
     tickTimer = null;
     disposed = false;
-    lastFiredMinuteByAutomationId = new Map();
+    lastTickAt = null;
     constructor(store) {
         super();
         this.store = store;
     }
-    start() {
+    start(lastAliveAt = null) {
         if (this.disposed || this.tickTimer !== null)
             return;
+        this.lastTickAt = lastAliveAt;
+        this.runTick();
+        this.scheduleNextTick();
+    }
+    refresh() {
+        if (this.disposed)
+            return;
+        if (this.tickTimer !== null)
+            clearTimeout(this.tickTimer);
+        this.tickTimer = null;
         this.scheduleNextTick();
     }
     dispose() {
         this.disposed = true;
-        if (this.tickTimer !== null) {
+        if (this.tickTimer !== null)
             clearTimeout(this.tickTimer);
-            this.tickTimer = null;
-        }
+        this.tickTimer = null;
         this.removeAllListeners();
     }
     runTick(now = new Date()) {
         if (this.disposed)
             return;
-        const minuteKey = Math.floor(now.getTime() / MS_PER_MINUTE);
-        const automations = this.store.list();
-        for (const automation of automations) {
-            if (!automation.enabled)
+        const at = now.getTime();
+        const since = this.lastTickAt ?? Math.floor(at / MS_PER_MINUTE) * MS_PER_MINUTE - 1;
+        const gap = this.lastTickAt !== null && at - since >= AUTOMATION_RECONCILE_MIN_DOWNTIME_MS;
+        let healthy = true;
+        for (const automation of this.store.list()) {
+            if (!automation.enabled ||
+                automation.lifecycle === "finished" ||
+                automation.trigger.kind !== "schedule")
                 continue;
-            if (automation.lifecycle === "finished")
-                continue;
-            // Watch and event triggers are event-driven (FolderWatchManager and
-            // SessionEventManager own them); the minute ticker only fires time-based
-            // schedules.
-            if (automation.trigger.kind !== "schedule")
-                continue;
-            const matched = compileScheduleAll(automation.trigger.schedule).some((expression) => {
-                const parsed = parseCronExpression(expression);
-                return parsed !== null && cronMatchesDate(parsed, now);
-            });
-            if (!matched)
-                continue;
-            if (this.lastFiredMinuteByAutomationId.get(automation.id) === minuteKey)
-                continue;
-            this.lastFiredMinuteByAutomationId.set(automation.id, minuteKey);
-            this.emit("due", automation);
-        }
-        const liveIds = new Set(automations.map((automation) => automation.id));
-        for (const trackedId of [...this.lastFiredMinuteByAutomationId.keys()]) {
-            if (!liveIds.has(trackedId))
-                this.lastFiredMinuteByAutomationId.delete(trackedId);
+            try {
+                const from = Math.max(since, automation.createdAt, automation.lastScheduledAt ?? -1);
+                const occurrences = enumerateMissedOccurrences(automation, from, at + 1);
+                const latest = occurrences.at(-1);
+                for (const scheduledFor of occurrences) {
+                    const shouldRun = scheduledFor === latest &&
+                        (!gap ||
+                            automation.missedRunPolicy === "run-latest" ||
+                            at - scheduledFor < MS_PER_MINUTE);
+                    this.emit(shouldRun ? "due" : "skipped", automation, scheduledFor);
+                }
+            }
+            catch (error) {
+                healthy = false;
+                this.emit("fault", error);
+            }
         }
-        this.emit("tick", now);
+        // If persistence failed, retry the window; the durable occurrence watermark
+        // deduplicates automations whose decisions already committed.
+        if (healthy)
+            this.lastTickAt = at;
+        this.emit("tick", now, healthy);
     }
     scheduleNextTick() {
         if (this.disposed)
             return;
         const now = Date.now();
-        const delayMs = MS_PER_MINUTE - (now % MS_PER_MINUTE) + AUTOMATION_TICK_ALIGNMENT_DELAY_MS;
+        let nextAt = now + MS_PER_MINUTE - (now % MS_PER_MINUTE);
+        for (const automation of this.store.list()) {
+            const next = computeNextAutomationRunAt(automation, new Date(now));
+            if (next !== null)
+                nextAt = Math.min(nextAt, next);
+        }
         this.tickTimer = setTimeout(() => {
             this.tickTimer = null;
-            this.runTick();
-            this.scheduleNextTick();
-        }, delayMs);
+            try {
+                this.runTick();
+            }
+            finally {
+                this.scheduleNextTick();
+            }
+        }, Math.max(AUTOMATION_TICK_ALIGNMENT_DELAY_MS, nextAt - now + AUTOMATION_TICK_ALIGNMENT_DELAY_MS));
         this.tickTimer.unref?.();
     }
 }

package/dist/automation-scheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"automation-scheduler.js","sourceRoot":"","sources":["../src/automation-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,kCAAkC,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAOjE,MAAM,OAAO,mBAAoB,SAAQ,YAAuC;IAKjD,KAAK;IAJ1B,SAAS,GAA0B,IAAI,CAAC;IACxC,QAAQ,GAAG,KAAK,CAAC;IACR,6BAA6B,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE3E,YAA6B,KAAsB;QACjD,KAAK,EAAE,CAAC;qBADmB,KAAK;IAElC,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI;YAAE,OAAO;QACrD,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED,OAAO;QACL,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,GAAG,GAAS,IAAI,IAAI,EAAE;QAC5B,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACtC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,UAAU,CAAC,OAAO;gBAAE,SAAS;YAClC,IAAI,UAAU,CAAC,SAAS,KAAK,UAAU;gBAAE,SAAS;YAClD,oEAAoE;YACpE,yEAAyE;YACzE,aAAa;YACb,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU;gBAAE,SAAS;YACrD,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;gBAClF,MAAM,MAAM,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;gBAC/C,OAAO,MAAM,KAAK,IAAI,IAAI,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO;gBAAE,SAAS;YACvB,IAAI,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,SAAS;gBAAE,SAAS;YAClF,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;YACjE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QACxE,KAAK,MAAM,SAAS,IAAI,CAAC,GAAG,IAAI,CAAC,6BAA6B,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YACvE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;gBAAE,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACpF,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,CAAC;IAEO,gBAAgB;QACtB,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,aAAa,GAAG,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,kCAAkC,CAAC;QAC3F,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC,EAAE,OAAO,CAAC,CAAC;QACZ,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC;IAC3B,CAAC;CACF"}
+{"version":3,"file":"automation-scheduler.js","sourceRoot":"","sources":["../src/automation-scheduler.ts"],"names":[],"mappings":"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"}

package/dist/automation-store.d.ts

@@ -11,6 +11,7 @@ export declare class AutomationStore {
     update(id: string, patch: UpdateAutomationInput): Automation | null;
     remove(id: string): boolean;
     removeSecretFromAll(secretName: string): boolean;
+    transact(id: string, update: (automation: Automation) => Automation): Automation | null;
     appendRun(id: string, record: AutomationRunRecord): Automation | null;
     updateRun(id: string, runId: string, patch: Partial<AutomationRunRecord>): Automation | null;
     markRunRead(id: string, runId: string): Automation | null;

package/dist/automation-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"automation-store.d.ts","sourceRoot":"","sources":["../src/automation-store.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,UAAU,EACV,mBAAmB,EAKnB,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAkIpB,qBAAa,eAAe;IAGd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAFrC,OAAO,CAAC,WAAW,CAAoB;IAEvC,YAA6B,QAAQ,EAAE,MAAM,EAE5C;IAED,IAAI,IAAI,UAAU,EAAE,CAEnB;IAED,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAEjC;IAKD,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAOnD;IAED,IAAI,IAAI,MAAM,CAEb;IAED,MAAM,CAAC,KAAK,EAAE,qBAAqB,GAAG,UAAU,CAsB/C;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,UAAU,GAAG,IAAI,CA4BlE;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAM1B;IASD,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAgB/C;IAGD,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,UAAU,GAAG,IAAI,CASpE;IAID,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,UAAU,GAAG,IAAI,CAa3F;IAKD,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAcxD;IAKD,eAAe,IAAI,OAAO,CAezB;IAMD,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CASvC;IAMD,YAAY,IAAI,OAAO,CAOtB;IAID,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAa/C;IAID,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,UAAU,GAAG,IAAI,CAezD;IASD,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,IAAI;IAmEZ,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,OAAO;CAOhB"}
+{"version":3,"file":"automation-store.d.ts","sourceRoot":"","sources":["../src/automation-store.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EACV,UAAU,EACV,mBAAmB,EAKnB,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAoIpB,qBAAa,eAAe;IAGd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAFrC,OAAO,CAAC,WAAW,CAAoB;IAEvC,YAA6B,QAAQ,EAAE,MAAM,EAE5C;IAED,IAAI,IAAI,UAAU,EAAE,CAEnB;IAED,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAEjC;IAKD,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAOnD;IAED,IAAI,IAAI,MAAM,CAEb;IAED,MAAM,CAAC,KAAK,EAAE,qBAAqB,GAAG,UAAU,CAyB/C;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,UAAU,GAAG,IAAI,CAoClE;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAM1B;IASD,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAgB/C;IAID,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,UAAU,GAAG,UAAU,GAAG,IAAI,CAetF;IAGD,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,UAAU,GAAG,IAAI,CASpE;IAID,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,UAAU,GAAG,IAAI,CAQ3F;IAKD,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAcxD;IAKD,eAAe,IAAI,OAAO,CAezB;IAMD,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CASvC;IAMD,YAAY,IAAI,OAAO,CAStB;IAID,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAa/C;IAID,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,UAAU,GAAG,IAAI,CAgBzD;IASD,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,IAAI;IA0EZ,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,OAAO;CAOhB"}

package/dist/automation-store.js

@@ -2,10 +2,12 @@ import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { AUTOMATION_RUN_HISTORY_CAP, AUTOMATIONS_FILE_VERSION, MAX_AUTOMATION_FINDINGS_LENGTH, MAX_AUTOMATION_LOG_LENGTH, MAX_AUTOMATION_TOOL_RESULT_LENGTH, } from "./constants.js";
-import { automationsFileSchema, automationsFileV1Schema, automationsFileV2Schema, automationsFileV3Schema, } from "./schemas.js";
+import { automationsFileSchema, automationsFileV1Schema, automationsFileV2Schema, automationsFileV3Schema, automationsFileV4Schema, } from "./schemas.js";
 import { normalizeScheduleInput } from "./utils/compile-schedule.js";
 import { generateWebhookId } from "./utils/generate-webhook-id.js";
 import { normalizeTriggerInput } from "./utils/normalize-trigger.js";
+import { isActiveAutomationRun } from "./utils/is-active-automation-run.js";
+import { trimAutomationRuns } from "./utils/trim-automation-runs.js";
 // A run is terminal once it has a definitive outcome; only those carry a
 // finishedAt when migrated from a v1 lastRun.
 const V1_TERMINAL_STATUSES = new Set(["completed", "failed", "missed"]);
@@ -163,6 +165,9 @@ export class AutomationStore {
             closeOnFinish: input.closeOnFinish ?? false,
             requestedSecrets: input.requestedSecrets ?? [],
             redactOutput: input.redactOutput ?? false,
+            timezone: input.timezone,
+            concurrencyPolicy: input.concurrencyPolicy ?? "skip",
+            missedRunPolicy: input.missedRunPolicy ?? "skip",
             runCount: 0,
             lifecycle: "active",
             runs: [],
@@ -194,6 +199,14 @@ export class AutomationStore {
             ...(patch.closeOnFinish !== undefined ? { closeOnFinish: patch.closeOnFinish } : {}),
             ...(patch.requestedSecrets !== undefined ? { requestedSecrets: patch.requestedSecrets } : {}),
             ...(patch.redactOutput !== undefined ? { redactOutput: patch.redactOutput } : {}),
+            ...(patch.timezone !== undefined ? { timezone: patch.timezone } : {}),
+            ...(patch.concurrencyPolicy !== undefined
+                ? { concurrencyPolicy: patch.concurrencyPolicy }
+                : {}),
+            ...(patch.missedRunPolicy !== undefined ? { missedRunPolicy: patch.missedRunPolicy } : {}),
+            ...(patch.trigger !== undefined || patch.timezone !== undefined || patch.enabled === true
+                ? { lastScheduledAt: Date.now() }
+                : {}),
             limit,
             lifecycle,
             updatedAt: Date.now(),
@@ -235,13 +248,31 @@ export class AutomationStore {
         }
         return changed;
     }
-    // Push a new run onto the newest-first history ring, trimming to the cap.
+    // One atomic file replacement commits a queue decision, its occurrence watermark,
+    // and run-count changes together. A failed write must not reserve work in memory.
+    transact(id, update) {
+        const index = this.automations.findIndex((automation) => automation.id === id);
+        if (index === -1)
+            return null;
+        const previous = this.automations;
+        const updated = update(previous[index]);
+        this.automations = previous.map((automation, position) => position === index ? updated : automation);
+        try {
+            this.persist();
+        }
+        catch (error) {
+            this.automations = previous;
+            throw error;
+        }
+        return updated;
+    }
+    // Push a new run onto the newest-first history ring, preserving active work.
     appendRun(id, record) {
         const index = this.automations.findIndex((automation) => automation.id === id);
         if (index === -1)
             return null;
         const current = this.automations[index];
-        const runs = [record, ...current.runs].slice(0, AUTOMATION_RUN_HISTORY_CAP);
+        const runs = trimAutomationRuns([record, ...current.runs]);
         const updated = { ...current, runs };
         this.automations[index] = updated;
         this.persist();
@@ -250,18 +281,12 @@ export class AutomationStore {
     // Advance an existing run in place (launched -> running -> completed/failed/
     // missed). No-op (null) if the run has already aged out of the ring.
     updateRun(id, runId, patch) {
-        const index = this.automations.findIndex((automation) => automation.id === id);
-        if (index === -1)
+        if (!this.get(id)?.runs.some((run) => run.runId === runId))
             return null;
-        const current = this.automations[index];
-        const runIndex = current.runs.findIndex((run) => run.runId === runId);
-        if (runIndex === -1)
-            return null;
-        const runs = current.runs.map((run, position) => position === runIndex ? { ...run, ...patch } : run);
-        const updated = { ...current, runs };
-        this.automations[index] = updated;
-        this.persist();
-        return updated;
+        return this.transact(id, (current) => ({
+            ...current,
+            runs: trimAutomationRuns(current.runs.map((run) => (run.runId === runId ? { ...run, ...patch } : run))),
+        }));
     }
     // Clear a single run's Triage unread flag (the user opened it). No-op if the
     // run is gone or already read — returns the current automation without
@@ -313,7 +338,7 @@ export class AutomationStore {
         const current = this.automations[index];
         if (current.runs.length === 0)
             return current;
-        const updated = { ...current, runs: [] };
+        const updated = { ...current, runs: current.runs.filter(isActiveAutomationRun) };
         this.automations[index] = updated;
         this.persist();
         return updated;
@@ -325,7 +350,9 @@ export class AutomationStore {
     clearAllRuns() {
         if (this.automations.every((automation) => automation.runs.length === 0))
             return false;
-        this.automations = this.automations.map((automation) => automation.runs.length === 0 ? automation : { ...automation, runs: [] });
+        this.automations = this.automations.map((automation) => automation.runs.length === 0
+            ? automation
+            : { ...automation, runs: automation.runs.filter(isActiveAutomationRun) });
         this.persist();
         return true;
     }
@@ -357,7 +384,8 @@ export class AutomationStore {
             runCount: 0,
             lifecycle: "active",
             enabled: true,
-            runs: clearHistory ? [] : current.runs,
+            runs: clearHistory ? current.runs.filter(isActiveAutomationRun) : current.runs,
+            lastScheduledAt: Date.now(),
             updatedAt: Date.now(),
         };
         this.automations[index] = updated;
@@ -398,12 +426,12 @@ export class AutomationStore {
             console.warn(`automations file invalid; starting with an empty list (${this.filePath})`);
             return;
         }
-        // Fast path: already v4. Trim any runs left above the cap by an older
+        // Fast path: current file version. Trim any runs left above the cap by an older
         // (higher) cap and persist, so lowering the trim cap never strands a
         // user's automations behind a schema rejection.
-        const v4 = automationsFileSchema.safeParse(json);
-        if (v4.success) {
-            this.automations = v4.data.automations;
+        const current = automationsFileSchema.safeParse(json);
+        if (current.success) {
+            this.automations = current.data.automations;
             if (this.trimRunsToCap())
                 this.persist();
             return;
@@ -421,6 +449,13 @@ export class AutomationStore {
                 return;
             }
         }
+        const legacyV4 = automationsFileV4Schema.safeParse(json);
+        if (legacyV4.success) {
+            this.automations = legacyV4.data.automations;
+            this.trimRunsToCap();
+            this.persist();
+            return;
+        }
         // Migrate v3 -> v4 (wrap the bare command in a shell runner), then persist
         // so later loads hit the fast path.
         const v3 = automationsFileV3Schema.safeParse(json);
@@ -455,8 +490,9 @@ export class AutomationStore {
         let changed = false;
         for (const automation of this.automations) {
             if (automation.runs.length > AUTOMATION_RUN_HISTORY_CAP) {
-                automation.runs = automation.runs.slice(0, AUTOMATION_RUN_HISTORY_CAP);
-                changed = true;
+                const trimmed = trimAutomationRuns(automation.runs);
+                changed ||= trimmed.length !== automation.runs.length;
+                automation.runs = trimmed;
             }
         }
         return changed;