@lchase/kiln 0.10.0 → 0.12.0

package/dist/serve.js

@@ -7,15 +7,17 @@ import { AUTH_PREFLIGHT_PREFIX } from "./auth.js";
 import { loadKilnConfig } from "./config.js";
 import { answerJob, readStatus, retryJob, reviseJob, runTick, startupRecovery } from "./driver.js";
 import { browse } from "./fs-browse.js";
-import { appendEvent, eventsForJob } from "./events.js";
+import { branchOf, buildBoard, dayReport, jobDetail, parseSeenQuery, parseStatsWindow, readBranchCommits, readDiffStat, statsFor, unseenChanges, } from "./board-view.js";
+import { appendEvent, eventsForJob, readEvents } from "./events.js";
 import { INVESTIGATION_WORKFLOW } from "./findings.js";
-import { defaultHost } from "./host.js";
+import { productionHost } from "./host.js";
 import { intakeJobs } from "./intake-http.js";
-import { packageRoot } from "./paths.js";
+import { jobBasename, packageRoot } from "./paths.js";
 import { SANDBOX_PREFLIGHT_PREFIX } from "./sandbox.js";
-import { renderConsole, renderMessagePage, renderTextPage } from "./serve-page.js";
+import { renderApp, renderMessagePage, renderTextPage } from "./serve-page.js";
 import { isPaused, pauseFactory, resumeFactory, spendFor } from "./rails.js";
 import { readSettings, saveSettings } from "./settings.js";
+import { triggerRows } from "./triggers.js";
 import { listWorkflowNames } from "./workflow.js";
 const BODY_LIMIT = 65_536;
 const TEXT_LIMIT = 100_000;
@@ -42,6 +44,7 @@ export function startServe(options) {
         let stopped = false;
         let timer;
         let firstTick;
+        let triggerStartup = true;
         const shutdown = () => {
             if (stopped)
                 return;
@@ -67,8 +70,10 @@ export function startServe(options) {
             const tick = () => {
                 if (stopped)
                     return;
+                const startup = triggerStartup;
+                triggerStartup = false;
                 refreshLiveConfig(state);
-                safeTick(state.config, state.secrets, false);
+                safeTick(state.config, state.secrets, startup);
             };
             firstTick = setTimeout(tick, 0);
             timer = setInterval(tick, options.tickSeconds * 1000);
@@ -82,9 +87,9 @@ export function loadServeCss() {
     }
     return readFileSync(path, "utf8");
 }
-function safeTick(config, secrets, startup) {
+function safeTick(config, secrets, triggerStartup) {
     try {
-        const report = runTick(config, defaultHost(), { startup });
+        const report = runTick(config, productionHost(), { startup: false, triggerStartup });
         if (report.startsWith(SANDBOX_PREFLIGHT_PREFIX) || report.startsWith(AUTH_PREFLIGHT_PREFIX)) {
             const tickAt = report.indexOf("\ntick ");
             const head = tickAt === -1 ? report : report.slice(0, tickAt);
@@ -201,14 +206,31 @@ async function handle(req, res, state, boundPort, css, csrf) {
         sendJson(res, 405, { error: "Method not allowed." }, secrets);
         return;
     }
-    if (path === "/" || path === "" || path === "/board") {
-        sendHtml(res, 200, renderConsole(css, readStatus(config).attention, pageOptions(state, csrf)), secrets);
-        return;
-    }
     if (path === "/api/jobs" || path === "/api/status") {
         sendJson(res, 200, statusDocument(state), secrets);
         return;
     }
+    if (path === "/api/board") {
+        sendJson(res, 200, boardPayload(state), secrets);
+        return;
+    }
+    if (path === "/api/stats") {
+        const window = parseStatsWindow(url.searchParams.get("window"));
+        if (!window) {
+            sendJson(res, 400, { error: "window must be today, 7d, or 30d." }, secrets);
+            return;
+        }
+        sendJson(res, 200, statsDocument(state, window), secrets);
+        return;
+    }
+    if (path === "/api/report") {
+        sendJson(res, 200, reportDocument(state), secrets);
+        return;
+    }
+    if (path === "/api/unseen") {
+        sendJson(res, 200, unseenDocument(state, url.searchParams.getAll("seen")), secrets);
+        return;
+    }
     if (path === "/api/events") {
         const jobId = url.searchParams.get("job_id");
         if (!jobId || !JOB_ID.test(jobId)) {
@@ -218,6 +240,17 @@ async function handle(req, res, state, boundPort, css, csrf) {
         sendJson(res, 200, { job_id: jobId, events: eventsForJob(config.kilnDir, jobId) }, secrets);
         return;
     }
+    const apiDetail = /^\/api\/jobs\/([^/]+)\/detail$/.exec(path);
+    if (apiDetail?.[1]) {
+        const jobId = parseJobId(apiDetail[1]);
+        const job = jobId ? findJob(config, jobId) : undefined;
+        if (!job) {
+            sendJson(res, 404, { error: jobId ? `No job ${jobId}.` : "Not found." }, secrets);
+            return;
+        }
+        sendJson(res, 200, detailDocument(state, job), secrets);
+        return;
+    }
     const apiJob = /^\/api\/jobs\/([^/]+)$/.exec(path);
     if (apiJob?.[1]) {
         const jobId = parseJobId(apiJob[1]);
@@ -229,6 +262,54 @@ async function handle(req, res, state, boundPort, css, csrf) {
         sendJson(res, 200, job, secrets);
         return;
     }
+    const listed = listSection(path);
+    if (listed) {
+        if (listed === "stats") {
+            const window = parseStatsWindow(url.searchParams.get("window"));
+            if (!window) {
+                sendHtml(res, 400, renderMessagePage(css, "Stats", "window must be today, 7d, or 30d."), secrets);
+                return;
+            }
+            sendHtml(res, 200, renderShell(state, css, csrf, "stats", { window }), secrets);
+            return;
+        }
+        sendHtml(res, 200, renderShell(state, css, csrf, listed), secrets);
+        return;
+    }
+    const repoPage = /^\/repos\/([^/]+)$/.exec(path);
+    if (repoPage?.[1]) {
+        let name;
+        try {
+            name = decodeURIComponent(repoPage[1]);
+        }
+        catch {
+            sendHtml(res, 404, renderMessagePage(css, "Not found", "Not found."), secrets);
+            return;
+        }
+        if (!state.config.repos[name]) {
+            sendHtml(res, 404, renderMessagePage(css, "Not found", `No repo ${name}.`), secrets);
+            return;
+        }
+        sendHtml(res, 200, renderShell(state, css, csrf, "repos", { repo: name }), secrets);
+        return;
+    }
+    const jobPage = /^\/jobs\/([^/]+)$/.exec(path);
+    if (jobPage?.[1]) {
+        const jobId = parseJobId(jobPage[1]);
+        const job = jobId ? findJob(config, jobId) : undefined;
+        if (!job) {
+            sendHtml(res, 404, renderMessagePage(css, "Not found", jobId ? `No job ${jobId}.` : "Not found."), secrets);
+            return;
+        }
+        const tabRaw = url.searchParams.get("tab");
+        if (tabRaw && tabRaw !== "overview" && tabRaw !== "changes" && tabRaw !== "timeline") {
+            sendHtml(res, 400, renderMessagePage(css, "Job", "tab must be overview, changes, or timeline."), secrets);
+            return;
+        }
+        const tab = tabRaw === "changes" || tabRaw === "timeline" ? tabRaw : "overview";
+        sendHtml(res, 200, renderShell(state, css, csrf, "job", { detail: detailDocument(state, job), tab }), secrets);
+        return;
+    }
     const page = /^\/jobs\/([^/]+)\/(spec|log|findings)$/.exec(path);
     if (page?.[1] && (page[2] === "spec" || page[2] === "log" || page[2] === "findings")) {
         const jobId = parseJobId(page[1]);
@@ -402,13 +483,13 @@ function redirectTarget(req) {
         return "/";
     try {
         const url = new URL(referer);
-        if (url.pathname === "/board")
-            return "/board";
+        if (!url.pathname.startsWith("/") || url.pathname.startsWith("//"))
+            return "/";
+        return `${url.pathname}${url.search}`;
     }
     catch {
         return "/";
     }
-    return "/";
 }
 function wantsJson(req) {
     const accept = headerValue(req.headers.accept);
@@ -639,9 +720,109 @@ function statusDocument(state) {
         repos: repoList(state.config),
         configError: state.configError ?? null,
         paused: isPaused(state.config.kilnDir),
-        spend: { day: spend.day, usd: spend.usd, cap: spend.cap },
+        spend: { day: spend.day, usd: spend.usd, cap: spend.cap, blocked: spend.blocked },
     };
 }
+function listSection(path) {
+    if (path === "/" || path === "" || path === "/board" || path === "/inbox")
+        return "inbox";
+    if (path === "/hand")
+        return "hand";
+    if (path === "/repos")
+        return "repos";
+    if (path === "/history")
+        return "history";
+    if (path === "/stats")
+        return "stats";
+    if (path === "/report")
+        return "report";
+    if (path === "/settings")
+        return "settings";
+    if (path === "/triggers")
+        return "triggers";
+    return undefined;
+}
+function renderShell(state, css, csrf, section, extra = {}) {
+    const status = readStatus(state.config);
+    const events = readEvents(state.config.kilnDir, { warn: () => { } });
+    const board = buildBoard(status.jobs, events);
+    const page = pageOptions(state, csrf);
+    return renderApp({
+        css,
+        section,
+        board,
+        attention: status.attention,
+        page: extra.repo ? { ...page, repo: extra.repo } : page,
+        ...(extra.repo ? { repo: extra.repo } : {}),
+        ...(section === "stats" && extra.window ? { stats: statsDocument(state, extra.window) } : {}),
+        ...(section === "report" ? { report: reportDocument(state) } : {}),
+        ...(extra.detail ? { detail: extra.detail, tab: extra.tab ?? "overview" } : {}),
+        ...(section === "triggers"
+            ? { triggers: triggerRows(state.config, readEvents(state.config.kilnDir, { warn: () => { } })) }
+            : {}),
+    });
+}
+function boardPayload(state) {
+    const status = readStatus(state.config);
+    const events = readEvents(state.config.kilnDir, { warn: () => { } });
+    const spend = spendFor(state.config.kilnDir, state.config.dailyDollarCap);
+    return {
+        ...buildBoard(status.jobs, events),
+        paused: isPaused(state.config.kilnDir),
+        spend,
+        configError: state.configError ?? null,
+    };
+}
+function statsDocument(state, window) {
+    const events = readEvents(state.config.kilnDir, { warn: () => { } });
+    return statsFor(events, {
+        window,
+        ...(state.config.dailyDollarCap !== undefined ? { cap: state.config.dailyDollarCap } : {}),
+    });
+}
+function reportDocument(state) {
+    const events = readEvents(state.config.kilnDir, { warn: () => { } });
+    return dayReport(events, state.config.dailyDollarCap !== undefined ? { cap: state.config.dailyDollarCap } : {});
+}
+function unseenDocument(state, seenValues) {
+    const events = readEvents(state.config.kilnDir, { warn: () => { } });
+    const board = buildBoard(readStatus(state.config).jobs, events);
+    return unseenChanges(events, parseSeenQuery(seenValues), new Set(board.inbox.map((job) => job.jobId)));
+}
+function detailDocument(state, job) {
+    const events = readEvents(state.config.kilnDir, { warn: () => { } });
+    const repo = state.config.repos[job.repo];
+    const branch = branchOf(job, events);
+    const base = prBase(events, job.jobId);
+    const commits = repo && branch ? readBranchCommits(repo.path, branch) : [];
+    const diff = repo && branch && base ? readDiffStat(repo.path, base, branch) : undefined;
+    const issue = jobIssue(state.config, job.jobId);
+    return jobDetail({
+        job,
+        events,
+        maxFixRounds: repo?.maxFixRounds ?? state.config.maxFixRounds,
+        commits,
+        ...(issue ? { issue } : {}),
+        ...(diff ? { diffStat: diff } : {}),
+    });
+}
+function prBase(events, jobId) {
+    let base;
+    for (const event of events) {
+        if (event.job_id === jobId && event.event === "pr.opened")
+            base = event.properties.base;
+    }
+    return base;
+}
+function jobIssue(config, jobId) {
+    try {
+        const raw = JSON.parse(readFileSync(join(config.jobsDir, `${jobBasename(jobId)}.json`), "utf8"));
+        return typeof raw.issue === "string" ? raw.issue : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 function statusCode(error) {
     if (typeof error === "object" && error !== null && "statusCode" in error) {
         const code = error.statusCode;

package/dist/settings.js

@@ -4,7 +4,8 @@ import { homedir } from "node:os";
 import { basename, dirname, join } from "node:path";
 import { assertBranchName, assertCheckoutDirectory } from "./config.js";
 import { DEFAULT_BRANCH_TEMPLATE, DEFAULT_PR_TITLE } from "./pr-names.js";
-import { DEFAULT_MAX_ATTEMPTS, DEFAULT_MAX_FIX_ROUNDS, DEFAULT_MAX_SAME_FINGERPRINT, DEFAULT_STALL_TIMEOUT_MS, KilnConfigFileSchema, SettingsWriteSchema, } from "./schemas.js";
+import { DEFAULT_MAX_ATTEMPTS, DEFAULT_MAX_FIX_ROUNDS, DEFAULT_MAX_SAME_FINGERPRINT, DEFAULT_STALL_TIMEOUT_MS, KilnConfigFileSchema, SettingsWriteSchema, TriggerConfigSchema, } from "./schemas.js";
+import { applyTriggerToggles, effectiveTriggers, knownTrigger } from "./triggers.js";
 const DEFAULTS = {
     deliver: "local",
     prTitle: DEFAULT_PR_TITLE,
@@ -48,6 +49,8 @@ export function saveSettings(configPath, body, home = homedir()) {
         return fail(400, "Settings are invalid.", fieldErrors(parsed.error));
     const { revision: _revision, ...editable } = parsed.data;
     const fields = checkoutFields(dirname(configPath), editable, home);
+    const triggerFields = triggerToggleFields(read.raw, editable);
+    Object.assign(fields, triggerFields);
     if (Object.keys(fields).length > 0)
         return fail(400, "Settings are invalid.", fields);
     const next = mergeSettings(read.raw, editable);
@@ -74,6 +77,7 @@ function project(path, revision, file) {
         ...(file.maxSameFingerprint !== undefined ? { maxSameFingerprint: file.maxSameFingerprint } : {}),
         ...(file.dailyDollarCap !== undefined ? { dailyDollarCap: file.dailyDollarCap } : {}),
         ...(sandbox ? { sandbox } : {}),
+        triggers: effectiveTriggers(file.triggers).map(triggerView),
         defaults: DEFAULTS,
     };
 }
@@ -111,6 +115,8 @@ function mergeSettings(raw, settings) {
     setOptional(next, "maxFixRounds", settings.maxFixRounds);
     setOptional(next, "maxSameFingerprint", settings.maxSameFingerprint);
     setOptional(next, "dailyDollarCap", settings.dailyDollarCap);
+    if (settings.triggers)
+        next.triggers = applyTriggerToggles(storedTriggers(raw.triggers), settings.triggers);
     if (settings.sandbox) {
         const prior = isRecord(raw.sandbox) ? { ...raw.sandbox } : {};
         setOptional(prior, "mode", settings.sandbox.mode);
@@ -122,6 +128,39 @@ function mergeSettings(raw, settings) {
     }
     return next;
 }
+function triggerView(trigger) {
+    return {
+        id: trigger.id,
+        kind: trigger.kind,
+        enabled: trigger.enabled !== false,
+        ...(trigger.cron ? { cron: trigger.cron } : {}),
+        ...(trigger.every ? { every: trigger.every } : {}),
+        ...(trigger.repo ? { repo: trigger.repo } : {}),
+        ...(trigger.jql ? { jql: trigger.jql } : {}),
+        ...(trigger.label ? { label: trigger.label } : {}),
+        ...(trigger.status ? { status: trigger.status } : {}),
+    };
+}
+function storedTriggers(value) {
+    if (!Array.isArray(value))
+        return [];
+    const out = [];
+    for (const item of value) {
+        const parsed = TriggerConfigSchema.safeParse(item);
+        if (parsed.success)
+            out.push(parsed.data);
+    }
+    return out;
+}
+function triggerToggleFields(raw, settings) {
+    const fields = {};
+    const file = storedTriggers(raw.triggers);
+    for (const toggle of settings.triggers ?? []) {
+        if (!knownTrigger(toggle.id, file))
+            fields[`triggers.${toggle.id}`] = `Unknown trigger ${toggle.id}.`;
+    }
+    return fields;
+}
 function checkoutFields(configDir, settings, home) {
     const fields = {};
     for (const [name, entry] of Object.entries(settings.repos)) {