gityo 1.1.6 → 1.1.8

package/dist/index.js

@@ -1710,7 +1710,7 @@ function useColor() {
 	if (process$1.env.FORCE_COLOR || process$1.env.CLICOLOR_FORCE !== void 0) return true;
 }
 new Command();
-var version$4 = "1.1.6";
+var version$4 = "1.1.8";
 const keybindingLookup = new Set(["emacs", "vim"]);
 function isKeybinding(value) {
 	return keybindingLookup.has(value);
@@ -228985,6 +228985,7 @@ async function mainController(options = {}) {
 	if (typeof options.input === "string" && finalCommitMessage.length === 0) throw new Error("Provided commit message input cannot be empty.");
 	const { diffScope, files } = await getCommitFiles(git, options.scope ?? "staged-or-changes");
 	if (files.length === 0) return console.log("No changed files found.");
+	console.log(source_default.dim(`${files.length} ${diffScope === "staged" ? "staged" : "changed"} file(s)`));
 	const diff = await getCommitDiff(git, diffScope);
 	if (finalCommitMessage.length > 0) {
 		console.log(source_default.yellow("✓ Using direct commit message"));
@@ -229135,6 +229136,21 @@ function toSpawnError(command, error$125) {
 	if (error$125.code === "ENOENT") return /* @__PURE__ */ new Error(`'${command}' was not found. Install it and make sure it is on your PATH.`);
 	return error$125;
 }
+const PULL_REQUEST_QUERY = `
+  query($owner: String!, $name: String!, $base: String!, $head: String!) {
+    repository(owner: $owner, name: $name) {
+      pullRequests(first: 100, states: OPEN, baseRefName: $base, headRefName: $head) {
+        nodes {
+          number
+          url
+          baseRefName
+          headRefName
+          commits { totalCount }
+        }
+      }
+    }
+  }
+`;
 async function getDefaultBranch() {
 	return (await exec("gh", [
 		"repo",
@@ -229150,22 +229166,29 @@ async function fetchCompare(base$2, head$1) {
 }
 async function findPullRequest(base$2, head$1) {
 	const matches = (await ghJson([
-		"pr",
-		"list",
-		"--state",
-		"open",
-		"--base",
-		base$2,
-		"--head",
-		head$1,
-		"--limit",
-		"100",
-		"--json",
-		"number,url,baseRefName,headRefName"
-	])).filter((pullRequest) => pullRequest.baseRefName === base$2 && pullRequest.headRefName === head$1);
+		"api",
+		"graphql",
+		"-f",
+		`query=${PULL_REQUEST_QUERY}`,
+		"-F",
+		"owner={owner}",
+		"-F",
+		"name={repo}",
+		"-F",
+		`base=${base$2}`,
+		"-F",
+		`head=${head$1}`
+	])).data.repository.pullRequests.nodes.filter((pullRequest) => pullRequest.baseRefName === base$2 && pullRequest.headRefName === head$1);
 	if (matches.length === 0) return null;
 	if (matches.length > 1) throw new Error(`Multiple open pull requests found for ${base$2} <- ${head$1}.`);
-	return matches[0];
+	const match = matches[0];
+	return {
+		number: match.number,
+		url: match.url,
+		baseRefName: match.baseRefName,
+		headRefName: match.headRefName,
+		commitCount: match.commits.totalCount
+	};
 }
 async function createPullRequest$1(input$3) {
 	return exec("gh", [
@@ -236220,6 +236243,7 @@ async function createPullRequest(options) {
 	const maxDiffTokens = options.maxDiffTokens ?? DEFAULT_MAX_DIFF_TOKENS;
 	const compare = await fetchCompare(options.base, options.head);
 	if (compare.commits.length === 0) throw new Error(`No commits found between '${options.base}' and '${options.head}'.`);
+	console.log(source_default.dim(`${compare.commits.length} commit(s) between ${options.base} and ${options.head}`));
 	const context = buildCompareContext(compare, maxDiffTokens);
 	let draft = "";
 	while (true) {
@@ -236240,7 +236264,7 @@ async function createPullRequest(options) {
 		body: content.body,
 		base: options.base,
 		head: options.head
-	}), options);
+	}), options, compare.commits.length);
 	console.log(pullRequest.url);
 	return pullRequest;
 }
@@ -236251,13 +236275,14 @@ function parsePullRequestContent(text$1) {
 		body: lines.slice(1).join("\n").trim()
 	};
 }
-async function resolveCreatedPullRequest(output$3, options) {
+async function resolveCreatedPullRequest(output$3, options, commitCount) {
 	const match = output$3.match(PR_URL_PATTERN);
 	if (match) return {
 		number: Number(match[1]),
 		url: match[0],
 		baseRefName: options.base,
-		headRefName: options.head
+		headRefName: options.head,
+		commitCount
 	};
 	const found = await findPullRequest(options.base, options.head);
 	if (found) return found;
@@ -236341,8 +236366,10 @@ async function mergePullRequestController(baseArg, headArg, options = {}) {
 		scope: options.all ? "everything" : "staged-or-changes"
 	});
 	let pullRequest = await findPullRequest(branches.base, branches.head);
-	if (pullRequest) console.log(pullRequest.url);
-	else pullRequest = await createPullRequest({
+	if (pullRequest) {
+		console.log(source_default.dim(`${pullRequest.commitCount} commit(s) between ${branches.base} and ${branches.head}`));
+		console.log(pullRequest.url);
+	} else pullRequest = await createPullRequest({
 		base: branches.base,
 		head: branches.head,
 		systemPrompt,
@@ -236361,6 +236388,7 @@ async function mergePullRequestController(baseArg, headArg, options = {}) {
 		return;
 	}
 	await mergePullRequest(pullRequest.number, options.mergeMethod ?? context.config.prMergeMethod);
+	if (options.web) await openPullRequest(pullRequest.number);
 }
 const toZeroIfInfinity = (value) => Number.isFinite(value) ? value : 0;
 function parseNumber(milliseconds) {
@@ -236941,7 +236969,7 @@ const pr = app.command("pr").description("Create and merge GitHub pull requests.
 pr.command("create").description("Create a pull request with an AI-generated title and body.").argument("[base-branch]", "Base branch to merge into (defaults to the repository default branch).").argument("[head-branch]", "Head branch with the changes (defaults to the current branch).").option("--model <model>", "Model key from config to use (overrides the configured model).").option("-t, --title-style <style>", "Title style key to use (defaults to \"default\").").option("-b, --body-style <style>", "Body style key to use (defaults to \"default\").").option("-y, --yolo", "Create the pull request without asking for confirmation.").option("-A, --all", "Commit all local changes, not just staged files, before continuing.").option("-w, --web", "Open the pull request in a browser.").action((baseBranch, headBranch, options) => {
 	handleError(() => createPullRequestController(baseBranch, headBranch, options));
 });
-pr.command("merge").description("Create the pull request if needed, then merge it.").argument("[base-branch]", "Base branch to merge into (defaults to the repository default branch).").argument("[head-branch]", "Head branch with the changes (defaults to the current branch).").option("--model <model>", "Model key from config to use (overrides the configured model).").option("-t, --title-style <style>", "Title style key to use (defaults to \"default\").").option("-b, --body-style <style>", "Body style key to use (defaults to \"default\").").option("-y, --yolo", "Merge the pull request without asking for confirmation.").option("-A, --all", "Commit all local changes, not just staged files, before continuing.").option("-m, --merge", "Merge the commits with the base branch.").option("-r, --rebase", "Rebase the commits onto the base branch.").option("-s, --squash", "Squash the commits into one commit.").action((baseBranch, headBranch, options) => {
+pr.command("merge").description("Create the pull request if needed, then merge it.").argument("[base-branch]", "Base branch to merge into (defaults to the repository default branch).").argument("[head-branch]", "Head branch with the changes (defaults to the current branch).").option("--model <model>", "Model key from config to use (overrides the configured model).").option("-t, --title-style <style>", "Title style key to use (defaults to \"default\").").option("-b, --body-style <style>", "Body style key to use (defaults to \"default\").").option("-y, --yolo", "Merge the pull request without asking for confirmation.").option("-A, --all", "Commit all local changes, not just staged files, before continuing.").option("-m, --merge", "Merge the commits with the base branch.").option("-r, --rebase", "Rebase the commits onto the base branch.").option("-s, --squash", "Squash the commits into one commit.").option("-w, --web", "Open the pull request in a browser after merging.").action((baseBranch, headBranch, options) => {
 	if ([
 		options.merge,
 		options.rebase,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gityo",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/NazmusSayad/gityo.git"