paperlint 10.3.0 → 10.4.0

package/src/adapters/git/index.ts

@@ -0,0 +1,227 @@
+/**
+ * The git ports over the git CLI, through `RunProcess`. Run from a folder of the paper (which exists),
+ * with absolute pathspecs, so it answers for whichever repository holds the paper.
+ *
+ *   committed   the last commit that touched a file (`git log -1`), and whether the file changed since
+ *               (`git status --porcelain`)
+ *   order       whether the clone is shallow; the decision file's first commit; every file's first
+ *               commit under the study's folder (`git log --reverse --name-only`); and for each, whether
+ *               the decision's first commit is its strict ancestor (`git merge-base --is-ancestor`)
+ */
+import type { AbsolutePath } from "../../domain/paths.ts";
+import type {
+  CommitAt,
+  Committed,
+  FirstCommit,
+  GitHistory,
+  GitOrder,
+  Order,
+  OrderFacts,
+} from "../../ports/git-history.ts";
+import type { ProcessExit, RunProcess } from "../../ports/process.ts";
+
+const TIMEOUT_MS = 60_000;
+
+/** git's stdout, or why it gave none; `allowed` lists the exit statuses that are answers. */
+const stdoutOf = (
+  x: ProcessExit,
+  allowed: readonly number[] = [0],
+):
+  | { readonly out: string; readonly status: number }
+  | { readonly why: string } => {
+  switch (x.kind) {
+    case "exited":
+      return allowed.includes(x.status)
+        ? { out: x.stdout, status: x.status }
+        : { why: x.stderr.trim() || `git exited ${String(x.status)}` };
+    case "not-found":
+      return { why: "git is not installed" };
+    case "spawn-failed":
+      return { why: x.message };
+    case "signalled":
+    case "timed-out":
+      return { why: `git did not finish (${x.kind})` };
+  }
+};
+
+/** git, run through `run` in `cwd` with `env` as its whole environment. */
+const gitIn =
+  (run: RunProcess, env: Readonly<Record<string, string>>) =>
+  (cwd: AbsolutePath, args: readonly string[], allowed?: readonly number[]) =>
+    stdoutOf(
+      run.run({
+        file: "git",
+        args: ["-c", "core.quotepath=false", ...args],
+        env,
+        timeoutMs: TIMEOUT_MS,
+        cwd,
+        maxOutputBytes: 64 * 1024 * 1024,
+      }),
+      allowed,
+    );
+
+/** `<sha>\t<date>` as a commit. */
+const commitAt = (line: string): CommitAt => {
+  const parts = line.split("\t");
+  return { commit: nth(parts, 0), date: nth(parts, 1) };
+};
+
+/** The `i`th of `parts`, "" when there are fewer. */
+const nth = (parts: readonly string[], i: number): string =>
+  parts.slice(i, i + 1).join("");
+
+/**
+ * The first commit of each path in `git log --reverse --format=%x01%H%x09%cI --name-only` output:
+ * a line starting with \x01 opens a commit, the lines after it name its files.
+ */
+export const firstCommitsOf = (log: string): ReadonlyMap<string, CommitAt> =>
+  log
+    .split("\x01")
+    .slice(1)
+    .reduce((seen, block) => {
+      const lines = block.split("\n");
+      const at = commitAt(nth(lines, 0));
+      const names = lines.slice(1);
+      return names
+        .filter((n) => n !== "" && !seen.has(n))
+        .reduce((m, n) => new Map([...m, [n, at]]), seen);
+    }, new Map<string, CommitAt>());
+
+/** The committed state of files. */
+export function gitHistory(
+  run: RunProcess,
+  env: Readonly<Record<string, string>>,
+): GitHistory & GitOrder {
+  const git = gitIn(run, env);
+  return {
+    committed: (paper, file): Committed => {
+      const log = git(paper, ["log", "-1", "--format=%H%x09%cI", "--", file]);
+      if ("why" in log) return { kind: "unknown", why: log.why };
+      const { commit, date } = commitAt(log.out.trim());
+      if (commit === "") return { kind: "not-committed" };
+      // `git log -1` names a deleting commit too, and a deleted file leaves a clean status.
+      const head = inHead(git, paper, file);
+      if ("why" in head) return { kind: "unknown", why: head.why };
+      if (!head.present) return { kind: "deleted", commit };
+      const status = git(paper, ["status", "--porcelain=v1", "--", file]);
+      if ("why" in status) return { kind: "unknown", why: status.why };
+      return status.out.trim() === ""
+        ? { kind: "committed", commit, date }
+        : { kind: "changed", commit };
+    },
+    order: (studyDir, decision) => orderIn(git, studyDir, decision),
+  };
+}
+
+type Git = ReturnType<typeof gitIn>;
+
+/** Whether `file` is in HEAD's tree (`git ls-tree`, which takes an absolute path in the worktree). */
+const inHead = (
+  git: Git,
+  cwd: AbsolutePath,
+  file: AbsolutePath,
+): { readonly present: boolean } | { readonly why: string } => {
+  const t = git(cwd, ["ls-tree", "--name-only", "HEAD", "--", file]);
+  return "why" in t ? t : { present: t.out.trim() !== "" };
+};
+
+/** The decision's first commit (null: never committed), and whether HEAD's tree still holds it. */
+const decisionIn = (
+  git: Git,
+  studyDir: AbsolutePath,
+  decision: AbsolutePath,
+):
+  | { readonly at: CommitAt | null; readonly deleted: boolean }
+  | { readonly why: string } => {
+  const d = git(studyDir, ["log", "--format=%H%x09%cI", "--", decision]);
+  if ("why" in d) return d;
+  const lines = d.out.trim().split("\n");
+  const first = commitAt(nth(lines, lines.length - 1));
+  if (first.commit === "") return { at: null, deleted: false };
+  const head = inHead(git, studyDir, decision);
+  return "why" in head ? head : { at: first, deleted: !head.present };
+};
+
+/** The order facts of the study in `studyDir`, decided by `decision`. */
+function orderIn(
+  git: Git,
+  studyDir: AbsolutePath,
+  decision: AbsolutePath,
+): OrderFacts {
+  const shallow = git(studyDir, ["rev-parse", "--is-shallow-repository"]);
+  if ("why" in shallow) return { kind: "unknown", why: shallow.why };
+  if (shallow.out.trim() === "true") return { kind: "shallow" };
+  const d = decisionIn(git, studyDir, decision);
+  if ("why" in d) return { kind: "unknown", why: d.why };
+  const files = git(studyDir, [
+    "log",
+    "--reverse",
+    "--format=%x01%H%x09%cI",
+    "--name-only",
+    "--relative",
+    "--",
+    ".",
+  ]);
+  if ("why" in files) return { kind: "unknown", why: files.why };
+  const ordered = ordersOf(git, studyDir, d.at, firstCommitsOf(files.out));
+  return "why" in ordered
+    ? { kind: "unknown", why: ordered.why }
+    : {
+        kind: "read",
+        decision: d.at,
+        decisionDeleted: d.deleted,
+        files: ordered.files,
+      };
+}
+
+/** git's answer for one commit: its order, or why git could not say. */
+type Answer =
+  | { readonly commit: string; readonly order: Order }
+  | { readonly commit: string; readonly why: string };
+const isFailed = (
+  a: Answer,
+): a is { readonly commit: string; readonly why: string } => "why" in a;
+const isOrdered = (
+  a: Answer,
+): a is { readonly commit: string; readonly order: Order } => "order" in a;
+
+/** The order of `commit` against `decision`'s first commit. */
+const answerFor = (
+  git: Git,
+  cwd: AbsolutePath,
+  decision: CommitAt | null,
+  commit: string,
+): Answer => {
+  if (decision === null) return { commit, order: "not-after" };
+  if (commit === decision.commit) return { commit, order: "same" };
+  const a = git(
+    cwd,
+    ["merge-base", "--is-ancestor", decision.commit, commit],
+    [0, 1],
+  );
+  if ("why" in a) return { commit, why: a.why };
+  return { commit, order: a.status === 0 ? "after" : "not-after" };
+};
+
+/** Each file's first commit with its order against `decision`'s; git asked once per distinct commit. */
+function ordersOf(
+  git: Git,
+  cwd: AbsolutePath,
+  decision: CommitAt | null,
+  firsts: ReadonlyMap<string, CommitAt>,
+): { readonly files: readonly FirstCommit[] } | { readonly why: string } {
+  const answers = [...new Set([...firsts.values()].map((c) => c.commit))].map(
+    (c) => answerFor(git, cwd, decision, c),
+  );
+  const failed = answers.find(isFailed);
+  if (failed !== undefined) return { why: failed.why };
+  return {
+    files: answers
+      .filter(isOrdered)
+      .flatMap(({ commit, order }) =>
+        [...firsts]
+          .filter(([, c]) => c.commit === commit)
+          .map(([path, c]) => ({ path, ...c, order })),
+      ),
+  };
+}

package/src/adapters/memory/index.test.ts

@@ -1,7 +1,13 @@
 /** The in-memory test doubles keep the contracts of the ports they stand in for. */
 import assert from "node:assert/strict";
 import { test } from "vitest";
-import { fixedDownload, memoryWorkspace } from "./index.ts";
+import { absolutePath } from "../../domain/paths.ts";
+import {
+  fixedDownload,
+  memoryFiles,
+  memoryListEntries,
+  memoryWorkspace,
+} from "./index.ts";
 
 test("memoryWorkspace: a `within` that throws is recorded as `threw`, and the error goes on", () => {
   const ws = memoryWorkspace();
@@ -23,3 +29,11 @@ test("fixedDownload: bytes are handed back as they are, and every URL is recorde
   assert.deepEqual(d.fetch("https://a", 1), { ok: true, value: bytes });
   assert.deepEqual(d.urls, ["https://a"]);
 });
+
+test("memoryListEntries: each name directly under a directory, a file or a directory", () => {
+  const files = memoryFiles({ "/s/a.md": "", "/s/out/b.csv": "" });
+  assert.deepEqual(memoryListEntries(files)(absolutePath("/s")), [
+    { name: "a.md", kind: "file" },
+    { name: "out", kind: "dir" },
+  ]);
+});

package/src/adapters/memory/index.ts

@@ -6,6 +6,7 @@ import { absolutePath } from "../../domain/paths.ts";
 import type { Download } from "../../ports/download.ts";
 import type { Files } from "../../ports/files.ts";
 import type { ListDir } from "../../ports/talk-media.ts";
+import type { ListEntries } from "../../ports/list-entries.ts";
 import type { Command, ProcessExit, RunProcess } from "../../ports/process.ts";
 import type { NotAPromise, Scratch, Workspace } from "../../ports/workspace.ts";
 import { err, ok } from "../../domain/result.ts";
@@ -72,6 +73,18 @@ export const memoryListDir =
     ),
   ];
 
+/**
+ * `ListEntries` over `memoryFiles`: each name directly under a directory, a file when it is one, else a
+ * directory. Memory holds no links: the walk's refusal to follow one is the node adapter's to show.
+ */
+export const memoryListEntries =
+  (files: MemoryFiles): ListEntries =>
+  (dir) =>
+    memoryListDir(files)(dir).map((name) => ({
+      name,
+      kind: files.isFile(absolutePath(`${dir}/${name}`)) ? "file" : "dir",
+    }));
+
 export interface MemoryWorkspace extends Workspace {
   /** Every file written into a scratch directory, in order. */
   readonly written: {

package/src/adapters/node/index.ts

@@ -35,3 +35,4 @@ export { nodeFiles } from "./files.io.ts";
 export { spawnProcess, type SpawnSync } from "./process.io.ts";
 export { hostDirs } from "./host.io.ts";
 export { nodeListDir } from "./list-dir.io.ts";
+export { nodeListEntries } from "./list-entries.io.ts";

package/src/adapters/node/list-entries.io.ts

@@ -0,0 +1,26 @@
+/** `ListEntries` over `node:fs`: `readdir` with its file types, which `lstat` each entry, never following a link. */
+import { readdirSync, type Dirent } from "node:fs";
+import type { AbsolutePath } from "../../domain/paths.ts";
+import { codeOf } from "../../domain/text.ts";
+import type { DirEntry, ListEntries } from "../../ports/list-entries.ts";
+
+/** What a directory entry is, its link never followed. */
+const kindOf = (d: Readonly<Dirent>): DirEntry["kind"] => {
+  if (d.isSymbolicLink()) return "symlink";
+  return d.isDirectory() ? "dir" : "file";
+};
+
+export const nodeListEntries: ListEntries = (
+  dir: AbsolutePath,
+): readonly DirEntry[] => {
+  try {
+    return readdirSync(dir, { withFileTypes: true }).map((d) => ({
+      name: d.name,
+      kind: kindOf(d),
+    }));
+  } catch (e) {
+    const code = codeOf(e);
+    if (code === "ENOENT" || code === "ENOTDIR") return [];
+    throw e;
+  }
+};

package/src/adapters/node/list-entries.test.ts

@@ -0,0 +1,43 @@
+/**
+ * `nodeListEntries`: a directory's entries with their kinds, a symbolic link reported as one and never
+ * followed; none for a missing directory or a file; other errors thrown.
+ */
+import { mkdirSync, symlinkSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+import { absolutePath } from "../../domain/paths.ts";
+import { useTempDir } from "../../../test/support.ts";
+import { nodeListEntries } from "./list-entries.io.ts";
+
+const root = useTempDir("paperlint-list-entries-");
+
+const sorted = (dir: string) =>
+  [...nodeListEntries(absolutePath(dir))].sort((a, b) =>
+    a.name.localeCompare(b.name),
+  );
+
+describe("nodeListEntries", () => {
+  it("names each entry's kind, a link to a directory as a link", () => {
+    const d = join(root, "study");
+    mkdirSync(join(d, "out"), { recursive: true });
+    writeFileSync(join(d, "a.md"), "");
+    symlinkSync(".", join(d, "loop"));
+    expect(sorted(d)).toEqual([
+      { name: "a.md", kind: "file" },
+      { name: "loop", kind: "symlink" },
+      { name: "out", kind: "dir" },
+    ]);
+  });
+
+  it("is empty for a directory that does not exist, and for a file", () => {
+    writeFileSync(join(root, "f"), "");
+    expect([
+      nodeListEntries(absolutePath(join(root, "none"))),
+      nodeListEntries(absolutePath(join(root, "f"))),
+    ]).toEqual([[], []]);
+  });
+
+  it("throws any other error", () => {
+    expect(() => nodeListEntries(absolutePath(`${root}/a\0b`))).toThrow();
+  });
+});

package/src/adapters/study-registry/index.test.ts

@@ -240,7 +240,7 @@ const planWith = (over: Readonly<Record<string, unknown>>): string =>
 
 describe("parsing a study's plan: ready or draft", () => {
   it("a filled plan is ready, its `extra` kept as it is", () => {
-    expect(parsePlan(JSON.stringify(PLAN))).toEqual({
+    expect(parsePlan(JSON.stringify(PLAN), "spike")).toEqual({
       kind: "ready",
       plan: PLAN,
     });
@@ -255,17 +255,20 @@ describe("parsing a study's plan: ready or draft", () => {
       },
       arms: [],
     };
-    expect(parsePlan(JSON.stringify(census))).toEqual({
+    expect(parsePlan(JSON.stringify(census), "spike")).toEqual({
       kind: "ready",
       plan: census,
     });
   });
 
   it("the template studies new writes is a draft of a census, naming every empty text", () => {
-    expect(planTemplate().population.draw).toEqual({ kind: "all", method: "" });
-    expect(parsePlan(planText(planTemplate()))).toEqual({
+    expect(planTemplate("spike", "x").population.draw).toEqual({
+      kind: "all",
+      method: "",
+    });
+    expect(parsePlan(planText(planTemplate("spike", "x")), "spike")).toEqual({
       kind: "draft",
-      plan: planTemplate(),
+      plan: planTemplate("spike", "x"),
       empty: [
         "question",
         "population.source",
@@ -277,7 +280,7 @@ describe("parsing a study's plan: ready or draft", () => {
 
   it("a text of white space only is empty", () => {
     const plan = { ...PLAN, primary_outcome: "  ", author_check: null };
-    expect(parsePlan(JSON.stringify(plan))).toEqual({
+    expect(parsePlan(JSON.stringify(plan), "spike")).toEqual({
       kind: "draft",
       plan,
       empty: ["primary_outcome"],
@@ -330,7 +333,7 @@ describe("parsing a study's plan: no contradictory state", () => {
       "population.draw.kind: Invalid discriminator value. Expected 'seeded' | 'all'",
     ],
   ])("refuses %s", (_why, t, why) => {
-    expect(parsePlan(t)).toEqual({ kind: "unreadable", why });
+    expect(parsePlan(t, "spike")).toEqual({ kind: "unreadable", why });
   });
 });
 
@@ -352,7 +355,7 @@ describe("parsing a study's plan: no name or fact said twice", () => {
       'population: Unrecognized key: "size"',
     ],
   ])("refuses %s", (_why, t, why) => {
-    expect(parsePlan(t)).toEqual({ kind: "unreadable", why });
+    expect(parsePlan(t, "spike")).toEqual({ kind: "unreadable", why });
   });
 });
 
@@ -395,7 +398,7 @@ describe("parsing a study's plan: strict at every level", () => {
       'arms.0: Unrecognized key: "model"',
     ],
   ])("refuses %s", (_why, t, why) => {
-    expect(parsePlan(t)).toEqual({ kind: "unreadable", why });
+    expect(parsePlan(t, "spike")).toEqual({ kind: "unreadable", why });
   });
 });
 

package/src/adapters/study-registry/index.ts

@@ -12,8 +12,13 @@
  * Its texts may be empty — the template's are — and the parser says which: a plan comes out ready or
  * a draft naming its empty texts, so nothing downstream looks at a text again. A plan still named
  * `prereg.json` has a loose schema of its own.
+ *
+ * A plan's `mode` (docs/design/study-modes.md) is parsed here too, strictly, a union on its `kind`:
+ * one mode at most, a glob that leaves the study's folder or a decision outside the paper refused,
+ * and a measurement's plan ready only with a mode.
  */
 import { z } from "zod";
+import { README } from "../../domain/repro-layout.ts";
 import {
   IN_PAPER,
   MEASUREMENT_ROLES,
@@ -29,9 +34,16 @@ import {
   type ParsedRegistry,
   type Requirement,
   type Study,
+  type PlanTextField,
+  type StudyKind,
   type StudyPlan,
   type StudyRegistry,
 } from "../../domain/study-registry.ts";
+import {
+  needsMode,
+  type Decision,
+  type StudyMode,
+} from "../../domain/study-mode.ts";
 import type { StudyRegistryCodec } from "../../ports/study-registry-codec.ts";
 
 const study = z.looseObject({
@@ -128,6 +140,66 @@ const extra = z.record(z.string(), z.unknown()).superRefine((e, ctx) => {
     });
 });
 
+/** Every value of `values` once: a repeat is an error naming it. */
+const once =
+  (what: string) =>
+  (values: readonly string[], ctx: Readonly<z.core.$RefinementCtx>): void => {
+    repeated(values).forEach((v) => {
+      ctx.addIssue({
+        code: "custom",
+        message: `${what} «${v}» is listed more than once`,
+      });
+    });
+  };
+
+/** Whether `p` is a relative path that stays where it starts: no backslash, not absolute, no `..`. */
+const staysInside = (p: string): boolean =>
+  !p.includes("\\") && !p.startsWith("/") && !p.split("/").includes("..");
+
+/** An output glob, relative to the study's folder: inside it, and never the study's README. */
+const inFolder = z
+  .string()
+  .min(1)
+  .refine(
+    (p) => staysInside(p) && p !== README,
+    `is not a path inside the study's folder, or names its ${README}`,
+  );
+
+/**
+ * Whether `p` names a file by one or more names joined by `/`, none empty, `.` or `..`: never the
+ * paper's folder itself (`.`) nor a path ending in `/`. Whether a name is a directory on disk is the
+ * gate's and the order rule's to see.
+ */
+const namesAFile = (p: string): boolean =>
+  p.split("/").every((n) => n !== "" && n !== "." && n !== "..");
+
+/**
+ * A decision file, relative to the PAPER's folder: inside it, and a file's path. Empty in a draft (the
+ * parser names it).
+ */
+const inPaper = z
+  .string()
+  .refine(staysInside, "is not a path inside the paper's folder")
+  .refine(
+    (p) => p === "" || !staysInside(p) || namesAFile(p),
+    "is not a path to a file inside the paper's folder: one or more names joined by /, none empty, . or ..",
+  );
+
+const decisionShape = z.strictObject({ file: inPaper, note: z.string() });
+
+/** The output globs: each once; none yet in a draft. */
+const outputs = z.array(inFolder).superRefine(once("the output"));
+
+/** How the outcomes are kept from the decisions: exactly one mode, by its `kind`. */
+const mode = z.discriminatedUnion("kind", [
+  z.strictObject({
+    kind: z.literal("decide_before_run"),
+    outputs,
+    decision: decisionShape,
+  }),
+  z.strictObject({ kind: z.literal("exploratory"), reason: z.string() }),
+]);
+
 /** A plan's shape: closed at every level; the paper's own keys go in `extra`. Null is the one "none". */
 const planShape = z.strictObject({
   question: z.string(),
@@ -136,6 +208,7 @@ const planShape = z.strictObject({
   primary_outcome: z.string(),
   author_check: authorCheck.nullable(),
   extra: extra.optional(),
+  mode: mode.optional(),
 });
 
 /**
@@ -196,6 +269,28 @@ const readyTexts = z.object({
   primary_outcome: filled,
 });
 
+/** Whether `t` says something. */
+const says = (t: string): boolean => /\S/u.test(t);
+
+/**
+ * The mode's texts that are still empty, by their field: the mode itself when a study of `kind` must
+ * declare one and the plan does not, a decide-first mode's outputs and decision, an exploratory reason.
+ */
+const modeEmpties = (
+  p: StudyPlan,
+  kind: StudyKind,
+): readonly PlanTextField[] => {
+  const m = p.mode;
+  if (m === undefined) return needsMode(kind) ? ["mode"] : [];
+  if (m.kind === "exploratory") return says(m.reason) ? [] : ["mode.reason"];
+  return PLAN_TEXT_FIELDS.filter(
+    (f) =>
+      (f === "mode.outputs" && m.outputs.length === 0) ||
+      (f === "mode.decision.file" && !says(m.decision.file)) ||
+      (f === "mode.decision.note" && !says(m.decision.note)),
+  );
+};
+
 /** A plan that parsed: ready, or a draft. */
 type ReadyOrDraft = Exclude<ParsedPlan, { readonly kind: "unreadable" }>;
 
@@ -203,29 +298,37 @@ type ReadyOrDraft = Exclude<ParsedPlan, { readonly kind: "unreadable" }>;
  * A parsed plan, ready when every required text is filled, else a draft naming the empty ones. A
  * draft that carries the author's check is no plan: the author approved one with empty texts.
  */
-const readyOrDraft = (
-  p: StudyPlan,
-  ctx: Readonly<z.core.$RefinementCtx>,
-): ReadyOrDraft => {
-  const checked = readyTexts.safeParse(p);
-  if (checked.success) return { kind: "ready", plan: p };
-  const paths = checked.error.issues.map((i) => i.path.join("."));
-  const empty = PLAN_TEXT_FIELDS.filter((f) => paths.includes(f));
-  if (p.author_check === null)
-    return { kind: "draft", plan: { ...p, author_check: null }, empty };
-  ctx.addIssue({
-    code: "custom",
-    path: ["author_check"],
-    message: `is set, and the plan leaves ${empty.map((f) => `\`${f}\``).join(", ")} empty — the author approves a complete plan: fill them, or set author_check to null`,
-  });
-  return z.NEVER;
-};
+const readyOrDraft =
+  (kind: StudyKind) =>
+  (p: StudyPlan, ctx: Readonly<z.core.$RefinementCtx>): ReadyOrDraft => {
+    const checked = readyTexts.safeParse(p);
+    const paths = checked.success
+      ? []
+      : checked.error.issues.map((i) => i.path.join("."));
+    const empty = [
+      ...PLAN_TEXT_FIELDS.filter((f) => paths.includes(f)),
+      ...modeEmpties(p, kind),
+    ];
+    if (empty.length === 0) return { kind: "ready", plan: p };
+    if (p.author_check === null)
+      return { kind: "draft", plan: { ...p, author_check: null }, empty };
+    ctx.addIssue({
+      code: "custom",
+      path: ["author_check"],
+      message: `is set, and the plan leaves ${empty.map((f) => `\`${f}\``).join(", ")} empty — the author approves a complete plan: fill them, or set author_check to null`,
+    });
+    return z.NEVER;
+  };
 
-/** A `plan.json`: strict, then ready or draft. */
-const plan = planShape.transform(readyOrDraft);
+/** A `plan.json` of a study of `kind`: strict, then ready or draft — a measurement's ready only with its mode. */
+const planFor = (kind: StudyKind) => planShape.transform(readyOrDraft(kind));
 
-/** A `prereg.json`: loose, mapped onto the plan, then ready or draft. */
-const legacyPlan = legacyAsPlan.transform(readyOrDraft);
+/**
+ * A `prereg.json`: loose, mapped onto the plan, then ready or draft. Written before modes existed, it
+ * is never asked for one; `repro/study-plan-name` already asks to move it to `plan.json`, where the
+ * strict parser does.
+ */
+const legacyPlan = legacyAsPlan.transform(readyOrDraft("spike"));
 
 // ── the schemas ARE the domain's types ─────────────────────────────────────────
 // Each schema's output and its hand-written domain type are the same type, both ways, once both are
@@ -261,8 +364,10 @@ export type SchemasAreTheDomain = [
   Same<z.output<typeof authorCheck>, AuthorCheck>,
   Same<z.output<typeof planShape>, StudyPlan>,
   Same<z.output<typeof legacyAsPlan>, StudyPlan>,
-  Same<z.output<typeof plan>, ReadyOrDraft>,
+  Same<z.output<ReturnType<typeof planFor>>, ReadyOrDraft>,
   Same<z.output<typeof legacyPlan>, ReadyOrDraft>,
+  Same<z.output<typeof mode>, StudyMode>,
+  Same<z.output<typeof decisionShape>, Decision>,
 ] extends true[]
   ? true
   : never;
@@ -315,8 +420,9 @@ const planParser =
       : { kind: "unreadable", why: reasons(parsed.error.issues) };
   };
 
-/** A `plan.json`: strict. */
-export const parseStudyPlan = planParser(plan);
+/** A `plan.json` of a study of `kind`: strict. */
+export const parseStudyPlan = (text: string, kind: StudyKind): ParsedPlan =>
+  planParser(planFor(kind))(text);
 
 /** A plan still named `prereg.json`: loose, read only when a row names it. */
 export const parseLegacyPlan = planParser(legacyPlan);