@lchase/kiln 0.9.0 → 0.11.0

package/dist/serve.js

@@ -5,15 +5,17 @@ import { homedir } from "node:os";
 import { join, resolve, sep } from "node:path";
 import { AUTH_PREFLIGHT_PREFIX } from "./auth.js";
 import { loadKilnConfig } from "./config.js";
-import { answerJob, readStatus, retryJob, runTick, startupRecovery } from "./driver.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 { 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 { listWorkflowNames } from "./workflow.js";
 const BODY_LIMIT = 65_536;
@@ -161,8 +163,18 @@ async function handle(req, res, state, boundPort, css, csrf) {
             await createJob(req, res, state, raw);
             return;
         }
-        const action = /^\/api\/jobs\/([^/]+)\/(approve|reject|retry)$/.exec(path);
-        if (!action?.[1] || (action[2] !== "approve" && action[2] !== "reject" && action[2] !== "retry")) {
+        if (path === "/api/pause" || path === "/api/resume") {
+            const pausing = path === "/api/pause";
+            const changed = pausing ? pauseFactory(config.kilnDir) : resumeFactory(config.kilnDir);
+            if (wantsJson(req)) {
+                sendJson(res, 200, { ok: true, paused: pausing, changed }, secrets);
+                return;
+            }
+            redirect(res, redirectTarget(req));
+            return;
+        }
+        const action = /^\/api\/jobs\/([^/]+)\/(approve|reject|retry|revise)$/.exec(path);
+        if (!action?.[1] || (action[2] !== "approve" && action[2] !== "reject" && action[2] !== "retry" && action[2] !== "revise")) {
             sendJson(res, 404, { error: "Not found." }, secrets);
             return;
         }
@@ -175,6 +187,14 @@ async function handle(req, res, state, boundPort, css, csrf) {
             await retry(req, res, config, css, secrets, jobId);
             return;
         }
+        if (action[2] === "revise") {
+            await revise(req, res, config, css, secrets, jobId, raw);
+            return;
+        }
+        if (action[2] !== "approve" && action[2] !== "reject") {
+            sendJson(res, 404, { error: "Not found." }, secrets);
+            return;
+        }
         await answer(req, res, config, css, secrets, jobId, action[2]);
         return;
     }
@@ -182,14 +202,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)) {
@@ -199,6 +236,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]);
@@ -210,6 +258,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]);
@@ -261,6 +357,48 @@ async function answer(req, res, config, css, secrets, jobId, choice) {
     }
     redirect(res, redirectTarget(req));
 }
+async function revise(req, res, config, css, secrets, jobId, raw) {
+    const note = noteFromBody(req, raw);
+    if (!note) {
+        const message = "A revise note is required.";
+        if (wantsJson(req))
+            sendJson(res, 400, { error: message }, secrets);
+        else
+            sendHtml(res, 400, renderMessagePage(css, "Could not revise", message), secrets);
+        return;
+    }
+    try {
+        reviseJob(config, jobId, note);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        const status = message.startsWith("No job ") ? 404 : 409;
+        if (wantsJson(req))
+            sendJson(res, status, { error: message }, secrets);
+        else
+            sendHtml(res, status, renderMessagePage(css, "Could not revise", message), secrets);
+        return;
+    }
+    const job = findJob(config, jobId);
+    if (wantsJson(req)) {
+        sendJson(res, 200, { ok: true, job }, secrets);
+        return;
+    }
+    redirect(res, redirectTarget(req));
+}
+function noteFromBody(req, raw) {
+    const type = headerValue(req.headers["content-type"]);
+    if (type.includes("application/json")) {
+        try {
+            const parsed = JSON.parse(raw);
+            return typeof parsed.note === "string" ? parsed.note : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    return new URLSearchParams(raw).get("note") ?? undefined;
+}
 async function retry(req, res, config, css, secrets, jobId) {
     try {
         retryJob(config, jobId);
@@ -341,13 +479,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);
@@ -561,20 +699,121 @@ function repoList(config) {
         .sort((left, right) => left.name.localeCompare(right.name));
 }
 function pageOptions(state, csrf) {
+    const spend = spendFor(state.config.kilnDir, state.config.dailyDollarCap);
     return {
         csrf,
         repos: repoList(state.config),
         workflows: listWorkflowNames(),
+        paused: isPaused(state.config.kilnDir),
+        spend,
         ...(state.configError ? { configError: state.configError } : {}),
     };
 }
 function statusDocument(state) {
+    const spend = spendFor(state.config.kilnDir, state.config.dailyDollarCap);
     return {
         ...readStatus(state.config),
         repos: repoList(state.config),
         configError: state.configError ?? null,
+        paused: isPaused(state.config.kilnDir),
+        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";
+    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" } : {}),
+    });
+}
+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,7 @@ 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_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, } from "./schemas.js";
 const DEFAULTS = {
     deliver: "local",
     prTitle: DEFAULT_PR_TITLE,
@@ -12,6 +12,8 @@ const DEFAULTS = {
     maxAttempts: DEFAULT_MAX_ATTEMPTS,
     stallTimeoutMs: DEFAULT_STALL_TIMEOUT_MS,
     maxFixRounds: DEFAULT_MAX_FIX_ROUNDS,
+    maxSameFingerprint: DEFAULT_MAX_SAME_FINGERPRINT,
+    dailyDollarCap: null,
     sandboxMode: "off",
 };
 export function readSettings(configPath) {
@@ -69,6 +71,8 @@ function project(path, revision, file) {
         ...(file.stallTimeoutMs !== undefined ? { stallTimeoutMs: file.stallTimeoutMs } : {}),
         ...(file.maxAttempts !== undefined ? { maxAttempts: file.maxAttempts } : {}),
         ...(file.maxFixRounds !== undefined ? { maxFixRounds: file.maxFixRounds } : {}),
+        ...(file.maxSameFingerprint !== undefined ? { maxSameFingerprint: file.maxSameFingerprint } : {}),
+        ...(file.dailyDollarCap !== undefined ? { dailyDollarCap: file.dailyDollarCap } : {}),
         ...(sandbox ? { sandbox } : {}),
         defaults: DEFAULTS,
     };
@@ -97,12 +101,16 @@ function mergeSettings(raw, settings) {
         setOptional(prior, "base", entry.base);
         setOptional(prior, "prTitle", entry.prTitle);
         setOptional(prior, "branch", entry.branch);
+        setOptional(prior, "maxAttempts", entry.maxAttempts);
+        setOptional(prior, "maxFixRounds", entry.maxFixRounds);
         repos[name] = prior;
     }
     next.repos = repos;
     setOptional(next, "stallTimeoutMs", settings.stallTimeoutMs);
     setOptional(next, "maxAttempts", settings.maxAttempts);
     setOptional(next, "maxFixRounds", settings.maxFixRounds);
+    setOptional(next, "maxSameFingerprint", settings.maxSameFingerprint);
+    setOptional(next, "dailyDollarCap", settings.dailyDollarCap);
     if (settings.sandbox) {
         const prior = isRecord(raw.sandbox) ? { ...raw.sandbox } : {};
         setOptional(prior, "mode", settings.sandbox.mode);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lchase/kiln",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "Run a workflow on any registered repo. A markdown spec is the input.",
   "license": "MIT",
   "type": "module",
@@ -16,7 +16,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/lchase/kiln.git"
+    "url": "git+https://github.com/lchase/kiln.git",
+    "directory": "packages/kiln"
   },
   "publishConfig": {
     "access": "public"
@@ -34,7 +35,7 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@lchase/yak": "0.8.0",
+    "@lchase/yak": "0.9.0",
     "zod": "^4.6.7"
   },
   "devDependencies": {

package/workflows/fix.yaml

@@ -45,4 +45,4 @@ steps:
     needs: [input, build]
     skipIf: 'build.status != "READY"'
     command:
-      run: 'git add -A && git diff --cached --quiet || git commit -m "kiln: $KILN_TASK_TITLE"'
+      run: 'git add -A && git diff --cached --quiet || git commit -m "kiln: $KILN_TASK_TITLE" --trailer "Kiln-Job: $KILN_JOB" --trailer "Kiln-Round: $KILN_ROUND" --trailer "Kiln-Prompts-Hash: $KILN_PROMPTS_HASH"'