@kitlangton/ghui 0.1.16 → 0.1.18

package/src/services/GitHubService.ts

@@ -1,71 +1,130 @@
-import { Context, Effect, Layer } from "effect"
+import { Context, Effect, Layer, Schema } from "effect"
 import { config } from "../config.js"
-import type { CheckItem, PullRequestItem, PullRequestMergeAction, PullRequestMergeInfo } from "../domain.js"
+import { pullRequestQueueSearchQualifier, type CheckItem, type CreatePullRequestCommentInput, type PullRequestItem, type PullRequestMergeAction, type PullRequestMergeInfo, type PullRequestQueueMode, type PullRequestReviewComment } from "../domain.js"
 import { getMergeActionDefinition } from "../mergeActions.js"
 import { CommandRunner, type CommandError, type JsonParseError } from "./CommandRunner.js"
 
-interface GitHubPullRequestSummaryNode {
-	readonly number: number
-	readonly title: string
-	readonly isDraft: boolean
-	readonly reviewDecision: string | null
-	readonly autoMergeRequest: unknown | null
-	readonly state: string
-	readonly createdAt: string
-	readonly closedAt?: string | null
-	readonly url: string
-	readonly repository: {
-		readonly nameWithOwner: string
-	}
-}
+const NullableString = Schema.NullOr(Schema.String)
+const OptionalNullableString = Schema.optional(NullableString)
+const OptionalNullableNumber = Schema.optional(Schema.NullOr(Schema.Number))
 
-interface GitHubPullRequestNode extends GitHubPullRequestSummaryNode {
-	readonly body: string
-	readonly labels: {
-		readonly nodes: readonly {
-			readonly name: string
-			readonly color?: string | null
-		}[]
-	}
-	readonly additions: number
-	readonly deletions: number
-	readonly changedFiles: number
-	readonly statusCheckRollup?: {
-		readonly contexts: {
-			readonly nodes: readonly GraphQLCheckContext[]
-		}
-	} | null
-}
+const RawCheckRunSchema = Schema.Struct({
+	__typename: Schema.Literal("CheckRun"),
+	name: OptionalNullableString,
+	status: OptionalNullableString,
+	conclusion: OptionalNullableString,
+})
 
-type GraphQLCheckContext =
-	| {
-		readonly __typename: "CheckRun"
-		readonly name?: string | null
-		readonly status?: string | null
-		readonly conclusion?: string | null
-	}
-	| {
-		readonly __typename: "StatusContext"
-		readonly context?: string | null
-		readonly state?: string | null
-	}
+const RawStatusContextSchema = Schema.Struct({
+	__typename: Schema.Literal("StatusContext"),
+	context: OptionalNullableString,
+	state: OptionalNullableString,
+})
 
-interface GraphQLSearchResponse {
-	readonly data: {
-		readonly search: {
-			readonly nodes: readonly (GitHubPullRequestNode | null)[]
-			readonly pageInfo: {
-				readonly hasNextPage: boolean
-				readonly endCursor: string | null
-			}
-		}
-	}
-}
+const RawCheckContextSchema = Schema.Union([RawCheckRunSchema, RawStatusContextSchema])
+
+const RawAuthorSchema = Schema.Struct({ login: Schema.String })
+const RawRepositorySchema = Schema.Struct({ nameWithOwner: Schema.String })
+const RawLabelSchema = Schema.Struct({
+	name: Schema.String,
+	color: OptionalNullableString,
+})
 
-interface GraphQLSearchSummaryResponse {
+const RawPullRequestSummaryFields = {
+	number: Schema.Number,
+	title: Schema.String,
+	isDraft: Schema.Boolean,
+	reviewDecision: NullableString,
+	autoMergeRequest: Schema.NullOr(Schema.Unknown),
+	state: Schema.String,
+	merged: Schema.Boolean,
+	createdAt: Schema.String,
+	closedAt: OptionalNullableString,
+	url: Schema.String,
+	author: RawAuthorSchema,
+	headRefOid: Schema.String,
+	repository: RawRepositorySchema,
+} as const
+
+const RawPullRequestSummaryNodeSchema = Schema.Struct(RawPullRequestSummaryFields)
+
+const RawPullRequestNodeSchema = Schema.Struct({
+	...RawPullRequestSummaryFields,
+	body: Schema.String,
+	labels: Schema.Struct({ nodes: Schema.Array(RawLabelSchema) }),
+	additions: Schema.Number,
+	deletions: Schema.Number,
+	changedFiles: Schema.Number,
+	statusCheckRollup: Schema.optional(Schema.NullOr(Schema.Struct({
+		contexts: Schema.Struct({ nodes: Schema.Array(RawCheckContextSchema) }),
+	}))),
+})
+
+const PageInfoSchema = Schema.Struct({
+	hasNextPage: Schema.Boolean,
+	endCursor: NullableString,
+})
+
+const SearchResponseSchema = <Item extends Schema.Top>(item: Item) =>
+	Schema.Struct({
+		data: Schema.Struct({
+			search: Schema.Struct({
+				nodes: Schema.Array(Schema.NullOr(item)),
+				pageInfo: PageInfoSchema,
+			}),
+		}),
+	})
+
+const ViewerSchema = Schema.Struct({ login: Schema.String })
+
+const MergeInfoResponseSchema = Schema.Struct({
+	number: Schema.Number,
+	title: Schema.String,
+	state: Schema.String,
+	isDraft: Schema.Boolean,
+	mergeable: Schema.String,
+	reviewDecision: NullableString,
+	autoMergeRequest: Schema.NullOr(Schema.Unknown),
+	statusCheckRollup: Schema.Array(RawCheckContextSchema),
+})
+
+const DiffCommentSideSchema = Schema.Union([Schema.Literal("LEFT"), Schema.Literal("RIGHT")])
+
+const PullRequestCommentSchema = Schema.Struct({
+	id: Schema.optional(Schema.NullOr(Schema.Union([Schema.Number, Schema.String]))),
+	node_id: OptionalNullableString,
+	body: OptionalNullableString,
+	html_url: OptionalNullableString,
+	url: OptionalNullableString,
+	created_at: OptionalNullableString,
+	user: Schema.optional(Schema.NullOr(Schema.Struct({
+		login: OptionalNullableString,
+	}))),
+	path: OptionalNullableString,
+	line: OptionalNullableNumber,
+	original_line: OptionalNullableNumber,
+	side: Schema.optional(Schema.NullOr(DiffCommentSideSchema)),
+})
+
+const CommentsResponseSchema = Schema.Union([
+	Schema.Array(PullRequestCommentSchema),
+	Schema.Array(Schema.Array(PullRequestCommentSchema)),
+])
+
+const RepoLabelsResponseSchema = Schema.Array(Schema.Struct({
+	name: Schema.String,
+	color: Schema.String,
+}))
+
+type RawPullRequestSummaryNode = Schema.Schema.Type<typeof RawPullRequestSummaryNodeSchema>
+type RawPullRequestNode = Schema.Schema.Type<typeof RawPullRequestNodeSchema>
+type RawCheckContext = Schema.Schema.Type<typeof RawCheckContextSchema>
+type RawPullRequestComment = Schema.Schema.Type<typeof PullRequestCommentSchema>
+
+type SearchResponse<Item> = {
 	readonly data: {
 		readonly search: {
-			readonly nodes: readonly (GitHubPullRequestSummaryNode | null)[]
+			readonly nodes: readonly (Item | null)[]
 			readonly pageInfo: {
 				readonly hasNextPage: boolean
 				readonly endCursor: string | null
@@ -74,21 +133,6 @@ interface GraphQLSearchSummaryResponse {
 	}
 }
 
-interface GitHubViewer {
-	readonly login: string
-}
-
-interface GitHubMergeInfoResponse {
-	readonly number: number
-	readonly title: string
-	readonly state: string
-	readonly isDraft: boolean
-	readonly mergeable: string
-	readonly reviewDecision: string | null
-	readonly autoMergeRequest: unknown | null
-	readonly statusCheckRollup: readonly GraphQLCheckContext[]
-}
-
 const pullRequestSearchQuery = `
 query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
   search(query: $searchQuery, type: ISSUE, first: $first, after: $after) {
@@ -104,9 +148,12 @@ query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
         deletions
         changedFiles
         state
+        merged
         createdAt
         closedAt
         url
+        author { login }
+        headRefOid
         repository { nameWithOwner }
         labels(first: 20) { nodes { name color } }
         statusCheckRollup {
@@ -136,9 +183,12 @@ query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
         reviewDecision
         autoMergeRequest { enabledAt }
         state
+        merged
         createdAt
         closedAt
         url
+        author { login }
+        headRefOid
         repository { nameWithOwner }
       }
     }
@@ -152,45 +202,57 @@ const normalizeDate = (value: string | null | undefined) => {
 	return new Date(value)
 }
 
+const getPullRequestState = (item: { readonly state: string; readonly merged: boolean }): PullRequestItem["state"] =>
+	item.merged ? "merged" : item.state.toLowerCase() === "open" ? "open" : "closed"
+
+const REVIEW_STATUS_BY_DECISION: Record<string, PullRequestItem["reviewStatus"]> = {
+	APPROVED: "approved",
+	CHANGES_REQUESTED: "changes",
+	REVIEW_REQUIRED: "review",
+}
+
 const getReviewStatus = (item: { readonly isDraft: boolean; readonly reviewDecision: string | null }): PullRequestItem["reviewStatus"] => {
 	if (item.isDraft) return "draft"
-	if (item.reviewDecision === "APPROVED") return "approved"
-	if (item.reviewDecision === "CHANGES_REQUESTED") return "changes"
-	if (item.reviewDecision === "REVIEW_REQUIRED") return "review"
+	if (item.reviewDecision) return REVIEW_STATUS_BY_DECISION[item.reviewDecision] ?? "none"
 	return "none"
 }
 
-const normalizeCheckStatus = (raw?: string | null): CheckItem["status"] => {
-	if (raw === "COMPLETED") return "completed"
-	if (raw === "IN_PROGRESS") return "in_progress"
-	if (raw === "QUEUED") return "queued"
-	return "pending"
+const CHECK_STATUS_BY_RAW: Record<string, CheckItem["status"]> = {
+	COMPLETED: "completed",
+	IN_PROGRESS: "in_progress",
+	QUEUED: "queued",
 }
 
-const normalizeCheckConclusion = (raw?: string | null): CheckItem["conclusion"] => {
-	if (raw === "SUCCESS") return "success"
-	if (raw === "FAILURE" || raw === "ERROR") return "failure"
-	if (raw === "NEUTRAL") return "neutral"
-	if (raw === "SKIPPED") return "skipped"
-	if (raw === "CANCELLED") return "cancelled"
-	if (raw === "TIMED_OUT") return "timed_out"
-	return null
+const CHECK_CONCLUSION_BY_RAW: Record<string, NonNullable<CheckItem["conclusion"]>> = {
+	SUCCESS: "success",
+	FAILURE: "failure",
+	ERROR: "failure",
+	NEUTRAL: "neutral",
+	SKIPPED: "skipped",
+	CANCELLED: "cancelled",
+	TIMED_OUT: "timed_out",
 }
 
-const getContextStatus = (context: GraphQLCheckContext): CheckItem["status"] => {
+const normalizeCheckStatus = (raw: string | null | undefined): CheckItem["status"] =>
+	raw ? CHECK_STATUS_BY_RAW[raw] ?? "pending" : "pending"
+
+const normalizeCheckConclusion = (raw: string | null | undefined): CheckItem["conclusion"] =>
+	raw ? CHECK_CONCLUSION_BY_RAW[raw] ?? null : null
+
+const getContextStatus = (context: RawCheckContext): CheckItem["status"] => {
 	if (context.__typename === "CheckRun") return normalizeCheckStatus(context.status)
 	if (context.state === "PENDING") return "in_progress"
 	return "completed"
 }
 
-const getContextConclusion = (context: GraphQLCheckContext): CheckItem["conclusion"] => {
+const getContextConclusion = (context: RawCheckContext): CheckItem["conclusion"] => {
 	if (context.__typename === "CheckRun") return normalizeCheckConclusion(context.conclusion)
 	if (context.state === "SUCCESS") return "success"
 	if (context.state === "FAILURE" || context.state === "ERROR") return "failure"
 	return null
 }
 
-const getCheckInfoFromContexts = (contexts: readonly GraphQLCheckContext[]): Pick<PullRequestItem, "checkStatus" | "checkSummary" | "checks"> => {
+const getCheckInfoFromContexts = (contexts: readonly RawCheckContext[]): Pick<PullRequestItem, "checkStatus" | "checkSummary" | "checks"> => {
 	if (contexts.length === 0) {
 		return { checkStatus: "none", checkSummary: null, checks: [] }
 	}
@@ -232,39 +294,10 @@ const getCheckInfoFromContexts = (contexts: readonly GraphQLCheckContext[]): Pic
 	return { checkStatus: "passing", checkSummary: `checks ${successful}/${contexts.length}`, checks }
 }
 
-const getCheckInfo = (item: GitHubPullRequestNode): Pick<PullRequestItem, "checkStatus" | "checkSummary" | "checks"> =>
-	getCheckInfoFromContexts(item.statusCheckRollup?.contexts.nodes ?? [])
-
-const parsePullRequest = (item: GitHubPullRequestNode): PullRequestItem => {
-	const checkInfo = getCheckInfo(item)
-
-	return {
-		repository: item.repository.nameWithOwner,
-		number: item.number,
-		title: item.title,
-		body: item.body,
-		labels: item.labels.nodes.map((label) => ({
-			name: label.name,
-			color: label.color ? `#${label.color}` : null,
-		})),
-		additions: item.additions,
-		deletions: item.deletions,
-		changedFiles: item.changedFiles,
-		state: item.state.toLowerCase() === "open" ? "open" : "closed",
-		reviewStatus: getReviewStatus(item),
-		checkStatus: checkInfo.checkStatus,
-		checkSummary: checkInfo.checkSummary,
-		checks: checkInfo.checks,
-		autoMergeEnabled: item.autoMergeRequest !== null,
-		detailLoaded: true,
-		createdAt: new Date(item.createdAt),
-		closedAt: normalizeDate(item.closedAt),
-		url: item.url,
-	}
-}
-
-const parsePullRequestSummary = (item: GitHubPullRequestSummaryNode): PullRequestItem => ({
+const parsePullRequestSummary = (item: RawPullRequestSummaryNode): PullRequestItem => ({
 	repository: item.repository.nameWithOwner,
+	author: item.author.login,
+	headRefOid: item.headRefOid,
 	number: item.number,
 	title: item.title,
 	body: "",
@@ -272,7 +305,7 @@ const parsePullRequestSummary = (item: GitHubPullRequestSummaryNode): PullReques
 	additions: 0,
 	deletions: 0,
 	changedFiles: 0,
-	state: item.state.toLowerCase() === "open" ? "open" : "closed",
+	state: getPullRequestState(item),
 	reviewStatus: getReviewStatus(item),
 	checkStatus: "none",
 	checkSummary: null,
@@ -284,23 +317,86 @@ const parsePullRequestSummary = (item: GitHubPullRequestSummaryNode): PullReques
 	url: item.url,
 })
 
-const searchQuery = (author: string) => `author:${author} is:pr is:open sort:created-desc`
+const parsePullRequest = (item: RawPullRequestNode): PullRequestItem => {
+	const checkInfo = getCheckInfoFromContexts(item.statusCheckRollup?.contexts.nodes ?? [])
+	return {
+		...parsePullRequestSummary(item),
+		body: item.body,
+		labels: item.labels.nodes.map((label) => ({
+			name: label.name,
+			color: label.color ? `#${label.color}` : null,
+		})),
+		additions: item.additions,
+		deletions: item.deletions,
+		changedFiles: item.changedFiles,
+		checkStatus: checkInfo.checkStatus,
+		checkSummary: checkInfo.checkSummary,
+		checks: checkInfo.checks,
+		detailLoaded: true,
+	}
+}
+
+const searchQuery = (mode: PullRequestQueueMode, author: string) => `${pullRequestQueueSearchQualifier(mode, author)} is:pr is:open sort:created-desc`
 
-type GitHubError = CommandError | JsonParseError
+const sortNewestFirst = (pullRequests: readonly PullRequestItem[]) =>
+	[...pullRequests].sort((left, right) => right.createdAt.getTime() - left.createdAt.getTime())
 
-const normalizeMergeable = (value: string): PullRequestMergeInfo["mergeable"] => {
-	if (value === "MERGEABLE") return "mergeable"
-	if (value === "CONFLICTING") return "conflicting"
-	return "unknown"
+const parsePullRequestComment = (comment: RawPullRequestComment): PullRequestReviewComment | null => {
+	const line = comment.line ?? comment.original_line
+	if (!comment.path || !line || (comment.side !== "LEFT" && comment.side !== "RIGHT")) return null
+	return {
+		id: String(comment.id ?? comment.node_id ?? `${comment.path}:${comment.side}:${line}:${comment.created_at ?? ""}:${comment.body ?? ""}`),
+		path: comment.path,
+		line,
+		side: comment.side,
+		author: comment.user?.login ?? "unknown",
+		body: comment.body ?? "",
+		createdAt: comment.created_at ? new Date(comment.created_at) : null,
+		url: comment.html_url ?? comment.url ?? null,
+	}
+}
+
+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) => {
+		const parsed = parsePullRequestComment(comment)
+		return parsed ? [parsed] : []
+	}))
 }
 
+const fallbackCreatedComment = (input: CreatePullRequestCommentInput): PullRequestReviewComment => ({
+	id: `created:${input.repository}:${input.number}:${input.path}:${input.side}:${input.line}:${Date.now()}`,
+	path: input.path,
+	line: input.line,
+	side: input.side,
+	author: config.author.replace(/^@/, "") || "you",
+	body: input.body,
+	createdAt: new Date(),
+	url: null,
+})
+
+export type GitHubError = CommandError | JsonParseError | Schema.SchemaError
+
+const MERGEABLE_BY_RAW: Record<string, PullRequestMergeInfo["mergeable"]> = {
+	MERGEABLE: "mergeable",
+	CONFLICTING: "conflicting",
+}
+
+const normalizeMergeable = (value: string): PullRequestMergeInfo["mergeable"] =>
+	MERGEABLE_BY_RAW[value] ?? "unknown"
+
 export class GitHubService extends Context.Service<GitHubService, {
-	readonly listOpenPullRequests: () => Effect.Effect<readonly PullRequestItem[], GitHubError>
-	readonly listOpenPullRequestDetails: () => Effect.Effect<readonly PullRequestItem[], GitHubError>
+	readonly listOpenPullRequests: (mode: PullRequestQueueMode) => Effect.Effect<readonly PullRequestItem[], GitHubError>
+	readonly listOpenPullRequestDetails: (mode: PullRequestQueueMode) => Effect.Effect<readonly PullRequestItem[], GitHubError>
 	readonly getAuthenticatedUser: () => Effect.Effect<string, GitHubError>
 	readonly getPullRequestDiff: (repository: string, number: number) => Effect.Effect<string, CommandError>
+	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>
+	readonly closePullRequest: (repository: string, number: number) => Effect.Effect<void, CommandError>
+	readonly createPullRequestComment: (input: CreatePullRequestCommentInput) => Effect.Effect<PullRequestReviewComment, GitHubError>
 	readonly toggleDraftStatus: (repository: string, number: number, isDraft: boolean) => Effect.Effect<void, CommandError>
 	readonly listRepoLabels: (repository: string) => Effect.Effect<readonly { readonly name: string; readonly color: string | null }[], GitHubError>
 	readonly addPullRequestLabel: (repository: string, number: number, label: string) => Effect.Effect<void, CommandError>
@@ -311,60 +407,40 @@ export class GitHubService extends Context.Service<GitHubService, {
 		Effect.gen(function*() {
 			const command = yield* CommandRunner
 
-			const listOpenPullRequests = Effect.fn("GitHubService.listOpenPullRequests")(function*() {
-				const pullRequests: PullRequestItem[] = []
-				let cursor: string | null = null
-
-				while (pullRequests.length < config.prFetchLimit) {
-					const pageSize = Math.min(100, config.prFetchLimit - pullRequests.length)
-					const response: GraphQLSearchSummaryResponse = yield* command.runJson<GraphQLSearchSummaryResponse>("gh", [
-						"api", "graphql",
-						"-f", `query=${pullRequestSummarySearchQuery}`,
-						"-F", `searchQuery=${searchQuery(config.author)}`,
-						"-F", `first=${pageSize}`,
-						...(cursor ? ["-F", `after=${cursor}`] : []),
-					])
-
-					for (const node of response.data.search.nodes) {
-						if (node) pullRequests.push(parsePullRequestSummary(node))
+			const paginateSearch = <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
 					}
 
-					if (!response.data.search.pageInfo.hasNextPage) break
-					cursor = response.data.search.pageInfo.endCursor
-					if (!cursor) break
-				}
-
-				return pullRequests.sort((left, right) => right.createdAt.getTime() - left.createdAt.getTime())
-			})
-
-			const listOpenPullRequestDetails = Effect.fn("GitHubService.listOpenPullRequestDetails")(function*() {
-				const pullRequests: PullRequestItem[] = []
-				let cursor: string | null = null
-
-				while (pullRequests.length < config.prFetchLimit) {
-					const pageSize = Math.min(100, config.prFetchLimit - pullRequests.length)
-					const response: GraphQLSearchResponse = yield* command.runJson<GraphQLSearchResponse>("gh", [
-						"api", "graphql",
-						"-f", `query=${pullRequestSearchQuery}`,
-						"-F", `searchQuery=${searchQuery(config.author)}`,
-						"-F", `first=${pageSize}`,
-						...(cursor ? ["-F", `after=${cursor}`] : []),
-					])
-
-					for (const node of response.data.search.nodes) {
-						if (node) pullRequests.push(parsePullRequest(node))
-					}
-
-					if (!response.data.search.pageInfo.hasNextPage) break
-					cursor = response.data.search.pageInfo.endCursor
-					if (!cursor) break
-				}
+					return sortNewestFirst(pullRequests)
+				})
+			}
 
-				return pullRequests.sort((left, right) => right.createdAt.getTime() - left.createdAt.getTime())
-			})
+			const listOpenPullRequests = paginateSearch("listOpenPullRequests", pullRequestSummarySearchQuery, RawPullRequestSummaryNodeSchema, parsePullRequestSummary)
+			const listOpenPullRequestDetails = paginateSearch("listOpenPullRequestDetails", pullRequestSearchQuery, RawPullRequestNodeSchema, parsePullRequest)
 
 			const getAuthenticatedUser = Effect.fn("GitHubService.getAuthenticatedUser")(function*() {
-				const viewer = yield* command.runJson<GitHubViewer>("gh", ["api", "user"])
+				const viewer = yield* command.runSchema(ViewerSchema, "gh", ["api", "user"])
 				return viewer.login
 			})
 
@@ -373,8 +449,15 @@ export class GitHubService extends Context.Service<GitHubService, {
 				return result.stdout
 			})
 
+			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`,
+				])
+				return parsePullRequestComments(response)
+			})
+
 			const getPullRequestMergeInfo = Effect.fn("GitHubService.getPullRequestMergeInfo")(function*(repository: string, number: number) {
-				const info = yield* command.runJson<GitHubMergeInfoResponse>("gh", [
+				const info = yield* command.runSchema(MergeInfoResponseSchema, "gh", [
 					"pr", "view", String(number), "--repo", repository,
 					"--json", "number,title,state,isDraft,mergeable,reviewDecision,autoMergeRequest,statusCheckRollup",
 				])
@@ -399,12 +482,28 @@ export class GitHubService extends Context.Service<GitHubService, {
 				yield* command.run("gh", [...base, ...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 createPullRequestComment = Effect.fn("GitHubService.createPullRequestComment")(function*(input: CreatePullRequestCommentInput) {
+				const response = yield* command.runSchema(PullRequestCommentSchema, "gh", [
+					"api", "--method", "POST", `repos/${input.repository}/pulls/${input.number}/comments`,
+					"-f", `body=${input.body}`,
+					"-f", `commit_id=${input.commitId}`,
+					"-f", `path=${input.path}`,
+					"-F", `line=${input.line}`,
+					"-f", `side=${input.side}`,
+				])
+				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 listRepoLabels = Effect.fn("GitHubService.listRepoLabels")(function*(repository: string) {
-				const labels = yield* command.runJson<readonly { name: string; color: string }[]>("gh", [
+				const labels = yield* command.runSchema(RepoLabelsResponseSchema, "gh", [
 					"label", "list", "--repo", repository, "--json", "name,color", "--limit", "100",
 				])
 				return labels.map((label) => ({ name: label.name, color: `#${label.color}` }))
@@ -423,8 +522,11 @@ export class GitHubService extends Context.Service<GitHubService, {
 				listOpenPullRequestDetails,
 				getAuthenticatedUser,
 				getPullRequestDiff,
+				listPullRequestComments,
 				getPullRequestMergeInfo,
 				mergePullRequest,
+				closePullRequest,
+				createPullRequestComment,
 				toggleDraftStatus,
 				listRepoLabels,
 				addPullRequestLabel,