@effected/github 0.23.1 → 0.25.0

package/GitHubIssue.js

@@ -1,4 +1,5 @@
 import { GraphQLDocument } from "./GraphQL.js";
+import { unstubbed } from "./internal/unstubbed.js";
 import { GitHubClient } from "./GitHubClient.js";
 import { Repo } from "./Repo.js";
 import { numericId } from "./internal/ids.js";
@@ -127,45 +128,20 @@ const CrossReferencedDocument = GraphQLDocument.make({
 var GitHubIssue = class GitHubIssue extends Context.Service()("@effected/github/GitHubIssue") {
 	/** The live service, built over a `GitHubClient`. */
 	static layer = Layer.effect(this, Effect.map(GitHubClient, (client) => make(client)));
-	/** An in-memory double; unstubbed members die naming themselves. */
+	/** An in-memory double; an unstubbed member dies when run, naming itself. */
 	static makeTest = (overrides = {}) => ({
-		get: overrides.get ?? (() => unstubbed("get")),
-		list: overrides.list ?? (() => unstubbed("list")),
-		close: overrides.close ?? (() => unstubbed("close")),
-		comment: overrides.comment ?? (() => unstubbed("comment")),
-		commentOnce: overrides.commentOnce ?? (() => unstubbed("commentOnce")),
-		linkedIssues: overrides.linkedIssues ?? (() => unstubbed("linkedIssues")),
-		isCrossReferencedBy: overrides.isCrossReferencedBy ?? (() => unstubbed("isCrossReferencedBy"))
+		get: overrides.get ?? (() => dies("get")),
+		list: overrides.list ?? (() => dies("list")),
+		close: overrides.close ?? (() => dies("close")),
+		comment: overrides.comment ?? (() => dies("comment")),
+		commentOnce: overrides.commentOnce ?? (() => dies("commentOnce")),
+		linkedIssues: overrides.linkedIssues ?? (() => dies("linkedIssues")),
+		isCrossReferencedBy: overrides.isCrossReferencedBy ?? (() => dies("isCrossReferencedBy"))
 	});
 	/** {@link GitHubIssue.makeTest} behind a `Layer`. */
 	static layerTest = (overrides = {}) => Layer.succeed(GitHubIssue, GitHubIssue.makeTest(overrides));
 };
-const unstubbed = (member) => {
-	throw new Error(`GitHubIssue.makeTest: ${member}() was called but not stubbed — pass an override.`);
-};
-/**
-* The REST calendar version this module's requests pin.
-*
-* @remarks
-* The routes are not deprecated — the **default api-version** is. When no
-* `x-github-api-version` header is sent (octokit sends none), GitHub serves
-* calendar version 2022-11-28, which it deprecated when 2026-03-10 shipped and
-* sunsets on 2028-03-10. Every response from an endpoint the new version
-* changed then carries a `Deprecation` header, which `@octokit/request` prints
-* straight to the consumer's console — the constructor's `log` option cannot
-* silence it, because the fetch wrapper resolves `request.log ?? console`.
-* `PATCH /repos/{owner}/{repo}/issues/{issue_number}` is on that list (the
-* singular `assignee` parameter was removed), so every `close` warned once per
-* issue in consumer workflow logs.
-*
-* Nothing this module sends or reads changed in 2026-03-10: `state` and
-* `state_reason` are untouched, and the projections read only fields both
-* versions carry. Pinning the current version is therefore the whole fix, and
-* it deliberately does **not** hide future deprecations — when GitHub
-* deprecates 2026-03-10 in turn, the header comes back and octokit warns
-* again.
-*/
-const API_VERSION_HEADERS = { "x-github-api-version": "2026-03-10" };
+const dies = unstubbed("GitHubIssue.makeTest");
 /** GitHub sends a label as either a string or an object; callers want the name. */
 const labelNames = (labels) => labels.flatMap((label) => typeof label === "string" ? [label] : label.name !== void 0 ? [label.name] : []);
 const project = (raw) => IssueInfo.make({
@@ -187,8 +163,7 @@ const make = (client) => ({
 		const raw = yield* client.request("GET /repos/{owner}/{repo}/issues/{issue_number}", {
 			owner,
 			repo,
-			issue_number: number,
-			headers: API_VERSION_HEADERS
+			issue_number: number
 		});
 		return project(raw);
 	}),
@@ -202,8 +177,7 @@ const make = (client) => ({
 			owner,
 			repo,
 			...options?.state !== void 0 ? { state: options.state } : {},
-			...options?.labels !== void 0 ? { labels: options.labels.join(",") } : {},
-			headers: API_VERSION_HEADERS
+			...options?.labels !== void 0 ? { labels: options.labels.join(",") } : {}
 		}, options?.page)).map(project);
 	}),
 	close: Effect.fn("GitHubIssue.close")(function* (number, reason) {
@@ -218,8 +192,7 @@ const make = (client) => ({
 			repo,
 			issue_number: number,
 			state: "closed",
-			...reason !== void 0 ? { state_reason: reason } : {},
-			headers: API_VERSION_HEADERS
+			...reason !== void 0 ? { state_reason: reason } : {}
 		});
 	}),
 	comment: Effect.fn("GitHubIssue.comment")(function* (number, body) {
@@ -233,8 +206,7 @@ const make = (client) => ({
 			owner,
 			repo,
 			issue_number: number,
-			body,
-			headers: API_VERSION_HEADERS
+			body
 		});
 		return numericId(created.id);
 	}),
@@ -249,8 +221,7 @@ const make = (client) => ({
 		const existing = (yield* client.paginate("GET /repos/{owner}/{repo}/issues/{issue_number}/comments", {
 			owner,
 			repo,
-			issue_number: issueNumber,
-			headers: API_VERSION_HEADERS
+			issue_number: issueNumber
 		})).find((comment) => marker.matches(comment.body ?? ""));
 		if (existing !== void 0) return CommentOnceResult.make({
 			wrote: false,
@@ -264,8 +235,7 @@ const make = (client) => ({
 			owner,
 			repo,
 			issue_number: issueNumber,
-			body: `${body}\n\n${marker.html}`,
-			headers: API_VERSION_HEADERS
+			body: `${body}\n\n${marker.html}`
 		});
 		return CommentOnceResult.make({
 			wrote: true,

package/GitHubRelease.js

@@ -1,4 +1,5 @@
 import { GitHubError } from "./GitHubError.js";
+import { unstubbed } from "./internal/unstubbed.js";
 import { GitHubClient } from "./GitHubClient.js";
 import { Repo } from "./Repo.js";
 import { Context, Effect, Layer, Option, Schema } from "effect";
@@ -59,22 +60,20 @@ var ReleaseAsset = class extends Schema.Class("ReleaseAsset")({
 var GitHubRelease = class GitHubRelease extends Context.Service()("@effected/github/GitHubRelease") {
 	/** The live service, built over a `GitHubClient`. */
 	static layer = Layer.effect(this, Effect.map(GitHubClient, (client) => make(client)));
-	/** An in-memory double; unstubbed members die naming themselves. */
+	/** An in-memory double; an unstubbed member dies when run, naming itself. */
 	static makeTest = (overrides = {}) => ({
-		create: overrides.create ?? (() => unstubbed("create")),
-		getByTag: overrides.getByTag ?? (() => unstubbed("getByTag")),
-		getByTagOption: overrides.getByTagOption ?? (() => unstubbed("getByTagOption")),
-		list: overrides.list ?? (() => unstubbed("list")),
-		update: overrides.update ?? (() => unstubbed("update")),
-		uploadAsset: overrides.uploadAsset ?? (() => unstubbed("uploadAsset")),
-		listAssets: overrides.listAssets ?? (() => unstubbed("listAssets"))
+		create: overrides.create ?? (() => dies("create")),
+		getByTag: overrides.getByTag ?? (() => dies("getByTag")),
+		getByTagOption: overrides.getByTagOption ?? (() => dies("getByTagOption")),
+		list: overrides.list ?? (() => dies("list")),
+		update: overrides.update ?? (() => dies("update")),
+		uploadAsset: overrides.uploadAsset ?? (() => dies("uploadAsset")),
+		listAssets: overrides.listAssets ?? (() => dies("listAssets"))
 	});
 	/** {@link GitHubRelease.makeTest} behind a `Layer`. */
 	static layerTest = (overrides = {}) => Layer.succeed(GitHubRelease, GitHubRelease.makeTest(overrides));
 };
-const unstubbed = (member) => {
-	throw new Error(`GitHubRelease.makeTest: ${member}() was called but not stubbed — pass an override.`);
-};
+const dies = unstubbed("GitHubRelease.makeTest");
 const project = (raw) => ReleaseInfo.make({
 	id: raw.id,
 	tag: raw.tag_name,

package/GitHubRepository.js

@@ -1,6 +1,8 @@
 import { GraphQLDocument } from "./GraphQL.js";
+import { unstubbed, unstubbedRead } from "./internal/unstubbed.js";
 import { GitHubClient } from "./GitHubClient.js";
 import { Repo } from "./Repo.js";
+import { REMOVED_BY_PINNED_VERSION, REPOSITORY_REST_SETTING_KEYS } from "./internal/repositoryRestSettingKeys.js";
 import { Context, Effect, Layer, Schema } from "effect";
 
 // src/GitHubRepository.ts
@@ -63,17 +65,21 @@ const SECURITY_ANALYSIS_STATUS_FIELDS = /* @__PURE__ */ new Set([
 	"dependabot_security_updates"
 ]);
 /**
-* Settings reachable **only** through the GraphQL `updateRepository` mutation,
-* mapped from snake_case keys to camelCase GraphQL input fields.
+* Settings written through the GraphQL `updateRepository` mutation, mapped
+* from snake_case keys to camelCase GraphQL input fields.
 *
 * @remarks
-* GitHub never exposed these on the REST repository endpoint — the
-* `PATCH /repos/{owner}/{repo}` route accepts none of them, and
-* `has_discussions` is the treacherous one: the REST **read** returns it, so
-* routing its write to the PATCH looks symmetric, but the PATCH silently
-* ignores unknown body fields and answers 200, so the write would look applied
-* while the repository never changed. Setting any of these forces a second
-* round trip to learn the repository's node id.
+* `applySettings` checks this map **first**, so a key here always goes
+* through GraphQL, even when the REST patch also declares it.
+* `has_sponsorships` and `has_discussions` are GraphQL-only: the
+* `PATCH /repos/{owner}/{repo}` route accepts neither, and `has_discussions`
+* is the treacherous one — the REST **read** returns it, so routing its write
+* to the PATCH looks symmetric, but the PATCH silently ignores unknown body
+* fields and answers 200, so the write would look applied while the
+* repository never changed. `has_pull_requests` is in the REST patch's body
+* too; GraphQL is preferred for it so the three toggles travel together.
+* Setting any of these forces a second round trip to learn the repository's
+* node id.
 *
 * @public
 */
@@ -170,12 +176,13 @@ const preparePatch = (patch) => {
 };
 /**
 * Read and update a repository's settings, including settings only GraphQL can
-* write, and look up its default branch, node id and owner type.
+* write, read and replace its topics, and look up its default branch, node id
+* and owner type.
 *
 * @remarks
 * Provide it with {@link GitHubRepository.layer}, which needs a `GitHubClient`;
-* every member also needs a `Repo` in `R`. `settings`, `defaultBranch`, `nodeId`
-* and `ownerType` are `Effect` values, not functions.
+* every member also needs a `Repo` in `R`. `settings`, `defaultBranch`, `nodeId`,
+* `ownerType` and `topics` are `Effect` values, not functions.
 *
 * @example
 * ```ts
@@ -186,7 +193,7 @@ const preparePatch = (patch) => {
 *   const repository = yield* GitHubRepository;
 *   const branch = yield* repository.defaultBranch;
 *   const applied = yield* repository.applySettings({ has_wiki: false, has_discussions: true });
-*   return { branch, applied }; // applied.rest, applied.graphql
+*   return { branch, applied }; // applied.rest, applied.graphql, applied.ignored
 * });
 * ```
 *
@@ -195,21 +202,22 @@ const preparePatch = (patch) => {
 var GitHubRepository = class GitHubRepository extends Context.Service()("@effected/github/GitHubRepository") {
 	/** The live service, built over a `GitHubClient`. */
 	static layer = Layer.effect(this, Effect.map(GitHubClient, (client) => make(client)));
-	/** An in-memory double; unstubbed members die naming themselves. */
+	/** An in-memory double; an unstubbed member dies when run, naming itself. */
 	static makeTest = (overrides = {}) => ({
-		settings: overrides.settings ?? Effect.sync(() => unstubbed("settings")),
-		updateSettings: overrides.updateSettings ?? (() => unstubbed("updateSettings")),
-		defaultBranch: overrides.defaultBranch ?? Effect.sync(() => unstubbed("defaultBranch")),
-		nodeId: overrides.nodeId ?? Effect.sync(() => unstubbed("nodeId")),
-		ownerType: overrides.ownerType ?? Effect.sync(() => unstubbed("ownerType")),
-		applySettings: overrides.applySettings ?? (() => unstubbed("applySettings"))
+		settings: overrides.settings ?? unread("settings"),
+		updateSettings: overrides.updateSettings ?? (() => dies("updateSettings")),
+		defaultBranch: overrides.defaultBranch ?? unread("defaultBranch"),
+		nodeId: overrides.nodeId ?? unread("nodeId"),
+		ownerType: overrides.ownerType ?? unread("ownerType"),
+		applySettings: overrides.applySettings ?? (() => dies("applySettings")),
+		topics: overrides.topics ?? unread("topics"),
+		setTopics: overrides.setTopics ?? (() => dies("setTopics"))
 	});
 	/** {@link GitHubRepository.makeTest} behind a `Layer`. */
 	static layerTest = (overrides = {}) => Layer.succeed(GitHubRepository, GitHubRepository.makeTest(overrides));
 };
-const unstubbed = (member) => {
-	throw new Error(`GitHubRepository.makeTest: ${member} was read but not stubbed — pass an override.`);
-};
+const dies = unstubbed("GitHubRepository.makeTest");
+const unread = unstubbedRead("GitHubRepository.makeTest");
 const make = (client) => {
 	const settings = Effect.fn("GitHubRepository.settings")(function* () {
 		const { owner, repo } = yield* Repo;
@@ -229,6 +237,30 @@ const make = (client) => {
 	})();
 	return {
 		settings,
+		topics: Effect.fn("GitHubRepository.topics")(function* () {
+			const { owner, repo } = yield* Repo;
+			yield* Effect.annotateCurrentSpan({
+				owner,
+				repo
+			});
+			return (yield* client.request("GET /repos/{owner}/{repo}/topics", {
+				owner,
+				repo
+			})).names;
+		})(),
+		setTopics: Effect.fn("GitHubRepository.setTopics")(function* (names) {
+			const { owner, repo } = yield* Repo;
+			yield* Effect.annotateCurrentSpan({
+				owner,
+				repo,
+				topics: names.length
+			});
+			return (yield* client.request("PUT /repos/{owner}/{repo}/topics", {
+				owner,
+				repo,
+				names: [...names]
+			})).names;
+		}),
 		updateSettings: Effect.fn("GitHubRepository.updateSettings")(function* (patch) {
 			const { owner, repo } = yield* Repo;
 			yield* Effect.annotateCurrentSpan({
@@ -254,6 +286,7 @@ const make = (client) => {
 			const rest = {};
 			const graphql = {};
 			const graphqlKeys = [];
+			const ignored = [];
 			for (const [key, value] of Object.entries(input)) {
 				const graphqlField = Object.hasOwn(GRAPHQL_ONLY_SETTINGS, key) ? GRAPHQL_ONLY_SETTINGS[key] : void 0;
 				if (graphqlField !== void 0) {
@@ -261,6 +294,11 @@ const make = (client) => {
 					graphqlKeys.push(key);
 					continue;
 				}
+				const removedIn = Object.hasOwn(REMOVED_BY_PINNED_VERSION, key) ? REMOVED_BY_PINNED_VERSION[key] : void 0;
+				if (!REPOSITORY_REST_SETTING_KEYS.has(key) || removedIn !== void 0 && client.apiVersion >= removedIn) {
+					ignored.push(key);
+					continue;
+				}
 				rest[key] = value;
 			}
 			const prepared = preparePatch(rest);
@@ -282,7 +320,8 @@ const make = (client) => {
 			}
 			return {
 				rest: restKeys,
-				graphql: graphqlKeys
+				graphql: graphqlKeys,
+				ignored
 			};
 		})
 	};

package/GitTag.js

@@ -1,4 +1,5 @@
 import { GitHubError } from "./GitHubError.js";
+import { unstubbed } from "./internal/unstubbed.js";
 import { GitHubClient } from "./GitHubClient.js";
 import { Repo } from "./Repo.js";
 import { Context, Effect, Layer, Option, Result, Schema, Stream } from "effect";
@@ -63,21 +64,19 @@ const versionFromTag = (tag) => {
 var GitTag = class GitTag extends Context.Service()("@effected/github/GitTag") {
 	/** The live service, built over a `GitHubClient`. */
 	static layer = Layer.effect(this, Effect.map(GitHubClient, (client) => make(client)));
-	/** An in-memory double; unstubbed members die naming themselves. */
+	/** An in-memory double; an unstubbed member dies when run, naming itself. */
 	static makeTest = (overrides = {}) => ({
-		create: overrides.create ?? (() => unstubbed("create")),
-		upsert: overrides.upsert ?? (() => unstubbed("upsert")),
-		delete: overrides.delete ?? (() => unstubbed("delete")),
-		list: overrides.list ?? (() => unstubbed("list")),
-		resolve: overrides.resolve ?? (() => unstubbed("resolve")),
-		latestSemver: overrides.latestSemver ?? (() => unstubbed("latestSemver"))
+		create: overrides.create ?? (() => dies("create")),
+		upsert: overrides.upsert ?? (() => dies("upsert")),
+		delete: overrides.delete ?? (() => dies("delete")),
+		list: overrides.list ?? (() => dies("list")),
+		resolve: overrides.resolve ?? (() => dies("resolve")),
+		latestSemver: overrides.latestSemver ?? (() => dies("latestSemver"))
 	});
 	/** {@link GitTag.makeTest} behind a `Layer`. */
 	static layerTest = (overrides = {}) => Layer.succeed(GitTag, GitTag.makeTest(overrides));
 };
-const unstubbed = (member) => {
-	throw new Error(`GitTag.makeTest: ${member}() was called but not stubbed — pass an override.`);
-};
+const dies = unstubbed("GitTag.makeTest");
 const shortTag = (tag) => tag.replace(/^refs\/tags\//, "").replace(/^tags\//, "");
 const rejectEmpty = (operation, tag) => {
 	const short = shortTag(tag).trim();

package/InstallationTokenStore.js

@@ -1,3 +1,4 @@
+import { unstubbed } from "./internal/unstubbed.js";
 import { Clock, Context, Duration, Effect, Layer, Option, Ref } from "effect";
 
 // src/InstallationTokenStore.ts
@@ -38,13 +39,14 @@ var InstallationTokenStore = class InstallationTokenStore extends Context.Servic
 			}));
 		})
 	})));
-	/** An in-memory double; unstubbed members die naming themselves. */
+	/** An in-memory double; an unstubbed member dies when run, naming itself. */
 	static makeTest = (overrides = {}) => ({
-		get: overrides.get ?? (() => Effect.die(/* @__PURE__ */ new Error("InstallationTokenStore.makeTest: get() was called but not stubbed"))),
-		set: overrides.set ?? (() => Effect.die(/* @__PURE__ */ new Error("InstallationTokenStore.makeTest: set() was called but not stubbed")))
+		get: overrides.get ?? (() => dies("get")),
+		set: overrides.set ?? (() => dies("set"))
 	});
 	/** {@link InstallationTokenStore.makeTest} behind a `Layer`. */
 	static layerTest = (overrides = {}) => Layer.succeed(InstallationTokenStore, InstallationTokenStore.makeTest(overrides));
 };
+const dies = unstubbed("InstallationTokenStore.makeTest");
 
 export { InstallationTokenStore };

package/PullRequest.js

@@ -1,5 +1,6 @@
 import { GitHubError } from "./GitHubError.js";
-import { GraphQLDocument } from "./GraphQL.js";
+import { GitHubGraphQLError, GraphQLDocument } from "./GraphQL.js";
+import { unstubbed } from "./internal/unstubbed.js";
 import { GitHubClient } from "./GitHubClient.js";
 import { Repo } from "./Repo.js";
 import { fileOf } from "./GitHubCommit.js";
@@ -54,7 +55,27 @@ var PullRequestInfo = class extends Schema.Class("PullRequestInfo")({
 	mergedAt: Schema.Option(Schema.DateTimeUtcFromString),
 	/** The description, when GitHub sent one. */
 	body: Schema.optionalKey(Schema.String),
-	/** The merge commit, once there is one. */
+	/**
+	* The sha of the commit the merge produced; absent until the pull request
+	* has merged.
+	*
+	* @remarks
+	* Read from GraphQL's `PullRequest.mergeCommit.oid`. The REST pull request
+	* object no longer carries `merge_commit_sha` under the api-version this
+	* package pins, so a merged pull request costs one extra GraphQL round trip
+	* per single read (`get`, `update`, `upsert`), and an open or
+	* closed-unmerged one costs nothing. When the REST response does carry the
+	* field (a client pinned to an older api-version), it is used for a merged
+	* pull request and the GraphQL read is skipped.
+	*
+	* **A list read leaves it absent unless asked.** `list` and
+	* `listAssociatedWithCommit` fill it only when called with
+	* `mergeCommits: true`, at one GraphQL call per 100 merged pull requests.
+	*
+	* It is never the speculative test-merge commit GitHub computes for an open
+	* pull request, so `mergeCommitSha === sha` means "this commit is what the
+	* pull request merged as".
+	*/
 	mergeCommitSha: Schema.optionalKey(Schema.String)
 }) {};
 const AutoMergeResponse = Schema.Struct({});
@@ -74,6 +95,24 @@ const DisableAutoMerge = GraphQLDocument.make({
 }`,
 	response: AutoMergeResponse
 })();
+/**
+* One answer per requested id, **in request order**: a merged pull request
+* carries its merge commit, and a node of another type answers `{}`.
+*/
+const MergeCommitsResponse = Schema.Struct({ nodes: Schema.Array(Schema.NullOr(Schema.Struct({ mergeCommit: Schema.optionalKey(Schema.NullOr(Schema.Struct({ oid: Schema.String }))) }))) });
+const MergeCommits = GraphQLDocument.make({
+	name: "PullRequestMergeCommits",
+	document: `query PullRequestMergeCommits($ids: [ID!]!) {
+  nodes(ids: $ids) {
+    ... on PullRequest { mergeCommit { oid } }
+  }
+}`,
+	response: MergeCommitsResponse
+})();
+/** GraphQL's `nodes(ids:)` accepts at most this many ids per call. */
+const NODES_PER_QUERY = 100;
+/** How many `nodes(ids:)` calls a list's merge-commit read keeps in flight. */
+const MERGE_COMMIT_CONCURRENCY = 4;
 /** GraphQL spells the merge methods in capitals. */
 const GRAPHQL_MERGE_METHOD = {
 	merge: "MERGE",
@@ -110,48 +149,82 @@ const GRAPHQL_MERGE_METHOD = {
 var PullRequest = class PullRequest extends Context.Service()("@effected/github/PullRequest") {
 	/** The live service, built over a `GitHubClient`. */
 	static layer = Layer.effect(this, Effect.map(GitHubClient, (client) => make(client)));
-	/** An in-memory double; unstubbed members die naming themselves. */
+	/** An in-memory double; an unstubbed member dies when run, naming itself. */
 	static makeTest = (overrides = {}) => ({
-		get: overrides.get ?? (() => unstubbed("get")),
-		list: overrides.list ?? (() => unstubbed("list")),
-		listFiles: overrides.listFiles ?? (() => unstubbed("listFiles")),
-		listAssociatedWithCommit: overrides.listAssociatedWithCommit ?? (() => unstubbed("listAssociatedWithCommit")),
-		create: overrides.create ?? (() => unstubbed("create")),
-		update: overrides.update ?? (() => unstubbed("update")),
-		upsert: overrides.upsert ?? (() => unstubbed("upsert")),
-		merge: overrides.merge ?? (() => unstubbed("merge")),
-		addLabels: overrides.addLabels ?? (() => unstubbed("addLabels")),
-		requestReviewers: overrides.requestReviewers ?? (() => unstubbed("requestReviewers")),
-		setAutoMerge: overrides.setAutoMerge ?? (() => unstubbed("setAutoMerge"))
+		get: overrides.get ?? (() => dies("get")),
+		list: overrides.list ?? (() => dies("list")),
+		listFiles: overrides.listFiles ?? (() => dies("listFiles")),
+		listAssociatedWithCommit: overrides.listAssociatedWithCommit ?? (() => dies("listAssociatedWithCommit")),
+		create: overrides.create ?? (() => dies("create")),
+		update: overrides.update ?? (() => dies("update")),
+		upsert: overrides.upsert ?? (() => dies("upsert")),
+		merge: overrides.merge ?? (() => dies("merge")),
+		addLabels: overrides.addLabels ?? (() => dies("addLabels")),
+		requestReviewers: overrides.requestReviewers ?? (() => dies("requestReviewers")),
+		setAutoMerge: overrides.setAutoMerge ?? (() => dies("setAutoMerge"))
 	});
 	/** {@link PullRequest.makeTest} behind a `Layer`. */
 	static layerTest = (overrides = {}) => Layer.succeed(PullRequest, PullRequest.makeTest(overrides));
 };
-const unstubbed = (member) => {
-	throw new Error(`PullRequest.makeTest: ${member}() was called but not stubbed — pass an override.`);
-};
+const dies = unstubbed("PullRequest.makeTest");
 const project = (raw) => Effect.try({
-	try: () => PullRequestInfo.make({
-		number: raw.number,
-		nodeId: raw.node_id,
-		url: raw.html_url,
-		title: raw.title,
-		state: raw.state === "closed" ? "closed" : "open",
-		head: raw.head.ref,
-		headSha: raw.head.sha,
-		base: raw.base.ref,
-		baseSha: raw.base.sha,
-		draft: raw.draft ?? false,
-		merged: raw.merged ?? raw.merged_at != null,
-		mergedAt: raw.merged_at == null ? Option.none() : Option.some(DateTime.makeUnsafe(raw.merged_at)),
-		...raw.body != null ? { body: raw.body } : {},
-		...raw.merge_commit_sha != null ? { mergeCommitSha: raw.merge_commit_sha } : {}
-	}),
+	try: () => {
+		const merged = raw.merged ?? raw.merged_at != null;
+		return PullRequestInfo.make({
+			number: raw.number,
+			nodeId: raw.node_id,
+			url: raw.html_url,
+			title: raw.title,
+			state: raw.state === "closed" ? "closed" : "open",
+			head: raw.head.ref,
+			headSha: raw.head.sha,
+			base: raw.base.ref,
+			baseSha: raw.base.sha,
+			draft: raw.draft ?? false,
+			merged,
+			mergedAt: raw.merged_at == null ? Option.none() : Option.some(DateTime.makeUnsafe(raw.merged_at)),
+			...raw.body != null ? { body: raw.body } : {},
+			...raw.merge_commit_sha != null && merged ? { mergeCommitSha: raw.merge_commit_sha } : {}
+		});
+	},
 	catch: (error) => GitHubError.decode("PullRequest", "GitHub returned an unexpected pull request", error)
 });
 /** `owner:branch` is what GitHub's `head` filter wants for a cross-fork search. */
 const qualifyHead = (owner, head) => head.includes(":") ? head : `${owner}:${head}`;
 const make = (client) => {
+	/**
+	* Fill `mergeCommitSha` for every merged pull request that lacks it, from
+	* GraphQL, in as few `nodes(ids:)` calls as the batch limit allows.
+	*
+	* @remarks
+	* The REST object stopped carrying `merge_commit_sha`, and the field is an
+	* `optionalKey`, so without this it would decode clean as always-absent —
+	* a silent break for anything matching a commit against it. Nothing is
+	* requested when no pull request in the batch needs it.
+	*
+	* `nodes(ids:)` answers positionally — one entry per id, in order, `null`
+	* for an id that resolves to nothing — so each answer is joined to the id
+	* at its index. An answer of the wrong length cannot be joined that way and
+	* fails as a decode error rather than pairing shas with the wrong pulls.
+	*/
+	const withMergeCommits = (pulls) => {
+		const ids = pulls.filter((pull) => pull.merged && pull.mergeCommitSha === void 0).map((pull) => pull.nodeId);
+		if (ids.length === 0) return Effect.succeed(pulls);
+		const batches = [];
+		for (let i = 0; i < ids.length; i += NODES_PER_QUERY) batches.push(ids.slice(i, i + NODES_PER_QUERY));
+		return Effect.forEach(batches, (batch) => Effect.flatMap(client.graphql(MergeCommits, { ids: batch }), (answer) => answer.nodes.length === batch.length ? Effect.succeed(batch.map((id, index) => [id, answer.nodes[index]?.mergeCommit?.oid])) : Effect.fail(GitHubGraphQLError.decode(MergeCommits.name, `nodes(ids:) answered ${answer.nodes.length} entries for ${batch.length} ids`))), { concurrency: MERGE_COMMIT_CONCURRENCY }).pipe(Effect.map((answers) => {
+			const oids = /* @__PURE__ */ new Map();
+			for (const [id, oid] of answers.flat()) if (oid !== void 0) oids.set(id, oid);
+			return pulls.map((pull) => {
+				const oid = pull.mergeCommitSha === void 0 ? oids.get(pull.nodeId) : void 0;
+				return oid === void 0 ? pull : PullRequestInfo.make({
+					...pull,
+					mergeCommitSha: oid
+				});
+			});
+		}));
+	};
+	const withMergeCommit = (pull) => Effect.map(withMergeCommits([pull]), (pulls) => pulls[0] ?? pull);
 	const list = Effect.fn("PullRequest.list")(function* (options) {
 		const { owner, repo } = yield* Repo;
 		const raw = yield* client.paginate("GET /repos/{owner}/{repo}/pulls", {
@@ -161,7 +234,8 @@ const make = (client) => {
 			...options?.head !== void 0 ? { head: qualifyHead(owner, options.head) } : {},
 			...options?.base !== void 0 ? { base: options.base } : {}
 		}, options?.page);
-		return yield* Effect.forEach(raw, project);
+		const pulls = yield* Effect.forEach(raw, project);
+		return options?.mergeCommits === true ? yield* withMergeCommits(pulls) : pulls;
 	});
 	const create = Effect.fn("PullRequest.create")(function* (input) {
 		const { owner, repo } = yield* Repo;
@@ -198,7 +272,7 @@ const make = (client) => {
 			...patch.state !== void 0 ? { state: patch.state } : {},
 			...patch.base !== void 0 ? { base: patch.base } : {}
 		});
-		return yield* project(updated);
+		return yield* withMergeCommit(yield* project(updated));
 	});
 	return {
 		list,
@@ -216,7 +290,7 @@ const make = (client) => {
 				repo,
 				pull_number: number
 			});
-			return yield* project(raw);
+			return yield* withMergeCommit(yield* project(raw));
 		}),
 		listFiles: Effect.fn("PullRequest.listFiles")(function* (number, options) {
 			const { owner, repo } = yield* Repo;
@@ -243,7 +317,8 @@ const make = (client) => {
 				repo,
 				commit_sha: sha
 			}, options?.page);
-			return yield* Effect.forEach(raw, project);
+			const pulls = yield* Effect.forEach(raw, project);
+			return options?.mergeCommits === true ? yield* withMergeCommits(pulls) : pulls;
 		}),
 		upsert: Effect.fn("PullRequest.upsert")(function* (input) {
 			const found = (yield* list({

package/PullRequestComment.js

@@ -1,3 +1,4 @@
+import { unstubbed } from "./internal/unstubbed.js";
 import { GitHubClient } from "./GitHubClient.js";
 import { Repo } from "./Repo.js";
 import { numericId } from "./internal/ids.js";
@@ -66,19 +67,17 @@ var CommentRecord = class extends Schema.Class("CommentRecord")({
 var PullRequestComment = class PullRequestComment extends Context.Service()("@effected/github/PullRequestComment") {
 	/** The live service, built over a `GitHubClient`. */
 	static layer = Layer.effect(this, Effect.map(GitHubClient, (client) => make(client)));
-	/** An in-memory double; unstubbed members die naming themselves. */
+	/** An in-memory double; an unstubbed member dies when run, naming itself. */
 	static makeTest = (overrides = {}) => ({
-		create: overrides.create ?? (() => unstubbed("create")),
-		upsert: overrides.upsert ?? (() => unstubbed("upsert")),
-		find: overrides.find ?? (() => unstubbed("find")),
-		delete: overrides.delete ?? (() => unstubbed("delete"))
+		create: overrides.create ?? (() => dies("create")),
+		upsert: overrides.upsert ?? (() => dies("upsert")),
+		find: overrides.find ?? (() => dies("find")),
+		delete: overrides.delete ?? (() => dies("delete"))
 	});
 	/** {@link PullRequestComment.makeTest} behind a `Layer`. */
 	static layerTest = (overrides = {}) => Layer.succeed(PullRequestComment, PullRequestComment.makeTest(overrides));
 };
-const unstubbed = (member) => {
-	throw new Error(`PullRequestComment.makeTest: ${member}() was called but not stubbed — pass an override.`);
-};
+const dies = unstubbed("PullRequestComment.makeTest");
 const recordOf = (raw) => CommentRecord.make({
 	id: numericId(raw.id),
 	body: raw.body ?? "",