patchrelay 0.35.11 → 0.35.13

package/dist/github-webhooks.js

@@ -64,6 +64,10 @@ function normalizePullRequestEvent(payload, repoFullName) {
         prNumber: pr.number,
         prUrl: pr.html_url,
         prState,
+        prAuthorLogin: pr.user?.login ?? undefined,
+        prLabels: Array.isArray(pr.labels)
+            ? pr.labels.map((label) => label?.name).filter((label) => typeof label === "string" && label.trim().length > 0)
+            : undefined,
     };
 }
 function normalizePullRequestReviewEvent(payload, repoFullName) {
@@ -97,8 +101,11 @@ function normalizePullRequestReviewEvent(payload, repoFullName) {
         prNumber: pr.number,
         prUrl: pr.html_url,
         prState: "open",
+        prAuthorLogin: pr.user?.login ?? undefined,
         reviewState,
         reviewBody: review.body ?? undefined,
+        reviewId: typeof review.id === "number" ? review.id : undefined,
+        reviewCommitId: typeof review.commit_id === "string" ? review.commit_id : undefined,
         reviewerName: review.user?.login ?? undefined,
     };
 }

package/dist/http.js

@@ -1,9 +1,6 @@
 import fastify from "fastify";
 import rawBody from "fastify-raw-body";
 import { getBuildInfo } from "./build-info.js";
-import { matchesOperatorFeedEvent } from "./operator-feed.js";
-import { buildStateHistory } from "./cli/watch/history-builder.js";
-import { buildPatchRelayQueueObservations, buildPatchRelayStateGraph } from "./cli/watch/state-visualization.js";
 export async function buildHttpServer(config, service, logger) {
     const buildInfo = getBuildInfo();
     const loopbackBind = isLoopbackBind(config.server.bind);
@@ -247,6 +244,9 @@ export async function buildHttpServer(config, service, logger) {
         });
     }
     if (managementRoutesEnabled) {
+        app.get("/api/issues", async (_request, reply) => {
+            return reply.send({ ok: true, issues: service.listTrackedIssues() });
+        });
         app.get("/api/issues/:issueKey", async (request, reply) => {
             const issueKey = request.params.issueKey;
             const result = await service.getIssueOverview(issueKey);
@@ -255,22 +255,6 @@ export async function buildHttpServer(config, service, logger) {
             }
             return reply.send({ ok: true, ...result });
         });
-        app.get("/api/issues/:issueKey/report", async (request, reply) => {
-            const issueKey = request.params.issueKey;
-            const result = await service.getIssueReport(issueKey);
-            if (!result) {
-                return reply.code(404).send({ ok: false, reason: "issue_not_found" });
-            }
-            return reply.send({ ok: true, ...result });
-        });
-        app.get("/api/issues/:issueKey/timeline", async (request, reply) => {
-            const issueKey = request.params.issueKey;
-            const result = await service.getIssueTimeline(issueKey);
-            if (!result) {
-                return reply.code(404).send({ ok: false, reason: "issue_not_found" });
-            }
-            return reply.send({ ok: true, ...result });
-        });
         app.get("/api/issues/:issueKey/live", async (request, reply) => {
             const issueKey = request.params.issueKey;
             const result = await service.getActiveRunStatus(issueKey);
@@ -279,14 +263,6 @@ export async function buildHttpServer(config, service, logger) {
             }
             return reply.send({ ok: true, ...result });
         });
-        app.get("/api/issues/:issueKey/runs/:runId/events", async (request, reply) => {
-            const { issueKey, runId } = request.params;
-            const result = await service.getRunEvents(issueKey, Number(runId));
-            if (!result) {
-                return reply.code(404).send({ ok: false, reason: "run_not_found" });
-            }
-            return reply.send({ ok: true, ...result });
-        });
         app.get("/api/issues/:issueKey/session-url", async (request, reply) => {
             const issueKey = request.params.issueKey;
             const ttlSeconds = getPositiveIntegerQueryParam(request, "ttlSeconds");
@@ -338,92 +314,6 @@ export async function buildHttpServer(config, service, logger) {
             }
             return reply.send({ ok: true, ...result });
         });
-        app.get("/api/feed", async (request, reply) => {
-            const feedQuery = {
-                limit: getPositiveIntegerQueryParam(request, "limit") ?? 50,
-                ...readFeedQueryFilters(request),
-            };
-            if (getQueryParam(request, "follow") !== "1") {
-                return reply.send({ ok: true, events: service.listOperatorFeed(feedQuery) });
-            }
-            reply.hijack();
-            reply.raw.writeHead(200, {
-                "content-type": "text/event-stream; charset=utf-8",
-                "cache-control": "no-cache, no-transform",
-                connection: "keep-alive",
-                "x-accel-buffering": "no",
-            });
-            const writeEvent = (event) => {
-                reply.raw.write(`event: feed\n`);
-                reply.raw.write(`data: ${JSON.stringify(event)}\n\n`);
-            };
-            for (const event of service.listOperatorFeed(feedQuery)) {
-                writeEvent(event);
-            }
-            const cleanup = () => {
-                clearInterval(keepAlive);
-                unsubscribe();
-                if (!reply.raw.destroyed)
-                    reply.raw.end();
-            };
-            const unsubscribe = service.subscribeOperatorFeed((event) => {
-                if (!matchesOperatorFeedEvent(event, feedQuery)) {
-                    return;
-                }
-                writeEvent(event);
-            });
-            const keepAlive = setInterval(() => {
-                reply.raw.write(": keepalive\n\n");
-            }, 15000);
-            reply.raw.on("error", cleanup);
-            request.raw.on("close", cleanup);
-        });
-        app.get("/api/watch/issues", async (_request, reply) => {
-            return reply.send({ ok: true, issues: service.listTrackedIssues() });
-        });
-        app.get("/api/watch", async (request, reply) => {
-            reply.hijack();
-            reply.raw.writeHead(200, {
-                "content-type": "text/event-stream; charset=utf-8",
-                "cache-control": "no-cache, no-transform",
-                connection: "keep-alive",
-                "x-accel-buffering": "no",
-            });
-            const writeSse = (eventType, data) => {
-                reply.raw.write(`event: ${eventType}\ndata: ${JSON.stringify(data)}\n\n`);
-            };
-            // Send initial issue snapshot
-            writeSse("issues", service.listTrackedIssues());
-            // Stream operator feed events
-            const issueFilter = getQueryParam(request, "issue");
-            const unsubscribeFeed = service.subscribeOperatorFeed((event) => {
-                if (issueFilter && event.issueKey !== issueFilter) {
-                    return;
-                }
-                writeSse("feed", event);
-            });
-            // When filtered to a specific issue, also stream codex notifications
-            const unsubscribeCodex = issueFilter
-                ? service.subscribeCodexNotifications((event) => {
-                    if (event.issueKey !== issueFilter) {
-                        return;
-                    }
-                    writeSse("codex", { method: event.method, params: event.params });
-                })
-                : undefined;
-            const cleanup = () => {
-                clearInterval(keepAlive);
-                unsubscribeFeed();
-                unsubscribeCodex?.();
-                if (!reply.raw.destroyed)
-                    reply.raw.end();
-            };
-            const keepAlive = setInterval(() => {
-                reply.raw.write(": keepalive\n\n");
-            }, 15000);
-            reply.raw.on("error", cleanup);
-            request.raw.on("close", cleanup);
-        });
         app.get("/api/installations", async (_request, reply) => {
             return reply.send({ ok: true, installations: service.listLinearInstallations() });
         });
@@ -515,22 +405,6 @@ function getQueryParam(request, key) {
     const value = request.query?.[key];
     return typeof value === "string" ? value : undefined;
 }
-function readFeedQueryFilters(request) {
-    const issueKey = getQueryParam(request, "issue")?.trim() || undefined;
-    const projectId = getQueryParam(request, "project")?.trim() || undefined;
-    const kind = (getQueryParam(request, "kind")?.trim() || undefined);
-    const stage = getQueryParam(request, "stage")?.trim() || undefined;
-    const status = getQueryParam(request, "status")?.trim() || undefined;
-    const workflowId = getQueryParam(request, "workflow")?.trim() || undefined;
-    return {
-        ...(issueKey ? { issueKey } : {}),
-        ...(projectId ? { projectId } : {}),
-        ...(kind ? { kind } : {}),
-        ...(stage ? { stage } : {}),
-        ...(status ? { status } : {}),
-        ...(workflowId ? { workflowId } : {}),
-    };
-}
 function getPositiveIntegerQueryParam(request, key) {
     const value = getQueryParam(request, key);
     if (!value || !/^\d+$/.test(value)) {
@@ -596,6 +470,7 @@ function renderAgentSessionStatusPage(params) {
     const commandCount = params.sessionStatus.liveThread?.commandCount ?? params.sessionStatus.latestReportSummary?.commandCount ?? 0;
     const fileChangeCount = params.sessionStatus.liveThread?.fileChangeCount ?? params.sessionStatus.latestReportSummary?.fileChangeCount ?? 0;
     const toolCallCount = params.sessionStatus.liveThread?.toolCallCount ?? params.sessionStatus.latestReportSummary?.toolCallCount ?? 0;
+    const sessionState = params.sessionStatus.issue.sessionState ?? "unknown";
     const factoryState = params.sessionStatus.issue.factoryState ?? "unknown";
     const linearState = params.sessionStatus.issue.currentLinearState ?? "unknown";
     const prState = params.sessionStatus.issue.prState ?? "unknown";
@@ -603,23 +478,8 @@ function renderAgentSessionStatusPage(params) {
     const checkState = params.sessionStatus.issue.prCheckStatus ?? "unknown";
     const ciAttempts = params.sessionStatus.issue.ciRepairAttempts ?? 0;
     const queueAttempts = params.sessionStatus.issue.queueRepairAttempts ?? 0;
-    const queueProtocol = params.sessionStatus.issue.queueProtocol;
-    const history = buildPublicStateHistory({
-        currentFactoryState: factoryState,
-        activeRunId: params.sessionStatus.activeRunId ?? null,
-        ...(params.sessionStatus.feedEvents ? { feedEvents: params.sessionStatus.feedEvents } : {}),
-        runs: params.sessionStatus.runs,
-    });
-    const graph = buildPatchRelayStateGraph(history, factoryState);
-    const queueObservations = buildPatchRelayQueueObservations({
-        factoryState,
-        ...(params.sessionStatus.activeRun?.runType ? { activeRunType: params.sessionStatus.activeRun.runType } : {}),
-        ...(params.sessionStatus.issue.prNumber !== undefined ? { prNumber: params.sessionStatus.issue.prNumber } : {}),
-        ...(params.sessionStatus.issue.prReviewState ? { prReviewState: params.sessionStatus.issue.prReviewState } : {}),
-    }, normalizeFeedEvents(params.sessionStatus.feedEvents));
-    const pathHtml = renderStatePath(history, factoryState);
-    const graphHtml = renderStateGraph(graph.main, graph.prLoops, graph.queueLoop, graph.exits);
-    const observationsHtml = renderObservationList(queueObservations);
+    const waitingReason = params.sessionStatus.issue.waitingReason ?? "No outstanding wait reason.";
+    const lastWakeReason = params.sessionStatus.issue.lastWakeReason ?? "unknown";
     return `<!doctype html>
 <html lang="en">
   <head>
@@ -693,7 +553,9 @@ function renderAgentSessionStatusPage(params) {
       ${issueUrl ? `<p><a href="${escapeHtml(issueUrl)}" target="_blank" rel="noopener noreferrer">Open issue in Linear</a></p>` : ""}
       ${prUrl ? `<p><a href="${escapeHtml(prUrl)}" target="_blank" rel="noopener noreferrer">Open pull request ${escapeHtml(prLabel ?? "")}</a></p>` : ""}
       <div class="chips">
-        <span class="chip"><strong>Factory:</strong> <code>${escapeHtml(factoryState)}</code></span>
+        <span class="chip"><strong>Session:</strong> <code>${escapeHtml(sessionState)}</code></span>
+        <span class="chip"><strong>Waiting reason:</strong> <code>${escapeHtml(waitingReason)}</code></span>
+        <span class="chip"><strong>Debug stage:</strong> <code>${escapeHtml(factoryState)}</code></span>
         <span class="chip"><strong>Linear:</strong> <code>${escapeHtml(linearState)}</code></span>
         <span class="chip"><strong>Active:</strong> ${activeStage}</span>
         <span class="chip"><strong>Latest:</strong> ${latestStage}</span>
@@ -706,14 +568,8 @@ function renderAgentSessionStatusPage(params) {
             <tr><th>Pull request</th><td>${escapeHtml(prLabel ?? "none")} (${escapeHtml(prState)})</td></tr>
             <tr><th>Review</th><td>${escapeHtml(reviewState)}</td></tr>
             <tr><th>Checks</th><td>${escapeHtml(checkState)}</td></tr>
-            <tr><th>Queue label</th><td><code>${escapeHtml(queueProtocol?.admissionLabel ?? "queue")}</code></td></tr>
-            <tr><th>Queue check</th><td><code>${escapeHtml(queueProtocol?.evictionCheckName ?? "merge-steward/queue")}</code></td></tr>
-            <tr><th>Last queue signal</th><td><code>${escapeHtml(queueProtocol?.lastQueueSignalAt ?? queueProtocol?.lastFailureAt ?? "none")}</code></td></tr>
-            <tr><th>Last queue incident</th><td>${queueProtocol?.lastIncidentUrl
-        ? `<a href="${escapeHtml(queueProtocol.lastIncidentUrl)}" target="_blank" rel="noopener noreferrer">${escapeHtml(queueProtocol.lastIncidentId ?? queueProtocol.lastIncidentUrl)}</a>`
-        : escapeHtml(queueProtocol?.lastIncidentId ?? "none")}</td></tr>
-            <tr><th>Queue failure class</th><td><code>${escapeHtml(queueProtocol?.lastIncidentFailureClass ?? "unknown")}</code></td></tr>
-            <tr><th>Queue incident summary</th><td>${escapeHtml(queueProtocol?.lastIncidentSummary ?? "none")}</td></tr>
+            <tr><th>Waiting reason</th><td>${escapeHtml(waitingReason)}</td></tr>
+            <tr><th>Last wake</th><td><code>${escapeHtml(lastWakeReason)}</code></td></tr>
             <tr><th>Latest plan</th><td>${escapeHtml(latestPlan)}</td></tr>
             <tr><th>Active command</th><td><code>${escapeHtml(activeCommand)}</code></td></tr>
             <tr><th>Latest summary</th><td>${escapeHtml(latestAgentMessage)}</td></tr>
@@ -725,24 +581,7 @@ function renderAgentSessionStatusPage(params) {
         <span class="chip"><strong>File changes:</strong> ${escapeHtml(String(fileChangeCount))}</span>
         <span class="chip"><strong>Tool calls:</strong> ${escapeHtml(String(toolCallCount))}</span>
         <span class="chip"><strong>CI repairs:</strong> ${escapeHtml(String(ciAttempts))}</span>
-        <span class="chip"><strong>Queue repairs:</strong> ${escapeHtml(String(queueAttempts))}</span>
-      </div>
-      <div class="section">
-        <h2>State Path</h2>
-        <div class="grid">
-          <div class="card">
-            <h3>Native Graph</h3>
-            ${graphHtml}
-          </div>
-          <div class="card">
-            <h3>Queue Observation</h3>
-            ${observationsHtml}
-          </div>
-        </div>
-        <div class="card" style="margin-top: 18px;">
-          <h3>Observed Path</h3>
-          ${pathHtml}
-        </div>
+        <span class="chip"><strong>Steward repairs:</strong> ${escapeHtml(String(queueAttempts))}</span>
       </div>
       <div class="section">
         <h2>Recent Stages</h2>
@@ -791,94 +630,3 @@ function formatStageRow(run) {
     const endedAt = run.endedAt ?? "-";
     return `<tr><td><code>${escapeHtml(runType)}</code></td><td>${escapeHtml(status)}</td><td><code>${escapeHtml(startedAt)}</code></td><td><code>${escapeHtml(endedAt)}</code></td></tr>`;
 }
-function normalizeFeedEvents(feedEvents) {
-    return (feedEvents ?? []).map((event, index) => ({
-        id: event.id ?? -(index + 1),
-        at: event.at,
-        level: event.level === "warn" || event.level === "error" ? event.level : "info",
-        kind: event.kind === "service"
-            || event.kind === "webhook"
-            || event.kind === "agent"
-            || event.kind === "comment"
-            || event.kind === "stage"
-            || event.kind === "turn"
-            || event.kind === "workflow"
-            || event.kind === "hook"
-            || event.kind === "github"
-            || event.kind === "linear"
-            ? event.kind
-            : "service",
-        summary: event.summary ?? "",
-        ...(event.detail ? { detail: event.detail } : {}),
-        ...(event.issueKey ? { issueKey: event.issueKey } : {}),
-        ...(event.projectId ? { projectId: event.projectId } : {}),
-        ...(event.stage ? { stage: event.stage } : {}),
-        ...(event.status ? { status: event.status } : {}),
-        ...(event.workflowId ? { workflowId: event.workflowId } : {}),
-        ...(event.nextStage ? { nextStage: event.nextStage } : {}),
-    }));
-}
-function buildPublicStateHistory(params) {
-    const runs = params.runs.flatMap((entry, index) => {
-        if (!entry.run?.runType || !entry.run?.status || !entry.run?.startedAt) {
-            return [];
-        }
-        return [{
-                id: entry.run.id ?? index + 1,
-                runType: entry.run.runType,
-                status: entry.run.status,
-                startedAt: entry.run.startedAt,
-                endedAt: entry.run.endedAt,
-                ...(entry.report ? {
-                    report: {
-                        runType: entry.run.runType,
-                        status: entry.run.status,
-                        prompt: "",
-                        assistantMessages: entry.report.assistantMessages ?? [],
-                        plans: [],
-                        reasoning: [],
-                        commands: (entry.report.commands ?? []),
-                        fileChanges: (entry.report.fileChanges ?? []),
-                        toolCalls: [],
-                        eventCounts: {},
-                    },
-                } : {}),
-            }];
-    });
-    return buildStateHistory(runs, normalizeFeedEvents(params.feedEvents), params.currentFactoryState, params.activeRunId);
-}
-function renderStateGraph(main, prLoops, queueLoop, exits) {
-    return [
-        renderGraphRow("main", main, true),
-        renderGraphRow("pr loops", prLoops, false),
-        renderGraphRow("queue loop", queueLoop, false),
-        renderGraphRow("exits", exits, false),
-    ].join("");
-}
-function renderGraphRow(label, nodes, withConnectors) {
-    const items = nodes.map((node, index) => {
-        const connector = withConnectors && index > 0 ? '<span class="graph-connector">→</span>' : "";
-        return `${connector}<span class="node ${escapeHtml(node.status)}">${escapeHtml(node.label)}</span>`;
-    }).join("");
-    return `<div class="graph-row"><strong>${escapeHtml(label)}:</strong> ${items}</div>`;
-}
-function renderObservationList(observations) {
-    if (observations.length === 0) {
-        return '<p>No queue observation is available yet.</p>';
-    }
-    return `<ul class="observation-list">${observations.map((observation) => `<li class="tone-${escapeHtml(observation.tone)}">${escapeHtml(observation.text)}</li>`).join("")}</ul>`;
-}
-function renderStatePath(history, currentFactoryState) {
-    if (history.length === 0) {
-        return `<p>Current native state: <code>${escapeHtml(currentFactoryState)}</code>.</p>`;
-    }
-    const items = [];
-    for (const node of history) {
-        items.push(`<li><code>${escapeHtml(node.state)}</code>${node.reason ? ` — ${escapeHtml(node.reason)}` : ""}${node.isCurrent ? " (current)" : ""}</li>`);
-        for (const trip of node.sideTrips) {
-            const returnText = trip.returnState ? ` → ${trip.returnedAt ? escapeHtml(trip.returnState) : escapeHtml(trip.returnState)}` : "";
-            items.push(`<li><code>${escapeHtml(trip.state)}</code> side trip${trip.reason ? ` — ${escapeHtml(trip.reason)}` : ""}${returnText ? ` ${returnText}` : ""}</li>`);
-        }
-    }
-    return `<ul class="path-list">${items.join("")}</ul>`;
-}