@openrig/cli 0.6.14 → 0.7.1

package/daemon/dist/domain/watchdog-job-update.js

@@ -0,0 +1,143 @@
+import { parse as parseYaml, parseDocument } from "yaml";
+import { artifactPoolListProblem } from "./policies/artifact-pool-helpers.js";
+import { edgeArtifactRequiredSpecProblem } from "./policies/edge-artifact-required.js";
+import { periodicReminderSpecProblem } from "./policies/periodic-reminder.js";
+import { workflowKeepaliveSpecProblem } from "./policies/workflow-keepalive.js";
+import { isQueueWait, retuneQueueWait } from "./queue-wait-backoff.js";
+import { nextDueAt } from "./watchdog-due.js";
+import { validateCadences, WatchdogJobsError, } from "./watchdog-jobs-repository.js";
+import { parseWatchdogSpec, watchdogJobTarget } from "./watchdog-policy-engine.js";
+/** The policies a caller registers through `rig watchdog register`. The others compute their own schedule. */
+const UPDATABLE_POLICIES = new Set([
+    "periodic-reminder",
+    "artifact-pool-ready",
+    "edge-artifact-required",
+    "workflow-keepalive",
+    "idle-gate-qitem",
+    "context-usage-threshold",
+]);
+/** The session the daemon registers its own jobs as (continuity and auto idle-gate watchdogs). */
+const DAEMON_REGISTRANT = "daemon@kernel";
+/** What each policy's own evaluation requires of a spec (its own check), applied before a spec is stored. */
+const SPEC_PROBLEMS = {
+    "periodic-reminder": (spec) => periodicReminderSpecProblem(spec)?.message,
+    "edge-artifact-required": (spec) => edgeArtifactRequiredSpecProblem(spec)?.message,
+    "artifact-pool-ready": (spec) => artifactPoolListProblem(spec.context["pools"]),
+    "workflow-keepalive": (spec) => workflowKeepaliveSpecProblem(spec)?.message,
+};
+function specProblem(policy, parsed) {
+    return SPEC_PROBLEMS[policy]?.(parsed) ?? null;
+}
+function storedTarget(job) {
+    try {
+        return watchdogJobTarget(job, parseWatchdogSpec(job.specYaml).target).session;
+    }
+    catch {
+        return job.targetSession;
+    }
+}
+/** `message` set on the spec's top-level mapping; the rest of the text, comments included, is left as written. */
+function withMessage(specYaml, message) {
+    const doc = parseDocument(specYaml);
+    if (doc.errors.length > 0 || !doc.contents || typeof doc.toJS() !== "object" || Array.isArray(doc.toJS())) {
+        throw new WatchdogJobsError("spec_invalid", "the stored watchdog spec is not a YAML mapping, so a message cannot be set on it");
+    }
+    doc.set("message", message);
+    return String(doc);
+}
+function explainInterval(job, dueMs, nowMs) {
+    if (dueMs === null) {
+        return `The job has no recorded evaluation to measure ${job.intervalSeconds}s from, so the scheduler evaluates it on its next pass.`;
+    }
+    const basis = job.lastEvaluationAt
+        ? `last evaluation ${job.lastEvaluationAt}`
+        : `registration ${job.registeredAt} (it has not been evaluated yet)`;
+    const when = new Date(dueMs).toISOString();
+    return `Takes effect now, measured from ${basis}: next evaluation ${when} (${job.intervalSeconds}s later)` +
+        (dueMs <= nowMs ? "; that time has passed, so the scheduler evaluates it on its next pass." : ".");
+}
+/**
+ * Change an active watchdog job's interval, spec or message in place. The job is rewritten through the existing
+ * schedule writer (`updateInPlace`) with its stored last evaluation passed back unchanged, so nothing about when it last ran is
+ * invented or lost. Every refusal happens before any write.
+ */
+export function updateWatchdogJob(jobs, jobId, input, now = () => new Date()) {
+    const job = jobs.getByIdOrThrow(jobId);
+    if (job.state === "terminal") {
+        throw new WatchdogJobsError("job_terminal", `cannot update watchdog job ${jobId}: state is terminal`, { jobId, state: job.state });
+    }
+    if (job.state === "stopped") {
+        throw new WatchdogJobsError("job_stopped", `cannot update watchdog job ${jobId}: it is stopped, and an update does not restart it; register a new job to run it again`, { jobId, state: job.state });
+    }
+    const { intervalSeconds, message, specYaml } = input;
+    if (intervalSeconds === undefined && message === undefined && specYaml === undefined) {
+        throw new WatchdogJobsError("nothing_to_update", "give at least one of intervalSeconds, message or specYaml");
+    }
+    if (job.registeredBySession === DAEMON_REGISTRANT) {
+        throw new WatchdogJobsError("policy_not_updatable", `watchdog job ${jobId} was registered by the daemon, which overwrites or replaces its own jobs, so an edit would be lost or change the id`, { jobId, registeredBySession: job.registeredBySession });
+    }
+    if (!UPDATABLE_POLICIES.has(job.policy)) {
+        throw new WatchdogJobsError("policy_not_updatable", `watchdog job ${jobId} runs the daemon's own ${job.policy} timing, which an update would only fight`, { jobId, policy: job.policy });
+    }
+    let newInterval = job.intervalSeconds;
+    if (intervalSeconds !== undefined) {
+        validateCadences({ intervalSeconds: intervalSeconds });
+        if (job.scanIntervalSeconds !== null) {
+            throw new WatchdogJobsError("interval_not_effective", `watchdog job ${jobId} runs on its scan interval (${job.scanIntervalSeconds}s), so changing interval_seconds would not change when it runs`, { jobId, scanIntervalSeconds: job.scanIntervalSeconds });
+        }
+        newInterval = intervalSeconds;
+    }
+    const queueWait = isQueueWait(job.specYaml);
+    let newSpec = job.specYaml;
+    if (message !== undefined || specYaml !== undefined) {
+        if (queueWait) {
+            throw new WatchdogJobsError("spec_not_updatable", `watchdog job ${jobId} is a queue wait; its spec holds the queue's packet and what it has delivered, so only its interval can change`, { jobId });
+        }
+        if (job.policy === "context-usage-threshold" && specYaml !== undefined) {
+            throw new WatchdogJobsError("spec_not_updatable", `watchdog job ${jobId} keeps its thresholds outside the spec; only its message and interval can change`, { jobId });
+        }
+        if (specYaml !== undefined && typeof specYaml !== "string") {
+            throw new WatchdogJobsError("spec_invalid", "specYaml must be a string");
+        }
+        if (message !== undefined && (typeof message !== "string" || !message.trim())) {
+            throw new WatchdogJobsError("spec_invalid", "message must be a non-empty string");
+        }
+        newSpec = specYaml ?? job.specYaml;
+        if (message !== undefined)
+            newSpec = withMessage(newSpec, message);
+        const parsed = parseWatchdogSpec(newSpec);
+        const named = parseYaml(newSpec)["policy"];
+        if (typeof named === "string" && named !== job.policy) {
+            throw new WatchdogJobsError("spec_invalid", `the spec names policy ${named}, but this job runs ${job.policy}; a job's policy cannot change`, { jobId, policy: job.policy });
+        }
+        const problem = specProblem(job.policy, parsed);
+        if (problem)
+            throw new WatchdogJobsError("spec_invalid", `watchdog spec is not valid for ${job.policy}: ${problem}`, { jobId, policy: job.policy });
+        const target = watchdogJobTarget(job, parsed.target).session;
+        if (target !== storedTarget(job)) {
+            throw new WatchdogJobsError("target_not_updatable", `the spec would deliver to ${target}, but this job delivers to ${storedTarget(job)}; a job's target cannot change`, { jobId, target, current: storedTarget(job) });
+        }
+    }
+    if (queueWait && intervalSeconds !== undefined)
+        newSpec = retuneQueueWait(newSpec, newInterval);
+    // A wait's retuned settings live in its spec, so an interval it already has can still change what is stored.
+    const retuned = queueWait && intervalSeconds !== undefined && newSpec !== job.specYaml;
+    const changed = [
+        ...(newInterval !== job.intervalSeconds || retuned ? ["intervalSeconds"] : []),
+        ...((message !== undefined || specYaml !== undefined) && newSpec !== job.specYaml ? ["specYaml"] : []),
+    ];
+    if (newInterval !== job.intervalSeconds || newSpec !== job.specYaml) {
+        jobs.updateInPlace(jobId, newSpec, newInterval, job.lastEvaluationAt);
+    }
+    const updated = jobs.getByIdOrThrow(jobId);
+    const nowMs = now().getTime();
+    const dueMs = nextDueAt(updated);
+    return {
+        job: updated,
+        changed,
+        nextDueAt: dueMs === null ? null : new Date(dueMs).toISOString(),
+        dueNow: dueMs === null || dueMs <= nowMs,
+        intervalEffect: intervalSeconds === undefined ? null : explainInterval(updated, dueMs, nowMs),
+    };
+}
+//# sourceMappingURL=watchdog-job-update.js.map

package/daemon/dist/domain/watchdog-job-update.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watchdog-job-update.js","sourceRoot":"","sources":["../../src/domain/watchdog-job-update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAyB,MAAM,qCAAqC,CAAC;AACrG,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,iBAAiB,GAGlB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEnF,8GAA8G;AAC9G,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACjC,mBAAmB;IACnB,qBAAqB;IACrB,wBAAwB;IACxB,oBAAoB;IACpB,iBAAiB;IACjB,yBAAyB;CAC1B,CAAC,CAAC;AAEH,kGAAkG;AAClG,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAiB1C,6GAA6G;AAC7G,MAAM,aAAa,GAA8F;IAC/G,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,EAAE,OAAO;IACzE,wBAAwB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,+BAA+B,CAAC,IAAI,CAAC,EAAE,OAAO;IAClF,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAsD,CAAC;IACpI,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,4BAA4B,CAAC,IAAI,CAAC,EAAE,OAAO;CAC5E,CAAC;AACF,SAAS,WAAW,CAAC,MAAc,EAAE,MAA4C;IAC/E,OAAO,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;AACjD,CAAC;AAED,SAAS,YAAY,CAAC,GAAgB;IACpC,IAAI,CAAC;QAAC,OAAO,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;IAAC,CAAC;IACtF,MAAM,CAAC;QAAC,OAAO,GAAG,CAAC,aAAa,CAAC;IAAC,CAAC;AACrC,CAAC;AAED,kHAAkH;AAClH,SAAS,WAAW,CAAC,QAAgB,EAAE,OAAe;IACpD,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,GAAG,CAAC,IAAI,EAAE,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAC1G,MAAM,IAAI,iBAAiB,CAAC,cAAc,EAAE,kFAAkF,CAAC,CAAC;IAClI,CAAC;IACD,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC5B,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAED,SAAS,eAAe,CAAC,GAAgB,EAAE,KAAoB,EAAE,KAAa;IAC5E,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,iDAAiD,GAAG,CAAC,eAAe,yDAAyD,CAAC;IACvI,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,gBAAgB;QAChC,CAAC,CAAC,mBAAmB,GAAG,CAAC,gBAAgB,EAAE;QAC3C,CAAC,CAAC,gBAAgB,GAAG,CAAC,YAAY,kCAAkC,CAAC;IACvE,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAC3C,OAAO,mCAAmC,KAAK,qBAAqB,IAAI,KAAK,GAAG,CAAC,eAAe,UAAU;QACxG,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,yEAAyE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACvG,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,IAA4B,EAC5B,KAAa,EACb,KAAwB,EACxB,MAAkB,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;IAElC,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,GAAG,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;QAC7B,MAAM,IAAI,iBAAiB,CAAC,cAAc,EAAE,8BAA8B,KAAK,qBAAqB,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;IACrI,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAiB,CACzB,aAAa,EACb,8BAA8B,KAAK,wFAAwF,EAC3H,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAC5B,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACrD,IAAI,eAAe,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACrF,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,EAAE,2DAA2D,CAAC,CAAC;IAChH,CAAC;IACD,IAAI,GAAG,CAAC,mBAAmB,KAAK,iBAAiB,EAAE,CAAC;QAClD,MAAM,IAAI,iBAAiB,CACzB,sBAAsB,EACtB,gBAAgB,KAAK,qHAAqH,EAC1I,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,CAAC,mBAAmB,EAAE,CACxD,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,iBAAiB,CACzB,sBAAsB,EACtB,gBAAgB,KAAK,0BAA0B,GAAG,CAAC,MAAM,2CAA2C,EACpG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAC9B,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,GAAG,GAAG,CAAC,eAAe,CAAC;IACtC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,gBAAgB,CAAC,EAAE,eAAe,EAAE,eAAyB,EAAE,CAAC,CAAC;QACjE,IAAI,GAAG,CAAC,mBAAmB,KAAK,IAAI,EAAE,CAAC;YACrC,MAAM,IAAI,iBAAiB,CACzB,wBAAwB,EACxB,gBAAgB,KAAK,+BAA+B,GAAG,CAAC,mBAAmB,gEAAgE,EAC3I,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,CAAC,mBAAmB,EAAE,CACxD,CAAC;QACJ,CAAC;QACD,WAAW,GAAG,eAAyB,CAAC;IAC1C,CAAC;IACD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC3B,IAAI,OAAO,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACpD,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,IAAI,iBAAiB,CACzB,oBAAoB,EACpB,gBAAgB,KAAK,gHAAgH,EACrI,EAAE,KAAK,EAAE,CACV,CAAC;QACJ,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,yBAAyB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACvE,MAAM,IAAI,iBAAiB,CACzB,oBAAoB,EACpB,gBAAgB,KAAK,kFAAkF,EACvG,EAAE,KAAK,EAAE,CACV,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC3D,MAAM,IAAI,iBAAiB,CAAC,cAAc,EAAE,2BAA2B,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAC9E,MAAM,IAAI,iBAAiB,CAAC,cAAc,EAAE,oCAAoC,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,GAAI,QAA+B,IAAI,GAAG,CAAC,QAAQ,CAAC;QAC3D,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,OAAiB,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAI,SAAS,CAAC,OAAO,CAA6B,CAAC,QAAQ,CAAC,CAAC;QACxE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,GAAG,CAAC,MAAM,EAAE,CAAC;YACtD,MAAM,IAAI,iBAAiB,CAAC,cAAc,EAAE,yBAAyB,KAAK,uBAAuB,GAAG,CAAC,MAAM,gCAAgC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9K,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,OAAO;YAAE,MAAM,IAAI,iBAAiB,CAAC,cAAc,EAAE,kCAAkC,GAAG,CAAC,MAAM,KAAK,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACpJ,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;QAC7D,IAAI,MAAM,KAAK,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,iBAAiB,CACzB,sBAAsB,EACtB,6BAA6B,MAAM,8BAA8B,YAAY,CAAC,GAAG,CAAC,gCAAgC,EAClH,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,CAC9C,CAAC;QACJ,CAAC;IACH,CAAC;IACD,IAAI,SAAS,IAAI,eAAe,KAAK,SAAS;QAAE,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAEhG,6GAA6G;IAC7G,MAAM,OAAO,GAAG,SAAS,IAAI,eAAe,KAAK,SAAS,IAAI,OAAO,KAAK,GAAG,CAAC,QAAQ,CAAC;IACvF,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,WAAW,KAAK,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,GAAG,CAAC,CAAC,OAAO,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,CAAC,IAAI,OAAO,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACvG,CAAC;IACF,IAAI,WAAW,KAAK,GAAG,CAAC,eAAe,IAAI,OAAO,KAAK,GAAG,CAAC,QAAQ,EAAE,CAAC;QACpE,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACjC,OAAO;QACL,GAAG,EAAE,OAAO;QACZ,OAAO;QACP,SAAS,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE;QAChE,MAAM,EAAE,KAAK,KAAK,IAAI,IAAI,KAAK,IAAI,KAAK;QACxC,cAAc,EAAE,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC;KAC9F,CAAC;AACJ,CAAC"}

package/daemon/dist/domain/watchdog-jobs-repository.d.ts

@@ -18,11 +18,15 @@ import type Database from "better-sqlite3";
  * PHASE_C_POLICIES retained as a deprecated alias for callers that
  * still reference it; new code uses PHASE_D_POLICIES.
  */
-export declare const PHASE_D_POLICIES: readonly ["periodic-reminder", "artifact-pool-ready", "edge-artifact-required", "workflow-keepalive", "idle-gate-qitem", "context-usage-threshold", "parked-owner-consumer", "delivery-deferral", "delivery-digest-flush"];
+export declare const PHASE_D_POLICIES: readonly ["periodic-reminder", "artifact-pool-ready", "edge-artifact-required", "workflow-keepalive", "idle-gate-qitem", "context-usage-threshold", "parked-owner-consumer", "delivery-deferral", "delivery-digest-flush", "quiet-release", "mode-scheduled-end"];
 /** @deprecated since Phase D — use PHASE_D_POLICIES. */
-export declare const PHASE_C_POLICIES: readonly ["periodic-reminder", "artifact-pool-ready", "edge-artifact-required", "workflow-keepalive", "idle-gate-qitem", "context-usage-threshold", "parked-owner-consumer", "delivery-deferral", "delivery-digest-flush"];
+export declare const PHASE_C_POLICIES: readonly ["periodic-reminder", "artifact-pool-ready", "edge-artifact-required", "workflow-keepalive", "idle-gate-qitem", "context-usage-threshold", "parked-owner-consumer", "delivery-deferral", "delivery-digest-flush", "quiet-release", "mode-scheduled-end"];
 export type WatchdogPolicyName = (typeof PHASE_D_POLICIES)[number];
 export type WatchdogJobState = "active" | "stopped" | "terminal";
+/** Issue #1180 — watchdog context samples share the compact-display freshness
+ *  window (ContextUsageStore.FRESHNESS_THRESHOLD_MS): a seat only samples on a
+ *  turn, so a reading older than this is a frozen estimate, not a trigger. */
+export declare const CONTEXT_SAMPLE_FRESHNESS_MS = 600000;
 export interface WatchdogJob {
     jobId: string;
     policy: WatchdogPolicyName;
@@ -51,9 +55,15 @@ export interface WatchdogJob {
     /** Visible lifecycle of the generated transcript binding. */
     bindingState: "pending-binding" | "bound" | null;
     thresholdBytes: number | null;
+    /** Issue #1180 — per-watchdog token threshold; null = not token-gated. */
+    thresholdTokens: number | null;
+    /** Issue #1180 — per-watchdog percent-of-seat-window threshold; null = not percent-gated. */
+    thresholdPercent: number | null;
     requiresJobId: string | null;
     /** The latest occupant generation for which this threshold fired. */
     lastFiredGeneration: string | null;
+    /** The condition this job last told its target about; null when none. */
+    lastFiredCondition: string | null;
 }
 export interface RegisterWatchdogJobInput {
     policy: string;
@@ -68,6 +78,8 @@ export interface RegisterWatchdogJobInput {
     targetGenerationUuid?: string | null;
     watchedFilePath?: string | null;
     thresholdBytes?: number | null;
+    thresholdTokens?: number | null;
+    thresholdPercent?: number | null;
     requiresJobId?: string | null;
 }
 export type EnsureAutoRegistrationInput = RegisterWatchdogJobInput;
@@ -76,6 +88,8 @@ export declare class WatchdogJobsError extends Error {
     readonly details?: Record<string, unknown> | undefined;
     constructor(code: string, message: string, details?: Record<string, unknown> | undefined);
 }
+/** Preserve optional cadence conversion while rejecting an uncomputable scan. */
+export declare function validateCadences(input: Pick<RegisterWatchdogJobInput, "intervalSeconds" | "scanIntervalSeconds">): void;
 export declare class WatchdogJobsRepository {
     private readonly db;
     private readonly now;
@@ -84,7 +98,30 @@ export declare class WatchdogJobsRepository {
     private readonly hasTargetGenColumn;
     private readonly hasContextUsageColumns;
     private readonly hasWatchedFileGenerationColumn;
+    private readonly hasThresholdUnitsColumns;
+    /** Per job, the spec and interval a caller's update replaced, for a delivery still in flight (see updateInPlace). */
+    private readonly updatedFrom;
+    /** Per job, the schedule its delivery in flight started under (see deliverySchedule). */
+    private readonly inFlight;
     constructor(db: Database.Database, now?: () => Date, resolveOccupantGeneration?: ((sessionName: string) => string | null) | undefined);
+    /**
+     * Issue #1180 — exactly one threshold unit per context-usage-threshold job:
+     * transcript bytes (legacy), sampled tokens, or percent of the seat's window.
+     */
+    private validateThresholdUnits;
+    /**
+     * Issue #1180 — the latest context-usage sample recorded for a seat under its
+     * CURRENT occupant generation (sampled after the live tenure's boot, mirroring
+     * the GHOST-STAGE generation guard in ContextUsageStore). Null = no usable
+     * sample; the caller decides between skip and terminal.
+     */
+    findContextUsageForSession(targetSession: string, occupantGeneration: string | null): {
+        usedPercentage: number | null;
+        contextWindowSize: number | null;
+        usedTokens: number | null;
+        sampledAt: string | null;
+        fresh: boolean;
+    } | null;
     register(input: RegisterWatchdogJobInput): WatchdogJob;
     /** Transcript path sampled during the requested seat occupant generation. */
     findTranscriptPath(targetSession: string, occupantGeneration?: string | null): string | null;
@@ -115,6 +152,22 @@ export declare class WatchdogJobsRepository {
     recordEvaluation(jobId: string, evaluatedAt: string, fired: boolean, schedule?: Pick<WatchdogJob, "specYaml" | "intervalSeconds" | "lastEvaluationAt">): void;
     /** Preserve job identity while its owner adjusts a durable reminder schedule. */
     updateSchedule(jobId: string, specYaml: string, intervalSeconds: number, lastEvaluationAt: string | null): void;
+    /**
+     * A caller's update of an active job in place (`rig watchdog update`). It writes through the same schedule
+     * writer, and remembers the spec and interval it replaced: a delivery that began under them and finishes after
+     * the update is the same wake, not a rescheduled one, so its receipt still counts (see `scheduleUnchanged`).
+     * Any other reschedule of the job that changes something forgets them.
+     */
+    updateInPlace(jobId: string, specYaml: string, intervalSeconds: number, lastEvaluationAt: string | null): void;
+    /** A job's schedule read as its delivery starts; scheduleUnchanged keeps matching it until deliveryAccounted. */
+    deliverySchedule(jobId: string): WatchdogJob;
+    deliveryAccounted(jobId: string): void;
+    /** A job that stopped running keeps no replaced schedules, unless a delivery in flight still needs them
+     *  (its deliveryAccounted releases them). */
+    private releaseStoppedSchedules;
+    /** True when `snapshot`, read before a delivery, is still the job's schedule or one only an update replaced. */
+    scheduleUnchanged(current: Pick<WatchdogJob, "jobId" | "specYaml" | "intervalSeconds">, snapshot: Pick<WatchdogJob, "specYaml" | "intervalSeconds">): boolean;
+    private writeSchedule;
     /**
      * R1 fix: write the actionable-state machine columns. Mirrors POC
      * engine's `state.actionable` + `state.last_actionable_at`. Called
@@ -139,13 +192,16 @@ export declare class WatchdogJobsRepository {
     stop(jobId: string, reason?: string): WatchdogJob;
     /**
      * GHOST-STAGE (e/Class-B): at a seat swap, stop every ARMED (state='active') job registered by the
-     * RETIRING generation — a stale wake firing into the successor's context is the specimen; the
-     * successor re-arms its own. Gen-scoped, NEVER name-scoped (the successor shares the seat name, so a
-     * name-scoped stop would kill the successor's own jobs). A NULL/empty generation never matches
-     * (UNKNOWN ≠ retired — note-2). Returns the count stopped. Auditable (terminal_reason), not a hard
-     * delete — the row stays for forensics. Pre-063 dbs no-op. `keepJobIds` are left running: the queue's
-     * current park timers wake the seat that owns a still-blocked row, which the successor inherits.
+     * RETIRING generation that wakes the retiring seat itself (`wakesRetiringSeat`, which the caller
+     * decides from the job's delivery target) — a stale wake firing into the successor's context is the
+     * specimen; the successor re-arms its own. A job it registered for another seat wakes that seat, never
+     * the successor, so it keeps running (#1775). Gen-scoped, NEVER name-scoped alone (the successor shares
+     * the seat name, so a name-scoped stop would kill the successor's own jobs). A NULL/empty generation
+     * never matches (UNKNOWN ≠ retired — note-2). Returns the count stopped. Auditable (terminal_reason),
+     * not a hard delete — the row stays for forensics. Pre-063 dbs no-op. `keepJobIds` are left running:
+     * the queue's current park timers wake the seat that owns a still-blocked row, which the successor
+     * inherits.
      */
-    dropArmedByRegisteringGeneration(generationUuid: string, keepJobIds?: readonly string[]): number;
+    dropArmedByRegisteringGeneration(generationUuid: string, wakesRetiringSeat: (job: WatchdogJob) => boolean, keepJobIds?: readonly string[]): number;
 }
 //# sourceMappingURL=watchdog-jobs-repository.d.ts.map

package/daemon/dist/domain/watchdog-jobs-repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watchdog-jobs-repository.d.ts","sourceRoot":"","sources":["../../src/domain/watchdog-jobs-repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"watchdog-jobs-repository.d.ts","sourceRoot":"","sources":["../../src/domain/watchdog-jobs-repository.ts"],"names":[],"mappings":"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"}

package/daemon/dist/domain/watchdog-jobs-repository.js

@@ -38,9 +38,17 @@ export const PHASE_D_POLICIES = [
     // additionalPolicies like parked-owner-consumer.
     "delivery-deferral",
     "delivery-digest-flush",
+    // Quiet hours: one release job per quiet window, posting what was held once quiet is off.
+    "quiet-release",
+    // A person's mode ends at its scheduled end: one job per application.
+    "mode-scheduled-end",
 ];
 /** @deprecated since Phase D — use PHASE_D_POLICIES. */
 export const PHASE_C_POLICIES = PHASE_D_POLICIES;
+/** Issue #1180 — watchdog context samples share the compact-display freshness
+ *  window (ContextUsageStore.FRESHNESS_THRESHOLD_MS): a seat only samples on a
+ *  turn, so a reading older than this is a frozen estimate, not a trigger. */
+export const CONTEXT_SAMPLE_FRESHNESS_MS = 600_000;
 export class WatchdogJobsError extends Error {
     code;
     details;
@@ -52,7 +60,7 @@ export class WatchdogJobsError extends Error {
     }
 }
 /** Preserve optional cadence conversion while rejecting an uncomputable scan. */
-function validateCadences(input) {
+export function validateCadences(input) {
     if (!Number.isInteger(input.intervalSeconds) || input.intervalSeconds <= 0) {
         throw new WatchdogJobsError("interval_invalid", `interval_seconds must be a positive integer (got ${String(input.intervalSeconds)})`, { field: "interval_seconds", intervalSeconds: input.intervalSeconds });
     }
@@ -87,6 +95,11 @@ export class WatchdogJobsRepository {
     hasTargetGenColumn;
     hasContextUsageColumns;
     hasWatchedFileGenerationColumn;
+    hasThresholdUnitsColumns;
+    /** Per job, the spec and interval a caller's update replaced, for a delivery still in flight (see updateInPlace). */
+    updatedFrom = new Map();
+    /** Per job, the schedule its delivery in flight started under (see deliverySchedule). */
+    inFlight = new Map();
     constructor(db, now = () => new Date(), 
     // GHOST-STAGE (e/Class-B): resolve the ARMING occupant's atom-B generation so a job carries the
     // generation that registered it. null/absent ⇒ UNKNOWN → the column stays NULL and the swap-time
@@ -99,6 +112,83 @@ export class WatchdogJobsRepository {
         this.hasTargetGenColumn = detectWatchdogColumn(db, "target_generation_uuid");
         this.hasContextUsageColumns = detectWatchdogColumn(db, "last_fired_generation_uuid");
         this.hasWatchedFileGenerationColumn = detectWatchdogColumn(db, "watched_file_generation_uuid");
+        this.hasThresholdUnitsColumns = detectWatchdogColumn(db, "threshold_tokens");
+    }
+    /**
+     * Issue #1180 — exactly one threshold unit per context-usage-threshold job:
+     * transcript bytes (legacy), sampled tokens, or percent of the seat's window.
+     */
+    validateThresholdUnits(input) {
+        const hasBytes = input.thresholdBytes != null;
+        const hasTokens = input.thresholdTokens != null;
+        const hasPercent = input.thresholdPercent != null;
+        if (Number(hasBytes) + Number(hasTokens) + Number(hasPercent) !== 1) {
+            throw new WatchdogJobsError("threshold_invalid", "context-usage-threshold requires exactly one of threshold_bytes, threshold_tokens, or threshold_percent", {
+                thresholdBytes: input.thresholdBytes ?? null,
+                thresholdTokens: input.thresholdTokens ?? null,
+                thresholdPercent: input.thresholdPercent ?? null,
+            });
+        }
+        if (hasBytes && (!Number.isInteger(input.thresholdBytes) || (input.thresholdBytes ?? 0) <= 0)) {
+            throw new WatchdogJobsError("threshold_invalid", `threshold_bytes must be a positive integer (got ${String(input.thresholdBytes)})`);
+        }
+        if (hasTokens && (!Number.isInteger(input.thresholdTokens) || (input.thresholdTokens ?? 0) <= 0)) {
+            throw new WatchdogJobsError("threshold_invalid", `threshold_tokens must be a positive integer (got ${String(input.thresholdTokens)})`);
+        }
+        if (hasPercent &&
+            (!Number.isFinite(input.thresholdPercent) ||
+                (input.thresholdPercent ?? 0) <= 0 ||
+                (input.thresholdPercent ?? 0) > 100)) {
+            throw new WatchdogJobsError("threshold_invalid", `threshold_percent must be a number from 0 (exclusive) to 100 (got ${String(input.thresholdPercent)})`);
+        }
+    }
+    /**
+     * Issue #1180 — the latest context-usage sample recorded for a seat under its
+     * CURRENT occupant generation (sampled after the live tenure's boot, mirroring
+     * the GHOST-STAGE generation guard in ContextUsageStore). Null = no usable
+     * sample; the caller decides between skip and terminal.
+     */
+    findContextUsageForSession(targetSession, occupantGeneration) {
+        if (!occupantGeneration)
+            return null;
+        const row = this.db
+            .prepare(`SELECT usage.used_percentage, usage.context_window_size,
+                usage.total_input_tokens, usage.total_output_tokens,
+                usage.sampled_at
+           FROM sessions AS session
+           JOIN occupant_tenures AS tenure
+             ON tenure.node_id = session.node_id
+            AND tenure.generation_uuid = ?
+           JOIN context_usage AS usage
+             ON usage.node_id = session.node_id
+          WHERE session.session_name = ?
+            AND usage.session_name = ?
+            AND usage.availability = 'known'
+            AND usage.sampled_at IS NOT NULL
+            AND julianday(usage.sampled_at) >= julianday(tenure.boot_at)
+          ORDER BY session.id DESC
+          LIMIT 1`)
+            .get(occupantGeneration, targetSession, targetSession);
+        if (!row)
+            return null;
+        const contextWindowSize = row.context_window_size ?? null;
+        const usedPercentage = row.used_percentage ?? null;
+        // Token estimate: seat-reported totals when present (Codex token_count),
+        // otherwise the reported percentage of the reported window (Claude statusline).
+        const sampledTotal = row.total_input_tokens != null && row.total_output_tokens != null
+            ? row.total_input_tokens + row.total_output_tokens
+            : null;
+        const usedTokens = sampledTotal != null
+            ? sampledTotal
+            : usedPercentage != null && contextWindowSize != null && contextWindowSize > 0
+                ? Math.round((usedPercentage / 100) * contextWindowSize)
+                : null;
+        const sampledAt = row.sampled_at ?? null;
+        const sampledMs = sampledAt ? Date.parse(sampledAt) : NaN;
+        const fresh = Number.isFinite(sampledMs)
+            && Date.now() - sampledMs >= 0
+            && Date.now() - sampledMs < CONTEXT_SAMPLE_FRESHNESS_MS;
+        return { usedPercentage, contextWindowSize, usedTokens, sampledAt, fresh };
     }
     register(input) {
         if (!PHASE_D_POLICIES.includes(input.policy)) {
@@ -112,14 +202,20 @@ export class WatchdogJobsRepository {
         if (isContextUsageThreshold && !this.hasContextUsageColumns) {
             throw new WatchdogJobsError("context_usage_schema_missing", "context-usage-threshold requires migration 074_context_usage_watchdog");
         }
-        if (isContextUsageThreshold &&
-            (!Number.isInteger(input.thresholdBytes) || (input.thresholdBytes ?? 0) <= 0)) {
-            throw new WatchdogJobsError("threshold_invalid", `threshold_bytes must be a positive integer (got ${String(input.thresholdBytes)})`);
+        if (isContextUsageThreshold) {
+            if ((input.thresholdTokens != null || input.thresholdPercent != null) &&
+                !this.hasThresholdUnitsColumns) {
+                throw new WatchdogJobsError("context_usage_schema_missing", "context-usage-threshold token/percent units require migration 124_context_usage_watchdog_units");
+            }
+            this.validateThresholdUnits(input);
         }
         const generatedContinuityJob = input.registeredBySession === "daemon@kernel" &&
             input.specYaml.includes("generated_by: continuity-policy-materializer") &&
             /continuity_mode: (managed-compaction|apprentice-handover)/.test(input.specYaml);
-        if (isContextUsageThreshold && !input.watchedFilePath && !generatedContinuityJob) {
+        // Issue #1180: token/percent jobs measure the seat's sampled context use,
+        // not a transcript file — only byte-gated jobs need a watched file.
+        const byteGated = isContextUsageThreshold && input.thresholdBytes != null;
+        if (byteGated && !input.watchedFilePath && !generatedContinuityJob) {
             throw new WatchdogJobsError("watched_file_unresolved", `no transcript file could be resolved for ${input.targetSession}`, { targetSession: input.targetSession });
         }
         if (isContextUsageThreshold && input.requiresJobId && !this.getById(input.requiresJobId)) {
@@ -160,6 +256,10 @@ export class WatchdogJobsRepository {
             columns.push("watched_file_path", "threshold_bytes", "requires_job_id", "last_fired_generation_uuid");
             values.push(isContextUsageThreshold ? input.watchedFilePath : null, isContextUsageThreshold ? input.thresholdBytes : null, isContextUsageThreshold ? (input.requiresJobId ?? null) : null, null);
         }
+        if (this.hasThresholdUnitsColumns) {
+            columns.push("threshold_tokens", "threshold_percent");
+            values.push(isContextUsageThreshold ? (input.thresholdTokens ?? null) : null, isContextUsageThreshold ? (input.thresholdPercent ?? null) : null);
+        }
         if (this.hasWatchedFileGenerationColumn) {
             columns.push("watched_file_generation_uuid");
             values.push(watchedFileGeneration);
@@ -322,11 +422,12 @@ export class WatchdogJobsRepository {
             if (schedule) {
                 // A delivery may yield while its owner reschedules the next wake. The
                 // fire still happened, but must not replace that newer due boundary.
-                this.db.prepare(`UPDATE watchdog_jobs SET last_fire_at = ?,
-          last_evaluation_at = CASE WHEN state = 'active' AND spec_yaml = ? AND interval_seconds = ? AND last_evaluation_at IS ?
-            THEN ? ELSE last_evaluation_at END
-          WHERE job_id = ?`)
-                    .run(evaluatedAt, schedule.specYaml, schedule.intervalSeconds, schedule.lastEvaluationAt, evaluatedAt, jobId);
+                // A caller's update of the job in place is not such a reschedule.
+                const current = this.getById(jobId);
+                const unchanged = current?.state === "active" && current.lastEvaluationAt === schedule.lastEvaluationAt
+                    && this.scheduleUnchanged(current, schedule);
+                this.db.prepare(`UPDATE watchdog_jobs SET last_fire_at = ?${unchanged ? ", last_evaluation_at = ?" : ""} WHERE job_id = ?`)
+                    .run(...(unchanged ? [evaluatedAt, evaluatedAt, jobId] : [evaluatedAt, jobId]));
                 return;
             }
             this.db
@@ -334,6 +435,7 @@ export class WatchdogJobsRepository {
                 .run(evaluatedAt, evaluatedAt, jobId);
         }
         else {
+            this.updatedFrom.delete(jobId);
             this.db
                 .prepare(`UPDATE watchdog_jobs SET last_evaluation_at = ? WHERE job_id = ?`)
                 .run(evaluatedAt, jobId);
@@ -341,6 +443,58 @@ export class WatchdogJobsRepository {
     }
     /** Preserve job identity while its owner adjusts a durable reminder schedule. */
     updateSchedule(jobId, specYaml, intervalSeconds, lastEvaluationAt) {
+        // A rewrite that stores what is already there reschedules nothing, so it keeps what an update replaced.
+        const current = this.getById(jobId);
+        if (!current || current.specYaml !== specYaml || current.intervalSeconds !== intervalSeconds
+            || current.lastEvaluationAt !== lastEvaluationAt)
+            this.updatedFrom.delete(jobId);
+        this.writeSchedule(jobId, specYaml, intervalSeconds, lastEvaluationAt);
+    }
+    /**
+     * A caller's update of an active job in place (`rig watchdog update`). It writes through the same schedule
+     * writer, and remembers the spec and interval it replaced: a delivery that began under them and finishes after
+     * the update is the same wake, not a rescheduled one, so its receipt still counts (see `scheduleUnchanged`).
+     * Any other reschedule of the job that changes something forgets them.
+     */
+    updateInPlace(jobId, specYaml, intervalSeconds, lastEvaluationAt) {
+        const before = this.getByIdOrThrow(jobId);
+        this.writeSchedule(jobId, specYaml, intervalSeconds, lastEvaluationAt);
+        // Bounded: only deliveries in flight at the time of an update can match, and a job's next evaluation clears it.
+        const replaced = [...(this.updatedFrom.get(jobId) ?? []), { specYaml: before.specYaml, intervalSeconds: before.intervalSeconds }];
+        const kept = replaced.slice(-8);
+        // However many updates land, the schedule the delivery in flight started under stays until that delivery is
+        // accounted for. A real reschedule still forgets it, because it clears this record.
+        const started = this.inFlight.get(jobId);
+        const isStarted = (s) => s.specYaml === started?.specYaml && s.intervalSeconds === started.intervalSeconds;
+        if (started && replaced.some(isStarted) && !kept.some(isStarted))
+            kept.unshift(started);
+        this.updatedFrom.set(jobId, kept);
+    }
+    /** A job's schedule read as its delivery starts; scheduleUnchanged keeps matching it until deliveryAccounted. */
+    deliverySchedule(jobId) {
+        const job = this.getByIdOrThrow(jobId);
+        this.inFlight.set(jobId, { specYaml: job.specYaml, intervalSeconds: job.intervalSeconds });
+        return job;
+    }
+    deliveryAccounted(jobId) {
+        this.inFlight.delete(jobId);
+        // Its schedule matches are done, and the next delivery starts under the job's current schedule.
+        this.updatedFrom.delete(jobId);
+    }
+    /** A job that stopped running keeps no replaced schedules, unless a delivery in flight still needs them
+     *  (its deliveryAccounted releases them). */
+    releaseStoppedSchedules(jobIds) {
+        for (const jobId of jobIds)
+            if (!this.inFlight.has(jobId))
+                this.updatedFrom.delete(jobId);
+    }
+    /** True when `snapshot`, read before a delivery, is still the job's schedule or one only an update replaced. */
+    scheduleUnchanged(current, snapshot) {
+        if (current.specYaml === snapshot.specYaml && current.intervalSeconds === snapshot.intervalSeconds)
+            return true;
+        return (this.updatedFrom.get(current.jobId) ?? []).some((replaced) => replaced.specYaml === snapshot.specYaml && replaced.intervalSeconds === snapshot.intervalSeconds);
+    }
+    writeSchedule(jobId, specYaml, intervalSeconds, lastEvaluationAt) {
         this.db.prepare(`UPDATE watchdog_jobs SET spec_yaml = ?, interval_seconds = ?, last_evaluation_at = ?
       WHERE job_id = ? AND state = 'active'`).run(specYaml, intervalSeconds, lastEvaluationAt, jobId);
     }
@@ -383,6 +537,7 @@ export class WatchdogJobsRepository {
         this.db
             .prepare(`UPDATE watchdog_jobs SET state = 'terminal', terminal_reason = ? WHERE job_id = ?`)
             .run(reason, jobId);
+        this.releaseStoppedSchedules([jobId]);
     }
     stop(jobId, reason = "operator_stopped") {
         const existing = this.getByIdOrThrow(jobId);
@@ -394,25 +549,40 @@ export class WatchdogJobsRepository {
         this.db
             .prepare(`UPDATE watchdog_jobs SET state = 'stopped', terminal_reason = ? WHERE job_id = ?`)
             .run(reason, jobId);
-        return this.getByIdOrThrow(jobId);
+        const stopped = this.getByIdOrThrow(jobId);
+        this.releaseStoppedSchedules([jobId]);
+        return stopped;
     }
     /**
      * GHOST-STAGE (e/Class-B): at a seat swap, stop every ARMED (state='active') job registered by the
-     * RETIRING generation — a stale wake firing into the successor's context is the specimen; the
-     * successor re-arms its own. Gen-scoped, NEVER name-scoped (the successor shares the seat name, so a
-     * name-scoped stop would kill the successor's own jobs). A NULL/empty generation never matches
-     * (UNKNOWN ≠ retired — note-2). Returns the count stopped. Auditable (terminal_reason), not a hard
-     * delete — the row stays for forensics. Pre-063 dbs no-op. `keepJobIds` are left running: the queue's
-     * current park timers wake the seat that owns a still-blocked row, which the successor inherits.
+     * RETIRING generation that wakes the retiring seat itself (`wakesRetiringSeat`, which the caller
+     * decides from the job's delivery target) — a stale wake firing into the successor's context is the
+     * specimen; the successor re-arms its own. A job it registered for another seat wakes that seat, never
+     * the successor, so it keeps running (#1775). Gen-scoped, NEVER name-scoped alone (the successor shares
+     * the seat name, so a name-scoped stop would kill the successor's own jobs). A NULL/empty generation
+     * never matches (UNKNOWN ≠ retired — note-2). Returns the count stopped. Auditable (terminal_reason),
+     * not a hard delete — the row stays for forensics. Pre-063 dbs no-op. `keepJobIds` are left running:
+     * the queue's current park timers wake the seat that owns a still-blocked row, which the successor
+     * inherits.
      */
-    dropArmedByRegisteringGeneration(generationUuid, keepJobIds = []) {
+    dropArmedByRegisteringGeneration(generationUuid, wakesRetiringSeat, keepJobIds = []) {
         if (!this.hasGenColumn || !generationUuid)
             return 0;
-        const keep = keepJobIds.length > 0 ? ` AND job_id NOT IN (${keepJobIds.map(() => "?").join(", ")})` : "";
+        const keep = new Set(keepJobIds);
+        const ids = this.db
+            .prepare(`SELECT * FROM watchdog_jobs WHERE state = 'active' AND registered_by_generation_uuid = ?`)
+            .all(generationUuid)
+            .map(rowToJob)
+            .filter((job) => !keep.has(job.jobId) && wakesRetiringSeat(job))
+            .map((job) => job.jobId);
+        if (ids.length === 0)
+            return 0;
         const res = this.db
             .prepare(`UPDATE watchdog_jobs SET state = 'stopped', terminal_reason = 'registering generation retired (seat handover)'
-         WHERE state = 'active' AND registered_by_generation_uuid = ?${keep}`)
-            .run(generationUuid, ...keepJobIds);
+         WHERE state = 'active' AND job_id IN (${ids.map(() => "?").join(", ")})`)
+            .run(...ids);
+        if (res.changes > 0)
+            this.releaseStoppedSchedules(ids);
         return res.changes;
     }
 }
@@ -441,8 +611,11 @@ function rowToJob(row) {
             ? (row.watched_file_path && row.watched_file_generation_uuid ? "bound" : "pending-binding")
             : null,
         thresholdBytes: row.threshold_bytes ?? null,
+        thresholdTokens: row.threshold_tokens ?? null,
+        thresholdPercent: row.threshold_percent ?? null,
         requiresJobId: row.requires_job_id ?? null,
         lastFiredGeneration: row.last_fired_generation_uuid ?? null,
+        lastFiredCondition: row.last_fired_condition ?? null,
     };
 }
 //# sourceMappingURL=watchdog-jobs-repository.js.map