ryco-cli 0.1.29 → 0.1.31

package/dist/{GitHubSourceControlProvider-CnIu0n2Y.mjs → GitHubSourceControlProvider-CRSDYcjc.mjs}

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 
-import { Fo as truncateSourceControlDetailContent, Mo as SOURCE_CONTROL_WORKFLOW_LOG_MAX_BYTES, No as SourceControlProviderError } from "./src-7E1M4gTQ.mjs";
-import { a as parseGitHubRepositoryOwnerFromUrl, i as parseGitHubRepositoryIdentityFromUrl, t as classifySourceControlCommentAuthorRole } from "./sourceControl-BiEBxN01.mjs";
-import { $n as GITHUB_PULL_REQUEST_LIST_JSON_FIELDS, Jn as githubDiscovery, ar as decodeGitHubPullRequestListJson, er as GitHubCli, ir as withoutStatusCheckRollupJsonField, lr as SourceControlProvider, nr as formatGitHubJsonFields, rr as isStatusCheckRollupAccessError, tr as GitHubCliError } from "./bin.mjs";
+import { Ds as SourceControlProviderError, Ts as SOURCE_CONTROL_WORKFLOW_LOG_MAX_BYTES, ks as truncateSourceControlDetailContent } from "./src-VTj60bUm.mjs";
+import { c as parseGitHubRepositoryOwnerFromUrl, n as classifySourceControlCommentAuthorRole, s as parseGitHubRepositoryIdentityFromUrl } from "./collectUint8StreamText-BsLSgI8i.mjs";
+import { Br as applyGitHubRequiredChecks, Fr as GitHubCli, Gr as hasCommentMutationMarker, Hr as decodeGitHubPullRequestListJson, Ir as GitHubCliError, Kr as stripCommentMutationMarker, Lr as formatGitHubJsonFields, Pr as GITHUB_PULL_REQUEST_LIST_JSON_FIELDS, Rr as isStatusCheckRollupAccessError, Vr as buildGitHubPullRequestSearchListArgs, Wr as appendCommentMutationMarker, Xr as SourceControlProvider, nr as githubDiscovery, tt as withSourceControlBodyFile, zr as withoutStatusCheckRollupJsonField } from "./bin.mjs";
 import { DateTime, Effect, FileSystem, Layer, Option, Result, Schema } from "effect";
-import { createHash } from "node:crypto";
 //#region src/sourceControl/GitHubSourceControlProvider.ts
 function providerError(operation, cause) {
 	return new SourceControlProviderError({
@@ -14,22 +13,6 @@ function providerError(operation, cause) {
 		cause
 	});
 }
-const RYCO_COMMENT_MARKER_PATTERN = /\n{0,2}<!-- ryco-comment-id:[a-f0-9]{64} -->\s*$/u;
-function commentMutationMarker(clientMutationId) {
-	return `<!-- ryco-comment-id:${createHash("sha256").update(clientMutationId).digest("hex")} -->`;
-}
-function appendCommentMutationMarker(body, clientMutationId) {
-	if (clientMutationId === void 0) return body;
-	return `${body.trimEnd()}\n\n${commentMutationMarker(clientMutationId)}`;
-}
-function stripCommentMutationMarker(body) {
-	return body.replace(RYCO_COMMENT_MARKER_PATTERN, "").trimEnd();
-}
-function hasCommentMutationMarker(comments, clientMutationId) {
-	if (clientMutationId === void 0) return false;
-	const marker = commentMutationMarker(clientMutationId);
-	return comments.some((comment) => comment.body.includes(marker));
-}
 function toChangeRequest(summary, stackSummary) {
 	return {
 		provider: "github",
@@ -39,7 +22,7 @@ function toChangeRequest(summary, stackSummary) {
 		baseRefName: summary.baseRefName,
 		headRefName: summary.headRefName,
 		state: summary.state ?? "open",
-		updatedAt: Option.none(),
+		updatedAt: summary.updatedAt ?? Option.none(),
 		...summary.isCrossRepository !== void 0 ? { isCrossRepository: summary.isCrossRepository } : {},
 		...summary.isDraft !== void 0 ? { isDraft: summary.isDraft } : {},
 		...summary.author ? { author: summary.author } : {},
@@ -51,7 +34,12 @@ function toChangeRequest(summary, stackSummary) {
 		...summary.headSha ? { headSha: summary.headSha } : {},
 		...summary.mergeability ? { mergeability: summary.mergeability } : {},
 		...summary.checkRollup ? { checkRollup: summary.checkRollup } : {},
-		...stackSummary ? { stackSummary } : {}
+		...stackSummary ? { stackSummary } : {},
+		...summary.createdAt ? { createdAt: summary.createdAt } : {},
+		...summary.reviewDecision !== void 0 ? { reviewDecision: summary.reviewDecision } : {},
+		...summary.additions !== void 0 ? { additions: summary.additions } : {},
+		...summary.deletions !== void 0 ? { deletions: summary.deletions } : {},
+		...summary.changedFiles !== void 0 ? { changedFiles: summary.changedFiles } : {}
 	};
 }
 function toIssueSummary(raw) {
@@ -137,7 +125,13 @@ function toChangeRequestDetail(raw, options) {
 		...typeof raw.additions === "number" ? { additions: raw.additions } : {},
 		...typeof raw.deletions === "number" ? { deletions: raw.deletions } : {},
 		...typeof raw.changedFiles === "number" ? { changedFiles: raw.changedFiles } : {},
-		...raw.files && raw.files.length > 0 ? { files: raw.files } : {}
+		...raw.files && raw.files.length > 0 ? { files: raw.files } : {},
+		...raw.reviewerStates ? { reviewerStates: raw.reviewerStates } : {},
+		...raw.mergeStateStatus ? { mergeStateStatus: raw.mergeStateStatus } : {},
+		...raw.autoMerge !== void 0 ? { autoMerge: raw.autoMerge } : {},
+		...raw.closedAt ? { closedAt: raw.closedAt } : {},
+		...raw.mergedAt ? { mergedAt: raw.mergedAt } : {},
+		...raw.mergedBy ? { mergedBy: raw.mergedBy } : {}
 	};
 }
 function optionFromString(value) {
@@ -221,6 +215,20 @@ function truncateWorkflowLog(log) {
 		truncated: true
 	};
 }
+/**
+* Head branches a landed merge leaves behind, top layer first: the merged
+* pull request's own (unless it comes from a fork, which is not ours to
+* delete) and, for a stacked merge, every open layer below it, which lands
+* with it. A lower layer's head is the base of the layer above, so it always
+* lives in the base repository.
+*/
+function landedHeadBranches(input) {
+	const { pullRequest, stack } = input;
+	const position = stack?.entries.find((entry) => entry.number === pullRequest.number)?.position;
+	const lower = stack && position !== void 0 ? stack.entries.filter((entry) => entry.position < position && entry.state === "open").toSorted((left, right) => right.position - left.position).map((entry) => entry.headRefName) : [];
+	const own = pullRequest.isCrossRepository === true ? [] : [pullRequest.headRefName];
+	return [.../* @__PURE__ */ new Set([...own, ...lower])];
+}
 const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 	const github = yield* GitHubCli;
 	const fileSystem = yield* FileSystem.FileSystem;
@@ -270,40 +278,34 @@ const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 			} : item;
 		});
 	}).pipe(Effect.catch(() => Effect.succeed(input.items)));
-	const withTempBodyFile = (input, useBodyFile) => Effect.gen(function* () {
-		const bodyFile = yield* fileSystem.makeTempFile({
-			prefix: input.prefix,
-			suffix: ".md"
-		}).pipe(Effect.mapError((cause) => new SourceControlProviderError({
-			provider: "github",
-			operation: input.operation,
-			detail: "Failed to create temp file for GitHub body.",
-			cause
-		})));
-		return yield* Effect.gen(function* () {
-			yield* fileSystem.writeFileString(bodyFile, input.body).pipe(Effect.mapError((cause) => new SourceControlProviderError({
-				provider: "github",
-				operation: input.operation,
-				detail: "Failed to write GitHub body temp file.",
-				cause
-			})));
-			return yield* useBodyFile(bodyFile);
-		}).pipe(Effect.ensuring(fileSystem.remove(bodyFile).pipe(Effect.catch(() => Effect.void))));
-	});
+	const withTempBodyFile = (input, useBodyFile) => withSourceControlBodyFile(fileSystem, {
+		...input,
+		provider: "github"
+	}, useBodyFile);
 	const listChangeRequests = (input) => {
+		const enrich = (items) => input.includeStackSummary === false ? Effect.succeed(items) : enrichChangeRequestsWithStacks({
+			cwd: input.cwd,
+			items
+		});
 		const headSelector = input.headSelector.trim();
-		if (input.state === "open" && headSelector.length > 0) return github.listOpenPullRequests({
+		const query = input.query?.trim() ?? "";
+		const searchScoped = input.involvement !== void 0 || query.length > 0;
+		if (input.state === "open" && headSelector.length > 0 && !searchScoped) return github.listOpenPullRequests({
 			cwd: input.cwd,
 			headSelector,
 			...input.limit !== void 0 ? { limit: input.limit } : {}
-		}).pipe(Effect.map((items) => items.map((item) => toChangeRequest(item))), Effect.flatMap((items) => enrichChangeRequestsWithStacks({
-			cwd: input.cwd,
-			items
-		})), Effect.mapError((error) => providerError("listChangeRequests", error)));
+		}).pipe(Effect.map((items) => items.map((item) => toChangeRequest(item))), Effect.flatMap(enrich), Effect.mapError((error) => providerError("listChangeRequests", error)));
 		const stateArg = input.state;
 		const executeListChangeRequests = (jsonFields) => github.execute({
 			cwd: input.cwd,
-			args: [
+			args: searchScoped ? buildGitHubPullRequestSearchListArgs({
+				involvement: input.involvement,
+				query,
+				state: stateArg,
+				headSelector,
+				limit: input.limit ?? 20,
+				jsonFields: formatGitHubJsonFields(jsonFields)
+			}) : [
 				"pr",
 				"list",
 				...headSelector.length > 0 ? ["--head", headSelector] : [],
@@ -318,20 +320,88 @@ const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 		return executeListChangeRequests(GITHUB_PULL_REQUEST_LIST_JSON_FIELDS).pipe(Effect.catchIf(isStatusCheckRollupAccessError, () => executeListChangeRequests(withoutStatusCheckRollupJsonField(GITHUB_PULL_REQUEST_LIST_JSON_FIELDS))), Effect.flatMap((result) => {
 			const raw = result.stdout.trim();
 			if (raw.length === 0) return Effect.succeed([]);
-			return Effect.sync(() => decodeGitHubPullRequestListJson(raw)).pipe(Effect.flatMap((decoded) => Result.isSuccess(decoded) ? Effect.succeed(decoded.success.map((item) => ({
-				...toChangeRequest(item),
-				updatedAt: item.updatedAt
-			}))) : Effect.fail(new SourceControlProviderError({
+			return Effect.sync(() => decodeGitHubPullRequestListJson(raw)).pipe(Effect.flatMap((decoded) => Result.isSuccess(decoded) ? Effect.succeed(decoded.success.map((item) => toChangeRequest(item))) : Effect.fail(new SourceControlProviderError({
 				provider: "github",
 				operation: "listChangeRequests",
 				detail: "GitHub CLI returned invalid change request JSON.",
 				cause: decoded.failure
 			}))));
-		}), Effect.flatMap((items) => enrichChangeRequestsWithStacks({
+		}), Effect.flatMap(enrich), Effect.mapError((error) => Schema.is(SourceControlProviderError)(error) ? error : providerError("listChangeRequests", error)));
+	};
+	/**
+	* Which rollup checks are required, read on the head the rollup describes.
+	* Skipped without checks to mark; a failed lookup leaves every check
+	* unmarked (unknown, which is not the same as optional).
+	*/
+	const readRequiredChecks = (input) => {
+		const { detail } = input;
+		const headSha = detail.headSha;
+		if (!headSha || !detail.checkRollup || detail.checkRollup.length === 0) return Effect.succeed([]);
+		return invokeGitHubEffect("getPullRequestRequiredChecks", () => github.getPullRequestRequiredChecks({
 			cwd: input.cwd,
-			items
-		})), Effect.mapError((error) => Schema.is(SourceControlProviderError)(error) ? error : providerError("listChangeRequests", error)));
+			host: input.host,
+			repository: input.repository,
+			number: detail.number,
+			headSha
+		})).pipe(Effect.orElseSucceed(() => []));
 	};
+	const getChangeRequestDetail = (input) => Effect.gen(function* () {
+		const raw = yield* github.getPullRequestDetail({
+			cwd: input.cwd,
+			reference: input.reference
+		}).pipe(Effect.mapError((error) => providerError("getChangeRequestDetail", error)));
+		const detail = toChangeRequestDetail(raw, { fullContent: input.fullContent ?? false });
+		const identity = parseGitHubRepositoryIdentityFromUrl(raw.url);
+		if (!identity) return {
+			...detail,
+			stackMetadataIncomplete: true
+		};
+		const enhancements = yield* Effect.all({
+			stack: invokeGitHubEffect("getPullRequestStack", () => github.getPullRequestStack({
+				cwd: input.cwd,
+				host: identity.host,
+				repository: identity.nameWithOwner,
+				number: raw.number
+			})).pipe(Effect.match({
+				onSuccess: (value) => ({
+					ok: true,
+					value
+				}),
+				onFailure: () => ({ ok: false })
+			})),
+			capabilities: invokeGitHubEffect("getRepositoryMergeCapabilities", () => github.getRepositoryMergeCapabilities({
+				cwd: input.cwd,
+				host: identity.host,
+				repository: identity.nameWithOwner
+			})).pipe(Effect.match({
+				onSuccess: (value) => ({
+					ok: true,
+					value
+				}),
+				onFailure: () => ({ ok: false })
+			})),
+			requiredChecks: readRequiredChecks({
+				cwd: input.cwd,
+				host: identity.host,
+				repository: identity.nameWithOwner,
+				detail: raw
+			})
+		}, { concurrency: 3 });
+		const stack = enhancements.stack.ok ? enhancements.stack.value : null;
+		const capabilities = enhancements.capabilities.ok ? enhancements.capabilities.value : null;
+		return {
+			...detail,
+			...detail.checkRollup && enhancements.requiredChecks.length > 0 ? { checkRollup: applyGitHubRequiredChecks(detail.checkRollup, enhancements.requiredChecks) } : {},
+			...stack ? { stack } : {},
+			stackMetadataIncomplete: !enhancements.stack.ok,
+			...capabilities ? { mergeCapabilities: {
+				merge: capabilities.merge,
+				squash: capabilities.squash,
+				rebase: capabilities.rebase
+			} } : {},
+			...capabilities?.deleteBranchOnMerge !== void 0 ? { deleteBranchOnMerge: capabilities.deleteBranchOnMerge } : {}
+		};
+	});
 	return SourceControlProvider.of({
 		kind: "github",
 		listChangeRequests,
@@ -341,7 +411,8 @@ const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 			baseBranch: input.baseRefName,
 			headSelector: input.headSelector,
 			title: input.title,
-			bodyFile: input.bodyFile
+			bodyFile: input.bodyFile,
+			...input.draft ? { draft: true } : {}
 		}).pipe(Effect.mapError((error) => providerError("createChangeRequest", error))),
 		getRepositoryCloneUrls: (input) => github.getRepositoryCloneUrls(input).pipe(Effect.mapError((error) => providerError("getRepositoryCloneUrls", error))),
 		createRepository: (input) => github.createRepository(input).pipe(Effect.mapError((error) => providerError("createRepository", error))),
@@ -403,50 +474,7 @@ const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 			cwd: input.cwd,
 			items
 		})), Effect.mapError((error) => providerError("searchChangeRequests", error))),
-		getChangeRequestDetail: (input) => Effect.gen(function* () {
-			const raw = yield* github.getPullRequestDetail({
-				cwd: input.cwd,
-				reference: input.reference
-			}).pipe(Effect.mapError((error) => providerError("getChangeRequestDetail", error)));
-			const detail = toChangeRequestDetail(raw, { fullContent: input.fullContent ?? false });
-			const identity = parseGitHubRepositoryIdentityFromUrl(raw.url);
-			if (!identity) return {
-				...detail,
-				stackMetadataIncomplete: true
-			};
-			const enhancements = yield* Effect.all({
-				stack: invokeGitHubEffect("getPullRequestStack", () => github.getPullRequestStack({
-					cwd: input.cwd,
-					host: identity.host,
-					repository: identity.nameWithOwner,
-					number: raw.number
-				})).pipe(Effect.match({
-					onSuccess: (value) => ({
-						ok: true,
-						value
-					}),
-					onFailure: () => ({ ok: false })
-				})),
-				capabilities: invokeGitHubEffect("getRepositoryMergeCapabilities", () => github.getRepositoryMergeCapabilities({
-					cwd: input.cwd,
-					host: identity.host,
-					repository: identity.nameWithOwner
-				})).pipe(Effect.match({
-					onSuccess: (value) => ({
-						ok: true,
-						value
-					}),
-					onFailure: () => ({ ok: false })
-				}))
-			}, { concurrency: 2 });
-			const stack = enhancements.stack.ok ? enhancements.stack.value : null;
-			return {
-				...detail,
-				...stack ? { stack } : {},
-				stackMetadataIncomplete: !enhancements.stack.ok,
-				...enhancements.capabilities.ok ? { mergeCapabilities: enhancements.capabilities.value } : {}
-			};
-		}),
+		getChangeRequestDetail,
 		mergeChangeRequest: (input) => Effect.gen(function* () {
 			const pullRequest = yield* github.getPullRequest({
 				cwd: input.cwd,
@@ -476,14 +504,33 @@ const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 				operation: "mergeChangeRequest",
 				detail: `The ${input.mergeMethod} merge method is disabled for this repository.`
 			});
-			return yield* github.mergePullRequestAsync({
+			if (input.expectedHeadSha && pullRequest.headSha && pullRequest.headSha !== input.expectedHeadSha) return yield* new SourceControlProviderError({
+				provider: "github",
+				operation: "mergeChangeRequest",
+				detail: "The pull request's head changed since it was loaded. Refresh and review the new commits, then try again."
+			});
+			const result = yield* github.mergePullRequestAsync({
 				cwd: input.cwd,
 				host: identity.host,
 				repository: identity.nameWithOwner,
 				number: pullRequest.number,
 				mergeMethod: input.mergeMethod,
-				stackMembership: stack ? "stacked" : "standalone"
+				stackMembership: stack ? "stacked" : "standalone",
+				...input.expectedHeadSha ? { expectedHeadSha: input.expectedHeadSha } : {}
 			}).pipe(Effect.mapError((error) => providerError("mergeChangeRequest", error)));
+			if (input.deleteBranch === true && result.outcome === "merged" && capabilities.deleteBranchOnMerge !== true) yield* Effect.forEach(landedHeadBranches({
+				pullRequest,
+				stack
+			}), (branch) => github.deleteBranch({
+				cwd: input.cwd,
+				host: identity.host,
+				repository: identity.nameWithOwner,
+				branch
+			}).pipe(Effect.catch((error) => Effect.logWarning("Merged pull request but could not delete a head branch.", {
+				branch,
+				detail: error.detail
+			}))), { discard: true });
+			return result;
 		}).pipe(Effect.mapError((error) => Schema.is(SourceControlProviderError)(error) ? error : providerError("mergeChangeRequest", error))),
 		addChangeRequestComment: (input) => Effect.gen(function* () {
 			const existing = input.clientMutationId ? yield* github.getPullRequestDetail({
@@ -522,6 +569,53 @@ const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 		getChangeRequestFilesViewed: (input) => github.getPullRequestFilesViewed(input).pipe(Effect.mapError((error) => providerError("getChangeRequestFilesViewed", error))),
 		setChangeRequestFileViewed: (input) => github.setPullRequestFileViewed(input).pipe(Effect.mapError((error) => providerError("setChangeRequestFileViewed", error))),
 		getChangeRequestDiff: (input) => github.getPullRequestDiff(input).pipe(Effect.mapError((error) => providerError("getChangeRequestDiff", error))),
+		getChangeRequestActivity: (input) => github.getPullRequestActivity({
+			cwd: input.cwd,
+			reference: input.reference
+		}).pipe(Effect.mapError((error) => providerError("getChangeRequestActivity", error))),
+		getChangeRequestFileContents: ({ context: _context, ...input }) => github.getPullRequestFileContents(input).pipe(Effect.mapError((error) => providerError("getChangeRequestFileContents", error))),
+		submitChangeRequestReview: (input) => github.submitPullRequestReview({
+			cwd: input.cwd,
+			reference: input.reference,
+			event: input.event,
+			body: input.body,
+			comments: input.comments,
+			expectedHeadSha: input.expectedHeadSha
+		}).pipe(Effect.mapError((error) => providerError("submitChangeRequestReview", error))),
+		replyToReviewThread: (input) => github.replyToPullRequestReviewThread({
+			cwd: input.cwd,
+			reference: input.reference,
+			threadId: input.threadId,
+			body: input.body,
+			clientMutationId: input.clientMutationId
+		}).pipe(Effect.map((thread) => ({ thread })), Effect.mapError((error) => providerError("replyToReviewThread", error))),
+		setReviewThreadResolved: (input) => github.setPullRequestReviewThreadResolved({
+			cwd: input.cwd,
+			reference: input.reference,
+			threadId: input.threadId,
+			resolved: input.resolved
+		}).pipe(Effect.mapError((error) => providerError("setReviewThreadResolved", error))),
+		updateChangeRequestComment: ({ context: _context, ...input }) => github.updatePullRequestComment(input).pipe(Effect.mapError((error) => providerError("updateChangeRequestComment", error))),
+		updateChangeRequest: (input) => Effect.gen(function* () {
+			const action = input.action;
+			const apply = (bodyFile) => github.updatePullRequest({
+				cwd: input.cwd,
+				reference: input.reference,
+				action,
+				...bodyFile ? { bodyFile } : {}
+			}).pipe(Effect.mapError((error) => providerError("updateChangeRequest", error)));
+			if (action.kind === "edit" && action.body !== void 0) yield* withTempBodyFile({
+				operation: "updateChangeRequest",
+				prefix: "ryco-gh-pr-body-",
+				body: action.body
+			}, apply);
+			else yield* apply();
+			return { detail: yield* getChangeRequestDetail({
+				cwd: input.cwd,
+				reference: input.reference,
+				fullContent: true
+			}) };
+		}),
 		createIssue: (input) => withTempBodyFile({
 			operation: "createIssue",
 			prefix: "ryco-gh-issue-body-",
@@ -557,10 +651,14 @@ const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 		getPullRequestState: (input) => github.getPullRequest({
 			cwd: input.cwd,
 			reference: String(input.number)
-		}).pipe(Effect.map((summary) => ({
-			state: summary.state ?? "open",
-			isDraft: summary.isDraft ?? false
-		})), Effect.mapError((cause) => providerError("getPullRequestState", cause))),
+		}).pipe(Effect.map((summary) => {
+			const state = summary.state ?? "open";
+			return {
+				state,
+				isDraft: summary.isDraft ?? false,
+				terminalAt: state === "merged" ? summary.mergedAt ?? summary.closedAt ?? null : state === "closed" ? summary.closedAt ?? null : null
+			};
+		}), Effect.mapError((cause) => providerError("getPullRequestState", cause))),
 		getIssueState: (input) => github.getIssue({
 			cwd: input.cwd,
 			reference: String(input.number)
@@ -645,4 +743,4 @@ const make = Effect.fn("makeGitHubSourceControlProvider")(function* () {
 });
 const layer = Layer.effect(SourceControlProvider, make());
 //#endregion
-export { githubDiscovery as discovery, layer, make };
+export { githubDiscovery as discovery, landedHeadBranches, layer, make };