@kitlangton/ghui 0.1.7 → 0.1.9

package/src/config.ts

@@ -1,9 +1,18 @@
-const parsePositiveInt = (value: string | undefined, fallback: number) => {
-	const parsed = Number.parseInt(value ?? "", 10)
-	return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback
-}
+import { Config, Effect } from "effect"
 
-export const config = {
-	author: process.env.GHUI_AUTHOR?.trim() || "@me",
-	prFetchLimit: parsePositiveInt(process.env.GHUI_PR_FETCH_LIMIT, 200),
-} as const
+const positiveIntOr = (fallback: number) => (value: number) => Number.isFinite(value) && value > 0 ? value : fallback
+
+const appConfig = Config.all({
+	author: Config.string("GHUI_AUTHOR").pipe(
+		Config.withDefault("@me"),
+		Config.map((value) => value.trim() || "@me"),
+	),
+	prFetchLimit: Config.int("GHUI_PR_FETCH_LIMIT").pipe(
+		Config.withDefault(200),
+		Config.map(positiveIntOr(200)),
+	),
+})
+
+export const config = Effect.runSync(Effect.gen(function*() {
+	return yield* appConfig
+}))

package/src/domain.ts

@@ -27,7 +27,24 @@ export interface PullRequestItem {
 	readonly checkStatus: "passing" | "pending" | "failing" | "none"
 	readonly checkSummary: string | null
 	readonly checks: readonly CheckItem[]
+	readonly autoMergeEnabled: boolean
+	readonly detailLoaded: boolean
 	readonly createdAt: Date
 	readonly closedAt: Date | null
 	readonly url: string
 }
+
+export interface PullRequestMergeInfo {
+	readonly repository: string
+	readonly number: number
+	readonly title: string
+	readonly state: PullRequestState
+	readonly isDraft: boolean
+	readonly mergeable: "mergeable" | "conflicting" | "unknown"
+	readonly reviewStatus: PullRequestItem["reviewStatus"]
+	readonly checkStatus: PullRequestItem["checkStatus"]
+	readonly checkSummary: string | null
+	readonly autoMergeEnabled: boolean
+}
+
+export type PullRequestMergeAction = "squash" | "auto" | "admin" | "disable-auto"

package/src/mergeActions.ts

@@ -0,0 +1,90 @@
+import type { PullRequestItem, PullRequestMergeAction, PullRequestMergeInfo } from "./domain.js"
+
+export interface MergeActionDefinition {
+	readonly action: PullRequestMergeAction
+	readonly title: string
+	readonly description: string
+	readonly cliArgs: readonly string[]
+	readonly pastTense: string
+	readonly danger?: boolean
+	readonly refreshOnSuccess?: boolean
+	readonly optimisticAutoMergeEnabled?: boolean
+	readonly isAvailable: (info: PullRequestMergeInfo) => boolean
+}
+
+const isCleanlyMergeable = (info: PullRequestMergeInfo) =>
+	info.state === "open" &&
+	!info.isDraft &&
+	info.mergeable === "mergeable" &&
+	info.reviewStatus !== "changes" &&
+	info.reviewStatus !== "review" &&
+	info.checkStatus !== "pending" &&
+	info.checkStatus !== "failing"
+
+const mergeActionDefinitions = {
+	squash: {
+		action: "squash",
+		title: "Squash merge now",
+		description: "Merge this pull request and delete the branch.",
+		cliArgs: ["--squash", "--delete-branch"],
+		pastTense: "Merged",
+		refreshOnSuccess: true,
+		isAvailable: isCleanlyMergeable,
+	},
+	auto: {
+		action: "auto",
+		title: "Enable auto-merge",
+		description: "Squash merge automatically after GitHub requirements pass.",
+		cliArgs: ["--squash", "--auto", "--delete-branch"],
+		pastTense: "Enabled auto-merge",
+		optimisticAutoMergeEnabled: true,
+		isAvailable: (info) => info.state === "open" && !info.autoMergeEnabled && !info.isDraft && info.mergeable !== "conflicting",
+	},
+	"disable-auto": {
+		action: "disable-auto",
+		title: "Disable auto-merge",
+		description: "Cancel the pending GitHub auto-merge request.",
+		cliArgs: ["--disable-auto"],
+		pastTense: "Disabled auto-merge",
+		optimisticAutoMergeEnabled: false,
+		isAvailable: (info) => info.state === "open" && info.autoMergeEnabled,
+	},
+	admin: {
+		action: "admin",
+		title: "Admin override merge",
+		description: "Bypass unmet merge requirements with --admin.",
+		cliArgs: ["--squash", "--admin", "--delete-branch"],
+		pastTense: "Admin merged",
+		danger: true,
+		refreshOnSuccess: true,
+		isAvailable: (info) => info.state === "open" && !info.isDraft && info.mergeable !== "conflicting",
+	},
+} as const satisfies Record<PullRequestMergeAction, MergeActionDefinition>
+
+export const mergeActions = [
+	mergeActionDefinitions.squash,
+	mergeActionDefinitions.auto,
+	mergeActionDefinitions["disable-auto"],
+	mergeActionDefinitions.admin,
+] as const satisfies readonly MergeActionDefinition[]
+
+export const availableMergeActions = (info: PullRequestMergeInfo | null): readonly MergeActionDefinition[] => {
+	if (!info) return []
+	return mergeActions.filter((action) => action.isAvailable(info))
+}
+
+export const getMergeActionDefinition = (action: PullRequestMergeAction): MergeActionDefinition =>
+	mergeActionDefinitions[action]
+
+export const mergeInfoFromPullRequest = (pullRequest: PullRequestItem): PullRequestMergeInfo => ({
+	repository: pullRequest.repository,
+	number: pullRequest.number,
+	title: pullRequest.title,
+	state: pullRequest.state,
+	isDraft: pullRequest.reviewStatus === "draft",
+	mergeable: "unknown",
+	reviewStatus: pullRequest.reviewStatus,
+	checkStatus: pullRequest.checkStatus,
+	checkSummary: pullRequest.checkSummary,
+	autoMergeEnabled: pullRequest.autoMergeEnabled,
+})

package/src/observability.ts

@@ -0,0 +1,46 @@
+import { Config, Effect, Layer } from "effect"
+import { FetchHttpClient } from "effect/unstable/http"
+import { OtlpLogger, OtlpSerialization, OtlpTracer } from "effect/unstable/observability"
+
+const observabilityConfig = Config.all({
+	endpoint: Config.string("GHUI_OTLP_ENDPOINT").pipe(
+		Config.withDefault(""),
+		Config.map((value) => value.trim()),
+	),
+	motelPort: Config.string("GHUI_MOTEL_PORT").pipe(
+		Config.withDefault(""),
+		Config.map((value) => value.trim()),
+	),
+})
+
+const resource = {
+	serviceName: "ghui",
+	serviceVersion: "local",
+}
+
+export const Observability = {
+	layer: Layer.unwrap(Effect.gen(function*() {
+		const { endpoint, motelPort } = yield* observabilityConfig
+		const baseUrl = endpoint || (motelPort ? `http://127.0.0.1:${motelPort}` : null)
+
+		return baseUrl === null
+			? Layer.empty
+			: Layer.merge(
+				OtlpTracer.layer({
+					url: `${baseUrl}/v1/traces`,
+					exportInterval: "500 millis",
+					shutdownTimeout: "1 second",
+					resource,
+				}),
+				OtlpLogger.layer({
+					url: `${baseUrl}/v1/logs`,
+					exportInterval: "500 millis",
+					shutdownTimeout: "1 second",
+					resource,
+				}),
+			).pipe(
+				Layer.provide(OtlpSerialization.layerJson),
+				Layer.provide(FetchHttpClient.layer),
+			)
+	})),
+} as const

package/src/services/CommandRunner.ts

@@ -49,7 +49,12 @@ export class CommandRunner extends Context.Service<CommandRunner, {
 			)
 
 			const run = Effect.fn("CommandRunner.run")(function*(command: string, args: readonly string[]) {
-				const result = yield* runProcess(command, args)
+				const result = yield* runProcess(command, args).pipe(Effect.withSpan("ghui.command.runProcess", {
+					attributes: {
+						"process.command": command,
+						"process.argv.count": args.length,
+					},
+				}))
 				if (result.exitCode !== 0) {
 					const detail = result.stderr.trim() || result.stdout.trim() || `exit code ${result.exitCode}`
 					return yield* new CommandError({ command, args: [...args], detail, cause: detail })

package/src/services/GitHubService.ts

@@ -1,11 +1,25 @@
 import { Context, Effect, Layer } from "effect"
 import { config } from "../config.js"
-import type { CheckItem, PullRequestItem } from "../domain.js"
+import type { CheckItem, PullRequestItem, PullRequestMergeAction, PullRequestMergeInfo } from "../domain.js"
+import { getMergeActionDefinition } from "../mergeActions.js"
 import { CommandRunner, type CommandError, type JsonParseError } from "./CommandRunner.js"
 
-interface GitHubPullRequestNode {
+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
+	}
+}
+
+interface GitHubPullRequestNode extends GitHubPullRequestSummaryNode {
 	readonly body: string
 	readonly labels: {
 		readonly nodes: readonly {
@@ -16,20 +30,11 @@ interface GitHubPullRequestNode {
 	readonly additions: number
 	readonly deletions: number
 	readonly changedFiles: number
-	readonly isDraft: boolean
-	readonly reviewDecision: string | null
 	readonly statusCheckRollup?: {
 		readonly contexts: {
 			readonly nodes: readonly GraphQLCheckContext[]
 		}
 	} | null
-	readonly state: string
-	readonly createdAt: string
-	readonly closedAt?: string | null
-	readonly url: string
-	readonly repository: {
-		readonly nameWithOwner: string
-	}
 }
 
 type GraphQLCheckContext =
@@ -57,10 +62,33 @@ interface GraphQLSearchResponse {
 	}
 }
 
+interface GraphQLSearchSummaryResponse {
+	readonly data: {
+		readonly search: {
+			readonly nodes: readonly (GitHubPullRequestSummaryNode | null)[]
+			readonly pageInfo: {
+				readonly hasNextPage: boolean
+				readonly endCursor: string | null
+			}
+		}
+	}
+}
+
 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) {
@@ -71,6 +99,7 @@ query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
         body
         isDraft
         reviewDecision
+        autoMergeRequest { enabledAt }
         additions
         deletions
         changedFiles
@@ -96,12 +125,34 @@ query PullRequests($searchQuery: String!, $first: Int!, $after: String) {
 }
 `
 
+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
+        createdAt
+        closedAt
+        url
+        repository { nameWithOwner }
+      }
+    }
+    pageInfo { hasNextPage endCursor }
+  }
+}
+`
+
 const normalizeDate = (value: string | null | undefined) => {
 	if (!value || value.startsWith("0001-01-01")) return null
 	return new Date(value)
 }
 
-const getReviewStatus = (item: GitHubPullRequestNode): PullRequestItem["reviewStatus"] => {
+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"
@@ -139,8 +190,7 @@ const getContextConclusion = (context: GraphQLCheckContext): CheckItem["conclusi
 	return null
 }
 
-const getCheckInfo = (item: GitHubPullRequestNode): Pick<PullRequestItem, "checkStatus" | "checkSummary" | "checks"> => {
-	const contexts = item.statusCheckRollup?.contexts.nodes ?? []
+const getCheckInfoFromContexts = (contexts: readonly GraphQLCheckContext[]): Pick<PullRequestItem, "checkStatus" | "checkSummary" | "checks"> => {
 	if (contexts.length === 0) {
 		return { checkStatus: "none", checkSummary: null, checks: [] }
 	}
@@ -182,6 +232,9 @@ const getCheckInfo = (item: GitHubPullRequestNode): Pick<PullRequestItem, "check
 	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)
 
@@ -202,20 +255,52 @@ const parsePullRequest = (item: GitHubPullRequestNode): PullRequestItem => {
 		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 => ({
+	repository: item.repository.nameWithOwner,
+	number: item.number,
+	title: item.title,
+	body: "",
+	labels: [],
+	additions: 0,
+	deletions: 0,
+	changedFiles: 0,
+	state: item.state.toLowerCase() === "open" ? "open" : "closed",
+	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 searchQuery = (author: string) => `author:${author} is:pr is:open sort:created-desc`
 
 type GitHubError = CommandError | JsonParseError
 
+const normalizeMergeable = (value: string): PullRequestMergeInfo["mergeable"] => {
+	if (value === "MERGEABLE") return "mergeable"
+	if (value === "CONFLICTING") return "conflicting"
+	return "unknown"
+}
+
 export class GitHubService extends Context.Service<GitHubService, {
 	readonly listOpenPullRequests: () => Effect.Effect<readonly PullRequestItem[], GitHubError>
+	readonly listOpenPullRequestDetails: () => Effect.Effect<readonly PullRequestItem[], GitHubError>
 	readonly getAuthenticatedUser: () => Effect.Effect<string, GitHubError>
 	readonly getPullRequestDiff: (repository: string, number: number) => Effect.Effect<string, CommandError>
+	readonly getPullRequestMergeInfo: (repository: string, number: number) => Effect.Effect<PullRequestMergeInfo, GitHubError>
+	readonly mergePullRequest: (repository: string, number: number, action: PullRequestMergeAction) => Effect.Effect<void, CommandError>
 	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>
@@ -230,6 +315,32 @@ export class GitHubService extends Context.Service<GitHubService, {
 				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))
+					}
+
+					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", [
@@ -262,6 +373,32 @@ export class GitHubService extends Context.Service<GitHubService, {
 				return result.stdout
 			})
 
+			const getPullRequestMergeInfo = Effect.fn("GitHubService.getPullRequestMergeInfo")(function*(repository: string, number: number) {
+				const info = yield* command.runJson<GitHubMergeInfoResponse>("gh", [
+					"pr", "view", String(number), "--repo", repository,
+					"--json", "number,title,state,isDraft,mergeable,reviewDecision,autoMergeRequest,statusCheckRollup",
+				])
+				const checkInfo = getCheckInfoFromContexts(info.statusCheckRollup)
+
+				return {
+					repository,
+					number: info.number,
+					title: info.title,
+					state: info.state.toLowerCase() === "open" ? "open" : "closed",
+					isDraft: info.isDraft,
+					mergeable: normalizeMergeable(info.mergeable),
+					reviewStatus: getReviewStatus(info),
+					checkStatus: checkInfo.checkStatus,
+					checkSummary: checkInfo.checkSummary,
+					autoMergeEnabled: info.autoMergeRequest !== null,
+				} 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 toggleDraftStatus = Effect.fn("GitHubService.toggleDraftStatus")(function*(repository: string, number: number, isDraft: boolean) {
 				yield* command.run("gh", ["pr", "ready", String(number), "--repo", repository, ...(isDraft ? [] : ["--undo"])])
 			})
@@ -283,8 +420,11 @@ export class GitHubService extends Context.Service<GitHubService, {
 
 			return GitHubService.of({
 				listOpenPullRequests,
+				listOpenPullRequestDetails,
 				getAuthenticatedUser,
 				getPullRequestDiff,
+				getPullRequestMergeInfo,
+				mergePullRequest,
 				toggleDraftStatus,
 				listRepoLabels,
 				addPullRequestLabel,