@coreplane/switchboard 1.256.0 → 1.258.0

package/dist/assets/src/core/coordinator/contract.ts

@@ -233,6 +233,26 @@ export interface ChecksSettledPayload {
   settledAt: number;
 }
 
+/** The event the merge watch sends a waiting unit when its pull request
+ *  merged, whoever merged (record 0071, mechanism three): the unit ends
+ *  `merged` by other. The type names the unit within the instance, the
+ *  nudge's alphabet and clip rule. */
+export const PULL_MERGED_EVENT_PREFIX = "pr-merged-";
+export function pullMergedEventType(key: { instanceId: string; unit: string }): string {
+  const suffix = `-${key.unit}`;
+  const room = 100 - PULL_MERGED_EVENT_PREFIX.length - suffix.length;
+  return `${PULL_MERGED_EVENT_PREFIX}${key.instanceId.slice(0, room)}${suffix}`;
+}
+
+/** What the merged event carries — the pull request and the merge's facts;
+ *  the waiting unit confirms through its own pr-check before it acts. */
+export interface PullMergedPayload {
+  repo: string;
+  number: number;
+  sha: string;
+  mergedAt: string;
+}
+
 /** What the event carries — ids, a status and a clock; the parent confirms
  *  through `read-record` before it acts, so nothing more rides here. */
 export interface RunFinishedPayload {
@@ -379,17 +399,17 @@ export interface UnitIdle {
   wakes: number;
 }
 
-/** One unit of the plan an instance runs (a task string is a generated plan of
- *  one unit, `U1`): its branch, the units it waits on, and — as the runner
- *  reaches it — its thread, its pull request, the round boundaries the card
- *  drew and how it ended. One row a person can read for "what happened to this
- *  unit". */
 /** What the severity gate caught on a round: the level in force and the gated findings as `id (severity)`. */
 export interface RoundGate {
   level: AddressSeverity;
   findings: string[];
 }
 
+/** One unit of the plan an instance runs (a task string is a generated plan of
+ *  one unit, `U1`): its branch, the units it waits on, and — as the runner
+ *  reaches it — its thread, its pull request, the round boundaries the card
+ *  drew and how it ended. One row a person can read for "what happened to this
+ *  unit". */
 export interface CoordinatorUnit {
   instanceId: string;
   /** `U<n>` as the plan spells it. */
@@ -606,6 +626,26 @@ export async function sendChecksSettled(
   }
 }
 
+/** The one send per merged fact the watch observed (record 0071): best effort
+ *  like `sendRunFinished` — a refusal is answered, never thrown; the waiting
+ *  unit's bounded wait re-asks its own pr-check on its next chunk. */
+export async function sendPullMerged(
+  workflow: WorkflowSender | undefined,
+  key: { instanceId: string; unit: string },
+  payload: PullMergedPayload,
+): Promise<RunFinishedSend> {
+  const instance = key.instanceId;
+  if (!workflow) return { kind: "no-binding", instance };
+  const type = pullMergedEventType(key);
+  try {
+    const handle = await workflow.get(instance);
+    await handle.sendEvent({ type, payload });
+    return { kind: "sent", instance, type };
+  } catch (err) {
+    return { kind: "failed", instance, type, reason: err instanceof Error ? err.message : String(err) };
+  }
+}
+
 /** One deploy-roll signal to the child's parent (run-history item 47a): best
  *  effort like `sendRunFinished` — a refusal is answered, never thrown; a lost
  *  send costs the wait a chunk, never the round. */

package/dist/assets/src/core/coordinator/driver.ts

@@ -61,7 +61,7 @@ import {
   type UnitEnding,
   type UnitPipelineState,
   stepPrefixOf,
-  type UnitSession,
+  type LeaseSegmentProgress,
 } from "../ship/coordinator.js";
 import {
   checksSettledEventType,
@@ -451,12 +451,15 @@ function prCheckReturn(step: string, a: BotAnswer): StepReturn {
  *  ask's answer carries `retried` instead: whether the re-run was dispatched,
  *  so the machine never waits on a head an undispatched re-run left unchanged. */
 function checksReturn(step: string, a: BotAnswer): StepReturn {
-  const { ok, checks, retried, at } = a.body;
+  const { ok, checks, draft, retried, at } = a.body;
   if (ok !== true) throw new UnreadableAnswer("checks", a, "ok");
   return {
     type: "checks",
     step,
     ...(isRoundChecks(checks) ? { checks } : {}),
+    // The pull request is a draft (issue 2063): the machine's table holds the
+    // unit for the ready event instead of merging or ending without a cause.
+    ...(draft === true ? { draft: true } : {}),
     ...(typeof retried === "boolean" ? { retried } : {}),
     at,
   };
@@ -691,7 +694,7 @@ async function runUnit(
   instanceId: string,
   node: PlanUnitNode,
   plan: PlanFacts,
-  session?: UnitSession,
+  session?: LeaseSegmentProgress,
 ): Promise<UnitEnding> {
   const unit = node.id;
   // A renewal's segment names its steps under the segment (`U10/s2/…`), so

package/dist/assets/src/core/delivery.ts

@@ -186,7 +186,10 @@ export interface WeekRow extends DeliveryIndicators {
   prs: number[];
 }
 
-export interface UnitRow extends DeliveryIndicators {
+/** One row per board issue the pull requests link — the report's "Issues:"
+ *  block and the Delivery page's table. The JSON field stays `units` (a served
+ *  shape older readers hold); only the words are the issue's. */
+export interface IssueRow extends DeliveryIndicators {
   /** The board issue, or null for the pull requests no issue claims. */
   issue: number | null;
   title: string;
@@ -198,7 +201,7 @@ export interface DeliveryReport {
   repo: string;
   range: DeliveryRange;
   weeks: WeekRow[];
-  units: UnitRow[];
+  units: IssueRow[];
   prs: PullRequestRow[];
   totals: DeliveryIndicators;
   identities: DeliveryIdentities;
@@ -448,7 +451,7 @@ export function buildDeliveryReport(input: DeliveryInput): DeliveryReport {
     const key = p.issue?.number ?? null;
     byIssue.set(key, [...(byIssue.get(key) ?? []), p]);
   }
-  const units: UnitRow[] = [...byIssue.entries()]
+  const units: IssueRow[] = [...byIssue.entries()]
     .sort(([a], [b]) => (a === null ? 1 : b === null ? -1 : a - b))
     .map(([issue, rows]) => {
       const first = rows.find((r) => r.issue !== undefined)?.issue;
@@ -572,7 +575,7 @@ function coverage(report: DeliveryReport): string {
   return `the newest ${report.totals.prsMerged} pull requests only${from}`;
 }
 
-/** One block per week, then the units — single-spaced lines, so chat carries them as they are. */
+/** One block per week, then the issues — single-spaced lines, so chat carries them as they are. */
 export function renderDeliveryReport(report: DeliveryReport, nowMs: number = systemClock()): string {
   const lines: string[] = [
     [
@@ -597,7 +600,7 @@ export function renderDeliveryReport(report: DeliveryReport, nowMs: number = sys
     );
   }
   if (report.units.length > 0) {
-    lines.push("", "Units:");
+    lines.push("", "Issues:");
     for (const u of report.units) {
       const prs = `${u.prs.length === 1 ? "PR" : "PRs"} ${u.prs.join(", ")}`;
       const who = u.issue === null ? "(no issue)" : `${u.issue} ${u.title}`;

package/dist/assets/src/core/pipelineStanding.ts

@@ -99,6 +99,7 @@ export const ROUND_STAGE = {
   dequeued: "fix",
   aborted: "hold",
   stopped: "hold",
+  held: "hold",
   continued: "continue",
   idle: "idle",
 } as const satisfies Record<ShipRoundOutcome, Stage | "start" | "continue" | "hold">;
@@ -171,6 +172,7 @@ export const ROUND_OUTCOME_WORDS = {
   dequeued: "removed from the merge queue",
   aborted: "aborted",
   stopped: "stopped",
+  held: "held",
   continued: "continuing",
   idle: "idle",
 } as const satisfies Record<ShipRoundOutcome, string>;