gityo 1.0.17 → 1.1.0

package/README.md

@@ -104,6 +104,5 @@ Styles control how commit messages, PR titles, and PR bodies are written. Choose
 
 - Run `gityo config styles` to view commit, PR title, and PR body styles.
 - Add `.gityo.json` to a repository for project-specific settings.
-- Add `.gityo.md` for project-specific commit instructions.
 - Run `gityo config` to see config locations.
 - Use the config schema for available settings and `--help` on each command for its options.

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.0.17";
+var version$4 = "1.1.0";
 const keybindingLookup = new Set(["emacs", "vim"]);
 function isKeybinding(value) {
 	return keybindingLookup.has(value);
@@ -24031,6 +24031,15 @@ async function getGit(cwd = process.cwd()) {
 		liveGit: createLiveGit(root)
 	};
 }
+async function getStagedFiles(git) {
+	return splitNull(await git.raw([
+		"diff",
+		"--cached",
+		"--name-only",
+		"--diff-filter=ACDMRTUXB",
+		"-z"
+	])).sort((left, right) => left.localeCompare(right));
+}
 async function getChangedFiles(git) {
 	const [unstaged, staged, untracked] = await Promise.all([
 		git.raw([
@@ -24039,13 +24048,7 @@ async function getChangedFiles(git) {
 			"--diff-filter=ACDMRTUXB",
 			"-z"
 		]),
-		git.raw([
-			"diff",
-			"--cached",
-			"--name-only",
-			"--diff-filter=ACDMRTUXB",
-			"-z"
-		]),
+		getStagedFiles(git),
 		git.raw([
 			"ls-files",
 			"--others",
@@ -24054,12 +24057,12 @@ async function getChangedFiles(git) {
 		])
 	]);
 	return Array.from(new Set([
-		...splitNull(staged),
+		...staged,
 		...splitNull(unstaged),
 		...splitNull(untracked)
 	])).sort((left, right) => left.localeCompare(right));
 }
-async function getCommitDiff(git, contextLines = 3) {
+async function getCommitDiff(git, scope, contextLines = 3) {
 	const unified = [`-U${contextLines}`];
 	const staged = await git.raw([
 		"diff",
@@ -24067,12 +24070,12 @@ async function getCommitDiff(git, contextLines = 3) {
 		"--no-ext-diff",
 		...unified
 	]);
-	if (staged.trim().length > 0) return {
-		diff: staged,
-		hasStaged: true
-	};
+	if (scope === "staged") return staged;
+	if (scope !== "all") throw new Error(`Unknown commit scope '${scope}'.`);
+	const hasStaged = staged.trim().length > 0;
 	const [unstaged, untracked] = await Promise.all([git.raw([
 		"diff",
+		...hasStaged ? ["HEAD"] : [],
 		"--no-ext-diff",
 		...unified
 	]), git.raw([
@@ -24081,17 +24084,14 @@ async function getCommitDiff(git, contextLines = 3) {
 		"--exclude-standard",
 		"-z"
 	])]);
-	return {
-		diff: [unstaged, ...await Promise.all(splitNull(untracked).map((file$4) => git.raw([
-			"diff",
-			"--no-index",
-			...unified,
-			"--",
-			"/dev/null",
-			file$4
-		])))].filter((part) => part.length > 0).join("\n"),
-		hasStaged: false
-	};
+	return [unstaged, ...await Promise.all(splitNull(untracked).map((file$4) => git.raw([
+		"diff",
+		"--no-index",
+		...unified,
+		"--",
+		"/dev/null",
+		file$4
+	])))].filter((part) => part.length > 0).join("\n");
 }
 function splitNull(output$3) {
 	return output$3.split("\0").filter(Boolean);
@@ -24106,17 +24106,16 @@ function createLiveGit(baseDir) {
 }
 const DEFAULT_MAX_DIFF_TOKENS = 24e3;
 const DEFAULT_PER_FILE_CAP = 400;
-const CHARS_PER_TOKEN = 4;
+const CHARS_PER_TOKEN$2 = 4;
 const MINIMIZED_CONTEXT_LINES = 1;
 const FILE_SECTION_PREFIX = "diff --git ";
 const HUNK_HEADER_PREFIX = "@@ ";
 const NOISE_FILE_PATTERNS = [/\.(lock|min\.(?:js|mjs|cjs|css)|map)$/i, /-lock\.[^/]+$/i];
 function estimateTokens(text$1) {
-	return Math.ceil(text$1.length / CHARS_PER_TOKEN);
+	return Math.ceil(text$1.length / CHARS_PER_TOKEN$2);
 }
 async function minimizeDiff(git, options) {
-	const { diff } = await getCommitDiff(git, MINIMIZED_CONTEXT_LINES);
-	const sections = splitFileSections(diff).map(parseSection);
+	const sections = splitFileSections(await getCommitDiff(git, options.scope, MINIMIZED_CONTEXT_LINES)).map(parseSection);
 	const kept = [];
 	const excludedPaths = /* @__PURE__ */ new Set();
 	for (const section of sections) if (isNoiseFile(section.path)) excludedPaths.add(section.path);
@@ -24215,7 +24214,7 @@ function splitOversizedSection(section, maxTokens) {
 	}), maxTokens);
 }
 function hardSplit(text$1, maxTokens) {
-	const maxChars = maxTokens * CHARS_PER_TOKEN;
+	const maxChars = maxTokens * CHARS_PER_TOKEN$2;
 	const chunks = [];
 	let current = "";
 	for (const line of text$1.split("\n")) {
@@ -36987,11 +36986,11 @@ var postToApi$7 = async ({ url: url$4, headers = {}, body, successfulResponseHan
 		});
 	}
 };
-function tool$3(tool2) {
+function tool(tool2) {
 	return tool2;
 }
 function createProviderDefinedToolFactory$4({ id, inputSchema: inputSchema$1 }) {
-	return ({ execute, outputSchema: outputSchema$2, needsApproval, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$3({
+	return ({ execute, outputSchema: outputSchema$2, needsApproval, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool({
 		type: "provider",
 		isProviderExecuted: false,
 		id,
@@ -37007,7 +37006,7 @@ function createProviderDefinedToolFactory$4({ id, inputSchema: inputSchema$1 })
 	});
 }
 function createProviderDefinedToolFactoryWithOutputSchema$3({ id, inputSchema: inputSchema$1, outputSchema: outputSchema$2 }) {
-	return ({ execute, needsApproval, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$3({
+	return ({ execute, needsApproval, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool({
 		type: "provider",
 		isProviderExecuted: false,
 		id,
@@ -37023,7 +37022,7 @@ function createProviderDefinedToolFactoryWithOutputSchema$3({ id, inputSchema: i
 	});
 }
 function createProviderExecutedToolFactory$2({ id, inputSchema: inputSchema$1, outputSchema: outputSchema$2, supportsDeferredResults }) {
-	return ({ onInputStart, onInputDelta, onInputAvailable,...args }) => tool$3({
+	return ({ onInputStart, onInputDelta, onInputAvailable,...args }) => tool({
 		type: "provider",
 		isProviderExecuted: true,
 		id,
@@ -48321,7 +48320,7 @@ var init_transport = __esmMin((() => {
 	init_parseUrl();
 	init_toEndpointV1$1();
 }));
-var parseBoolean, expectBoolean, expectNumber, MAX_FLOAT, expectFloat32, expectLong, expectInt, expectInt32, expectShort, expectByte, expectSizedInt, castInt, expectNonNull, expectObject, expectString, expectUnion, strictParseDouble, strictParseFloat, strictParseFloat32, NUMBER_REGEX, parseNumber, limitedParseDouble, handleFloat, limitedParseFloat, limitedParseFloat32, parseFloatString, strictParseLong, strictParseInt, strictParseInt32, strictParseShort, strictParseByte, stackTraceWarning, logger$1;
+var parseBoolean, expectBoolean, expectNumber, MAX_FLOAT, expectFloat32, expectLong, expectInt, expectInt32, expectShort, expectByte, expectSizedInt, castInt, expectNonNull, expectObject, expectString, expectUnion, strictParseDouble, strictParseFloat, strictParseFloat32, NUMBER_REGEX, parseNumber$1, limitedParseDouble, handleFloat, limitedParseFloat, limitedParseFloat32, parseFloatString, strictParseLong, strictParseInt, strictParseInt32, strictParseShort, strictParseByte, stackTraceWarning, logger$1;
 var init_parse_utils = __esmMin((() => {
 	init_transport();
 	parseBoolean = (value) => {
@@ -48427,16 +48426,16 @@ var init_parse_utils = __esmMin((() => {
 		return asObject;
 	};
 	strictParseDouble = (value) => {
-		if (typeof value == "string") return expectNumber(parseNumber(value));
+		if (typeof value == "string") return expectNumber(parseNumber$1(value));
 		return expectNumber(value);
 	};
 	strictParseFloat = strictParseDouble;
 	strictParseFloat32 = (value) => {
-		if (typeof value == "string") return expectFloat32(parseNumber(value));
+		if (typeof value == "string") return expectFloat32(parseNumber$1(value));
 		return expectFloat32(value);
 	};
 	NUMBER_REGEX = /(-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?)|(-?Infinity)|(NaN)/g;
-	parseNumber = (value) => {
+	parseNumber$1 = (value) => {
 		const matches = value.match(NUMBER_REGEX);
 		if (matches === null || matches[0].length !== value.length) throw new TypeError(`Expected real number, got implicit NaN`);
 		return parseFloat(value);
@@ -48460,20 +48459,20 @@ var init_parse_utils = __esmMin((() => {
 		}
 	};
 	strictParseLong = (value) => {
-		if (typeof value === "string") return expectLong(parseNumber(value));
+		if (typeof value === "string") return expectLong(parseNumber$1(value));
 		return expectLong(value);
 	};
 	strictParseInt = strictParseLong;
 	strictParseInt32 = (value) => {
-		if (typeof value === "string") return expectInt32(parseNumber(value));
+		if (typeof value === "string") return expectInt32(parseNumber$1(value));
 		return expectInt32(value);
 	};
 	strictParseShort = (value) => {
-		if (typeof value === "string") return expectShort(parseNumber(value));
+		if (typeof value === "string") return expectShort(parseNumber$1(value));
 		return expectShort(value);
 	};
 	strictParseByte = (value) => {
-		if (typeof value === "string") return expectByte(parseNumber(value));
+		if (typeof value === "string") return expectByte(parseNumber$1(value));
 		return expectByte(value);
 	};
 	stackTraceWarning = (message) => {
@@ -48495,7 +48494,7 @@ function dateToUtcString(date$10) {
 	const secondsString = secondsInt < 10 ? `0${secondsInt}` : `${secondsInt}`;
 	return `${DAYS[dayOfWeek]}, ${dayOfMonthString} ${MONTHS[month]} ${year$1} ${hoursString}:${minutesString}:${secondsString} GMT`;
 }
-var DAYS, MONTHS, RFC3339, parseRfc3339DateTime, RFC3339_WITH_OFFSET$1, parseRfc3339DateTimeWithOffset, IMF_FIXDATE$1, RFC_850_DATE$1, ASC_TIME$1, parseRfc7231DateTime, parseEpochTimestamp, buildDate, parseTwoDigitYear, FIFTY_YEARS_IN_MILLIS, adjustRfc850Year, parseMonthByShortName, DAYS_IN_MONTH, validateDayOfMonth, isLeapYear, parseDateValue, parseMilliseconds, parseOffsetToMilliseconds, stripLeadingZeroes;
+var DAYS, MONTHS, RFC3339, parseRfc3339DateTime, RFC3339_WITH_OFFSET$1, parseRfc3339DateTimeWithOffset, IMF_FIXDATE$1, RFC_850_DATE$1, ASC_TIME$1, parseRfc7231DateTime, parseEpochTimestamp, buildDate, parseTwoDigitYear, FIFTY_YEARS_IN_MILLIS, adjustRfc850Year, parseMonthByShortName, DAYS_IN_MONTH, validateDayOfMonth, isLeapYear, parseDateValue, parseMilliseconds$1, parseOffsetToMilliseconds, stripLeadingZeroes;
 var init_date_utils = __esmMin((() => {
 	init_parse_utils();
 	DAYS = [
@@ -48608,7 +48607,7 @@ var init_date_utils = __esmMin((() => {
 	buildDate = (year$1, month, day, time$7) => {
 		const adjustedMonth = month - 1;
 		validateDayOfMonth(year$1, adjustedMonth, day);
-		return new Date(Date.UTC(year$1, adjustedMonth, day, parseDateValue(time$7.hours, "hour", 0, 23), parseDateValue(time$7.minutes, "minute", 0, 59), parseDateValue(time$7.seconds, "seconds", 0, 60), parseMilliseconds(time$7.fractionalMilliseconds)));
+		return new Date(Date.UTC(year$1, adjustedMonth, day, parseDateValue(time$7.hours, "hour", 0, 23), parseDateValue(time$7.minutes, "minute", 0, 59), parseDateValue(time$7.seconds, "seconds", 0, 60), parseMilliseconds$1(time$7.fractionalMilliseconds)));
 	};
 	parseTwoDigitYear = (value) => {
 		const thisYear = (/* @__PURE__ */ new Date()).getUTCFullYear();
@@ -48653,7 +48652,7 @@ var init_date_utils = __esmMin((() => {
 		if (dateVal < lower || dateVal > upper) throw new TypeError(`${type$1} must be between ${lower} and ${upper}, inclusive`);
 		return dateVal;
 	};
-	parseMilliseconds = (value) => {
+	parseMilliseconds$1 = (value) => {
 		if (value === null || value === void 0) return 0;
 		return strictParseFloat32("0." + value) * 1e3;
 	};
@@ -150845,7 +150844,7 @@ function jsonrepair(text$1) {
 	throwUnexpectedCharacter();
 	function parseValue() {
 		parseWhitespaceAndSkipComments();
-		const processed$1 = parseObject() || parseArray() || parseString() || parseNumber$1() || parseKeywords() || parseUnquotedString(false) || parseRegex();
+		const processed$1 = parseObject() || parseArray() || parseString() || parseNumber$2() || parseKeywords() || parseUnquotedString(false) || parseRegex();
 		parseWhitespaceAndSkipComments();
 		return processed$1;
 	}
@@ -151139,7 +151138,7 @@ function jsonrepair(text$1) {
 		}
 		return processed$1;
 	}
-	function parseNumber$1() {
+	function parseNumber$2() {
 		const start = i$5;
 		let num = "";
 		let invalid = false;
@@ -171147,7 +171146,7 @@ function hasWebSearch(client) {
 	return typeof client.webSearch === "function";
 }
 function webSearch(options = {}) {
-	return tool$3({
+	return tool({
 		description: "Search the web for current information about any topic. Use this when you need up-to-date information, recent news, current statistics, or real-time data that may not be in your training data.",
 		inputSchema: webSearchInputSchema,
 		execute: async (input2, { abortSignal }) => {
@@ -171203,7 +171202,7 @@ function webSearch(options = {}) {
 }
 var webFetchInputSchema = external_exports$2.object({ url: external_exports$2.string().url("Must be a valid URL").describe("The URL to fetch content from") });
 function webFetch(options = {}) {
-	return tool$3({
+	return tool({
 		description: "Fetch and read content from a specific web URL. Use this to retrieve the full text content of web pages, articles, documentation, or any publicly accessible web content for analysis or summarization.",
 		inputSchema: webFetchInputSchema,
 		execute: async (input2, context) => {
@@ -203416,7 +203415,7 @@ var require_dist$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		safeParseJSON: () => safeParseJSON$2,
 		safeValidateTypes: () => safeValidateTypes$2,
 		standardSchemaValidator: () => standardSchemaValidator,
-		tool: () => tool$2,
+		tool: () => tool$3,
 		validateTypes: () => validateTypes$2,
 		validator: () => validator,
 		validatorSymbol: () => validatorSymbol,
@@ -203918,7 +203917,7 @@ var require_dist$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			});
 		}
 	};
-	function tool$2(tool2) {
+	function tool$3(tool2) {
 		return tool2;
 	}
 	function dynamicTool$2(tool2) {
@@ -203928,7 +203927,7 @@ var require_dist$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		};
 	}
 	function createProviderDefinedToolFactory({ id, name: name$18, inputSchema: inputSchema$1 }) {
-		return ({ execute, outputSchema: outputSchema$2, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$2({
+		return ({ execute, outputSchema: outputSchema$2, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$3({
 			type: "provider-defined",
 			id,
 			name: name$18,
@@ -203943,7 +203942,7 @@ var require_dist$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		});
 	}
 	function createProviderDefinedToolFactoryWithOutputSchema({ id, name: name$18, inputSchema: inputSchema$1, outputSchema: outputSchema$2 }) {
-		return ({ execute, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$2({
+		return ({ execute, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$3({
 			type: "provider-defined",
 			id,
 			name: name$18,
@@ -206837,11 +206836,11 @@ var postToApi$1 = async ({ url: url$4, headers = {}, body, successfulResponseHan
 		});
 	}
 };
-function tool$1(tool2) {
+function tool$2(tool2) {
 	return tool2;
 }
 function createProviderToolFactory$1({ id, inputSchema: inputSchema$1 }) {
-	return ({ execute, outputSchema: outputSchema$2, needsApproval, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$1({
+	return ({ execute, outputSchema: outputSchema$2, needsApproval, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$2({
 		type: "provider",
 		id,
 		args,
@@ -206856,7 +206855,7 @@ function createProviderToolFactory$1({ id, inputSchema: inputSchema$1 }) {
 	});
 }
 function createProviderToolFactoryWithOutputSchema$1({ id, inputSchema: inputSchema$1, outputSchema: outputSchema$2, supportsDeferredResults }) {
-	return ({ execute, needsApproval, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$1({
+	return ({ execute, needsApproval, toModelOutput, onInputStart, onInputDelta, onInputAvailable,...args }) => tool$2({
 		type: "provider",
 		id,
 		args,
@@ -228815,6 +228814,11 @@ const configSchema = object$3({
 	prBodyStyle: string$5().min(1),
 	prTitleStyles: record$3(string$5().min(1), instructionSchema),
 	prBodyStyles: record$3(string$5().min(1), instructionSchema),
+	prMergeMethod: _enum$4([
+		"merge",
+		"rebase",
+		"squash"
+	]),
 	maxDiffTokens: number$4().int().min(1e3),
 	perFileCap: number$4().int().min(50),
 	autoAcceptCommitMessage: boolean$4(),
@@ -228832,6 +228836,7 @@ function resolveConfig(input$3) {
 		prBodyStyle: parsed.prBodyStyle,
 		prTitleStyles: parsed.prTitleStyles,
 		prBodyStyles: parsed.prBodyStyles,
+		prMergeMethod: parsed.prMergeMethod ?? "merge",
 		maxDiffTokens: parsed.maxDiffTokens,
 		perFileCap: parsed.perFileCap,
 		autoAcceptCommitMessage: parsed.autoAcceptCommitMessage ?? false,
@@ -228842,15 +228847,26 @@ function resolveConfig(input$3) {
 const PROJECT_CONFIG_FILE_NAME = ".gityo.json";
 const GLOBAL_CONFIG_FILE_PATH = path.join(os.homedir(), ".config", "gityo.json");
 async function loadConfig(cwd = process.cwd()) {
-	const [globalConfig$3, projectConfig, projectInstructions] = await Promise.all([
-		readGlobalConfig(),
-		readProjectConfig(cwd),
-		readInstructionsFile(path.join(cwd, ".gityo.md"))
-	]);
+	const [globalConfig$3, projectConfig] = await Promise.all([readGlobalConfig(), readProjectConfig(cwd)]);
 	return resolveConfig({
 		...globalConfig$3 ?? {},
 		...projectConfig ?? {},
-		commitInstructions: projectInstructions ?? projectConfig?.commitInstructions ?? globalConfig$3?.commitInstructions
+		models: {
+			...globalConfig$3?.models,
+			...projectConfig?.models
+		},
+		commitStyles: {
+			...globalConfig$3?.commitStyles,
+			...projectConfig?.commitStyles
+		},
+		prTitleStyles: {
+			...globalConfig$3?.prTitleStyles,
+			...projectConfig?.prTitleStyles
+		},
+		prBodyStyles: {
+			...globalConfig$3?.prBodyStyles,
+			...projectConfig?.prBodyStyles
+		}
 	});
 }
 async function readProjectConfig(cwd = process.cwd()) {
@@ -228877,17 +228893,6 @@ async function readConfigFile(filePath) {
 	if (!result.success) throw new Error(`Invalid config in ${filePath}: ${result.error.message}`);
 	return result.data;
 }
-async function readInstructionsFile(filePath) {
-	let contents;
-	try {
-		contents = await readFile(filePath, "utf8");
-	} catch (error$125) {
-		if (isMissingFileError(error$125)) return;
-		throw error$125;
-	}
-	const value = contents.trim();
-	return value.length > 0 ? value : void 0;
-}
 function isMissingFileError(error$125) {
 	return error$125 instanceof Error && "code" in error$125 && typeof error$125.code === "string" && error$125.code === "ENOENT";
 }
@@ -228950,10 +228955,10 @@ async function runWithLoading(label, task) {
 		readline.clearLine(process.stdout, 0);
 	}
 }
-const MAP_CONCURRENCY = 3;
-const PROMPT_RESERVE_TOKENS = 800;
-const MIN_CHUNK_BUDGET_TOKENS = 1e3;
-const MAX_TOC_LINES = 500;
+const MAP_CONCURRENCY$1 = 3;
+const PROMPT_RESERVE_TOKENS$2 = 800;
+const MIN_CHUNK_BUDGET_TOKENS$1 = 1e3;
+const MAX_TOC_LINES$1 = 500;
 async function mainController(options = {}) {
 	const { git, liveGit } = await getGit();
 	const config$5 = await loadConfig((await git.revparse(["--show-toplevel"])).trim());
@@ -228970,9 +228975,9 @@ async function mainController(options = {}) {
 	const forceExecPostCommand = options.post || options.yolo;
 	let finalCommitMessage = options.input?.trim() ?? "";
 	if (typeof options.input === "string" && finalCommitMessage.length === 0) throw new Error("Provided commit message input cannot be empty.");
-	const files = await getChangedFiles(git);
+	const { diffScope, files } = await getCommitFiles(git, options.scope ?? "staged-or-changes");
 	if (files.length === 0) return console.log("No changed files found.");
-	const { diff, hasStaged } = await getCommitDiff(git);
+	const diff = await getCommitDiff(git, diffScope);
 	if (finalCommitMessage.length > 0) {
 		console.log(source_default.yellow("✓ Using direct commit message"));
 		console.log(source_default.cyan.dim(finalCommitMessage));
@@ -228981,6 +228986,7 @@ async function mainController(options = {}) {
 	if (finalCommitMessage.length === 0) while (true) {
 		finalCommitMessage = (await runWithLoading("Generating commit message", () => generateMessage({
 			git,
+			scope: diffScope,
 			languageModel,
 			style,
 			instructions,
@@ -228997,7 +229003,7 @@ async function mainController(options = {}) {
 	}
 	if (finalCommitMessage.length === 0) throw new Error("Commit message cannot be empty.");
 	if (forceLLMGenerate) console.log(source_default.green("✓ Committing changes"));
-	if (!hasStaged) await git.add(["-A"]);
+	if (diffScope === "all") await git.add(["-A"]);
 	console.log(files.join("\n"));
 	console.log("");
 	await liveGit.commit(finalCommitMessage);
@@ -229014,19 +229020,35 @@ async function mainController(options = {}) {
 	await liveGit.push();
 	if (config$5.postCommand === "push-and-pull") await liveGit.pull();
 }
+async function getCommitFiles(git, commitScope) {
+	const stagedFiles = await getStagedFiles(git);
+	let diffScope;
+	if (commitScope === "everything") diffScope = "all";
+	else if (commitScope === "staged-only") {
+		if (stagedFiles.length === 0) throw new Error("Nothing is staged.");
+		diffScope = "staged";
+	} else if (commitScope === "staged-or-changes") diffScope = stagedFiles.length > 0 ? "staged" : "all";
+	else throw new Error(`Unknown commit scope '${commitScope}'.`);
+	const files = diffScope === "staged" ? stagedFiles : await getChangedFiles(git);
+	return {
+		diffScope,
+		files
+	};
+}
 async function generateMessage(options) {
 	const { git, languageModel, style, instructions, diff } = options;
 	if (estimateTokens(diff) <= options.maxDiffTokens) return generateCommitMessage(languageModel, style, instructions, diff);
 	const { toc, body } = await minimizeDiff(git, {
+		scope: options.scope,
 		perFileCap: options.perFileCap,
 		allFiles: options.files
 	});
 	if (estimateTokens(toc) + estimateTokens(body) <= options.maxDiffTokens) return generateCommitMessage(languageModel, style, instructions, `${toc}\n\n${body}`);
 	let effectiveToc = toc;
-	let chunkBudget = options.maxDiffTokens - estimateTokens(effectiveToc) - PROMPT_RESERVE_TOKENS;
-	if (chunkBudget < MIN_CHUNK_BUDGET_TOKENS) {
-		effectiveToc = toc.split("\n").slice(0, MAX_TOC_LINES).join("\n");
-		chunkBudget = Math.max(options.maxDiffTokens - estimateTokens(effectiveToc) - PROMPT_RESERVE_TOKENS, MIN_CHUNK_BUDGET_TOKENS);
+	let chunkBudget = options.maxDiffTokens - estimateTokens(effectiveToc) - PROMPT_RESERVE_TOKENS$2;
+	if (chunkBudget < MIN_CHUNK_BUDGET_TOKENS$1) {
+		effectiveToc = toc.split("\n").slice(0, MAX_TOC_LINES$1).join("\n");
+		chunkBudget = Math.max(options.maxDiffTokens - estimateTokens(effectiveToc) - PROMPT_RESERVE_TOKENS$2, MIN_CHUNK_BUDGET_TOKENS$1);
 	}
 	const chunks = splitDiffIntoChunks(body, chunkBudget);
 	const summaries = new Array(chunks.length);
@@ -229037,7 +229059,7 @@ async function generateMessage(options) {
 			summaries[index$2] = await summarizeChanges(languageModel, effectiveToc, chunks[index$2]);
 		}
 	}
-	await Promise.all(Array.from({ length: Math.min(MAP_CONCURRENCY, chunks.length) }, worker));
+	await Promise.all(Array.from({ length: Math.min(MAP_CONCURRENCY$1, chunks.length) }, worker));
 	return generateCommitMessageFromSummaries(languageModel, style, instructions, effectiveToc, summaries);
 }
 const CONFIG_SCHEMA_URL = "https://github.com/NazmusSayad/gityo/raw/refs/heads/schema/schema.json";
@@ -229153,12 +229175,12 @@ async function createPullRequest$1(input$3) {
 		input$3.head
 	]);
 }
-async function mergePullRequest(number$7) {
+async function mergePullRequest(number$7, method) {
 	await execInherit("gh", [
 		"pr",
 		"merge",
 		String(number$7),
-		"--merge"
+		`--${method}`
 	]);
 }
 async function openPullRequest(number$7) {
@@ -236143,7 +236165,7 @@ const renderPullRequest = createRenderer({
 async function getCurrentBranch() {
 	return (await exec("git", ["branch", "--show-current"])).trim();
 }
-async function getRepoRoot() {
+async function getRepoRoot$1() {
 	return (await exec("git", ["rev-parse", "--show-toplevel"])).trim();
 }
 async function resolvePrBranches(baseArg, headArg) {
@@ -236158,7 +236180,7 @@ async function resolvePrBranches(baseArg, headArg) {
 	};
 }
 async function loadPullRequestContext(options = {}) {
-	const config$5 = await loadConfig(await getRepoRoot());
+	const config$5 = await loadConfig(await getRepoRoot$1());
 	const languageModel = resolveLanguageModel(resolveModelConfig(config$5.models, options.modelKey ?? "default"));
 	const titleStyleKey = options.titleStyle ?? config$5.prTitleStyle ?? "default";
 	const titleStyle = config$5.prTitleStyles?.[titleStyleKey] ?? PR_TITLE_STYLES[titleStyleKey];
@@ -236247,9 +236269,11 @@ function buildCompareContext(compare, maxDiffTokens) {
 async function handleUncommittedChanges(headBranch, options = {}) {
 	if (await getCurrentBranch() !== headBranch) return;
 	const { git } = await getGit();
-	const files = await getChangedFiles(git);
+	const scope = options.scope ?? "staged-or-changes";
+	const { diffScope, files } = await getCommitFiles(git, scope);
 	if (files.length === 0) return;
-	console.log(source_default.yellow(`• You have ${files.length} uncommitted local change(s):\n${files.join("\n")}`));
+	const label = diffScope === "staged" ? "staged" : "uncommitted";
+	console.log(source_default.yellow(`• You have ${files.length} ${label} local change(s):\n${files.join("\n")}`));
 	console.log("");
 	if (!options.yolo) {
 		if (!await dist_default({
@@ -236257,14 +236281,15 @@ async function handleUncommittedChanges(headBranch, options = {}) {
 			default: true,
 			theme: selectionTheme
 		})) {
-			console.log(source_default.dim("Ignoring uncommitted local changes."));
+			console.log(source_default.dim(`Ignoring ${label} local changes.`));
 			console.log("");
 			return;
 		}
 	}
 	await mainController({
 		yolo: options.yolo,
-		push: true
+		push: true,
+		scope
 	});
 	console.log("");
 }
@@ -236276,7 +236301,10 @@ async function createPullRequestController(baseArg, headArg, options = {}) {
 	});
 	const systemPrompt = buildPullRequestSystemPrompt(context);
 	const branches = await resolvePrBranches(baseArg, headArg);
-	await handleUncommittedChanges(branches.head, { yolo: options.yolo ?? false });
+	await handleUncommittedChanges(branches.head, {
+		yolo: options.yolo ?? false,
+		scope: options.all ? "everything" : "staged-or-changes"
+	});
 	const pullRequest = await createPullRequest({
 		base: branches.base,
 		head: branches.head,
@@ -236300,7 +236328,10 @@ async function mergePullRequestController(baseArg, headArg, options = {}) {
 	});
 	const systemPrompt = buildPullRequestSystemPrompt(context);
 	const branches = await resolvePrBranches(baseArg, headArg);
-	await handleUncommittedChanges(branches.head, { yolo: options.yolo ?? false });
+	await handleUncommittedChanges(branches.head, {
+		yolo: options.yolo ?? false,
+		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({
@@ -236321,7 +236352,479 @@ async function mergePullRequestController(baseArg, headArg, options = {}) {
 		console.log("Pull request merge cancelled.");
 		return;
 	}
-	await mergePullRequest(pullRequest.number);
+	await mergePullRequest(pullRequest.number, options.mergeMethod ?? context.config.prMergeMethod);
+}
+const toZeroIfInfinity = (value) => Number.isFinite(value) ? value : 0;
+function parseNumber(milliseconds) {
+	return {
+		days: Math.trunc(milliseconds / 864e5),
+		hours: Math.trunc(milliseconds / 36e5 % 24),
+		minutes: Math.trunc(milliseconds / 6e4 % 60),
+		seconds: Math.trunc(milliseconds / 1e3 % 60),
+		milliseconds: Math.trunc(milliseconds % 1e3),
+		microseconds: Math.trunc(toZeroIfInfinity(milliseconds * 1e3) % 1e3),
+		nanoseconds: Math.trunc(toZeroIfInfinity(milliseconds * 1e6) % 1e3)
+	};
+}
+function parseBigint(milliseconds) {
+	return {
+		days: milliseconds / 86400000n,
+		hours: milliseconds / 3600000n % 24n,
+		minutes: milliseconds / 60000n % 60n,
+		seconds: milliseconds / 1000n % 60n,
+		milliseconds: milliseconds % 1000n,
+		microseconds: 0n,
+		nanoseconds: 0n
+	};
+}
+function parseMilliseconds(milliseconds) {
+	switch (typeof milliseconds) {
+		case "number":
+			if (Number.isFinite(milliseconds)) return parseNumber(milliseconds);
+			break;
+		case "bigint": return parseBigint(milliseconds);
+	}
+	throw new TypeError("Expected a finite number or bigint");
+}
+const isZero = (value) => value === 0 || value === 0n;
+const pluralize = (word, count) => count === 1 || count === 1n ? word : `${word}s`;
+const SECOND_ROUNDING_EPSILON = 1e-7;
+const ONE_DAY_IN_MILLISECONDS = 24n * 60n * 60n * 1000n;
+function prettyMilliseconds(milliseconds, options) {
+	const isBigInt = typeof milliseconds === "bigint";
+	if (!isBigInt && !Number.isFinite(milliseconds)) throw new TypeError("Expected a finite number or bigint");
+	options = { ...options };
+	const sign$2 = milliseconds < 0 ? "-" : "";
+	milliseconds = milliseconds < 0 ? -milliseconds : milliseconds;
+	if (options.colonNotation) {
+		options.compact = false;
+		options.formatSubMilliseconds = false;
+		options.separateMilliseconds = false;
+		options.verbose = false;
+	}
+	if (options.compact) {
+		options.unitCount = 1;
+		options.secondsDecimalDigits = 0;
+		options.millisecondsDecimalDigits = 0;
+	}
+	let result = [];
+	const floorDecimals = (value, decimalDigits) => {
+		const flooredInterimValue = Math.floor(value * 10 ** decimalDigits + SECOND_ROUNDING_EPSILON);
+		return (Math.round(flooredInterimValue) / 10 ** decimalDigits).toFixed(decimalDigits);
+	};
+	const add = (value, long, short, valueString) => {
+		if ((result.length === 0 || !options.colonNotation) && isZero(value) && !(options.colonNotation && short === "m")) return;
+		valueString ?? (valueString = String(value));
+		if (options.colonNotation) {
+			const wholeDigits = valueString.includes(".") ? valueString.split(".")[0].length : valueString.length;
+			const minLength = result.length > 0 ? 2 : 1;
+			valueString = "0".repeat(Math.max(0, minLength - wholeDigits)) + valueString;
+		} else valueString += options.verbose ? " " + pluralize(long, value) : short;
+		result.push(valueString);
+	};
+	const parsed = parseMilliseconds(milliseconds);
+	const days = BigInt(parsed.days);
+	if (options.hideYearAndDays) add(BigInt(days) * 24n + BigInt(parsed.hours), "hour", "h");
+	else {
+		if (options.hideYear) add(days, "day", "d");
+		else {
+			add(days / 365n, "year", "y");
+			add(days % 365n, "day", "d");
+		}
+		add(Number(parsed.hours), "hour", "h");
+	}
+	add(Number(parsed.minutes), "minute", "m");
+	if (!options.hideSeconds) if (options.separateMilliseconds || options.formatSubMilliseconds || !options.colonNotation && milliseconds < 1e3 && !options.subSecondsAsDecimals) {
+		const seconds = Number(parsed.seconds);
+		const milliseconds$1 = Number(parsed.milliseconds);
+		const microseconds = Number(parsed.microseconds);
+		const nanoseconds = Number(parsed.nanoseconds);
+		add(seconds, "second", "s");
+		if (options.formatSubMilliseconds) {
+			add(milliseconds$1, "millisecond", "ms");
+			add(microseconds, "microsecond", "µs");
+			add(nanoseconds, "nanosecond", "ns");
+		} else {
+			const millisecondsAndBelow = milliseconds$1 + microseconds / 1e3 + nanoseconds / 1e6;
+			const millisecondsDecimalDigits = typeof options.millisecondsDecimalDigits === "number" ? options.millisecondsDecimalDigits : 0;
+			const roundedMilliseconds = millisecondsAndBelow >= 1 ? Math.round(millisecondsAndBelow) : Math.ceil(millisecondsAndBelow);
+			const maximumMilliseconds = 1e3 - 10 ** -millisecondsDecimalDigits;
+			const millisecondsString = millisecondsDecimalDigits ? Math.min(millisecondsAndBelow, maximumMilliseconds).toFixed(millisecondsDecimalDigits) : Math.min(roundedMilliseconds, maximumMilliseconds);
+			add(Number.parseFloat(millisecondsString), "millisecond", "ms", millisecondsString);
+		}
+	} else {
+		const secondsFixed = floorDecimals((isBigInt ? Number(milliseconds % ONE_DAY_IN_MILLISECONDS) : milliseconds) / 1e3 % 60, typeof options.secondsDecimalDigits === "number" ? options.secondsDecimalDigits : 1);
+		const secondsString = options.keepDecimalsOnWholeSeconds ? secondsFixed : secondsFixed.replace(/\.0+$/, "");
+		add(Number.parseFloat(secondsString), "second", "s", secondsString);
+	}
+	if (result.length === 0) return sign$2 + "0" + (options.verbose ? " milliseconds" : "ms");
+	const separator = options.colonNotation ? ":" : " ";
+	if (typeof options.unitCount === "number") result = result.slice(0, Math.max(options.unitCount, 1));
+	return sign$2 + result.join(separator);
+}
+async function listReleases(limit) {
+	const output$3 = await exec("gh", [
+		"release",
+		"list",
+		"--exclude-drafts",
+		"--limit",
+		String(limit),
+		"--json",
+		"tagName,publishedAt"
+	]);
+	return JSON.parse(output$3).sort((a, b$2) => Date.parse(b$2.publishedAt) - Date.parse(a.publishedAt));
+}
+const COMMIT_JQ = "{hash: .sha, date: .commit.author.date, authorName: .commit.author.name, authorEmail: .commit.author.email, message: .commit.message}";
+async function getBranchHeadSha(branch) {
+	return (await exec("gh", [
+		"api",
+		`repos/{owner}/{repo}/commits/${encodeURIComponent(branch)}`,
+		"--jq",
+		".sha"
+	])).trim();
+}
+async function listReleaseCommits(fromTag, toSha) {
+	const commits = (await exec("gh", [
+		"api",
+		"--paginate",
+		...fromTag === null ? [
+			`repos/{owner}/{repo}/commits?sha=${toSha}&per_page=100`,
+			"--jq",
+			`.[] | ${COMMIT_JQ}`
+		] : [
+			`repos/{owner}/{repo}/compare/${encodeURIComponent(fromTag)}...${toSha}?per_page=100`,
+			"--jq",
+			`.commits[] | ${COMMIT_JQ}`
+		]
+	])).split("\n").filter((line) => line.length > 0).map((line) => JSON.parse(line));
+	return fromTag === null ? commits : commits.reverse();
+}
+async function releaseExists(tag) {
+	try {
+		await exec("gh", [
+			"release",
+			"view",
+			tag,
+			"--json",
+			"tagName"
+		]);
+		return true;
+	} catch {
+		return false;
+	}
+}
+async function deleteRelease(tag) {
+	await execInherit("gh", [
+		"release",
+		"delete",
+		tag,
+		"--yes"
+	]);
+	await execInherit("gh", [
+		"api",
+		"--method",
+		"DELETE",
+		`repos/{owner}/{repo}/git/refs/tags/${encodeURIComponent(tag)}`
+	]);
+}
+async function createRelease(input$3) {
+	await execInherit("gh", [
+		"release",
+		"create",
+		input$3.tag,
+		"--target",
+		input$3.target,
+		"--notes",
+		input$3.notes
+	]);
+}
+async function getRepoRoot() {
+	return (await exec("git", ["rev-parse", "--show-toplevel"])).trim();
+}
+async function fetchBranchAndTags(branch) {
+	await exec("git", [
+		"fetch",
+		"origin",
+		branch,
+		"--tags",
+		"--force"
+	]);
+}
+async function assertLocalCommitsMatch(fromTag, toSha, githubHashes) {
+	for (const ref of fromTag === null ? [toSha] : [fromTag, toSha]) try {
+		await exec("git", [
+			"cat-file",
+			"-e",
+			`${ref}^{commit}`
+		]);
+	} catch {
+		throw new Error(`'${ref}' from GitHub is not in your local repository. Fetch it and try again.`);
+	}
+	const range$2 = fromTag === null ? toSha : `${fromTag}..${toSha}`;
+	const localHashes = (await exec("git", ["rev-list", range$2])).split("\n").filter((line) => line.length > 0);
+	const githubSet = new Set(githubHashes);
+	if (!(localHashes.length === githubHashes.length && localHashes.every((hash$5) => githubSet.has(hash$5)))) throw new Error(`Local commits do not match GitHub for ${range$2}: ${localHashes.length} local, ${githubHashes.length} on GitHub.`);
+}
+var prompt_default = "You generate concise, well-structured, easy-to-read release notes from git commit history.\n\n**Audience**: end users, product managers, and non-technical stakeholders — not engineers.\n\n## What to include:\n\n- Include every change a user could notice, however small — new features, fixes, improvements, changed behavior. When in doubt, include it: your job is to translate a change into user terms, not to omit it.\n- Drop a change only when it is purely internal with zero user impact (refactors, renames, formatting, internal tooling, dependency/version bumps). Drop it silently — never mention it, not even as a generic \"internal improvements\" note.\n\n## How to write:\n\n- Describe WHAT changed and WHY it matters, not HOW it is implemented.\n- Write for someone who doesn't know the product is built with code. Use everyday language, framing each change as what the user can now do, see, or no longer worry about.\n- Avoid all technical jargon, library/framework names, and implementation-specific terminology.\n\n## Never expose:\n\n- Internal details: source code, file names or paths, class/function/variable names, API routes, database tables, config keys, dependency or package names, or any other internal identifier. Restate the change in user terms instead — omit it only if it has no user impact at all.\n- Sensitive information: credentials, secrets, tokens, internal URLs, private endpoints, or environment-specific values.\n\n## Output format:\n\n- Group related changes under `##` headings (e.g. \"New Features\", \"Bug Fixes\", \"Improvements\", \"Breaking Changes\"), with each change as a bullet point.\n- Put breaking changes in their own section and explain how users should adapt.\n- Output ONLY the release note content — no preamble, commentary, \"Here is...\", or top-level \"Release Note\" title.\n- Separate sections with `##` headings, never `---`.\n- If and ONLY if every change is purely internal with zero user impact, output exactly `_No notable changes in this release._` and nothing else — never explaining or listing what was dropped. If even one change is user-noticeable, write the note normally.\n";
+const MAP_CONCURRENCY = 3;
+async function summarizeChunks(languageModel, instructions, chunks) {
+	const summaries = new Array(chunks.length);
+	let nextChunk = 0;
+	async function worker() {
+		while (nextChunk < chunks.length) {
+			const index$2 = nextChunk++;
+			summaries[index$2] = (await generateText({
+				model: languageModel,
+				instructions,
+				messages: [{
+					role: "user",
+					content: chunks[index$2]
+				}]
+			})).text.trim();
+		}
+	}
+	await Promise.all(Array.from({ length: Math.min(MAP_CONCURRENCY, chunks.length) }, worker));
+	return summaries.map((summary, index$2) => `Part ${index$2 + 1}:\n${summary}`).join("\n\n");
+}
+const CHARS_PER_TOKEN$1 = 4;
+const MIN_TOOL_OUTPUT_TOKENS = 200;
+const PROMPT_RESERVE_TOKENS$1 = 800;
+const MIN_CHUNK_BUDGET_TOKENS = 1e3;
+const MAX_TOC_LINES = 500;
+const BUDGET_EXHAUSTED = "Size limit reached. Write the release notes with the information you already have.";
+const NOISE_FILE_EXCLUDES = [
+	":(top,exclude)*.lock",
+	":(top,exclude)*-lock.*",
+	":(top,exclude)*.min.js",
+	":(top,exclude)*.min.mjs",
+	":(top,exclude)*.min.cjs",
+	":(top,exclude)*.min.css",
+	":(top,exclude)*.map"
+];
+const diffSummaryPrompt = `You summarize parts of a large git diff for a release notes generator.
+Describe WHAT changed and any effect a user could notice.
+Be factual and terse. Do NOT write release notes. Maximum 120 words.`;
+function parseLsTree(output$3) {
+	return output$3.split("\n").filter((line) => line.length > 0).map((line) => {
+		const tabIdx = line.indexOf("	");
+		return tabIdx >= 0 ? line.slice(tabIdx + 1) : "";
+	});
+}
+function createReleaseTools(languageModel, limits) {
+	let remainingTokens = limits.maxTokens;
+	function spend(text$1) {
+		const maxChars = remainingTokens * CHARS_PER_TOKEN$1;
+		const fitted = text$1.length <= maxChars ? text$1 : `${text$1.slice(0, maxChars)}\n[... truncated to fit the size limit]`;
+		remainingTokens -= estimateTokens(fitted);
+		return fitted;
+	}
+	async function readCommitDiff(ref) {
+		const fullDiff = await exec("git", [
+			"show",
+			"--no-color",
+			"--pretty=format:",
+			ref
+		]);
+		if (estimateTokens(fullDiff) <= remainingTokens) return fullDiff;
+		const tocLines = (await exec("git", [
+			"show",
+			"--no-color",
+			"--pretty=format:",
+			"--numstat",
+			ref
+		])).trim().split("\n");
+		const toc = tocLines.length <= MAX_TOC_LINES ? tocLines.join("\n") : [...tocLines.slice(0, MAX_TOC_LINES), `[... ${tocLines.length - MAX_TOC_LINES} more files]`].join("\n");
+		const header = `This diff is too large to show in full.\n\nChanged files (additions, deletions, path):\n${toc}`;
+		const minimizedDiff = capFileSections(await exec("git", [
+			"show",
+			"--no-color",
+			"--pretty=format:",
+			"--unified=1",
+			ref,
+			"--",
+			":/",
+			...NOISE_FILE_EXCLUDES
+		]), limits.perFileCap);
+		const minimized = `${header}\n\nDiff with less context, generated files excluded, and long files truncated:\n${minimizedDiff}`;
+		if (estimateTokens(minimized) <= remainingTokens) return minimized;
+		return `${header}\n\nSummaries of the diff:\n${await summarizeChunks(languageModel, diffSummaryPrompt, splitDiffIntoChunks(minimizedDiff, Math.max(limits.maxTokens - estimateTokens(toc) - PROMPT_RESERVE_TOKENS$1, MIN_CHUNK_BUDGET_TOKENS)).map((chunk$1) => `All changed files:\n${toc}\n\nChanges (part of a larger diff):\n${chunk$1}`))}`;
+	}
+	return {
+		check_diff: tool({
+			description: "Get the full diff of a specific commit. Returns the patch showing all changes (additions, deletions, modifications) introduced by the commit.",
+			inputSchema: object$3({ commithash: string$5().describe("The commit hash, tag, branch, or any other git ref resolvable by git rev-parse.") }),
+			execute: async ({ commithash }) => {
+				if (remainingTokens < MIN_TOOL_OUTPUT_TOKENS) return { error: BUDGET_EXHAUSTED };
+				return spend(await readCommitDiff(commithash));
+			}
+		}),
+		browse_code: tool({
+			description: "Browse the code at a specific commit. If the path points to a file, returns its content. If the path points to a folder, returns the list of files and sub-folders it contains. Pass an empty string for the path to browse the repository root.",
+			inputSchema: object$3({
+				commithash: string$5().describe("The commit hash, tag, branch, or any other git ref resolvable by git rev-parse."),
+				path: string$5().describe("Path to a file or folder within the repository, relative to the repo root. Use forward slashes. Pass an empty string for the root.")
+			}),
+			execute: async ({ commithash, path: path$4 }) => {
+				if (remainingTokens < MIN_TOOL_OUTPUT_TOKENS) return { error: BUDGET_EXHAUSTED };
+				const normalized = path$4.replace(/^\/+|\/+$/g, "");
+				if (normalized === "") return {
+					type: "folder",
+					items: parseLsTree(spend(await exec("git", ["ls-tree", commithash])))
+				};
+				const ref = `${commithash}:${normalized}`;
+				let objectType$2;
+				try {
+					objectType$2 = (await exec("git", [
+						"cat-file",
+						"-t",
+						ref
+					])).trim();
+				} catch {
+					return { error: "doesn't exists" };
+				}
+				if (objectType$2 === "tree") return {
+					type: "folder",
+					items: parseLsTree(spend(await exec("git", ["ls-tree", ref])))
+				};
+				if (objectType$2 === "blob") return {
+					type: "file",
+					content: spend(await exec("git", ["show", ref]))
+				};
+				return { error: "doesn't exists" };
+			}
+		})
+	};
+}
+function capFileSections(diff, perFileCap) {
+	return ("\n" + diff.trimStart()).split("\ndiff --git ").slice(1).map((section) => {
+		const lines = `diff --git ${section}`.split("\n");
+		const bodyLines = lines.length - 1;
+		if (bodyLines <= perFileCap) return lines.join("\n");
+		return [...lines.slice(0, perFileCap + 1), `[... ${bodyLines - perFileCap} more lines truncated]`].join("\n");
+	}).join("\n");
+}
+const EMPTY_RELEASE_NOTES = "_No notable changes in this release._";
+const PROMPT_RESERVE_TOKENS = 800;
+const CHARS_PER_TOKEN = 4;
+const commitsSummaryPrompt = `You summarize part of a git commit history for a release notes generator.
+List every change a user could notice, each with the commit hash(es) it comes from.
+Skip purely internal changes. Be factual and terse. Do NOT write release notes. Maximum 200 words.`;
+async function generateReleaseNotes(languageModel, commits, limits) {
+	const commitsContext = await buildCommitsContext(languageModel, commits, limits.maxTokens);
+	return (await generateText({
+		model: languageModel,
+		instructions: prompt_default,
+		tools: createReleaseTools(languageModel, limits),
+		stopWhen: isStepCount(1e3),
+		messages: [{
+			role: "user",
+			content: [{
+				type: "text",
+				text: "Here are the commits related to the release:"
+			}, {
+				type: "text",
+				text: commitsContext
+			}]
+		}]
+	})).text.trim();
+}
+async function buildCommitsContext(languageModel, commits, maxTokens) {
+	const fullList = commits.map((commit) => formatCommit(commit, commit.message)).join("\n\n");
+	if (estimateTokens(fullList) <= maxTokens) return fullList;
+	const subjectList = commits.map((commit) => formatCommit(commit, commit.message.split("\n")[0])).join("\n\n");
+	if (estimateTokens(subjectList) <= maxTokens) return `Only commit subjects are shown because the full messages are too large. Use check_diff for details.\n\n${subjectList}`;
+	const chunkBudget = Math.max(maxTokens - PROMPT_RESERVE_TOKENS, 1e3);
+	const chunks = [];
+	let current = "";
+	for (const commit of commits) {
+		const entry = formatCommit(commit, commit.message).slice(0, chunkBudget * CHARS_PER_TOKEN);
+		if (current.length > 0 && estimateTokens(`${current}\n\n${entry}`) > chunkBudget) {
+			chunks.push(current);
+			current = "";
+		}
+		current = current.length === 0 ? entry : `${current}\n\n${entry}`;
+	}
+	if (current.length > 0) chunks.push(current);
+	const summaries = await summarizeChunks(languageModel, commitsSummaryPrompt, chunks);
+	return `There are ${commits.length} commits, too many to show in full, so here are summaries of them. Use check_diff for details.\n\n${summaries}`;
+}
+function formatCommit(commit, message) {
+	return [
+		`- Commithash: ${commit.hash}`,
+		`  - > ${message.replaceAll("\n", "\n    > ")}`,
+		`  - Timestamp: ${commit.date}`,
+		`  - Author: ${commit.authorName} <${commit.authorEmail}>`
+	].join("\n");
+}
+const renderReleaseNotes = createRenderer({
+	width: 80,
+	listIndent: 2
+});
+async function releaseController(tagArg, options = {}) {
+	if (options.yolo && tagArg === void 0) throw new Error("A release tag is required with --yolo.");
+	const config$5 = await loadConfig(await getRepoRoot());
+	const languageModel = resolveLanguageModel(resolveModelConfig(config$5.models, options.model ?? "default"));
+	const releases = await listReleases(100);
+	let tag = tagArg?.trim() ?? "";
+	if (tagArg === void 0) {
+		printRecentReleases(releases.slice(0, 5).reverse());
+		tag = (await dist_default$1({
+			message: "Release tag",
+			theme: selectionTheme,
+			validate: (value) => value.trim().length > 0 || "Release tag cannot be empty."
+		})).trim();
+	}
+	if (tag.length === 0) throw new Error("Release tag cannot be empty.");
+	const exists$2 = await releaseExists(tag);
+	if (exists$2 && !options.force) {
+		if (!await dist_default({
+			message: source_default.yellow(`Release ${tag} already exists. Recreate it?`),
+			default: false,
+			theme: selectionTheme
+		})) {
+			console.log("Release creation cancelled.");
+			return;
+		}
+	}
+	const branch = await getDefaultBranch();
+	if (branch.length === 0) throw new Error("Could not determine the default branch.");
+	const tagIndex = releases.findIndex((release) => release.tagName === tag);
+	const previousTag = (tagIndex === -1 ? releases[0] : releases[tagIndex + 1])?.tagName ?? null;
+	const headSha = await getBranchHeadSha(branch);
+	const commits = await runWithLoading("Loading commits from GitHub", () => listReleaseCommits(previousTag, headSha));
+	await runWithLoading("Fetching commits", () => fetchBranchAndTags(branch));
+	await assertLocalCommitsMatch(previousTag, headSha, commits.map((commit) => commit.hash));
+	console.log(source_default.dim(`${commits.length} commit(s) since ${previousTag ?? "the first commit"}`));
+	let notes = "";
+	while (true) {
+		notes = commits.length === 0 ? EMPTY_RELEASE_NOTES : await runWithLoading("Generating release notes", () => generateReleaseNotes(languageModel, commits, {
+			maxTokens: config$5.maxDiffTokens ?? DEFAULT_MAX_DIFF_TOKENS,
+			perFileCap: config$5.perFileCap ?? DEFAULT_PER_FILE_CAP
+		}));
+		console.log(renderReleaseNotes(notes).trim());
+		console.log("");
+		if (options.yolo || await acceptGenerated(`Create release ${source_default.cyan.bold(tag)} on ${source_default.yellow.bold(branch)}`, "generate new release notes")) break;
+	}
+	if (notes.length === 0) throw new Error("The selected model returned empty release notes.");
+	if (exists$2) await deleteRelease(tag);
+	await createRelease({
+		tag,
+		target: headSha,
+		notes
+	});
+}
+function printRecentReleases(releases) {
+	if (releases.length === 0) return;
+	const longestTag = Math.max(...releases.map((release) => release.tagName.length));
+	console.log(source_default.blue.bold("Recent:"));
+	for (const release of releases) {
+		const age = prettyMilliseconds(Date.now() - Date.parse(release.publishedAt), {
+			verbose: true,
+			unitCount: 1
+		});
+		console.log(source_default.cyan(release.tagName.padEnd(longestTag)), source_default.dim(`${age} ago`));
+	}
+	console.log("");
 }
 async function showStylesController() {
 	const config$5 = await loadConfig();
@@ -236358,26 +236861,54 @@ function handleError(fn$1) {
 		}
 	});
 }
-const app = new Command().enablePositionalOptions().name("gityo").description("Stage changes, generate a commit message, create a commit, and run a post-commit git command.").option("-i, --input <input>", "Use the provided input as the commit message.").option("-s, --style <style>", "Commit message style key to use (defaults to \"default\").").option("-m, --model <model>", "Model key from config to use (defaults to \"default\").").option("-g, --generate", "Generate a commit message and commit without asking.").option("-p, --post", "Run the post-commit git command without asking.").option("-y, --yolo", "Skip all questions, and generate message, commit, run post command. [Will fail if no model available]").version(`v${version$4}`, "-v, --version", "Show the current version.").action((options) => {
+const app = new Command().enablePositionalOptions().name("gityo").description("Stage changes, generate a commit message, create a commit, and run a post-commit git command.").option("-i, --input <input>", "Use the provided input as the commit message.").option("-s, --style <style>", "Commit message style key to use (defaults to \"default\").").option("--model <model>", "Model key from config to use (defaults to \"default\").").option("-g, --generate", "Generate a commit message and commit without asking.").option("-p, --post", "Run the post-commit git command without asking.").option("-S, --staged", "Commit only staged files. Fails if nothing is staged.").option("-A, --all", "Commit all changes, not just staged files.").option("-y, --yolo", "Skip all questions, and generate message, commit, run post command. [Will fail if no model available]").version(`v${version$4}`, "-v, --version", "Show the current version.").action((options) => {
 	if (options.generate && options.input) {
 		console.error("Cannot use --generate and --input together.");
 		process.exit(1);
 	}
-	handleError(() => mainController(options));
+	if (options.staged && options.all) {
+		console.error("Cannot use --staged and --all together.");
+		process.exit(1);
+	}
+	handleError(() => mainController({
+		...options,
+		scope: options.all ? "everything" : options.staged ? "staged-only" : "staged-or-changes"
+	}));
 });
-app.command("commit").description("Stage changes, generate a commit message, create a commit, and run a post-commit git command.").option("-i, --input <input>", "Use the provided input as the commit message.").option("-s, --style <style>", "Commit message style key to use (defaults to \"default\").").option("-m, --model <model>", "Model key from config to use (defaults to \"default\").").option("-g, --generate", "Generate a commit message and commit without asking.").option("-p, --post", "Run the post-commit git command without asking.").option("-y, --yolo", "Skip all questions, and generate message, commit, run post command. [Will fail if no model available]").action((options) => {
+app.command("commit").description("Stage changes, generate a commit message, create a commit, and run a post-commit git command.").option("-i, --input <input>", "Use the provided input as the commit message.").option("-s, --style <style>", "Commit message style key to use (defaults to \"default\").").option("--model <model>", "Model key from config to use (defaults to \"default\").").option("-g, --generate", "Generate a commit message and commit without asking.").option("-p, --post", "Run the post-commit git command without asking.").option("-S, --staged", "Commit only staged files. Fails if nothing is staged.").option("-A, --all", "Commit all changes, not just staged files.").option("-y, --yolo", "Skip all questions, and generate message, commit, run post command. [Will fail if no model available]").action((options) => {
 	if (options.generate && options.input) {
 		console.error("Cannot use --generate and --input together.");
 		process.exit(1);
 	}
-	handleError(() => mainController(options));
+	if (options.staged && options.all) {
+		console.error("Cannot use --staged and --all together.");
+		process.exit(1);
+	}
+	handleError(() => mainController({
+		...options,
+		scope: options.all ? "everything" : options.staged ? "staged-only" : "staged-or-changes"
+	}));
 });
 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("-m, --model <model>", "Model key from config to use (defaults to \"default\").").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("-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 (defaults to \"default\").").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("-m, --model <model>", "Model key from config to use (defaults to \"default\").").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.").action((baseBranch, headBranch, options) => {
-	handleError(() => mergePullRequestController(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 (defaults to \"default\").").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) => {
+	if ([
+		options.merge,
+		options.rebase,
+		options.squash
+	].filter(Boolean).length > 1) {
+		console.error("Use only one of --merge, --rebase, or --squash.");
+		process.exit(1);
+	}
+	handleError(() => mergePullRequestController(baseBranch, headBranch, {
+		...options,
+		mergeMethod: options.merge ? "merge" : options.rebase ? "rebase" : options.squash ? "squash" : void 0
+	}));
+});
+app.command("release").description("Create a GitHub release with AI-generated release notes.").argument("[tag]", "Release tag to create (asks when omitted).").option("--model <model>", "Model key from config to use (defaults to \"default\").").option("-y, --yolo", "Create the release without asking for confirmation (requires a tag).").option("-f, --force", "Recreate the release without asking if it already exists.").action((tag, options) => {
+	handleError(() => releaseController(tag, options));
 });
 app.command("config").description("Show where to manage your gityo configuration.").action(() => {
 	handleError(showConfigController);

package/package.json

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