gityo 1.1.9 → 1.1.11

package/dist/{flow-DMdKWnY_.js → flow-BJ8xhhps.js}

@@ -22404,6 +22404,19 @@ async function getCommitDiff(git, scope, contextLines = 3) {
 		file$4
 	])))].filter((part) => part.length > 0).join("\n");
 }
+function countDiffLines(diff) {
+	let additions = 0;
+	let deletions = 0;
+	let inHunk = false;
+	for (const line of diff.split("\n")) if (line.startsWith("diff ")) inHunk = false;
+	else if (line.startsWith("@@")) inHunk = true;
+	else if (inHunk && line.startsWith("+")) additions++;
+	else if (inHunk && line.startsWith("-")) deletions++;
+	return {
+		additions,
+		deletions
+	};
+}
 function splitNull(output$3) {
 	return output$3.split("\0").filter(Boolean);
 }
@@ -227014,8 +227027,12 @@ const PROVIDER_NPM_PACKAGES = Object.keys(SUPPORTED_PROVIDERS);
 function resolveModelConfig(models, modelKey) {
 	const modelKeys = Object.keys(models ?? {});
 	if (!models || modelKeys.length === 0) throw new Error("No models configured. Edit your config file to add a model — run `gityo config` to see where.");
-	const modelConfig = models[modelKey ?? modelKeys[0]];
-	if (modelConfig) return modelConfig;
+	const key$1 = modelKey ?? modelKeys[0];
+	const modelConfig = models[key$1];
+	if (modelConfig) return {
+		...modelConfig,
+		key: key$1
+	};
 	throw new Error(`Model '${modelKey}' is not configured. Available models: ${modelKeys.join(", ")}.`);
 }
 function resolveLanguageModel(modelConfig) {
@@ -227294,15 +227311,20 @@ async function mainController(options = {}) {
 	const forceLLMGenerate = options.generate || options.yolo;
 	const forceExecPostCommand = options.post || options.yolo;
 	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);
+	const lineCounts = countDiffLines(diff);
+	console.log([
+		source_default.dim(`${files.length} ${diffScope === "staged" ? "staged " : ""}${files.length === 1 ? "file" : "files"},`),
+		source_default.green.dim(`+${lineCounts.additions}`),
+		source_default.red.dim(`-${lineCounts.deletions}`)
+	].join(" "));
 	if (finalCommitMessage.length > 0) {
 		console.log(source_default.yellow("✓ Using direct commit message"));
 		console.log(source_default.cyan.dim(finalCommitMessage));
 		console.log("");
 	}
 	if (finalCommitMessage.length === 0) while (true) {
-		finalCommitMessage = await runWithLoading("Generating commit message", () => writeCommitMessage(prepared, diff));
+		finalCommitMessage = await runWithLoading(`Generating commit message (${prepared.modelConfig.key})`, () => writeCommitMessage(prepared, diff));
 		console.log(source_default.cyan.dim(finalCommitMessage));
 		console.log("");
 		if (forceLLMGenerate || config$4.autoAcceptCommitMessage) break;
@@ -227332,7 +227354,8 @@ async function prepareCommit(options) {
 	const root = (await git.revparse(["--show-toplevel"])).trim();
 	const config$4 = await loadConfig(root);
 	const modelKey = options.model ?? config$4.commitModel ?? config$4.model;
-	const languageModel = resolveLanguageModel(resolveModelConfig(config$4.models, modelKey));
+	const modelConfig = resolveModelConfig(config$4.models, modelKey);
+	const languageModel = resolveLanguageModel(modelConfig);
 	const styleKey = options.style ?? config$4.commitStyle ?? "default";
 	const style = await resolveStyle(styleKey, config$4.commitStyles, options.cwd);
 	if (!style) {
@@ -227346,6 +227369,7 @@ async function prepareCommit(options) {
 		liveGit,
 		root,
 		config: config$4,
+		modelConfig,
 		languageModel,
 		style,
 		instructions,
@@ -227549,6 +227573,17 @@ async function createPullRequest(cwd, input$3) {
 		input$3.head
 	], cwd);
 }
+async function editPullRequest(cwd, number$7, input$3) {
+	await exec("gh", [
+		"pr",
+		"edit",
+		String(number$7),
+		"--title",
+		input$3.title,
+		"--body",
+		input$3.body
+	], cwd);
+}
 async function mergePullRequest(cwd, number$7, method, output$3) {
 	await execWithOutput("gh", [
 		"pr",
@@ -234555,7 +234590,8 @@ async function resolvePrBranches(cwd, baseArg, headArg) {
 }
 async function loadPullRequestContext(cwd, options = {}) {
 	const config$4 = await loadConfig(await getRepoRoot$1(cwd));
-	const languageModel = resolveLanguageModel(resolveModelConfig(config$4.models, options.modelKey ?? config$4.prModel ?? config$4.model));
+	const modelConfig = resolveModelConfig(config$4.models, options.modelKey ?? config$4.prModel ?? config$4.model);
+	const languageModel = resolveLanguageModel(modelConfig);
 	const titleStyleKey = options.titleStyle ?? config$4.prTitleStyle ?? "default";
 	const titleStyle = config$4.prTitleStyles?.[titleStyleKey] ?? PR_TITLE_STYLES[titleStyleKey];
 	if (!titleStyle) {
@@ -234575,30 +234611,38 @@ async function loadPullRequestContext(cwd, options = {}) {
 		}).join(", ");
 		throw new Error(`Pull request body style '${bodyStyleKey}' is not configured. Available body styles: ${availableStyles}.`);
 	}
+	const bodyInstructions = typeof bodyStyle === "string" ? bodyStyle : await readFile(path.resolve(cwd, bodyStyle.path), "utf8");
 	return {
 		config: config$4,
 		languageModel,
+		modelKey: modelConfig.key,
 		titleInstructions,
-		bodyInstructions: typeof bodyStyle === "string" ? bodyStyle : await readFile(path.resolve(cwd, bodyStyle.path), "utf8")
+		bodyInstructions
 	};
 }
 async function createPullRequest$1(options) {
 	const maxDiffTokens = options.maxDiffTokens ?? DEFAULT_MAX_DIFF_TOKENS;
 	const compare = await fetchPullRequestCompare(options.cwd, options.base, options.head);
-	console.log(source_default.dim(`${compare.commits.length} commit(s) between ${options.base} and ${options.head}`));
+	console.log(formatCompareSummary(compare));
 	const context = buildCompareContext(compare, maxDiffTokens);
 	let draft = "";
 	while (true) {
-		draft = await runWithLoading("Generating pull request title and body", () => generatePullRequest({
+		draft = await runWithLoading(`Generating pull request title and body (${options.modelKey})`, () => generatePullRequest({
 			languageModel: options.languageModel,
 			systemPrompt: options.systemPrompt,
 			context
 		}));
 		console.log(renderPullRequest(draft).trim());
 		console.log("");
-		if (options.autoAccept || await acceptGenerated(`Create PR: ${source_default.red.bold(options.base)} ${source_default.reset("←")} ${source_default.yellow.bold(options.head)}`, "generate a new pull message")) break;
+		if (options.autoAccept || await acceptGenerated(`${options.existing ? `Update PR #${options.existing.number}` : "Create PR"}: ${source_default.red.bold(options.base)} ${source_default.reset("←")} ${source_default.yellow.bold(options.head)}`, "generate a new pull message")) break;
 	}
 	const content = parsePullRequestContent(draft);
+	if (options.existing) {
+		if (options.autoAccept) console.log(source_default.green("✓ Updating pull request"));
+		await editPullRequest(options.cwd, options.existing.number, content);
+		console.log(options.existing.url);
+		return options.existing;
+	}
 	if (options.autoAccept) console.log(source_default.green("✓ Creating pull request"));
 	const pullRequest = await submitPullRequest(options.cwd, content, {
 		base: options.base,
@@ -234607,6 +234651,16 @@ async function createPullRequest$1(options) {
 	console.log(pullRequest.url);
 	return pullRequest;
 }
+function formatCompareSummary(compare) {
+	const files = compare.files ?? [];
+	const additions = files.reduce((total, file$4) => total + file$4.additions, 0);
+	const deletions = files.reduce((total, file$4) => total + file$4.deletions, 0);
+	return [
+		source_default.dim(`${compare.commits.length} ${compare.commits.length === 1 ? "commit" : "commits"}, ${files.length} ${files.length === 1 ? "file" : "files"},`),
+		source_default.green.dim(`+${additions}`),
+		source_default.red.dim(`-${deletions}`)
+	].join(" ");
+}
 async function fetchPullRequestCompare(cwd, base$2, head$1) {
 	const compare = await fetchCompare(cwd, base$2, head$1);
 	if (compare.commits.length === 0) throw new Error(`No commits found between '${base$2}' and '${head$1}'.`);
@@ -234988,4 +235042,4 @@ async function publishRelease(cwd, input$3, replace, output$3) {
 	if (replace) await deleteRelease(cwd, input$3.tag, output$3);
 	await createRelease(cwd, input$3, output$3);
 }
-export { writeCommitMessage as A, PR_TITLE_PROMPTS as B, findPullRequest as C, getCommitFiles as D, openPullRequest as E, GLOBAL_CONFIG_FILE_PATH as F, dist_default$1 as G, getCommitDiff as H, PROJECT_CONFIG_FILE_NAME as I, dist_default as K, loadConfig as L, acceptGenerated as M, mergeTheme as N, mainController as O, selectionTheme as P, COMMIT_STYLE_PROMPTS as R, generatePullRequest as S, mergePullRequest as T, getGit as U, DEFAULT_MAX_DIFF_TOKENS as V, source_default as W, parsePullRequestContent as _, verifyReleaseCommits as a, createRenderer as b, getBranchHeadSha as c, releaseExists as d, buildCompareContext as f, loadPullRequestContext as g, getCurrentBranch as h, resolveReleaseModel as i, runWithLoading as j, prepareCommit as k, listReleaseCommits as l, fetchPullRequestCompare as m, getPreviousTag as n, writeReleaseNotes as o, createPullRequest$1 as p, publishRelease as r, getRepoRoot as s, bumpVersionTag as t, listReleases as u, resolvePrBranches as v, getDefaultBranch as w, buildPullRequestSystemPrompt as x, submitPullRequest as y, PR_BODY_PROMPTS as z };
+export { mainController as A, COMMIT_STYLE_PROMPTS as B, generatePullRequest as C, mergePullRequest as D, getDefaultBranch as E, mergeTheme as F, DEFAULT_MAX_DIFF_TOKENS as G, PR_TITLE_PROMPTS as H, selectionTheme as I, source_default as J, getCommitDiff as K, GLOBAL_CONFIG_FILE_PATH as L, writeCommitMessage as M, runWithLoading as N, openPullRequest as O, acceptGenerated as P, PROJECT_CONFIG_FILE_NAME as R, buildPullRequestSystemPrompt as S, findPullRequest as T, resolveLanguageModel as U, PR_BODY_PROMPTS as V, resolveModelConfig as W, dist_default as X, dist_default$1 as Y, loadPullRequestContext as _, verifyReleaseCommits as a, submitPullRequest as b, getBranchHeadSha as c, releaseExists as d, buildCompareContext as f, getCurrentBranch as g, formatCompareSummary as h, resolveReleaseModel as i, prepareCommit as j, getCommitFiles as k, listReleaseCommits as l, fetchPullRequestCompare as m, getPreviousTag as n, writeReleaseNotes as o, createPullRequest$1 as p, getGit as q, publishRelease as r, getRepoRoot as s, bumpVersionTag as t, listReleases as u, parsePullRequestContent as v, fetchCompare as w, createRenderer as x, resolvePrBranches as y, loadConfig as z };

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { B as PR_TITLE_PROMPTS, C as findPullRequest, D as getCommitFiles, E as openPullRequest, F as GLOBAL_CONFIG_FILE_PATH, G as dist_default$1, I as PROJECT_CONFIG_FILE_NAME, K as dist_default, L as loadConfig, M as acceptGenerated, N as mergeTheme, O as mainController, P as selectionTheme, R as COMMIT_STYLE_PROMPTS, T as mergePullRequest, U as getGit, W as source_default, a as verifyReleaseCommits, b as createRenderer, c as getBranchHeadSha, d as releaseExists, g as loadPullRequestContext, h as getCurrentBranch, i as resolveReleaseModel, j as runWithLoading, l as listReleaseCommits, n as getPreviousTag, o as writeReleaseNotes, p as createPullRequest, r as publishRelease, s as getRepoRoot, t as bumpVersionTag, u as listReleases, v as resolvePrBranches, w as getDefaultBranch, x as buildPullRequestSystemPrompt, z as PR_BODY_PROMPTS } from "./flow-DMdKWnY_.js";
+import { A as mainController, B as COMMIT_STYLE_PROMPTS, D as mergePullRequest, E as getDefaultBranch, F as mergeTheme, H as PR_TITLE_PROMPTS, I as selectionTheme, J as source_default, L as GLOBAL_CONFIG_FILE_PATH, N as runWithLoading, O as openPullRequest, P as acceptGenerated, R as PROJECT_CONFIG_FILE_NAME, S as buildPullRequestSystemPrompt, T as findPullRequest, U as resolveLanguageModel, V as PR_BODY_PROMPTS, W as resolveModelConfig, X as dist_default, Y as dist_default$1, _ as loadPullRequestContext, a as verifyReleaseCommits, c as getBranchHeadSha, d as releaseExists, g as getCurrentBranch, h as formatCompareSummary, k as getCommitFiles, l as listReleaseCommits, n as getPreviousTag, o as writeReleaseNotes, p as createPullRequest, q as getGit, r as publishRelease, s as getRepoRoot, t as bumpVersionTag, u as listReleases, w as fetchCompare, x as createRenderer, y as resolvePrBranches, z as loadConfig } from "./flow-BJ8xhhps.js";
 import "./defineProperty-DZ5JLFN4.js";
 import "./token-util-CV7QlXpE.js";
 import { EventEmitter } from "node:events";
@@ -1699,7 +1699,7 @@ function useColor() {
 	if (process$1.env.FORCE_COLOR || process$1.env.CLICOLOR_FORCE !== void 0) return true;
 }
 new Command();
-var version = "1.1.9";
+var version = "1.1.11";
 const CONFIG_SCHEMA_URL = "https://github.com/NazmusSayad/gityo/raw/refs/heads/schema/schema.json";
 async function showConfigController() {
 	const projectConfigPath = path.join(process.cwd(), PROJECT_CONFIG_FILE_NAME);
@@ -1750,19 +1750,22 @@ async function createPullRequestController(baseArg, headArg, options = {}) {
 		yolo: options.yolo ?? false,
 		scope: options.all ? "everything" : "staged-or-changes"
 	});
+	const existing = options.update ? await findPullRequest(cwd, branches.base, branches.head) : null;
 	const pullRequest = await createPullRequest({
 		cwd,
 		base: branches.base,
 		head: branches.head,
 		systemPrompt,
 		languageModel: context.languageModel,
+		modelKey: context.modelKey,
 		maxDiffTokens: context.config.maxDiffTokens,
-		autoAccept: options.yolo ?? false
+		autoAccept: options.yolo ?? false,
+		existing
 	}).catch(async (error) => {
 		if (!options.web) throw error;
-		const existing = await findPullRequest(cwd, branches.base, branches.head);
-		if (!existing) throw error;
-		return existing;
+		const existing$1 = await findPullRequest(cwd, branches.base, branches.head);
+		if (!existing$1) throw error;
+		return existing$1;
 	});
 	if (options.web) await openPullRequest(cwd, pullRequest.number);
 }
@@ -1780,8 +1783,8 @@ async function mergePullRequestController(baseArg, headArg, options = {}) {
 		scope: options.all ? "everything" : "staged-or-changes"
 	});
 	let pullRequest = await findPullRequest(cwd, branches.base, branches.head);
-	if (pullRequest) {
-		console.log(source_default.dim(`${pullRequest.commitCount} commit(s) between ${branches.base} and ${branches.head}`));
+	if (pullRequest && !options.update) {
+		console.log(formatCompareSummary(await fetchCompare(cwd, branches.base, branches.head)));
 		console.log(pullRequest.url);
 	} else pullRequest = await createPullRequest({
 		cwd,
@@ -1789,8 +1792,10 @@ async function mergePullRequestController(baseArg, headArg, options = {}) {
 		head: branches.head,
 		systemPrompt,
 		languageModel: context.languageModel,
+		modelKey: context.modelKey,
 		maxDiffTokens: context.config.maxDiffTokens,
-		autoAccept: options.yolo ?? false
+		autoAccept: options.yolo ?? false,
+		existing: pullRequest
 	});
 	console.log("");
 	if (options.yolo) console.log(source_default.yellow(`✓ Merging pull request #${pullRequest.number}`));
@@ -1969,7 +1974,8 @@ async function releaseController(tagArg, options = {}) {
 		}, exists, "inherit");
 		return;
 	}
-	const languageModel = resolveReleaseModel(config$1, options.model);
+	const modelConfig = resolveModelConfig(config$1.models, options.model ?? config$1.releaseModel ?? config$1.model);
+	const languageModel = resolveLanguageModel(modelConfig);
 	const previousTag = getPreviousTag(releases, tag);
 	const headSha = await getBranchHeadSha(cwd, branch);
 	const commits = await runWithLoading("Loading commits from GitHub", () => listReleaseCommits(cwd, previousTag, headSha));
@@ -1977,7 +1983,7 @@ async function releaseController(tagArg, options = {}) {
 	console.log(source_default.dim(`${commits.length} commit(s) since ${previousTag ?? "the first commit"}`));
 	let notes = "";
 	while (true) {
-		notes = await runWithLoading("Generating release notes", () => writeReleaseNotes(cwd, languageModel, config$1, commits));
+		notes = await runWithLoading(`Generating release notes (${modelConfig.key})`, () => writeReleaseNotes(cwd, languageModel, config$1, commits));
 		console.log(renderReleaseNotes(notes).trim());
 		console.log("");
 		if (options.yolo || await acceptGenerated(`Create release ${source_default.yellow.bold(tag)} on ${source_default.yellow.bold(branch)}`, "generate new release notes")) break;
@@ -2066,10 +2072,10 @@ app.command("commit").description("Stage changes, generate a commit message, cre
 	}));
 });
 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) => {
+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("-u, --update", "Regenerate the title and body and update the existing pull request.").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.").option("-w, --web", "Open the pull request in a browser after merging.").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("-u, --update", "Regenerate the title and body and update the existing pull request.").option("-w, --web", "Open the pull request in a browser after merging.").action((baseBranch, headBranch, options) => {
 	if ([
 		options.merge,
 		options.rebase,

package/dist/lib.js

@@ -1,4 +1,4 @@
-import { A as writeCommitMessage, C as findPullRequest, H as getCommitDiff, L as loadConfig, S as generatePullRequest, T as mergePullRequest, V as DEFAULT_MAX_DIFF_TOKENS, _ as parsePullRequestContent, a as verifyReleaseCommits, c as getBranchHeadSha, d as releaseExists, f as buildCompareContext, g as loadPullRequestContext, i as resolveReleaseModel, k as prepareCommit, l as listReleaseCommits, m as fetchPullRequestCompare, n as getPreviousTag, o as writeReleaseNotes, r as publishRelease, s as getRepoRoot, t as bumpVersionTag, u as listReleases, v as resolvePrBranches, w as getDefaultBranch, x as buildPullRequestSystemPrompt, y as submitPullRequest } from "./flow-DMdKWnY_.js";
+import { C as generatePullRequest, D as mergePullRequest, E as getDefaultBranch, G as DEFAULT_MAX_DIFF_TOKENS, K as getCommitDiff, M as writeCommitMessage, S as buildPullRequestSystemPrompt, T as findPullRequest, _ as loadPullRequestContext, a as verifyReleaseCommits, b as submitPullRequest, c as getBranchHeadSha, d as releaseExists, f as buildCompareContext, i as resolveReleaseModel, j as prepareCommit, l as listReleaseCommits, m as fetchPullRequestCompare, n as getPreviousTag, o as writeReleaseNotes, r as publishRelease, s as getRepoRoot, t as bumpVersionTag, u as listReleases, v as parsePullRequestContent, y as resolvePrBranches, z as loadConfig } from "./flow-BJ8xhhps.js";
 import "./defineProperty-DZ5JLFN4.js";
 import "./token-util-CV7QlXpE.js";
 async function createCommitSession(options) {

package/package.json

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