@deftai/directive-core 0.84.0 → 0.86.0

package/dist/review-monitor/record.js

@@ -1,163 +1,384 @@
-import { execFileSync } from "node:child_process";
-import { closeSync, existsSync, fdatasyncSync, mkdirSync, openSync, readFileSync, renameSync, writeSync, } from "node:fs";
-import { dirname, isAbsolute, join, resolve } from "node:path";
-import { DEFAULT_STALE_MINUTES, REVIEW_MONITOR_FILENAME, SCHEMA_VERSION } from "./constants.js";
-function resolveMainWorktreeRoot(startDir) {
-    let root = resolve(startDir);
-    try {
-        const out = execFileSync("git", ["rev-parse", "--git-common-dir"], {
-            cwd: startDir,
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-        }).trim();
-        if (out.length > 0) {
-            const commonDir = isAbsolute(out) ? out : resolve(startDir, out);
-            root = dirname(commonDir);
-        }
-    }
-    catch {
-        // Not a git work tree -- fall back to startDir.
-    }
-    return root;
+import { resolve } from "node:path";
+import { resolveRepo } from "../triage/queue/repo.js";
+import { DEFAULT_STALE_MINUTES, EXIT_CONFIG_ERROR, EXIT_CONFLICT, EXIT_READY, SCHEMA_VERSION, } from "./constants.js";
+import { createReviewOwnerComment, deleteReviewOwnerComment, listReviewOwnerComments, resolveGitHubLogin, updateReviewOwnerComment, } from "./github-lease.js";
+import { computeExpiresAt, findActiveLeaseComment, isLeaseExpired, parseIso8601Utc, parseReviewOwnerLease, renderReleasedReviewOwnerComment, renderReviewOwnerComment, selectWinningReviewOwnerComment, } from "./lease-comment.js";
+export { parseIso8601Utc };
+function leaseToRecord(pr, repo, lease, commentId, worktreePath, parentSessionId) {
+    return {
+        pr,
+        repo,
+        head_sha: lease.head_sha,
+        platform_primitive: lease.platform_primitive,
+        monitor_agent_id: lease.monitor_agent_id,
+        owner: lease.owner,
+        started_at: lease.started_at,
+        expires_at: lease.expires_at,
+        worktree_path: worktreePath,
+        parent_session_id: parentSessionId,
+        ended_at: lease.ended_at,
+        comment_id: commentId,
+    };
 }
-export function reviewMonitorPath(projectRoot) {
-    const root = resolveMainWorktreeRoot(projectRoot);
-    return join(root, ".deft", REVIEW_MONITOR_FILENAME);
+function buildLease(input) {
+    const startedAtIso = input.startedAt.toISOString();
+    return {
+        owner: input.owner,
+        monitor_agent_id: input.monitorAgentId.trim(),
+        head_sha: input.headSha,
+        started_at: startedAtIso,
+        expires_at: computeExpiresAt(input.startedAt, input.staleMinutes),
+        platform_primitive: input.platformPrimitive,
+        ended_at: null,
+    };
+}
+function resolveRegisterRepo(input) {
+    return resolveRepo(input.repo ?? null, resolve(input.projectRoot));
 }
-function atomicWriteJson(path, payload) {
-    mkdirSync(dirname(path), { recursive: true });
-    const tmp = `${path}.tmp-${process.pid}`;
-    const text = `${JSON.stringify(payload, null, 2)}\n`;
-    const fd = openSync(tmp, "w");
-    try {
-        writeSync(fd, text, undefined, "utf8");
-        fdatasyncSync(fd);
+function sameClaimHolder(lease, owner, monitorAgentId) {
+    return lease.monitor_agent_id === monitorAgentId.trim() && lease.owner === owner;
+}
+function conflictMessage(holder, pr) {
+    return (`review_monitor_register: PR #${pr} review-owner lease held by ${holder.owner} ` +
+        `(monitor_agent_id=${holder.monitor_agent_id}, expires_at=${holder.expires_at}).`);
+}
+function resolveCreateRace(repo, pr, createdId, seams) {
+    const listed = listReviewOwnerComments(repo, pr, seams);
+    if (!Array.isArray(listed)) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: `review_monitor_register: ${listed.error}`,
+            record: null,
+            commentId: null,
+            priorOwner: null,
+        };
     }
-    finally {
-        closeSync(fd);
+    const winner = selectWinningReviewOwnerComment(listed);
+    if (winner === null || winner.id === createdId) {
+        return null;
     }
-    renameSync(tmp, path);
-}
-export function emptyReviewMonitorFile() {
-    return { schema_version: SCHEMA_VERSION, records: [] };
+    if (winner.id !== createdId) {
+        const deleteResult = deleteReviewOwnerComment(repo, createdId, seams);
+        if ("error" in deleteResult) {
+            return {
+                exitCode: EXIT_CONFIG_ERROR,
+                message: `review_monitor_register: create-race loser could not delete duplicate: ${deleteResult.error}`,
+                record: null,
+                commentId: null,
+                priorOwner: winner?.lease?.owner ?? null,
+            };
+        }
+        const holder = winner?.lease ?? null;
+        return {
+            exitCode: EXIT_CONFLICT,
+            message: holder !== null
+                ? conflictMessage(holder, pr)
+                : `review_monitor_register: PR #${pr} create-race lost to an older claim comment.`,
+            record: null,
+            commentId: winner?.id ?? null,
+            priorOwner: holder?.owner ?? null,
+        };
+    }
+    return null;
 }
-export function readReviewMonitorFile(path) {
-    if (!existsSync(path)) {
-        return { data: emptyReviewMonitorFile(), error: null };
+function verifyExclusiveActiveClaim(repo, pr, commentId, owner, monitorAgentId, seams, options) {
+    const relisted = listReviewOwnerComments(repo, pr, seams);
+    if (!Array.isArray(relisted)) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: `review_monitor_register: ${relisted.error}`,
+            record: null,
+            commentId: null,
+            priorOwner: null,
+        };
     }
-    let parsed;
-    try {
-        parsed = JSON.parse(readFileSync(path, "utf8"));
+    const active = findActiveLeaseComment(relisted, options);
+    if (active === null || active.id !== commentId) {
+        const holder = active?.lease ?? null;
+        return {
+            exitCode: EXIT_CONFLICT,
+            message: holder !== null
+                ? conflictMessage(holder, pr)
+                : `review_monitor_register: PR #${pr} post-write verify failed; active lease not on comment ${commentId}.`,
+            record: null,
+            commentId: active?.id ?? commentId,
+            priorOwner: holder?.owner ?? null,
+        };
     }
-    catch (exc) {
-        return { data: null, error: `${path}: invalid JSON (${String(exc)}).` };
+    if (active.lease === null || !sameClaimHolder(active.lease, owner, monitorAgentId)) {
+        const holder = active.lease ?? {
+            owner: "unknown",
+            monitor_agent_id: "unknown",
+            expires_at: "",
+            head_sha: null,
+            started_at: "",
+            platform_primitive: "cursor-task",
+            ended_at: null,
+        };
+        return {
+            exitCode: EXIT_CONFLICT,
+            message: conflictMessage(holder, pr),
+            record: null,
+            commentId: active.id,
+            priorOwner: holder.owner !== owner ? holder.owner : null,
+        };
     }
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-        return { data: null, error: `${path}: review-monitor file must be a JSON object.` };
+    return null;
+}
+export function registerReviewMonitor(input) {
+    const repo = resolveRegisterRepo(input);
+    if (repo === null) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: "review_monitor_register: could not resolve owner/repo — pass --repo OWNER/REPO or run inside a git repo with origin",
+            record: null,
+            commentId: null,
+            priorOwner: null,
+        };
     }
-    const obj = parsed;
-    const recordsRaw = obj.records;
-    const records = [];
-    if (Array.isArray(recordsRaw)) {
-        for (const entry of recordsRaw) {
-            if (typeof entry !== "object" || entry === null || Array.isArray(entry)) {
-                continue;
-            }
-            const e = entry;
-            const pr = e.pr;
-            const monitorAgentId = e.monitor_agent_id;
-            const platformPrimitive = e.platform_primitive;
-            const startedAt = e.started_at;
-            const worktreePath = e.worktree_path;
-            if (typeof pr !== "number" ||
-                !Number.isInteger(pr) ||
-                pr <= 0 ||
-                typeof monitorAgentId !== "string" ||
-                monitorAgentId.trim().length === 0 ||
-                typeof platformPrimitive !== "string" ||
-                typeof startedAt !== "string" ||
-                typeof worktreePath !== "string") {
-                continue;
-            }
-            records.push({
-                pr,
-                repo: typeof e.repo === "string" ? e.repo : null,
-                head_sha: typeof e.head_sha === "string" ? e.head_sha : null,
-                platform_primitive: platformPrimitive,
-                monitor_agent_id: monitorAgentId.trim(),
-                started_at: startedAt,
-                worktree_path: worktreePath,
-                parent_session_id: typeof e.parent_session_id === "string" ? e.parent_session_id : null,
-                ended_at: typeof e.ended_at === "string" ? e.ended_at : null,
+    const seams = input.seams ?? {};
+    const owner = input.owner ?? resolveGitHubLogin(seams);
+    if (owner === null || owner.length === 0) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: "review_monitor_register: could not resolve GitHub login — pass --owner or authenticate gh",
+            record: null,
+            commentId: null,
+            priorOwner: null,
+        };
+    }
+    const startedAt = input.startedAt ?? new Date();
+    const staleMinutes = input.staleMinutes ?? DEFAULT_STALE_MINUTES;
+    const monitorAgentId = input.monitorAgentId.trim();
+    const worktreePath = resolve(input.projectRoot);
+    const listed = listReviewOwnerComments(repo, input.pr, seams);
+    if (!Array.isArray(listed)) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: `review_monitor_register: ${listed.error}`,
+            record: null,
+            commentId: null,
+            priorOwner: null,
+        };
+    }
+    const anchor = selectWinningReviewOwnerComment(listed);
+    const active = findActiveLeaseComment(listed, { now: startedAt, headSha: input.headSha ?? null });
+    if (active?.lease !== null && active?.lease !== undefined) {
+        const holder = active.lease;
+        if (sameClaimHolder(holder, owner, monitorAgentId)) {
+            const renewed = buildLease({
+                owner,
+                monitorAgentId,
+                headSha: input.headSha ?? holder.head_sha,
+                platformPrimitive: input.platformPrimitive,
+                startedAt,
+                staleMinutes,
             });
+            const body = renderReviewOwnerComment(renewed);
+            const updated = updateReviewOwnerComment(repo, active.id, body, seams);
+            if ("error" in updated) {
+                return {
+                    exitCode: EXIT_CONFIG_ERROR,
+                    message: `review_monitor_register: ${updated.error}`,
+                    record: null,
+                    commentId: active.id,
+                    priorOwner: null,
+                };
+            }
+            return {
+                exitCode: EXIT_READY,
+                message: `review_monitor_register: renewed PR #${input.pr} review-owner lease for ${monitorAgentId} (comment ${active.id}).`,
+                record: leaseToRecord(input.pr, repo, renewed, active.id, worktreePath, input.parentSessionId ?? null),
+                commentId: active.id,
+                priorOwner: null,
+            };
+        }
+        if (!isLeaseExpired(holder, startedAt) && input.force !== true) {
+            return {
+                exitCode: EXIT_CONFLICT,
+                message: conflictMessage(holder, input.pr),
+                record: leaseToRecord(input.pr, repo, holder, active.id, null, null),
+                commentId: active.id,
+                priorOwner: holder.owner,
+            };
         }
+        const priorOwner = holder.owner;
+        const takeover = buildLease({
+            owner,
+            monitorAgentId,
+            headSha: input.headSha ?? null,
+            platformPrimitive: input.platformPrimitive,
+            startedAt,
+            staleMinutes,
+        });
+        const body = renderReviewOwnerComment(takeover);
+        const updated = updateReviewOwnerComment(repo, active.id, body, seams);
+        if ("error" in updated) {
+            return {
+                exitCode: EXIT_CONFIG_ERROR,
+                message: `review_monitor_register: ${updated.error}`,
+                record: null,
+                commentId: active.id,
+                priorOwner,
+            };
+        }
+        const forceNote = input.force === true && !isLeaseExpired(holder, startedAt)
+            ? ` (forced takeover from ${priorOwner})`
+            : isLeaseExpired(holder, startedAt)
+                ? " (expired lease takeover)"
+                : "";
+        return {
+            exitCode: EXIT_READY,
+            message: `review_monitor_register: claimed PR #${input.pr} review-owner lease for ${monitorAgentId}` +
+                `${forceNote} (comment ${active.id}).`,
+            record: leaseToRecord(input.pr, repo, takeover, active.id, worktreePath, input.parentSessionId ?? null),
+            commentId: active.id,
+            priorOwner: priorOwner !== owner ? priorOwner : null,
+        };
+    }
+    const lease = buildLease({
+        owner,
+        monitorAgentId,
+        headSha: input.headSha ?? null,
+        platformPrimitive: input.platformPrimitive,
+        startedAt,
+        staleMinutes,
+    });
+    const body = renderReviewOwnerComment(lease);
+    if (anchor !== null) {
+        const updated = updateReviewOwnerComment(repo, anchor.id, body, seams);
+        if ("error" in updated) {
+            return {
+                exitCode: EXIT_CONFIG_ERROR,
+                message: `review_monitor_register: ${updated.error}`,
+                record: null,
+                commentId: anchor.id,
+                priorOwner: null,
+            };
+        }
+        const verified = verifyExclusiveActiveClaim(repo, input.pr, anchor.id, owner, monitorAgentId, seams, { now: startedAt, headSha: input.headSha ?? null });
+        if (verified !== null) {
+            return verified;
+        }
+        return {
+            exitCode: EXIT_READY,
+            message: `review_monitor_register: claimed PR #${input.pr} review-owner lease for ${monitorAgentId} (comment ${anchor.id}).`,
+            record: leaseToRecord(input.pr, repo, lease, anchor.id, worktreePath, input.parentSessionId ?? null),
+            commentId: anchor.id,
+            priorOwner: null,
+        };
+    }
+    const created = createReviewOwnerComment(repo, input.pr, body, seams);
+    if ("error" in created) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: `review_monitor_register: ${created.error}`,
+            record: null,
+            commentId: null,
+            priorOwner: null,
+        };
+    }
+    const race = resolveCreateRace(repo, input.pr, created.id, seams);
+    if (race !== null) {
+        return race;
     }
     return {
-        data: {
-            schema_version: typeof obj.schema_version === "number" ? obj.schema_version : SCHEMA_VERSION,
-            records,
-        },
-        error: null,
-    };
-}
-export function writeReviewMonitorFile(path, data) {
-    atomicWriteJson(path, data);
-}
-export function registerReviewMonitor(input) {
-    const path = reviewMonitorPath(input.projectRoot);
-    const { data, error } = readReviewMonitorFile(path);
-    if (data === null) {
-        throw new Error(error ?? "could not read review-monitor file");
-    }
-    const startedAt = (input.startedAt ?? new Date()).toISOString();
-    const record = {
-        pr: input.pr,
-        repo: input.repo ?? null,
-        head_sha: input.headSha ?? null,
-        platform_primitive: input.platformPrimitive,
-        monitor_agent_id: input.monitorAgentId.trim(),
-        started_at: startedAt,
-        worktree_path: resolve(input.projectRoot),
-        parent_session_id: input.parentSessionId ?? null,
-        ended_at: null,
+        exitCode: EXIT_READY,
+        message: `review_monitor_register: claimed PR #${input.pr} review-owner lease for ${monitorAgentId} (comment ${created.id}).`,
+        record: leaseToRecord(input.pr, repo, lease, created.id, worktreePath, input.parentSessionId ?? null),
+        commentId: created.id,
+        priorOwner: null,
     };
-    const active = data.records.filter((r) => r.ended_at === null && r.pr !== input.pr);
-    writeReviewMonitorFile(path, {
-        schema_version: SCHEMA_VERSION,
-        records: [...active, record],
-    });
-    return { path, record };
 }
-export function parseIso8601Utc(value) {
-    if (typeof value !== "string" || value.length === 0) {
-        return null;
+export function releaseReviewMonitor(input) {
+    const repo = resolveRepo(input.repo ?? null, resolve(input.projectRoot));
+    if (repo === null) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: "review_monitor_release: could not resolve owner/repo — pass --repo OWNER/REPO or run inside a git repo with origin",
+        };
     }
-    const trimmed = value.trim();
-    let candidate = trimmed;
-    if (trimmed.endsWith("Z")) {
-        candidate = `${trimmed.slice(0, -1)}+00:00`;
+    const seams = input.seams ?? {};
+    const listed = listReviewOwnerComments(repo, input.pr, seams);
+    if (!Array.isArray(listed)) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: `review_monitor_release: ${listed.error}`,
+        };
     }
-    if (!candidate.endsWith("+00:00")) {
-        return null;
+    const anchor = selectWinningReviewOwnerComment(listed);
+    if (anchor === null) {
+        return {
+            exitCode: EXIT_READY,
+            message: `review_monitor_release: no review-owner comment on PR #${input.pr}; nothing to release.`,
+        };
+    }
+    const active = findActiveLeaseComment(listed, { now: input.endedAt ?? new Date() });
+    const owner = input.owner ?? resolveGitHubLogin(seams);
+    if (active?.lease !== null && active?.lease !== undefined) {
+        const holder = active.lease;
+        if (owner === null || owner.length === 0) {
+            return {
+                exitCode: EXIT_CONFIG_ERROR,
+                message: "review_monitor_release: could not resolve GitHub login — pass --owner or authenticate gh",
+            };
+        }
+        const monitorAgentId = input.monitorAgentId?.trim() ?? null;
+        const ownerMatches = holder.owner === owner;
+        const authorized = monitorAgentId !== null && monitorAgentId.length > 0
+            ? ownerMatches && holder.monitor_agent_id === monitorAgentId
+            : ownerMatches;
+        if (!authorized) {
+            return {
+                exitCode: EXIT_CONFLICT,
+                message: conflictMessage(holder, input.pr),
+            };
+        }
     }
-    const parsed = new Date(candidate);
-    if (Number.isNaN(parsed.getTime())) {
+    const releaseTarget = active ?? anchor;
+    const endedAt = (input.endedAt ?? new Date()).toISOString();
+    const body = renderReleasedReviewOwnerComment(endedAt);
+    const updated = updateReviewOwnerComment(repo, releaseTarget.id, body, seams);
+    if ("error" in updated) {
+        return {
+            exitCode: EXIT_CONFIG_ERROR,
+            message: `review_monitor_release: ${updated.error}`,
+        };
+    }
+    return {
+        exitCode: EXIT_READY,
+        message: `review_monitor_release: released PR #${input.pr} review-owner lease (comment ${releaseTarget.id}).`,
+    };
+}
+export function findActiveMonitorForPrFromComments(comments, pr, options) {
+    const mapped = comments
+        .map((entry) => ({
+        id: entry.id,
+        body: entry.body,
+        createdAt: "",
+        lease: parseReviewOwnerLease(entry.body),
+    }))
+        .filter((entry) => entry.lease !== null);
+    const active = findActiveLeaseComment(mapped, {
+        now: options.now,
+        headSha: options.headSha ?? null,
+    });
+    if (active?.lease === null || active?.lease === undefined) {
         return null;
     }
-    return parsed;
+    return leaseToRecord(pr, options.repo ?? null, active.lease, active.id, null, null);
 }
 export function isRecordActive(record, options) {
     if (record.ended_at !== null) {
         return false;
     }
     const started = parseIso8601Utc(record.started_at);
-    if (started === null) {
+    const expires = parseIso8601Utc(record.expires_at);
+    if (started === null || expires === null) {
         return false;
     }
     const now = options.now ?? new Date();
-    const staleMinutes = options.staleMinutes ?? DEFAULT_STALE_MINUTES;
-    const ageMs = now.getTime() - started.getTime();
-    if (ageMs > staleMinutes * 60 * 1000) {
+    if (now.getTime() > expires.getTime()) {
         return false;
     }
     if (options.headSha !== undefined && options.headSha !== null && record.head_sha !== null) {
@@ -172,7 +393,33 @@ export function findActiveMonitorForPr(file, pr, options) {
     }
     return matches.sort((a, b) => b.started_at.localeCompare(a.started_at))[0] ?? null;
 }
+export function emptyReviewMonitorFile() {
+    return { schema_version: SCHEMA_VERSION, records: [] };
+}
+/** @deprecated Local `.deft/review-monitor.json` is obsolete (#2814); always empty. */
+export function readReviewMonitorFile(_path) {
+    return { data: emptyReviewMonitorFile(), error: null };
+}
+/** @deprecated Local `.deft/review-monitor.json` is obsolete (#2814); no-op. */
+export function writeReviewMonitorFile(_path, _data) {
+    // intentionally no-op
+}
+/** @deprecated Local `.deft/review-monitor.json` is obsolete (#2814). */
+export function reviewMonitorPath(projectRoot) {
+    return resolve(projectRoot, ".deft", "review-monitor.json");
+}
 export function defaultSubagentStatusDir(projectRoot) {
-    return join(resolve(projectRoot), ".deft-scratch", "subagent-status");
+    return resolve(projectRoot, ".deft-scratch", "subagent-status");
+}
+export function fetchActiveMonitorFromGithub(repo, pr, options = {}) {
+    const listed = listReviewOwnerComments(repo, pr, options.seams ?? {});
+    if (!Array.isArray(listed)) {
+        return { error: listed.error };
+    }
+    return findActiveMonitorForPrFromComments(listed, pr, {
+        now: options.now,
+        headSha: options.headSha ?? null,
+        repo,
+    });
 }
 //# sourceMappingURL=record.js.map

package/dist/review-monitor/verify.d.ts

@@ -1,4 +1,5 @@
 import { EXIT_CONFIG_ERROR, EXIT_NOT_READY, EXIT_READY, MONITORING_TIER_1, MONITORING_TIER_3 } from "./constants.js";
+import type { ReviewOwnerGithubSeams } from "./github-lease.js";
 import { type ReviewMonitorRecord } from "./record.js";
 import { type MonitoringTierProbe } from "./tier-detection.js";
 export type ReviewMonitorCallSite = "solo" | "swarm-phase5-6" | "swarm-phase6-cascade" | "unspecified";
@@ -13,6 +14,7 @@ export interface VerifyReviewMonitorArgs {
     readonly staleMinutes?: number;
     readonly now?: Date;
     readonly environ?: NodeJS.ProcessEnv;
+    readonly seams?: ReviewOwnerGithubSeams;
 }
 export interface VerifyReviewMonitorResult {
     readonly exitCode: typeof EXIT_READY | typeof EXIT_NOT_READY | typeof EXIT_CONFIG_ERROR;