@kitlangton/ghui 0.1.19 → 0.1.20

package/src/services/GitHubService.ts

@@ -1,8 +1,8 @@
 import { Context, Effect, Layer, Schema } from "effect"
 import { config } from "../config.js"
-import { DiffCommentSide, pullRequestQueueSearchQualifier, type CheckItem, type CreatePullRequestCommentInput, type Mergeable, type PullRequestItem, type PullRequestMergeAction, type PullRequestMergeInfo, type PullRequestQueueMode, type PullRequestReviewComment, type ReviewStatus } from "../domain.js"
+import { DiffCommentSide, pullRequestQueueSearchQualifier, type CheckItem, type CreatePullRequestCommentInput, type ListPullRequestPageInput, type Mergeable, type PullRequestItem, type PullRequestMergeAction, type PullRequestMergeInfo, type PullRequestPage, type PullRequestQueueMode, type PullRequestReviewComment, type ReviewStatus } from "../domain.js"
 import { getMergeActionDefinition } from "../mergeActions.js"
-import { CommandRunner, type CommandError, type JsonParseError } from "./CommandRunner.js"
+import { CommandError, CommandRunner, type JsonParseError } from "./CommandRunner.js"
 
 const NullableString = Schema.NullOr(Schema.String)
 const OptionalNullableString = Schema.optionalKey(NullableString)
@@ -29,6 +29,10 @@ const RawLabelSchema = Schema.Struct({
 	color: OptionalNullableString,
 })
 
+const RawStatusCheckRollupSchema = Schema.Struct({
+	contexts: Schema.Struct({ nodes: Schema.Array(RawCheckContextSchema) }),
+})
+
 const RawPullRequestSummaryFields = {
 	number: Schema.Number,
 	title: Schema.String,
@@ -45,7 +49,10 @@ const RawPullRequestSummaryFields = {
 	repository: RawRepositorySchema,
 } as const
 
-const RawPullRequestSummaryNodeSchema = Schema.Struct(RawPullRequestSummaryFields)
+const RawPullRequestSummaryNodeSchema = Schema.Struct({
+	...RawPullRequestSummaryFields,
+	statusCheckRollup: Schema.optionalKey(Schema.NullOr(RawStatusCheckRollupSchema)),
+})
 
 const RawPullRequestNodeSchema = Schema.Struct({
 	...RawPullRequestSummaryFields,
@@ -54,9 +61,15 @@ const RawPullRequestNodeSchema = Schema.Struct({
 	additions: Schema.Number,
 	deletions: Schema.Number,
 	changedFiles: Schema.Number,
-	statusCheckRollup: Schema.optionalKey(Schema.NullOr(Schema.Struct({
-		contexts: Schema.Struct({ nodes: Schema.Array(RawCheckContextSchema) }),
-	}))),
+	statusCheckRollup: Schema.optionalKey(Schema.NullOr(RawStatusCheckRollupSchema)),
+})
+
+const PullRequestDetailResponseSchema = Schema.Struct({
+	data: Schema.Struct({
+		repository: Schema.NullOr(Schema.Struct({
+			pullRequest: Schema.NullOr(RawPullRequestNodeSchema),
+		})),
+	}),
 })
 
 const PageInfoSchema = Schema.Struct({
@@ -74,6 +87,17 @@ const SearchResponseSchema = <Item extends Schema.Top>(item: Item) =>
 		}),
 	})
 
+const RepositoryPullRequestsResponseSchema = Schema.Struct({
+	data: Schema.Struct({
+		repository: Schema.NullOr(Schema.Struct({
+			pullRequests: Schema.Struct({
+				nodes: Schema.Array(Schema.NullOr(RawPullRequestSummaryNodeSchema)),
+				pageInfo: PageInfoSchema,
+			}),
+		})),
+	}),
+})
+
 const ViewerSchema = Schema.Struct({ login: Schema.String })
 
 const MergeInfoResponseSchema = Schema.Struct({
@@ -103,11 +127,23 @@ const PullRequestCommentSchema = Schema.Struct({
 	side: Schema.optionalKey(Schema.NullOr(DiffCommentSide)),
 })
 
+const PullRequestFileSchema = Schema.Struct({
+	filename: Schema.String,
+	previous_filename: OptionalNullableString,
+	status: OptionalNullableString,
+	patch: OptionalNullableString,
+})
+
 const CommentsResponseSchema = Schema.Union([
 	Schema.Array(PullRequestCommentSchema),
 	Schema.Array(Schema.Array(PullRequestCommentSchema)),
 ])
 
+const PullRequestFilesResponseSchema = Schema.Union([
+	Schema.Array(PullRequestFileSchema),
+	Schema.Array(Schema.Array(PullRequestFileSchema)),
+])
+
 const RepoLabelsResponseSchema = Schema.Array(Schema.Struct({
 	name: Schema.String,
 	color: Schema.String,
@@ -117,6 +153,7 @@ type RawPullRequestSummaryNode = Schema.Schema.Type<typeof RawPullRequestSummary
 type RawPullRequestNode = Schema.Schema.Type<typeof RawPullRequestNodeSchema>
 type RawCheckContext = Schema.Schema.Type<typeof RawCheckContextSchema>
 type RawPullRequestComment = Schema.Schema.Type<typeof PullRequestCommentSchema>
+type RawPullRequestFile = Schema.Schema.Type<typeof PullRequestFileSchema>
 
 type SearchResponse<Item> = {
 	readonly data: {
@@ -130,11 +167,41 @@ type SearchResponse<Item> = {
 	}
 }
 
-const pullRequestSearchQuery = `
-query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
-  search(query: $searchQuery, type: ISSUE, first: $first, after: $after) {
-    nodes {
-      ... on PullRequest {
+type PullRequestConnection<Item> = {
+	readonly nodes: readonly (Item | null)[]
+	readonly pageInfo: {
+		readonly hasNextPage: boolean
+		readonly endCursor: string | null
+	}
+}
+
+const STATUS_CHECK_FRAGMENT = `
+        statusCheckRollup {
+          contexts(first: 100) {
+            nodes {
+              __typename
+              ... on CheckRun { name status conclusion }
+              ... on StatusContext { context state }
+            }
+          }
+        }`
+
+const SUMMARY_FIELDS_FRAGMENT = `
+        number
+        title
+        isDraft
+        reviewDecision
+        autoMergeRequest { enabledAt }
+        state
+        merged
+        createdAt
+        closedAt
+        url
+        author { login }
+        headRefOid
+        repository { nameWithOwner }${STATUS_CHECK_FRAGMENT}`
+
+const DETAIL_FIELDS_FRAGMENT = `
         number
         title
         body
@@ -152,16 +219,13 @@ query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
         author { login }
         headRefOid
         repository { nameWithOwner }
-        labels(first: 20) { nodes { name color } }
-        statusCheckRollup {
-          contexts(first: 100) {
-            nodes {
-              __typename
-              ... on CheckRun { name status conclusion }
-              ... on StatusContext { context state }
-            }
-          }
-        }
+        labels(first: 20) { nodes { name color } }${STATUS_CHECK_FRAGMENT}`
+
+const pullRequestSearchQuery = `
+query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
+  search(query: $searchQuery, type: ISSUE, first: $first, after: $after) {
+    nodes {
+      ... on PullRequest {${DETAIL_FIELDS_FRAGMENT}
       }
     }
     pageInfo { hasNextPage endCursor }
@@ -169,24 +233,20 @@ query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
 }
 `
 
+const pullRequestDetailQuery = `
+query PullRequest($owner: String!, $name: String!, $number: Int!) {
+  repository(owner: $owner, name: $name) {
+    pullRequest(number: $number) {${DETAIL_FIELDS_FRAGMENT}
+    }
+  }
+}
+`
+
 const pullRequestSummarySearchQuery = `
 query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
   search(query: $searchQuery, type: ISSUE, first: $first, after: $after) {
     nodes {
-      ... on PullRequest {
-        number
-        title
-        isDraft
-        reviewDecision
-        autoMergeRequest { enabledAt }
-        state
-        merged
-        createdAt
-        closedAt
-        url
-        author { login }
-        headRefOid
-        repository { nameWithOwner }
+      ... on PullRequest {${SUMMARY_FIELDS_FRAGMENT}
       }
     }
     pageInfo { hasNextPage endCursor }
@@ -194,6 +254,18 @@ query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
 }
 `
 
+const repositoryPullRequestsQuery = `
+query RepositoryPullRequests($owner: String!, $name: String!, $first: Int!, $after: String) {
+  repository(owner: $owner, name: $name) {
+    pullRequests(states: OPEN, first: $first, after: $after, orderBy: { field: UPDATED_AT, direction: DESC }) {
+      nodes {${SUMMARY_FIELDS_FRAGMENT}
+      }
+      pageInfo { hasNextPage endCursor }
+    }
+  }
+}
+`
+
 const normalizeDate = (value: string | null | undefined) => {
 	if (!value || value.startsWith("0001-01-01")) return null
 	return new Date(value)
@@ -296,28 +368,31 @@ const getCheckInfoFromContexts = (contexts: readonly RawCheckContext[]): Pick<Pu
 	return { checkStatus: "passing", checkSummary: `checks ${successful}/${contexts.length}`, checks }
 }
 
-const parsePullRequestSummary = (item: RawPullRequestSummaryNode): PullRequestItem => ({
-	repository: item.repository.nameWithOwner,
-	author: item.author.login,
-	headRefOid: item.headRefOid,
-	number: item.number,
-	title: item.title,
-	body: "",
-	labels: [],
-	additions: 0,
-	deletions: 0,
-	changedFiles: 0,
-	state: getPullRequestState(item),
-	reviewStatus: getReviewStatus(item),
-	checkStatus: "none",
-	checkSummary: null,
-	checks: [],
-	autoMergeEnabled: item.autoMergeRequest !== null,
-	detailLoaded: false,
-	createdAt: new Date(item.createdAt),
-	closedAt: normalizeDate(item.closedAt),
-	url: item.url,
-})
+const parsePullRequestSummary = (item: RawPullRequestSummaryNode): PullRequestItem => {
+	const checkInfo = getCheckInfoFromContexts(item.statusCheckRollup?.contexts.nodes ?? [])
+	return {
+		repository: item.repository.nameWithOwner,
+		author: item.author.login,
+		headRefOid: item.headRefOid,
+		number: item.number,
+		title: item.title,
+		body: "",
+		labels: [],
+		additions: 0,
+		deletions: 0,
+		changedFiles: 0,
+		state: getPullRequestState(item),
+		reviewStatus: getReviewStatus(item),
+		checkStatus: checkInfo.checkStatus,
+		checkSummary: checkInfo.checkSummary,
+		checks: checkInfo.checks,
+		autoMergeEnabled: item.autoMergeRequest !== null,
+		detailLoaded: false,
+		createdAt: new Date(item.createdAt),
+		closedAt: normalizeDate(item.closedAt),
+		url: item.url,
+	}
+}
 
 const parsePullRequest = (item: RawPullRequestNode): PullRequestItem => {
 	const checkInfo = getCheckInfoFromContexts(item.statusCheckRollup?.contexts.nodes ?? [])
@@ -338,10 +413,21 @@ const parsePullRequest = (item: RawPullRequestNode): PullRequestItem => {
 	}
 }
 
-const searchQuery = (mode: PullRequestQueueMode, author: string) => `${pullRequestQueueSearchQualifier(mode, author)} is:pr is:open sort:created-desc`
+const searchQuery = (mode: PullRequestQueueMode, author: string, repository: string | null) => {
+	const sort = mode === "repository" ? "sort:updated-desc" : "sort:created-desc"
+	return `${pullRequestQueueSearchQualifier(mode, author, repository)} is:pr is:open ${sort}`
+}
+
+const pullRequestPage = <Item>(connection: PullRequestConnection<Item>, parse: (node: Item) => PullRequestItem): PullRequestPage => ({
+	items: connection.nodes.flatMap((node) => node ? [parse(node)] : []),
+	endCursor: connection.pageInfo.endCursor,
+	hasNextPage: connection.pageInfo.hasNextPage && connection.pageInfo.endCursor !== null,
+})
 
-const sortNewestFirst = (pullRequests: readonly PullRequestItem[]) =>
-	[...pullRequests].sort((left, right) => right.createdAt.getTime() - left.createdAt.getTime())
+const repositoryParts = (repository: string) => {
+	const [owner, name] = repository.split("/")
+	return owner && name ? { owner, name } : null
+}
 
 const parsePullRequestComment = (comment: RawPullRequestComment): PullRequestReviewComment | null => {
 	const line = comment.line ?? comment.original_line
@@ -359,15 +445,40 @@ const parsePullRequestComment = (comment: RawPullRequestComment): PullRequestRev
 }
 
 const parsePullRequestComments = (response: Schema.Schema.Type<typeof CommentsResponseSchema>): readonly PullRequestReviewComment[] => {
-	const pages: readonly (readonly RawPullRequestComment[])[] = Array.isArray(response[0])
-		? response as readonly (readonly RawPullRequestComment[])[]
-		: [response as readonly RawPullRequestComment[]]
-	return pages.flatMap((page) => page.flatMap((comment) => {
+	return flattenSlurpedPages(response).flatMap((comment) => {
 		const parsed = parsePullRequestComment(comment)
 		return parsed ? [parsed] : []
-	}))
+	})
+}
+
+const flattenSlurpedPages = <Item>(response: readonly Item[] | readonly (readonly Item[])[]): readonly Item[] =>
+	Array.isArray(response[0]) ? (response as readonly (readonly Item[])[]).flat() : response as readonly Item[]
+
+const parsePullRequestFiles = (response: Schema.Schema.Type<typeof PullRequestFilesResponseSchema>): readonly RawPullRequestFile[] =>
+	flattenSlurpedPages(response)
+
+const diffPath = (path: string) => /\s|"/.test(path) ? JSON.stringify(path) : path
+
+const prefixedDiffPath = (prefix: "a" | "b", path: string) => diffPath(`${prefix}/${path}`)
+
+const fileHeaderPatch = (file: RawPullRequestFile) => {
+	const oldPath = file.previous_filename ?? file.filename
+	const newPath = file.filename
+	const oldRef = file.status === "added" ? "/dev/null" : prefixedDiffPath("a", oldPath)
+	const newRef = file.status === "removed" ? "/dev/null" : prefixedDiffPath("b", newPath)
+	const lines = [
+		`diff --git ${prefixedDiffPath("a", oldPath)} ${prefixedDiffPath("b", newPath)}`,
+		...(file.status === "renamed" && file.previous_filename ? [`rename from ${oldPath}`, `rename to ${newPath}`] : []),
+		`--- ${oldRef}`,
+		`+++ ${newRef}`,
+	]
+	if (file.patch) lines.push(file.patch.trimEnd())
+	return lines.join("\n")
 }
 
+export const pullRequestFilesToPatch = (files: readonly RawPullRequestFile[]) =>
+	files.map(fileHeaderPatch).join("\n")
+
 const fallbackCreatedComment = (input: CreatePullRequestCommentInput): PullRequestReviewComment => ({
 	id: `created:${input.repository}:${input.number}:${input.path}:${input.side}:${input.line}:${Date.now()}`,
 	path: input.path,
@@ -390,10 +501,12 @@ const normalizeMergeable = (value: string): Mergeable =>
 	MERGEABLE_BY_RAW[value] ?? "unknown"
 
 export class GitHubService extends Context.Service<GitHubService, {
-	readonly listOpenPullRequests: (mode: PullRequestQueueMode) => Effect.Effect<readonly PullRequestItem[], GitHubError>
-	readonly listOpenPullRequestDetails: (mode: PullRequestQueueMode) => Effect.Effect<readonly PullRequestItem[], GitHubError>
+	readonly listOpenPullRequests: (mode: PullRequestQueueMode, repository: string | null) => Effect.Effect<readonly PullRequestItem[], GitHubError>
+	readonly listOpenPullRequestPage: (input: ListPullRequestPageInput) => Effect.Effect<PullRequestPage, GitHubError>
+	readonly listOpenPullRequestDetails: (mode: PullRequestQueueMode, repository: string | null) => Effect.Effect<readonly PullRequestItem[], GitHubError>
+	readonly getPullRequestDetails: (repository: string, number: number) => Effect.Effect<PullRequestItem, GitHubError>
 	readonly getAuthenticatedUser: () => Effect.Effect<string, GitHubError>
-	readonly getPullRequestDiff: (repository: string, number: number) => Effect.Effect<string, CommandError>
+	readonly getPullRequestDiff: (repository: string, number: number) => Effect.Effect<string, GitHubError>
 	readonly listPullRequestComments: (repository: string, number: number) => Effect.Effect<readonly PullRequestReviewComment[], GitHubError>
 	readonly getPullRequestMergeInfo: (repository: string, number: number) => Effect.Effect<PullRequestMergeInfo, GitHubError>
 	readonly mergePullRequest: (repository: string, number: number, action: PullRequestMergeAction) => Effect.Effect<void, CommandError>
@@ -409,55 +522,112 @@ export class GitHubService extends Context.Service<GitHubService, {
 		Effect.gen(function*() {
 			const command = yield* CommandRunner
 
-			const paginateSearch = <Item extends Schema.Top>(label: string, query: string, schema: Item, parse: (node: Item["Type"]) => PullRequestItem) => {
+			const ghJson = <S extends Schema.Top>(label: string, schema: S, args: readonly string[]) =>
+				command.runSchema(schema, "gh", args).pipe(Effect.withSpan(`GitHubService.${label}`))
+
+			const ghVoid = (label: string, args: readonly string[]) =>
+				command.run("gh", args).pipe(Effect.withSpan(`GitHubService.${label}`), Effect.asVoid)
+
+			const searchPage = <Item extends Schema.Top>(label: string, query: string, schema: Item, parse: (node: Item["Type"]) => PullRequestItem) => {
 				const responseSchema = SearchResponseSchema(schema)
-				return Effect.fn(`GitHubService.${label}`)(function*(mode: PullRequestQueueMode) {
-					const pullRequests: PullRequestItem[] = []
-					let cursor: string | null = null
-
-					while (pullRequests.length < config.prFetchLimit) {
-						const pageSize = Math.min(100, config.prFetchLimit - pullRequests.length)
-						const response: SearchResponse<Item["Type"]> = yield* command.runSchema(responseSchema, "gh", [
-							"api", "graphql",
-							"-f", `query=${query}`,
-							"-F", `searchQuery=${searchQuery(mode, config.author)}`,
-							"-F", `first=${pageSize}`,
-							...(cursor ? ["-F", `after=${cursor}`] : []),
-						])
-
-						for (const node of response.data.search.nodes) {
-							if (node) pullRequests.push(parse(node))
-						}
-
-						if (!response.data.search.pageInfo.hasNextPage) break
-						cursor = response.data.search.pageInfo.endCursor
-						if (!cursor) break
-					}
-
-					return sortNewestFirst(pullRequests)
+				return Effect.fn(`GitHubService.${label}`)(function*(input: ListPullRequestPageInput) {
+					const response: SearchResponse<Item["Type"]> = yield* command.runSchema(responseSchema, "gh", [
+						"api", "graphql",
+						"-f", `query=${query}`,
+						"-F", `searchQuery=${searchQuery(input.mode, config.author, input.repository)}`,
+						"-F", `first=${input.pageSize}`,
+						...(input.cursor ? ["-F", `after=${input.cursor}`] : []),
+					])
+					return pullRequestPage(response.data.search, parse)
 				})
 			}
 
-			const listOpenPullRequests = paginateSearch("listOpenPullRequests", pullRequestSummarySearchQuery, RawPullRequestSummaryNodeSchema, parsePullRequestSummary)
-			const listOpenPullRequestDetails = paginateSearch("listOpenPullRequestDetails", pullRequestSearchQuery, RawPullRequestNodeSchema, parsePullRequest)
+			const listOpenPullRequestSearchPage = searchPage("listOpenPullRequestSearchPage", pullRequestSummarySearchQuery, RawPullRequestSummaryNodeSchema, parsePullRequestSummary)
+			const listOpenPullRequestDetailsPage = searchPage("listOpenPullRequestDetailsPage", pullRequestSearchQuery, RawPullRequestNodeSchema, parsePullRequest)
+
+			const listRepositoryPullRequestPage = Effect.fn("GitHubService.listRepositoryPullRequestPage")(function*(input: ListPullRequestPageInput) {
+				if (!input.repository) return { items: [], endCursor: null, hasNextPage: false } satisfies PullRequestPage
+				const repo = repositoryParts(input.repository)
+				if (!repo) {
+					return yield* new CommandError({ command: "gh", args: [], detail: `Invalid repository: ${input.repository}`, cause: input.repository })
+				}
+
+				const response = yield* command.runSchema(RepositoryPullRequestsResponseSchema, "gh", [
+					"api", "graphql",
+					"-f", `query=${repositoryPullRequestsQuery}`,
+					"-F", `owner=${repo.owner}`,
+					"-F", `name=${repo.name}`,
+					"-F", `first=${input.pageSize}`,
+					...(input.cursor ? ["-F", `after=${input.cursor}`] : []),
+				])
+				const connection = response.data.repository?.pullRequests
+				if (!connection) {
+					return yield* new CommandError({ command: "gh", args: [], detail: `Repository not found: ${input.repository}`, cause: input.repository })
+				}
+				return pullRequestPage(connection, parsePullRequestSummary)
+			})
+
+			const listOpenPullRequestPage = Effect.fn("GitHubService.listOpenPullRequestPage")(function*(input: ListPullRequestPageInput) {
+				const pageSize = Math.max(1, Math.min(100, input.pageSize))
+				const pageInput = { ...input, pageSize }
+				if (pageInput.mode === "repository" && pageInput.repository) return yield* listRepositoryPullRequestPage(pageInput)
+				return yield* listOpenPullRequestSearchPage(pageInput)
+			})
+
+			const paginatePages = Effect.fn("GitHubService.paginatePages")(function*(mode: PullRequestQueueMode, repository: string | null, loadPage: (input: ListPullRequestPageInput) => Effect.Effect<PullRequestPage, GitHubError>) {
+				const pullRequests: PullRequestItem[] = []
+				let cursor: string | null = null
+
+				while (pullRequests.length < config.prFetchLimit) {
+					const page: PullRequestPage = yield* loadPage({ mode, repository, cursor, pageSize: Math.min(100, config.prFetchLimit - pullRequests.length) })
+					pullRequests.push(...page.items)
+					if (!page.hasNextPage || !page.endCursor) break
+					cursor = page.endCursor
+				}
 
-			const getAuthenticatedUser = Effect.fn("GitHubService.getAuthenticatedUser")(function*() {
-				const viewer = yield* command.runSchema(ViewerSchema, "gh", ["api", "user"])
-				return viewer.login
+				return pullRequests
 			})
 
-			const getPullRequestDiff = Effect.fn("GitHubService.getPullRequestDiff")(function*(repository: string, number: number) {
-				const result = yield* command.run("gh", ["pr", "diff", String(number), "--repo", repository, "--color", "never"])
-				return result.stdout
+			const listOpenPullRequests = Effect.fn("GitHubService.listOpenPullRequests")(function*(mode: PullRequestQueueMode, repository: string | null) {
+				return yield* paginatePages(mode, repository, listOpenPullRequestPage)
+			})
+			const listOpenPullRequestDetails = Effect.fn("GitHubService.listOpenPullRequestDetails")(function*(mode: PullRequestQueueMode, repository: string | null) {
+				return yield* paginatePages(mode, repository, listOpenPullRequestDetailsPage)
 			})
 
-			const listPullRequestComments = Effect.fn("GitHubService.listPullRequestComments")(function*(repository: string, number: number) {
-				const response = yield* command.runSchema(CommentsResponseSchema, "gh", [
-					"api", "--paginate", "--slurp", `repos/${repository}/pulls/${number}/comments`,
+			const getPullRequestDetails = Effect.fn("GitHubService.getPullRequestDetails")(function*(repository: string, number: number) {
+				const repo = repositoryParts(repository)
+				if (!repo) {
+					return yield* new CommandError({ command: "gh", args: [], detail: `Invalid repository: ${repository}`, cause: repository })
+				}
+
+				const response = yield* command.runSchema(PullRequestDetailResponseSchema, "gh", [
+					"api", "graphql",
+					"-f", `query=${pullRequestDetailQuery}`,
+					"-F", `owner=${repo.owner}`,
+					"-F", `name=${repo.name}`,
+					"-F", `number=${number}`,
 				])
-				return parsePullRequestComments(response)
+				const pullRequest = response.data.repository?.pullRequest
+				if (!pullRequest) {
+					return yield* new CommandError({ command: "gh", args: [], detail: `Pull request not found: ${repository}#${number}`, cause: `${repository}#${number}` })
+				}
+				return parsePullRequest(pullRequest)
 			})
 
+			const getAuthenticatedUser = () =>
+				ghJson("getAuthenticatedUser", ViewerSchema, ["api", "user"]).pipe(Effect.map((viewer) => viewer.login))
+
+			const getPullRequestDiff = (repository: string, number: number) =>
+				ghJson("getPullRequestDiff", PullRequestFilesResponseSchema, [
+					"api", "--paginate", "--slurp", `repos/${repository}/pulls/${number}/files`,
+				]).pipe(Effect.map((response) => pullRequestFilesToPatch(parsePullRequestFiles(response))))
+
+			const listPullRequestComments = (repository: string, number: number) =>
+				ghJson("listPullRequestComments", CommentsResponseSchema, [
+					"api", "--paginate", "--slurp", `repos/${repository}/pulls/${number}/comments`,
+				]).pipe(Effect.map(parsePullRequestComments))
+
 			const getPullRequestMergeInfo = Effect.fn("GitHubService.getPullRequestMergeInfo")(function*(repository: string, number: number) {
 				const info = yield* command.runSchema(MergeInfoResponseSchema, "gh", [
 					"pr", "view", String(number), "--repo", repository,
@@ -479,14 +649,11 @@ export class GitHubService extends Context.Service<GitHubService, {
 				} satisfies PullRequestMergeInfo
 			})
 
-			const mergePullRequest = Effect.fn("GitHubService.mergePullRequest")(function*(repository: string, number: number, action: PullRequestMergeAction) {
-				const base = ["pr", "merge", String(number), "--repo", repository] as const
-				yield* command.run("gh", [...base, ...getMergeActionDefinition(action).cliArgs])
-			})
+			const mergePullRequest = (repository: string, number: number, action: PullRequestMergeAction) =>
+				ghVoid("mergePullRequest", ["pr", "merge", String(number), "--repo", repository, ...getMergeActionDefinition(action).cliArgs])
 
-			const closePullRequest = Effect.fn("GitHubService.closePullRequest")(function*(repository: string, number: number) {
-				yield* command.run("gh", ["pr", "close", String(number), "--repo", repository])
-			})
+			const closePullRequest = (repository: string, number: number) =>
+				ghVoid("closePullRequest", ["pr", "close", String(number), "--repo", repository])
 
 			const createPullRequestComment = Effect.fn("GitHubService.createPullRequestComment")(function*(input: CreatePullRequestCommentInput) {
 				const response = yield* command.runSchema(PullRequestCommentSchema, "gh", [
@@ -500,28 +667,25 @@ export class GitHubService extends Context.Service<GitHubService, {
 				return parsePullRequestComment(response) ?? fallbackCreatedComment(input)
 			})
 
-			const toggleDraftStatus = Effect.fn("GitHubService.toggleDraftStatus")(function*(repository: string, number: number, isDraft: boolean) {
-				yield* command.run("gh", ["pr", "ready", String(number), "--repo", repository, ...(isDraft ? [] : ["--undo"])])
-			})
+			const toggleDraftStatus = (repository: string, number: number, isDraft: boolean) =>
+				ghVoid("toggleDraftStatus", ["pr", "ready", String(number), "--repo", repository, ...(isDraft ? [] : ["--undo"])])
 
-			const listRepoLabels = Effect.fn("GitHubService.listRepoLabels")(function*(repository: string) {
-				const labels = yield* command.runSchema(RepoLabelsResponseSchema, "gh", [
+			const listRepoLabels = (repository: string) =>
+				ghJson("listRepoLabels", RepoLabelsResponseSchema, [
 					"label", "list", "--repo", repository, "--json", "name,color", "--limit", "100",
-				])
-				return labels.map((label) => ({ name: label.name, color: `#${label.color}` }))
-			})
+				]).pipe(Effect.map((labels) => labels.map((label) => ({ name: label.name, color: `#${label.color}` }))))
 
-			const addPullRequestLabel = Effect.fn("GitHubService.addPullRequestLabel")(function*(repository: string, number: number, label: string) {
-				yield* command.run("gh", ["pr", "edit", String(number), "--repo", repository, "--add-label", label])
-			})
+			const addPullRequestLabel = (repository: string, number: number, label: string) =>
+				ghVoid("addPullRequestLabel", ["pr", "edit", String(number), "--repo", repository, "--add-label", label])
 
-			const removePullRequestLabel = Effect.fn("GitHubService.removePullRequestLabel")(function*(repository: string, number: number, label: string) {
-				yield* command.run("gh", ["pr", "edit", String(number), "--repo", repository, "--remove-label", label])
-			})
+			const removePullRequestLabel = (repository: string, number: number, label: string) =>
+				ghVoid("removePullRequestLabel", ["pr", "edit", String(number), "--repo", repository, "--remove-label", label])
 
 			return GitHubService.of({
 				listOpenPullRequests,
+				listOpenPullRequestPage,
 				listOpenPullRequestDetails,
+				getPullRequestDetails,
 				getAuthenticatedUser,
 				getPullRequestDiff,
 				listPullRequestComments,