@intentius/chant 0.124.34 → 0.124.36

package/dist/workspace/ci-serve.d.ts

@@ -5,10 +5,13 @@
  * {@link ciRun} (./ci-run.ts): `plan` for each new pull request head, and
  * `record` for each new commit on the target branch (#4168), measured from
  * the head the previous poll saw (the push's `before`). The record applies
- * nothing; with `applyOnMerge` (`--apply-on-merge`) the commit gets `apply`
- * in its place, as before #4168. After each job settles it runs `ci tick`
- * from the runs the jobs recorded, when the declaration has `ci.green`.
- * What the list below says of the apply holds for it under `applyOnMerge`.
+ * nothing. With `applyOnMerge` (`--apply-on-merge`) the newest green commit
+ * of the branch, once no apply ran for it, gets `apply`: `pr-apply --green`
+ * at that commit, measured from the one last applied (#4168 step 9). After
+ * each job settles it runs `ci tick` from the runs the jobs recorded, when
+ * the declaration has `ci.green`, so a green commit follows the record that
+ * made its runs. What the list below says of the apply holds for it under
+ * `applyOnMerge`.
  *
  * - Dedupe. A state file in the state directory keeps every job it started,
  *   keyed by job and commit (`plan:<pr>:<sha>`, `record:<sha>`, `apply:<sha>`), with how it
@@ -19,10 +22,11 @@
  *   the one `chant operator` holds) named for `prApplyGroup`, renews it while
  *   it runs and releases it after. An apply that finds it held waits for a
  *   later poll, as a forge's concurrency group queues it.
- * - Merged pull request. An apply asks the forge for the pull request whose
- *   merge commit the new head is (`pullRequestFor`, as pr-apply does) and
+ * - Merged pull request. A record asks the forge for the pull request whose
+ *   merge commit the new head is (`pullRequestFor`, as pr-record does) and
  *   passes it as `--pr`, so its commit status link and run index use
- *   `<pr>/<commit>`. With none found it runs without `--pr`.
+ *   `<pr>/<commit>`. With none found it runs without `--pr`. An apply covers
+ *   every merge since the last applied green commit, so it passes none.
  * - Resume records. Each apply gets `<state>/resume/<prApplyRecordKey>.json`
  *   as its `--resume` record, so a re-run of a failed apply at the same
  *   commit finishes under the approval it has. This replaces the forge's CI
@@ -56,6 +60,24 @@
  *   forge's keeps its facts, and the job's push sends them. Nothing here
  *   pushes the ledger.
  *
+ * - Land branches (#4168 4.4). With `land`, each `chant/land/<name>` branch
+ *   pushed to the remote is a change asking to land without a pull request.
+ *   A head that does not descend from the target's is refused and left for
+ *   its author to rebase. Otherwise `buildCommand` runs on it with
+ *   `CHANT_BUILD_PHASES` set to `ci.green.preMerge` and `CHANT_BUILD_REASON`
+ *   `land`, and the phases are judged from the Op run records on its head
+ *   ({@link judgePreMerge}). When the command exits 0 and every phase
+ *   passes, the target is pushed to the head, a fast-forward the remote
+ *   refuses if the target moved, and the land branch is deleted. The next
+ *   poll sees the new head and runs the record job, whose merge record
+ *   names a work item or a direct push. A refused land stays in the state
+ *   file under `land:<name>:<sha>`, so a new push to the branch is tried
+ *   again and the same head is not.
+ * - The `git` forge kind (#4016 gap 6). With `forge: "git"` the serve reads
+ *   only refs, through `git ls-remote` against `origin`, so any git server
+ *   that takes pushes will do. It lists no pull requests and sets no commit
+ *   status, and the jobs run without `--forge`.
+ *
  * Host mode only: each job runs in a fresh worktree on this host as this
  * user, with the clean environment `ciRun` gives it. A pull request from a
  * fork is never planned, and with `authors` only those people's pull requests
@@ -65,12 +87,13 @@
  * {@link ciServeObserve} is the poll that makes them; a webhook handler would
  * turn a checked payload into the same triggers and schedule them.
  */
-import { type BuildRequest } from "./ci-builds.js";
+import { type BuildRequestReason } from "./ci-builds.js";
 import { type OpenPullRequest } from "../pr-forge.js";
 import type { CommandContext } from "../cli/registry.js";
 import { type CiJobName, type CiRunRequest, type CiRunResult } from "./ci-run.js";
-/** The forges `ci serve` polls. GitLab is later. */
-export type CiServeForgeKind = "github" | "forgejo";
+import { type CommitVerdict } from "./ci-green.js";
+/** The forges `ci serve` polls. GitLab is later. `git` is any git server, read through refs alone (#4016 gap 6). */
+export type CiServeForgeKind = "github" | "forgejo" | "git";
 /** What `ci serve` reads from the forge: the two calls GitHub's and Forgejo's clients have (../pr-forge.ts). */
 export interface CiServeForge {
     openPullRequests(base: string): Promise<OpenPullRequest[]>;
@@ -80,8 +103,8 @@ export interface CiServeForge {
 }
 /**
  * A job the forge's state calls for: the plan of a pull request's head, or
- * for a target-branch commit its record (#4168) or, with `applyOnMerge`,
- * its apply.
+ * for a target-branch commit its record (#4168), or with `applyOnMerge` the
+ * apply of the newest green commit (#4168 step 9).
  */
 export type CiServeTrigger = {
     job: "plan";
@@ -95,6 +118,30 @@ export type CiServeTrigger = {
     base: string;
     rerun?: boolean;
 };
+/**
+ * The `git` forge kind (#4016 gap 6): the branch head from `git ls-remote`
+ * against `remote`, and no pull requests. A remote that can't be reached is
+ * an error for the pass, as a forge API's would be.
+ */
+export declare function gitCiServeForge(top: string, remote?: string): CiServeForge;
+/** What a build runs: a `ci/build/<sha>` request (#4169), or a land branch's pre-merge phases (#4168 4.4). */
+export interface CiServeBuildInput {
+    commit: string;
+    phases: string[];
+    reason: BuildRequestReason | "land";
+}
+/** Where pushed land branches live on the remote (#4168 4.4). */
+export declare const LAND_BRANCH_PREFIX = "chant/land/";
+/** One land branch head in the state file, by `land:<name>:<sha>`. */
+export interface CiServeLandState {
+    branch: string;
+    commit: string;
+    status: "running" | "landed" | "refused";
+    /** Why it was refused, in a line. */
+    reason?: string;
+    startedAt: string;
+    settledAt?: string;
+}
 /** One job in the state file. */
 export interface CiServeJobState {
     job: CiJobName;
@@ -132,6 +179,8 @@ export interface CiServeState {
         startedAt: string;
         settledAt?: string;
     }>;
+    /** The land branch heads seen (#4168 4.4), by `land:<name>:<sha>`. */
+    lands?: Record<string, CiServeLandState>;
 }
 /** What a pass did, in order, for the log. */
 export type CiServeEvent = {
@@ -189,6 +238,15 @@ export type CiServeEvent = {
     status: "started" | "ok" | "fail" | "held";
     exitCode?: number;
 }
+/** A land branch (#4168 4.4): its pre-merge phases started, the target moved to it, or it was refused and left. */
+ | {
+    type: "land";
+    branch: string;
+    commit: string;
+    status: "started" | "landed" | "refused" | "held";
+    reason?: string;
+    warning?: string;
+}
 /** `ci tick` after the pass (#4168): the tags it made from the runs. */
  | {
     type: "tick";
@@ -244,9 +302,21 @@ export interface CiServeOptions {
     /** Runs a build. Default: `sh -c <buildCommand>` in a detached worktree of the commit. */
     build?: (input: {
         top: string;
-        request: BuildRequest;
+        request: CiServeBuildInput;
         command: string;
     }) => Promise<number>;
+    /**
+     * Land `chant/land/<name>` branches (#4168 4.4): the `ci.green.preMerge`
+     * phases each must pass first. Needs `buildCommand`, which runs them.
+     */
+    land?: {
+        phases: string[];
+    };
+    /** Judges a land head's phases. Default {@link judgePreMerge} from the Op run records. */
+    judgeLand?: (input: {
+        commit: string;
+        base: string;
+    }) => Promise<CommitVerdict>;
 }
 /** The jobs this process runs now, by state key, shared by every pass of one loop. */
 export interface CiServeRuntime {
@@ -321,6 +391,17 @@ export declare function ciServeBuilds(opts: CiServeOptions, rt: CiServeRuntime):
     started: Promise<void>[];
     events: CiServeEvent[];
 };
+/**
+ * Serve the land branches (#4168 4.4): for each `chant/land/<name>` head not
+ * in the state file, refuse it unless it descends from the target's head,
+ * else run `buildCommand` on it with the pre-merge phases, judge them, and
+ * when they pass push the target to it and delete the branch. At most
+ * `maxJobs` builds and jobs run at once.
+ */
+export declare function ciServeLands(opts: CiServeOptions, rt: CiServeRuntime): Promise<{
+    started: Promise<void>[];
+    events: CiServeEvent[];
+}>;
 /**
  * The loop: a pass every `intervalMs` until `signal` aborts, jobs running
  * across passes up to `maxJobs`. A pass the forge fails is logged and the

package/dist/workspace/ci-serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ci-serve.d.ts","sourceRoot":"","sources":["../../src/workspace/ci-serve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ci-serve.d.ts","sourceRoot":"","sources":["../../src/workspace/ci-serve.ts"],"names":[],"mappings":"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"}

package/dist/workspace/ci-serve.js

@@ -5,10 +5,13 @@
  * {@link ciRun} (./ci-run.ts): `plan` for each new pull request head, and
  * `record` for each new commit on the target branch (#4168), measured from
  * the head the previous poll saw (the push's `before`). The record applies
- * nothing; with `applyOnMerge` (`--apply-on-merge`) the commit gets `apply`
- * in its place, as before #4168. After each job settles it runs `ci tick`
- * from the runs the jobs recorded, when the declaration has `ci.green`.
- * What the list below says of the apply holds for it under `applyOnMerge`.
+ * nothing. With `applyOnMerge` (`--apply-on-merge`) the newest green commit
+ * of the branch, once no apply ran for it, gets `apply`: `pr-apply --green`
+ * at that commit, measured from the one last applied (#4168 step 9). After
+ * each job settles it runs `ci tick` from the runs the jobs recorded, when
+ * the declaration has `ci.green`, so a green commit follows the record that
+ * made its runs. What the list below says of the apply holds for it under
+ * `applyOnMerge`.
  *
  * - Dedupe. A state file in the state directory keeps every job it started,
  *   keyed by job and commit (`plan:<pr>:<sha>`, `record:<sha>`, `apply:<sha>`), with how it
@@ -19,10 +22,11 @@
  *   the one `chant operator` holds) named for `prApplyGroup`, renews it while
  *   it runs and releases it after. An apply that finds it held waits for a
  *   later poll, as a forge's concurrency group queues it.
- * - Merged pull request. An apply asks the forge for the pull request whose
- *   merge commit the new head is (`pullRequestFor`, as pr-apply does) and
+ * - Merged pull request. A record asks the forge for the pull request whose
+ *   merge commit the new head is (`pullRequestFor`, as pr-record does) and
  *   passes it as `--pr`, so its commit status link and run index use
- *   `<pr>/<commit>`. With none found it runs without `--pr`.
+ *   `<pr>/<commit>`. With none found it runs without `--pr`. An apply covers
+ *   every merge since the last applied green commit, so it passes none.
  * - Resume records. Each apply gets `<state>/resume/<prApplyRecordKey>.json`
  *   as its `--resume` record, so a re-run of a failed apply at the same
  *   commit finishes under the approval it has. This replaces the forge's CI
@@ -56,6 +60,24 @@
  *   forge's keeps its facts, and the job's push sends them. Nothing here
  *   pushes the ledger.
  *
+ * - Land branches (#4168 4.4). With `land`, each `chant/land/<name>` branch
+ *   pushed to the remote is a change asking to land without a pull request.
+ *   A head that does not descend from the target's is refused and left for
+ *   its author to rebase. Otherwise `buildCommand` runs on it with
+ *   `CHANT_BUILD_PHASES` set to `ci.green.preMerge` and `CHANT_BUILD_REASON`
+ *   `land`, and the phases are judged from the Op run records on its head
+ *   ({@link judgePreMerge}). When the command exits 0 and every phase
+ *   passes, the target is pushed to the head, a fast-forward the remote
+ *   refuses if the target moved, and the land branch is deleted. The next
+ *   poll sees the new head and runs the record job, whose merge record
+ *   names a work item or a direct push. A refused land stays in the state
+ *   file under `land:<name>:<sha>`, so a new push to the branch is tried
+ *   again and the same head is not.
+ * - The `git` forge kind (#4016 gap 6). With `forge: "git"` the serve reads
+ *   only refs, through `git ls-remote` against `origin`, so any git server
+ *   that takes pushes will do. It lists no pull requests and sets no commit
+ *   status, and the jobs run without `--forge`.
+ *
  * Host mode only: each job runs in a fresh worktree on this host as this
  * user, with the clean environment `ciRun` gives it. A pull request from a
  * fork is never planned, and with `authors` only those people's pull requests
@@ -77,9 +99,31 @@ import { acquireLease, currentHolderId, releaseLease, DEFAULT_LEASE_TTL_MS } fro
 import { parseDuration } from "../op/duration.js";
 import { reportUrlOf } from "./ci-report-url.js";
 import { CI_JOB_OPS, ciJobPlace, ciLoopOptions, ciSecretsOf, ciRun, ciStatusFromEnv, CiRunError } from "./ci-run.js";
-import { CiGreenError, ciTick, RUNNER_KEY_ENV, signedRunsRequired } from "./ci-green.js";
+import { CiGreenError, ciTick, judgePreMerge, lastGreen, RUNNER_KEY_ENV, signedRunsRequired } from "./ci-green.js";
 import { gitTop } from "./tree.js";
+import { readDeclaration } from "./declaration.js";
+import { locateWorkspace } from "./which-chant.js";
 import { ciServeRunnerKey, formatRunnerKeySetup, setupRunnerKey } from "./ci-runner-key.js";
+/**
+ * The `git` forge kind (#4016 gap 6): the branch head from `git ls-remote`
+ * against `remote`, and no pull requests. A remote that can't be reached is
+ * an error for the pass, as a forge API's would be.
+ */
+export function gitCiServeForge(top, remote = "origin") {
+    return {
+        openPullRequests: async () => [],
+        async branchHead(branch) {
+            const r = gitStatus(top, ["ls-remote", "--exit-code", remote, `refs/heads/${branch}`]);
+            if (r.code === 2)
+                return undefined;
+            if (r.code !== 0)
+                throw new CiRunError(`git ls-remote ${remote} could not read refs/heads/${branch}`);
+            return r.out.split(/\s+/)[0] || undefined;
+        },
+    };
+}
+/** Where pushed land branches live on the remote (#4168 4.4). */
+export const LAND_BRANCH_PREFIX = "chant/land/";
 export const newCiServeRuntime = () => ({ inflight: new Map() });
 /** The state key of a job. */
 export function ciServeKey(t) {
@@ -224,8 +268,8 @@ export async function ciServeObserve(opts, rt = newCiServeRuntime()) {
     const triggers = [];
     const events = [];
     const [head, prs] = await Promise.all([opts.client.branchHead(place.branch), opts.client.openPullRequests(place.branch)]);
-    // #4168: a new target commit is recorded, and applied only with applyOnMerge.
-    const onMerge = opts.applyOnMerge ? "apply" : "record";
+    // #4168: a new target commit is recorded. With applyOnMerge the newest green commit is applied, below.
+    const onMerge = "record";
     if (head === undefined) {
         events.push({ type: "no-branch", branch: place.branch });
     }
@@ -261,6 +305,17 @@ export async function ciServeObserve(opts, rt = newCiServeRuntime()) {
         if (opts.rerunFailed && failedEntry(entry, key, rt))
             triggers.push({ job: onMerge, commit: head, base: entry.base, rerun: true });
     }
+    if (opts.applyOnMerge && head !== undefined) {
+        const green = newestGreen(place.top, opts.cwd, place.branch);
+        if (green) {
+            const key = ciServeKey({ job: "apply", commit: green });
+            const entry = state.jobs[key];
+            if (!entry)
+                triggers.push({ job: "apply", commit: green, base: green });
+            else if (opts.rerunFailed && failedEntry(entry, key, rt))
+                triggers.push({ job: "apply", commit: green, base: entry.base, rerun: true });
+        }
+    }
     const authors = opts.authors?.length ? new Set(opts.authors.map((a) => a.toLowerCase())) : undefined;
     for (const pr of prs) {
         if (pr.fork) {
@@ -358,7 +413,7 @@ export async function ciServeSchedule(opts, triggers, rt = newCiServeRuntime())
         const entry = { job: t.job, commit: t.commit, base: t.base, ...pr, status: "running", runId, attempts: attempt, startedAt: now().toISOString() };
         update((s) => {
             s.jobs[key] = entry;
-            if (t.job !== "plan" && !t.rerun)
+            if (t.job === "record" && !t.rerun)
                 s.target = t.commit;
         });
         emit({ type: "started", job: t.job, commit: t.commit, ...pr, base: t.base, runId, attempt, ...(resume && existsSync(resume) ? { resume } : {}) });
@@ -395,7 +450,7 @@ async function runJob(opts, place, t, paths, held) {
         tryGit(place.top, ["fetch", "--quiet", "--no-tags", "origin", t.job === "plan" ? `refs/pull/${t.pr}/head` : place.branch]);
         const hostEnv = { ...(opts.job?.hostEnv ?? process.env), GITHUB_REPOSITORY: opts.repo };
         // An apply is for a merge: pass the pull request whose merge commit it is, so the commit status link and the run index use `<pr>/<commit>`. None found, or a forge that errs, is today's behaviour.
-        if (t.job !== "plan" && opts.client.pullRequestFor)
+        if (t.job === "record" && opts.client.pullRequestFor)
             merged = (await opts.client.pullRequestFor(t.commit).catch(() => null)) ?? undefined;
         const run = opts.run ?? ciRun;
         const r = await run({
@@ -404,7 +459,8 @@ async function runJob(opts, place, t, paths, held) {
             cwd: opts.cwd,
             job: t.job,
             env: opts.env,
-            forge: opts.forge,
+            // #4016 gap 6: a plain git server has no API, so the job runs without --forge, shaped as a GitHub job.
+            ...(opts.forge === "git" ? { forge: "github", noForge: true } : { forge: opts.forge }),
             base: t.base,
             ...(t.job === "plan" ? { pr: t.pr } : merged !== undefined ? { pr: merged } : {}),
             commit: t.commit,
@@ -425,6 +481,21 @@ async function runJob(opts, place, t, paths, held) {
             await releaseLease(place.group, held.holder, held.lease.token, { cwd: opts.cwd }).catch(() => false);
     }
 }
+/**
+ * The newest green commit of the target branch (#4168 step 9), after
+ * fetching the ci tags, or undefined when none is green or the workspace
+ * declares no `ci.green`.
+ */
+function newestGreen(top, cwd, branch) {
+    tryGit(top, ["fetch", "--quiet", "origin", `+refs/heads/${branch}:refs/remotes/origin/${branch}`, "+refs/tags/ci/*:refs/tags/ci/*"]);
+    try {
+        const doc = lastGreen({ cwd });
+        return "commit" in doc && doc.commit ? doc.commit.sha : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** One pass: observe, schedule, serve build requests, and with `wait` wait for the jobs it started. */
 export async function ciServePass(opts, rt = newCiServeRuntime(), wait = true) {
     const observed = await ciServeObserve(opts, rt);
@@ -432,10 +503,11 @@ export async function ciServePass(opts, rt = newCiServeRuntime(), wait = true) {
         opts.log?.(e);
     const scheduled = await ciServeSchedule(opts, observed.triggers, rt);
     const builds = opts.buildCommand ? ciServeBuilds(opts, rt) : { started: [], events: [] };
+    const lands = opts.land && opts.buildCommand ? await ciServeLands(opts, rt) : { started: [], events: [] };
     const jobs = wait ? await Promise.all(scheduled.started) : [];
     if (wait)
-        await Promise.all(builds.started);
-    return { events: [...observed.events, ...scheduled.events, ...builds.events], jobs };
+        await Promise.all([...builds.started, ...lands.started]);
+    return { events: [...observed.events, ...scheduled.events, ...builds.events, ...lands.events], jobs };
 }
 /**
  * Serve the build requests (#4169): fetch the `ci/build/*` tags, and start
@@ -489,6 +561,110 @@ export function ciServeBuilds(opts, rt) {
     }
     return { started, events };
 }
+/** The land branches on `origin`, by name, with their heads (#4168 4.4). */
+function landBranches(top) {
+    const r = gitStatus(top, ["ls-remote", "origin", `refs/heads/${LAND_BRANCH_PREFIX}*`]);
+    if (r.code !== 0)
+        return [];
+    return r.out
+        .split("\n")
+        .map((line) => line.split(/\s+/))
+        .filter(([sha, ref]) => sha && ref?.startsWith(`refs/heads/${LAND_BRANCH_PREFIX}`))
+        .map(([head, ref]) => ({ name: ref.slice(`refs/heads/${LAND_BRANCH_PREFIX}`.length), head: head }))
+        .sort((a, b) => a.name.localeCompare(b.name));
+}
+/** Why a land's phases don't let it land, or undefined when every one passed. */
+function landRefusal(verdict) {
+    if (verdict.verdict === "pass")
+        return undefined;
+    const failed = verdict.phases.filter((p) => p.verdict === "fail").map((p) => p.phase);
+    if (failed.length > 0)
+        return `the pre-merge phase${failed.length > 1 ? "s" : ""} ${failed.join(", ")} failed`;
+    const open = verdict.phases.filter((p) => p.verdict !== "pass").map((p) => p.phase);
+    return `the build recorded no finished run for ${open.join(", ")}`;
+}
+/**
+ * Serve the land branches (#4168 4.4): for each `chant/land/<name>` head not
+ * in the state file, refuse it unless it descends from the target's head,
+ * else run `buildCommand` on it with the pre-merge phases, judge them, and
+ * when they pass push the target to it and delete the branch. At most
+ * `maxJobs` builds and jobs run at once.
+ */
+export async function ciServeLands(opts, rt) {
+    const place = servePlace(opts);
+    const fresh = { forge: opts.forge, repo: opts.repo, env: opts.env, branch: place.branch, ...(place.member ? { member: place.member } : {}) };
+    const update = (fn) => {
+        const st = readCiServeState(place.stateFile, fresh);
+        fn(st);
+        writeState(place.stateFile, st);
+    };
+    const events = [];
+    const started = [];
+    const now = opts.now ?? (() => new Date());
+    const log = (e) => {
+        events.push(e);
+        opts.log?.(e);
+    };
+    const phases = opts.land.phases;
+    const seen = readCiServeState(place.stateFile, fresh).lands ?? {};
+    for (const { name, head } of landBranches(place.top)) {
+        const key = `land:${name}:${head}`;
+        const branch = `${LAND_BRANCH_PREFIX}${name}`;
+        if (seen[key] || rt.inflight.has(key))
+            continue;
+        if (rt.inflight.size >= (opts.maxJobs ?? 1)) {
+            log({ type: "land", branch, commit: head, status: "held", reason: "--max-jobs jobs run" });
+            continue;
+        }
+        const settle = (status, reason, warning) => {
+            update((st) => {
+                st.lands = { ...st.lands, [key]: { branch, commit: head, status, ...(reason ? { reason } : {}), startedAt: st.lands?.[key]?.startedAt ?? now().toISOString(), settledAt: now().toISOString() } };
+            });
+            log({ type: "land", branch, commit: head, status, ...(reason ? { reason } : {}), ...(warning ? { warning } : {}) });
+        };
+        const target = await opts.client.branchHead(place.branch);
+        if (target === undefined) {
+            log({ type: "error", message: `${branch} waits: the remote has no branch ${place.branch} to land it on` });
+            continue;
+        }
+        tryGit(place.top, ["fetch", "--quiet", "--no-tags", "origin", place.branch, `+refs/heads/${branch}:refs/chant/ci-serve/land/${name}`]);
+        // #4168 4.4: a land only ever fast-forwards the target, so its head must descend from the target's.
+        if (gitStatus(place.top, ["merge-base", "--is-ancestor", target, head]).code !== 0) {
+            settle("refused", `${head.slice(0, 12)} does not descend from ${place.branch} at ${target.slice(0, 12)}; rebase ${branch} onto it and push again`);
+            continue;
+        }
+        update((st) => {
+            st.lands = { ...st.lands, [key]: { branch, commit: head, status: "running", startedAt: now().toISOString() } };
+        });
+        log({ type: "land", branch, commit: head, status: "started" });
+        const build = opts.build ?? runBuild;
+        const judge = opts.judgeLand ?? ((input) => judgePreMerge({ cwd: opts.cwd, ...input }));
+        const job = (async () => {
+            const code = await build({ top: place.top, request: { commit: head, phases, reason: "land" }, command: opts.buildCommand }).catch(() => 1);
+            if (code !== 0)
+                return settle("refused", `the build of ${phases.join(", ")} exited ${code}`);
+            let refusal;
+            try {
+                refusal = landRefusal(await judge({ commit: head, base: target }));
+            }
+            catch (err) {
+                refusal = `the pre-merge phases could not be judged: ${message(err)}`;
+            }
+            if (refusal)
+                return settle("refused", refusal);
+            // A plain push: the remote refuses it unless it fast-forwards the target, so a target that moved meanwhile refuses the land.
+            const pushed = spawnSync("git", ["push", "--quiet", "origin", `${head}:refs/heads/${place.branch}`], { cwd: place.top, encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] });
+            if (pushed.status !== 0)
+                return settle("refused", `the push to ${place.branch} was refused: ${(pushed.stderr ?? "").trim().split("\n").pop() ?? ""}`);
+            const deleted = gitStatus(place.top, ["push", "--quiet", "origin", "--delete", `refs/heads/${branch}`]);
+            tryGit(place.top, ["update-ref", "-d", `refs/chant/ci-serve/land/${name}`]);
+            settle("landed", undefined, deleted.code === 0 ? undefined : `${branch} could not be deleted on the remote; delete it by hand`);
+        })().finally(() => rt.inflight.delete(key));
+        rt.inflight.set(key, job);
+        started.push(job);
+    }
+    return { started, events };
+}
 /** `sh -c <command>` in a fresh detached worktree of the request's commit, removed after. Resolves to the exit code. */
 async function runBuild(input) {
     const dir = mkdtempSync(join(tmpdir(), "chant-ci-build-"));
@@ -579,6 +755,16 @@ export function formatCiServeEvent(e) {
                 return `${what} waits: --max-jobs jobs run`;
             return e.status === "started" ? `${what} started` : e.status === "ok" ? `${what} passed` : `${what} failed${e.exitCode !== undefined ? ` with exit code ${e.exitCode}` : ""}`;
         }
+        case "land": {
+            const what = `${e.branch} at ${e.commit.slice(0, 12)}`;
+            if (e.status === "started")
+                return `${what}: the pre-merge phases started`;
+            if (e.status === "held")
+                return `${what} waits: ${e.reason ?? "--max-jobs jobs run"}`;
+            if (e.status === "refused")
+                return `${what} was refused and left on the remote: ${e.reason ?? "no reason given"}`;
+            return `${what} landed${e.warning ? `; ${e.warning}` : ", and the land branch was deleted"}`;
+        }
         case "tick":
             return e.made.length > 0 ? `ci tick made ${e.made.join(", ")}` : "ci tick: no tag due";
         case "error":
@@ -614,8 +800,8 @@ export function runnerKeySetupCommand(ctx) {
     return 0;
 }
 const USAGE = "chant ci serve --setup-key [--trust [--principal <name>]] [--state <dir>] [--branch <name>] | " +
-    "chant ci serve --forge forgejo|github --repo <owner/repo> --env <env> [--interval <s>] [--max-jobs <n>] [--state <dir>] " +
-    "[--author <login>]... [--once] [--rerun-failed] [--build-command <line>] [--gate <name>] [--wave-gate <name>] [--branch <name>] [--events-json] [--report-url <url>] [--no-status] [--status-url <url template>] " +
+    "chant ci serve --forge forgejo|github|git --repo <owner/repo> --env <env> [--interval <s>] [--max-jobs <n>] [--state <dir>] " +
+    "[--author <login>]... [--once] [--rerun-failed] [--build-command <line>] [--land] [--gate <name>] [--wave-gate <name>] [--branch <name>] [--events-json] [--report-url <url>] [--no-status] [--status-url <url template>] " +
     "[--image <image>] [--before-script <line>]... [--pr-build] [--pr-build-command <line>] [--chant <command>] [--pass-env <NAME>]... [--secrets <file>] [--key <runner key.pem>] [--unsigned]";
 const ENV_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
 /** `--interval`: seconds, or a duration such as `30s` or `2m`. Default 30 seconds. */
@@ -627,6 +813,19 @@ export function ciServeInterval(value) {
         throw new CiRunError(`--interval takes seconds or a duration of a second or more, not ${JSON.stringify(value)}`);
     return ms;
 }
+/** `ci.green.preMerge` where `cwd` is, for `--land` (#4168 4.4). Throws when the declaration names none. */
+function preMergeOf(cwd) {
+    let pre;
+    try {
+        pre = readDeclaration(locateWorkspace(cwd).tree).ci?.green?.preMerge;
+    }
+    catch (err) {
+        throw new CiRunError(`--land reads ci.green.preMerge from the workspace declaration, which could not be read: ${message(err)}`);
+    }
+    if (!pre || pre.length === 0)
+        throw new CiRunError("--land runs the ci.green.preMerge phases on each land branch, and the declaration names none; add them to ci.green");
+    return pre;
+}
 /** `chant ci serve` (#4095). */
 export async function runCiServe(ctx) {
     const { args } = ctx;
@@ -634,10 +833,14 @@ export async function runCiServe(ctx) {
         if (args.setupKey)
             return runnerKeySetupCommand(ctx);
         const forge = args.forge;
-        if (forge !== "forgejo" && forge !== "github")
-            throw new CiRunError(`--forge names the forge ci serve polls: --forge forgejo|github${forge ? `, not ${JSON.stringify(forge)}` : ""}`);
-        if (!args.ciRepo)
+        if (forge !== "forgejo" && forge !== "github" && forge !== "git")
+            throw new CiRunError(`--forge names the forge ci serve polls: --forge forgejo|github|git${forge ? `, not ${JSON.stringify(forge)}` : ""}`);
+        // #4016 gap 6: a plain git server has no repository name to ask an API for, so --repo only labels the state file.
+        if (!args.ciRepo && forge !== "git")
             throw new CiRunError("--repo names the repository whose pull requests ci serve polls: --repo <owner/repo>");
+        // #4168 4.4: landing runs the pre-merge phases through the build command.
+        if (args.ciLand && !args.ciBuildCommand)
+            throw new CiRunError("--land runs each land branch's pre-merge phases with --build-command, so it needs one: --build-command '<line>'");
         if (!args.env)
             throw new CiRunError("--env names the environment the pipeline is for: --env <env>");
         for (const name of args.passEnv ?? [])
@@ -653,6 +856,8 @@ export async function runCiServe(ctx) {
             throw new CiRunError("ci serve runs in a clone of the repository it serves, and this directory is not in a git repository");
         const stateDir = args.statePath ? resolve(args.statePath) : defaultCiServeStateDir(cwd);
         const branch = args.branch ?? "main";
+        const repo = args.ciRepo ?? (tryGit(top, ["remote", "get-url", "origin"]) || "origin");
+        const landPhases = args.ciLand ? preMergeOf(cwd) : undefined;
         // #4099: the host's key, checked against .chant/trust.json at the target's head before the first poll.
         // #4156: signing is opt-in. Without ci.green.signedSince no key is quiet, and an untrusted one warns once and serves unsigned.
         const keyed = ciServeRunnerKey({
@@ -678,28 +883,41 @@ export async function runCiServe(ctx) {
         const reportUrl = await reportUrlOf(args.reportUrl, cwd);
         if (reportUrl && !args.reportUrl)
             console.error(`ci serve: reports and the run index go to ${reportUrl}, the declaration's ci.reportUrl`);
-        const hostEnv = { ...process.env, GITHUB_REPOSITORY: args.ciRepo };
-        const client = forgeFromEnv(forge, hostEnv);
-        const { status, warning } = ciStatusFromEnv({ forge, hostEnv, noStatus: args.noStatus, statusUrl: args.statusUrl });
-        if (warning)
-            console.error(formatWarning({ message: warning }));
-        if (!client.openPullRequests || !client.branchHead)
-            throw new CiRunError(`the ${forge} client cannot list pull requests`);
+        const hostEnv = { ...process.env, GITHUB_REPOSITORY: repo };
+        let client;
+        let status;
+        if (forge === "git") {
+            // #4016 gap 6: refs only, and no commit status to set.
+            client = gitCiServeForge(top);
+            if (!args.noStatus)
+                console.error(formatWarning({ message: "the git forge kind has no API, so no commit status is set; each job's result is in the state file and its report" }));
+        }
+        else {
+            const api = forgeFromEnv(forge, hostEnv);
+            const fromEnv = ciStatusFromEnv({ forge, hostEnv, noStatus: args.noStatus, statusUrl: args.statusUrl });
+            if (fromEnv.warning)
+                console.error(formatWarning({ message: fromEnv.warning }));
+            status = fromEnv.status;
+            if (!api.openPullRequests || !api.branchHead)
+                throw new CiRunError(`the ${forge} client cannot list pull requests`);
+            client = { openPullRequests: api.openPullRequests.bind(api), branchHead: api.branchHead.bind(api), pullRequestFor: api.pullRequestFor.bind(api) };
+        }
         // #4168: a host that applied each merge before the upgrade hears that it no longer does.
         if (!args.applyOnMerge)
-            console.error("ci serve: each new commit on the target branch gets the record job, which applies nothing (#4168); --apply-on-merge applies it");
+            console.error("ci serve: each new commit on the target branch gets the record job, which applies nothing (#4168); --apply-on-merge also applies each newest green commit");
         const opts = {
             cwd,
             forge,
-            repo: args.ciRepo,
+            repo,
             env: args.env,
-            client: { openPullRequests: client.openPullRequests.bind(client), branchHead: client.branchHead.bind(client), pullRequestFor: client.pullRequestFor.bind(client) },
+            client,
             stateDir,
             ...(args.maxJobs ? { maxJobs: args.maxJobs } : {}),
             ...(args.ciAuthors?.length ? { authors: args.ciAuthors } : {}),
             ...(args.rerunFailed ? { rerunFailed: true } : {}),
             ...(args.ciBuildCommand ? { buildCommand: args.ciBuildCommand } : {}),
             ...(args.applyOnMerge ? { applyOnMerge: true } : {}),
+            ...(landPhases ? { land: { phases: landPhases } } : {}),
             // #4168: the tick from the runs the jobs recorded, signed with the runs' key. No ci.green, no tick.
             tick: async () => {
                 try {