qkpr 1.0.5-beta.1 → 1.0.6

package/README.md

@@ -48,6 +48,8 @@ You can directly access the PR creation feature:
 
 ```bash
 qkpr pr
+# or specify the target branch directly
+qkpr pr main
 ```
 
 The CLI will interactively guide you through creating a pull request:
@@ -189,7 +191,11 @@ Shows an interactive menu to choose from all available features
 qkpr pr
 ```
 
-Directly create a pull request with interactive branch selection
+Directly create a pull request with interactive branch selection. You can also specify the target branch directly:
+
+```bash
+qkpr pr [branch]
+```
 
 ### Generate Commit Message
 

package/dist/index.mjs

@@ -12,8 +12,18 @@ import inquirer from "inquirer";
 import inquirerAutoComplete from "inquirer-autocomplete-prompt";
 import { GoogleGenerativeAI } from "@google/generative-ai";
 import ora from "ora";
+import { createHash } from "node:crypto";
 import { homedir } from "node:os";
 import searchCheckbox from "inquirer-search-checkbox";
+import ansiEscapes from "ansi-escapes";
+import figures from "figures";
+import Choices from "inquirer/lib/objects/choices.js";
+import Base from "inquirer/lib/prompts/base.js";
+import observe from "inquirer/lib/utils/events.js";
+import Paginator from "inquirer/lib/utils/paginator.js";
+import * as utils from "inquirer/lib/utils/readline.js";
+import runAsync from "run-async";
+import { takeWhile } from "rxjs";
 
 //#region src/services/pr.ts
 /**
@@ -123,9 +133,10 @@ function getBranchCategory(branchName) {
 	return "other";
 }
 /**
-* 获取分支详细信息（包含时间和分类）
+* 获取分支详细信息（包含时间和分类）- 优化版本
 */
 function getBranchesWithInfo(branches) {
+	if (branches.length > 50) return getBranchesWithInfoBatch(branches);
 	return branches.map((branchName) => {
 		const { timestamp, formatted } = getBranchLastCommitTime(branchName);
 		return {
@@ -137,6 +148,75 @@ function getBranchesWithInfo(branches) {
 	});
 }
 /**
+* 批量获取分支信息，性能优化版本
+*/
+function getBranchesWithInfoBatch(branches) {
+	try {
+		const timestamps = execSync(branches.map((branch) => {
+			return `git log -1 --format=%ct origin/${branch} 2>/dev/null || echo "0"`;
+		}).join("; echo \"---\";"), {
+			encoding: "utf-8",
+			stdio: [
+				"pipe",
+				"pipe",
+				"ignore"
+			]
+		}).split("---").map((line) => {
+			const timestamp = Number.parseInt(line.trim(), 10);
+			return Number.isNaN(timestamp) ? 0 : timestamp;
+		});
+		return branches.map((branchName, index) => {
+			const timestamp = timestamps[index] || 0;
+			const { formatted } = formatTimestamp(timestamp);
+			return {
+				name: branchName,
+				lastCommitTime: timestamp,
+				lastCommitTimeFormatted: formatted,
+				category: getBranchCategory(branchName)
+			};
+		});
+	} catch (error) {
+		console.warn("Batch fetch failed, falling back to individual fetch:", error);
+		return branches.map((branchName) => {
+			const { timestamp, formatted } = getBranchLastCommitTime(branchName);
+			return {
+				name: branchName,
+				lastCommitTime: timestamp,
+				lastCommitTimeFormatted: formatted,
+				category: getBranchCategory(branchName)
+			};
+		});
+	}
+}
+/**
+* 格式化时间戳 - 提取为独立函数供批量版本使用
+*/
+function formatTimestamp(timestamp) {
+	if (timestamp === 0) return {
+		timestamp: 0,
+		formatted: "unknown"
+	};
+	const date = /* @__PURE__ */ new Date(timestamp * 1e3);
+	const diffMs = (/* @__PURE__ */ new Date()).getTime() - date.getTime();
+	const diffDays = Math.floor(diffMs / (1e3 * 60 * 60 * 24));
+	let formatted;
+	if (diffDays === 0) {
+		const diffHours = Math.floor(diffMs / (1e3 * 60 * 60));
+		if (diffHours === 0) {
+			const diffMinutes = Math.floor(diffMs / (1e3 * 60));
+			formatted = diffMinutes <= 1 ? "just now" : `${diffMinutes}m ago`;
+		} else formatted = `${diffHours}h ago`;
+	} else if (diffDays === 1) formatted = "yesterday";
+	else if (diffDays < 7) formatted = `${diffDays}d ago`;
+	else if (diffDays < 30) formatted = `${Math.floor(diffDays / 7)}w ago`;
+	else if (diffDays < 365) formatted = `${Math.floor(diffDays / 30)}mo ago`;
+	else formatted = `${Math.floor(diffDays / 365)}y ago`;
+	return {
+		timestamp,
+		formatted
+	};
+}
+/**
 * 解析 Git remote URL
 */
 function parseRemoteUrl(remote) {
@@ -339,6 +419,25 @@ function createPullRequest(sourceBranch, targetBranch, remoteUrl) {
 const CONFIG_DIR = join(homedir(), ".qkpr");
 const CONFIG_FILE = join(CONFIG_DIR, "config.json");
 /**
+* 获取当前仓库的唯一标识
+* 使用 git remote URL 的 hash 值作为仓库标识
+*/
+function getRepositoryId() {
+	try {
+		const normalizedUrl = execSync("git remote get-url origin", {
+			encoding: "utf-8",
+			stdio: [
+				"pipe",
+				"pipe",
+				"ignore"
+			]
+		}).trim().replace(/\.git$/, "").replace(/^https?:\/\//, "").replace(/^git@/, "").replace(/:/g, "/").toLowerCase();
+		return createHash("md5").update(normalizedUrl).digest("hex").substring(0, 12);
+	} catch {
+		return createHash("md5").update(process.cwd()).digest("hex").substring(0, 12);
+	}
+}
+/**
 * 确保配置目录存在
 */
 function ensureConfigDir() {
@@ -393,33 +492,47 @@ function setGeminiModel(model) {
 	writeConfig(config);
 }
 /**
-* 获取已固定的分支列表
+* 获取已固定的分支列表(仓库级别)
 */
 function getPinnedBranches() {
-	return readConfig().pinnedBranches || [];
+	const config = readConfig();
+	const repoId = getRepositoryId();
+	if (config.repositoryPinnedBranches?.[repoId]) return config.repositoryPinnedBranches[repoId];
+	if (config.pinnedBranches && config.pinnedBranches.length > 0) {
+		if (!config.repositoryPinnedBranches) config.repositoryPinnedBranches = {};
+		config.repositoryPinnedBranches[repoId] = [...config.pinnedBranches];
+		delete config.pinnedBranches;
+		writeConfig(config);
+		return config.repositoryPinnedBranches[repoId];
+	}
+	return [];
 }
 /**
-* 添加固定分支
+* 添加固定分支(仓库级别)
 */
 function addPinnedBranch(branch) {
 	const config = readConfig();
-	const pinnedBranches = config.pinnedBranches || [];
+	const repoId = getRepositoryId();
+	if (!config.repositoryPinnedBranches) config.repositoryPinnedBranches = {};
+	const pinnedBranches = config.repositoryPinnedBranches[repoId] || [];
 	if (!pinnedBranches.includes(branch)) {
 		pinnedBranches.push(branch);
-		config.pinnedBranches = pinnedBranches;
+		config.repositoryPinnedBranches[repoId] = pinnedBranches;
 		writeConfig(config);
 	}
 }
 /**
-* 移除固定分支
+* 移除固定分支(仓库级别)
 */
 function removePinnedBranch(branch) {
 	const config = readConfig();
-	const pinnedBranches = config.pinnedBranches || [];
+	const repoId = getRepositoryId();
+	if (!config.repositoryPinnedBranches?.[repoId]) return;
+	const pinnedBranches = config.repositoryPinnedBranches[repoId];
 	const index = pinnedBranches.indexOf(branch);
 	if (index > -1) {
 		pinnedBranches.splice(index, 1);
-		config.pinnedBranches = pinnedBranches;
+		config.repositoryPinnedBranches[repoId] = pinnedBranches;
 		writeConfig(config);
 	}
 }
@@ -1252,10 +1365,259 @@ async function handleConfigPromptsCommand() {
 	}
 }
 
+//#endregion
+//#region src/utils/prompts/autocomplete-pin.ts
+function isSelectable(choice) {
+	return choice.type !== "separator" && !choice.disabled;
+}
+var AutocompletePinPrompt = class extends Base {
+	currentChoices;
+	firstRender;
+	selected;
+	initialValue;
+	paginator;
+	searchedOnce;
+	searching;
+	lastSearchTerm;
+	lastPromise;
+	nbChoices;
+	done;
+	answer;
+	answerName;
+	shortAnswer;
+	constructor(questions, rl, answers) {
+		super(questions, rl, answers);
+		const opt = this.opt;
+		if (!opt.source) this.throwParamError("source");
+		this.currentChoices = new Choices([], answers);
+		this.firstRender = true;
+		this.selected = 0;
+		this.initialValue = opt.default;
+		if (!opt.suggestOnly) opt.default = null;
+		const shouldLoop = opt.loop === void 0 ? true : opt.loop;
+		this.paginator = new Paginator(this.screen, { isInfinite: shouldLoop });
+	}
+	/**
+	* Start the Inquiry session
+	* @param  {Function} cb      Callback when prompt is done
+	* @return {this}
+	*/
+	_run(cb) {
+		this.done = cb;
+		if (Array.isArray(this.rl.history)) this.rl.history = [];
+		const events = observe(this.rl);
+		const dontHaveAnswer = () => this.answer === void 0;
+		events.line.pipe(takeWhile(dontHaveAnswer)).forEach(this.onSubmit.bind(this));
+		events.keypress.pipe(takeWhile(dontHaveAnswer)).forEach(this.onKeypress.bind(this));
+		this.search(void 0);
+		return this;
+	}
+	/**
+	* Render the prompt to screen
+	* @return {undefined}
+	*/
+	render(error) {
+		let content = this.getQuestion();
+		let bottomContent = "";
+		const opt = this.opt;
+		const suggestText = opt.suggestOnly ? ", tab to autocomplete" : "";
+		content += dim(`(Use arrow keys or type to search${suggestText}, Ctrl+P to Pin)`);
+		if (this.status === "answered") content += cyan(this.shortAnswer || this.answerName || this.answer);
+		else if (this.searching) {
+			content += this.rl.line;
+			bottomContent += `  ${dim(opt.searchText || "Searching...")}`;
+		} else if (this.nbChoices) {
+			const choicesStr = listRender(this.currentChoices, this.selected);
+			content += this.rl.line;
+			const indexPosition = this.selected;
+			let realIndexPosition = 0;
+			this.currentChoices.choices.every((choice, index) => {
+				if (index > indexPosition) return false;
+				const name = choice.name;
+				realIndexPosition += name ? name.split("\n").length : 0;
+				return true;
+			});
+			bottomContent += this.paginator.paginate(choicesStr, realIndexPosition, opt.pageSize);
+		} else {
+			content += this.rl.line;
+			bottomContent += `  ${yellow(opt.emptyText || "No results...")}`;
+		}
+		if (error) bottomContent += `\n${red(">> ")}${error}`;
+		this.firstRender = false;
+		this.screen.render(content, bottomContent);
+	}
+	/**
+	* When user press `enter` key
+	*/
+	onSubmit(line) {
+		let lineOrRl = line || this.rl.line;
+		const opt = this.opt;
+		if (opt.suggestOnly && !lineOrRl) lineOrRl = opt.default === null ? "" : opt.default;
+		if (typeof opt.validate === "function") {
+			const checkValidationResult = (validationResult$1) => {
+				if (validationResult$1 !== true) this.render(validationResult$1 || "Enter something, tab to autocomplete!");
+				else this.onSubmitAfterValidation(lineOrRl);
+			};
+			let validationResult;
+			if (opt.suggestOnly) validationResult = opt.validate(lineOrRl, this.answers);
+			else {
+				const choice = this.currentChoices.getChoice(this.selected);
+				validationResult = opt.validate(choice, this.answers);
+			}
+			if (isPromise(validationResult)) validationResult.then(checkValidationResult);
+			else checkValidationResult(validationResult);
+		} else this.onSubmitAfterValidation(lineOrRl);
+	}
+	onSubmitAfterValidation(line) {
+		const opt = this.opt;
+		let choice = {};
+		if (this.nbChoices && this.nbChoices <= this.selected && !opt.suggestOnly) {
+			this.rl.write(line);
+			this.search(line);
+			return;
+		}
+		if (opt.suggestOnly) {
+			choice.value = line || this.rl.line;
+			this.answer = line || this.rl.line;
+			this.answerName = line || this.rl.line;
+			this.shortAnswer = line || this.rl.line;
+			this.rl.line = "";
+		} else if (this.nbChoices) {
+			choice = this.currentChoices.getChoice(this.selected);
+			this.answer = choice.value;
+			this.answerName = choice.name;
+			this.shortAnswer = choice.short;
+		} else {
+			this.rl.write(line);
+			this.search(line);
+			return;
+		}
+		runAsync(opt.filter, (_err, value) => {
+			choice.value = value;
+			this.answer = value;
+			if (opt.suggestOnly) this.shortAnswer = value;
+			this.status = "answered";
+			this.render();
+			this.screen.done();
+			this.done(choice.value);
+		})(choice.value);
+	}
+	search(searchTerm) {
+		const opt = this.opt;
+		let currentValue;
+		if (this.currentChoices && this.nbChoices && this.nbChoices > this.selected) {
+			const currentChoice = this.currentChoices.getChoice(this.selected);
+			if (currentChoice) currentValue = currentChoice.value;
+		}
+		this.selected = 0;
+		if (this.searchedOnce) {
+			this.searching = true;
+			this.currentChoices = new Choices([], this.answers);
+			this.render();
+		} else this.searchedOnce = true;
+		this.lastSearchTerm = searchTerm;
+		let thisPromise;
+		try {
+			const result = opt.source(this.answers, searchTerm);
+			thisPromise = Promise.resolve(result);
+		} catch (error) {
+			thisPromise = Promise.reject(error);
+		}
+		this.lastPromise = thisPromise;
+		return thisPromise.then((choices) => {
+			if (thisPromise !== this.lastPromise) return;
+			this.currentChoices = new Choices(choices, this.answers);
+			const realChoices = choices.filter((choice) => isSelectable(choice));
+			this.nbChoices = realChoices.length;
+			let selectedIndex = -1;
+			if (currentValue !== void 0) selectedIndex = realChoices.findIndex((choice) => choice === currentValue || choice.value === currentValue);
+			if (selectedIndex === -1) selectedIndex = realChoices.findIndex((choice) => choice === this.initialValue || choice.value === this.initialValue);
+			if (selectedIndex >= 0) this.selected = selectedIndex;
+			this.searching = false;
+			this.render();
+		});
+	}
+	ensureSelectedInRange() {
+		const selectedIndex = Math.min(this.selected, this.nbChoices);
+		this.selected = Math.max(selectedIndex, 0);
+	}
+	/**
+	* When user type
+	*/
+	onKeypress(e) {
+		const opt = this.opt;
+		let len;
+		const keyName = e.key && e.key.name || void 0;
+		if (keyName === "p" && e.key.ctrl) {
+			if (this.nbChoices && opt.onPin) {
+				const choice = this.currentChoices.getChoice(this.selected);
+				if (choice) Promise.resolve(opt.onPin(choice.value, choice)).then(() => {
+					this.search(this.rl.line);
+				});
+			}
+			return;
+		}
+		if (keyName === "tab" && opt.suggestOnly) {
+			if (this.currentChoices.getChoice(this.selected)) {
+				this.rl.write(ansiEscapes.cursorLeft);
+				const autoCompleted = this.currentChoices.getChoice(this.selected).value;
+				this.rl.write(ansiEscapes.cursorForward(autoCompleted.length));
+				this.rl.line = autoCompleted;
+				this.render();
+			}
+		} else if (keyName === "down" || keyName === "n" && e.key.ctrl) {
+			len = this.nbChoices;
+			this.selected = this.selected < len - 1 ? this.selected + 1 : 0;
+			this.ensureSelectedInRange();
+			this.render();
+			utils.up(this.rl, 2);
+		} else if (keyName === "up") {
+			len = this.nbChoices;
+			this.selected = this.selected > 0 ? this.selected - 1 : len - 1;
+			this.ensureSelectedInRange();
+			this.render();
+		} else if (this.lastSearchTerm !== this.rl.line) this.search(this.rl.line);
+	}
+};
+/**
+* Function for rendering list choices
+* @param  {any} choices The choices to render
+* @param  {number} pointer Position of the pointer
+* @return {string}         Rendered content
+*/
+function listRender(choices, pointer) {
+	let output = "";
+	let separatorOffset = 0;
+	choices.forEach((choice, i) => {
+		if (choice.type === "separator") {
+			separatorOffset++;
+			output += `  ${choice}\n`;
+			return;
+		}
+		if (choice.disabled) {
+			separatorOffset++;
+			output += `  - ${choice.name}`;
+			output += ` (${typeof choice.disabled === "string" ? choice.disabled : "Disabled"})`;
+			output += "\n";
+			return;
+		}
+		const isSelected = i - separatorOffset === pointer;
+		let line = (isSelected ? `${figures.pointer} ` : "  ") + choice.name;
+		if (isSelected) line = cyan(line);
+		output += `${line} \n`;
+	});
+	return output.replace(/\n$/, "");
+}
+function isPromise(value) {
+	return typeof value === "object" && typeof value.then === "function";
+}
+var autocomplete_pin_default = AutocompletePinPrompt;
+
 //#endregion
 //#region src/utils/pr-cli.ts
 inquirer.registerPrompt("autocomplete", inquirerAutoComplete);
 inquirer.registerPrompt("search-checkbox", searchCheckbox);
+inquirer.registerPrompt("autocomplete-pin", autocomplete_pin_default);
 /**
 * 通用的分支选择函数，支持单选和多选
 */
@@ -1268,59 +1630,104 @@ async function promptBranchSelection(branches, options) {
 		return mode === "single" ? "" : [];
 	}
 	const branchInfos = getBranchesWithInfo(branches);
-	const pinnedBranchNames = getPinnedBranches();
-	const allPinnedBranches = branchInfos.filter((b) => pinnedBranchNames.includes(b.name));
-	const regularBranches = branchInfos.filter((b) => !pinnedBranchNames.includes(b.name));
-	const pinnedBranches = filterPinned ? [] : allPinnedBranches;
-	pinnedBranches.sort((a, b) => {
-		return pinnedBranchNames.indexOf(a.name) - pinnedBranchNames.indexOf(b.name);
-	});
-	regularBranches.sort((a, b) => a.name.localeCompare(b.name));
-	const MAX_BRANCHES = 100;
-	if (regularBranches.length > MAX_BRANCHES) regularBranches.splice(MAX_BRANCHES);
-	const choices = [];
-	if (pinnedBranches.length > 0) {
-		choices.push(new inquirer.Separator(magenta("━━━━━━━━ 📌 Pinned Branches ━━━━━━━━")));
-		pinnedBranches.forEach((branch) => {
-			choices.push({
-				name: `📌 ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
-				value: branch.name,
-				short: branch.name,
-				checked: defaultSelected.includes(branch.name)
+	if (mode === "single") {
+		const sortingPinnedBranches = getPinnedBranches();
+		const searchBranches = async (_answers, input = "") => {
+			const currentPinnedBranches = getPinnedBranches();
+			const addCancelOption = (list) => {
+				list.push(new inquirer.Separator(" "));
+				list.push({
+					name: dim("  [Cancel PR creation]"),
+					value: "__CANCEL__",
+					short: "Cancel"
+				});
+			};
+			const createBranchChoice = (branch) => {
+				return {
+					name: `${currentPinnedBranches.includes(branch.name) ? "📌" : "  "} ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
+					value: branch.name,
+					short: branch.name
+				};
+			};
+			const topGroupBranches = branchInfos.filter((b) => sortingPinnedBranches.includes(b.name));
+			const bottomGroupBranches = branchInfos.filter((b) => !sortingPinnedBranches.includes(b.name));
+			const effectiveTopGroup = filterPinned ? [] : topGroupBranches;
+			effectiveTopGroup.sort((a, b) => {
+				return sortingPinnedBranches.indexOf(a.name) - sortingPinnedBranches.indexOf(b.name);
 			});
-		});
-		choices.push(new inquirer.Separator(" "));
-	}
-	if (regularBranches.length > 0) {
-		choices.push(new inquirer.Separator(cyan("━━━━━━━━ 🌿 All Branches (Alphabetical) ━━━━━━━━")));
-		regularBranches.forEach((branch) => {
-			choices.push({
-				name: `   ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
-				value: branch.name,
-				short: branch.name,
-				checked: defaultSelected.includes(branch.name)
+			bottomGroupBranches.sort((a, b) => a.name.localeCompare(b.name));
+			const displayBottomGroup = bottomGroupBranches.slice(0, 100);
+			const choices = [];
+			[...effectiveTopGroup, ...displayBottomGroup].forEach((branch) => {
+				choices.push(createBranchChoice(branch));
 			});
-		});
-		choices.push(new inquirer.Separator(" "));
-	}
-	const searchBranches = async (_answers, input = "") => {
-		const lowerInput = input.toLowerCase();
-		return choices.filter((choice) => {
-			if (!choice.value) return true;
-			return choice.value.toLowerCase().includes(lowerInput);
-		});
-	};
-	if (mode === "single") {
+			if (!filterPinned) addCancelOption(choices);
+			const lowerInput = input.toLowerCase();
+			if (lowerInput.trim()) {
+				const searchChoices = branchInfos.filter((branch) => branch.name.toLowerCase().includes(lowerInput)).map(createBranchChoice);
+				addCancelOption(searchChoices);
+				return searchChoices;
+			}
+			return choices.filter((choice) => {
+				if (!choice.value || choice.value === "__CANCEL__") return true;
+				return choice.value.toLowerCase().includes(lowerInput);
+			});
+		};
 		const { selectedBranch } = await inquirer.prompt([{
-			type: "autocomplete",
+			type: "autocomplete-pin",
 			name: "selectedBranch",
 			message,
 			source: searchBranches,
 			pageSize: 20,
-			default: pinnedBranches.length > 0 ? pinnedBranches[0].name : regularBranches[0]?.name
+			onPin: async (branchName) => {
+				if (getPinnedBranches().includes(branchName)) removePinnedBranch(branchName);
+				else addPinnedBranch(branchName);
+			}
 		}]);
 		return selectedBranch;
 	} else {
+		const pinnedBranchNames = getPinnedBranches();
+		const allPinnedBranches = branchInfos.filter((b) => pinnedBranchNames.includes(b.name));
+		const regularBranches = branchInfos.filter((b) => !pinnedBranchNames.includes(b.name));
+		const pinnedBranches = filterPinned ? [] : allPinnedBranches;
+		const choices = [];
+		if (!filterPinned) {
+			choices.push(new inquirer.Separator(" "));
+			choices.push({
+				name: dim("  [Cancel PR creation]"),
+				value: "__CANCEL__",
+				short: "Cancel"
+			});
+		}
+		pinnedBranches.sort((a, b) => {
+			return pinnedBranchNames.indexOf(a.name) - pinnedBranchNames.indexOf(b.name);
+		});
+		regularBranches.sort((a, b) => a.name.localeCompare(b.name));
+		if (regularBranches.length > 100) regularBranches.splice(100);
+		if (pinnedBranches.length > 0) {
+			choices.push(new inquirer.Separator(magenta("━━━━━━━━ 📌 Pinned Branches ━━━━━━━━")));
+			pinnedBranches.forEach((branch) => {
+				choices.push({
+					name: `📌 ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
+					value: branch.name,
+					short: branch.name,
+					checked: defaultSelected.includes(branch.name)
+				});
+			});
+			choices.push(new inquirer.Separator(" "));
+		}
+		if (regularBranches.length > 0) {
+			choices.push(new inquirer.Separator(cyan("━━━━━━━━ 🌿 All Branches (Alphabetical) ━━━━━━━━")));
+			regularBranches.forEach((branch) => {
+				choices.push({
+					name: `   ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
+					value: branch.name,
+					short: branch.name,
+					checked: defaultSelected.includes(branch.name)
+				});
+			});
+			choices.push(new inquirer.Separator(" "));
+		}
 		const { selectedBranches } = await inquirer.prompt([{
 			type: "search-checkbox",
 			name: "selectedBranches",
@@ -1340,6 +1747,10 @@ async function promptTargetBranch(branches, currentBranch) {
 		message: "Select target branch (type to search):",
 		mode: "single"
 	});
+	if (targetBranch === "__CANCEL__") {
+		console.log(yellow("\n🚫 PR creation cancelled."));
+		return null;
+	}
 	if (!targetBranch) {
 		console.log(yellow("⚠️  No branch selected. Using \"main\" as default."));
 		return "main";
@@ -1400,7 +1811,7 @@ async function handlePinCommand(branchName) {
 		addPinnedBranch(branchName);
 		console.log(green(`✅  Branch '${branchName}' has been pinned`));
 	} else {
-		const { getAllBranches: getAllBranches$1 } = await import("./pr-C2AR97YR.mjs");
+		const { getAllBranches: getAllBranches$1 } = await import("./pr-Cv5LeZ_A.mjs");
 		const branches = getAllBranches$1();
 		if (branches.length === 0) {
 			console.log(yellow("⚠️  No branches found"));
@@ -1559,7 +1970,7 @@ async function promptForUpdate(packageName$1, result) {
 		type: "confirm",
 		name: "shouldUpdate",
 		message: "Would you like to update now?",
-		default: false
+		default: true
 	}, {
 		type: "list",
 		name: "packageManager",
@@ -1798,7 +2209,7 @@ async function promptPushBranch(branchName) {
 /**
 * 处理 PR 命令
 */
-async function handlePRCommand() {
+async function handlePRCommand(targetBranchArg) {
 	printPRBanner();
 	const gitInfo = getGitInfo();
 	if (!gitInfo.isGitRepo) {
@@ -1827,7 +2238,13 @@ async function handlePRCommand() {
 		console.log(yellow("⚠️  No branches found."));
 		return;
 	}
-	const targetBranch = await promptTargetBranch(branches, gitInfo.currentBranch);
+	let targetBranch = null;
+	if (targetBranchArg) if (branches.includes(targetBranchArg)) {
+		targetBranch = targetBranchArg;
+		console.log(green(`✅  Using specified target branch: ${targetBranch}\n`));
+	} else console.log(yellow(`⚠️  Branch '${targetBranchArg}' not found. Falling back to interactive selection.`));
+	if (!targetBranch) targetBranch = await promptTargetBranch(branches, gitInfo.currentBranch);
+	if (!targetBranch) return;
 	const prInfo = createPullRequest(gitInfo.currentBranch, targetBranch, gitInfo.remoteUrl);
 	if (!prInfo) {
 		console.log(red("❌  Failed to create PR information"));
@@ -1848,12 +2265,16 @@ async function handlePRCommand() {
 		if (!createMergeBranch(targetBranch, prInfo.mergeBranchName)) return;
 		if (await promptAutoMergeSource(gitInfo.currentBranch, targetBranch)) {
 			console.log(yellow(`\n🔄  Merging '${gitInfo.currentBranch}' to detect conflicts...`));
-			if (!mergeSourceToMergeBranch(gitInfo.currentBranch)) {
-				console.log(yellow("\n⚠️  Merge conflicts detected! Please resolve them manually:"));
-				console.log(dim(`   1. Resolve conflicts in your editor`));
-				console.log(dim(`   2. Run: git add <resolved-files>`));
-				console.log(dim(`   3. Run: git commit`));
-				console.log(dim(`   4. Push the merge branch when ready`));
+			try {
+				if (!mergeSourceToMergeBranch(gitInfo.currentBranch)) {
+					console.log(yellow("\n⚠️  Merge conflicts detected! Please resolve them manually:"));
+					console.log(dim(`   1. Resolve conflicts in your editor`));
+					console.log(dim(`   2. Run: git add <resolved-files>`));
+					console.log(dim(`   3. Run: git commit`));
+					console.log(dim(`   4. Push the merge branch when ready`));
+				}
+			} catch {
+				return;
 			}
 		} else {
 			console.log(green(`\n✅  Merge branch '${prInfo.mergeBranchName}' created without merging.`));
@@ -1866,8 +2287,13 @@ async function handlePRCommand() {
 }
 yargs(hideBin(process.argv)).scriptName("qkpr").usage("Usage: $0 <command> [options]").command("$0", "Show interactive menu to choose features", () => {}, async () => {
 	await showMainMenu();
-}).command("pr", "🔧  Create a Pull Request with interactive branch selection", () => {}, async () => {
-	await handlePRCommand();
+}).command("pr [branch]", "🔧  Create a Pull Request with interactive branch selection", (yargs$1) => {
+	return yargs$1.positional("branch", {
+		describe: "Target branch name",
+		type: "string"
+	});
+}, async (argv) => {
+	await handlePRCommand(argv.branch);
 	await checkAndNotifyUpdate(packageName, version);
 }).command("commit", "🤖  Generate commit message using AI", () => {}, async () => {
 	await handleCommitCommand();
@@ -1909,4 +2335,4 @@ yargs(hideBin(process.argv)).scriptName("qkpr").usage("Usage: $0 <command> [opti
 }).version(version).alias("v", "version").help("h").alias("h", "help").epilog("For more information, visit https://github.com/KazooTTT/qkpr").argv;
 
 //#endregion
-export { generatePRMessage as a, getBranchCategory as c, getCommitsBetweenBranches as d, getGitInfo as f, generateMergeBranchName as i, getBranchLastCommitTime as l, parseRemoteUrl as m, createMergeBranch as n, generatePRUrl as o, mergeSourceToMergeBranch as p, createPullRequest as r, getAllBranches as s, copyToClipboard as t, getBranchesWithInfo as u };
+export { generateMergeBranchName as a, getAllBranches as c, getBranchesWithInfo as d, getBranchesWithInfoBatch as f, parseRemoteUrl as g, mergeSourceToMergeBranch as h, formatTimestamp as i, getBranchCategory as l, getGitInfo as m, createMergeBranch as n, generatePRMessage as o, getCommitsBetweenBranches as p, createPullRequest as r, generatePRUrl as s, copyToClipboard as t, getBranchLastCommitTime as u };

package/dist/pr-Cv5LeZ_A.mjs

@@ -0,0 +1,3 @@
+import { a as generateMergeBranchName, c as getAllBranches, d as getBranchesWithInfo, f as getBranchesWithInfoBatch, g as parseRemoteUrl, h as mergeSourceToMergeBranch, i as formatTimestamp, l as getBranchCategory, m as getGitInfo, n as createMergeBranch, o as generatePRMessage, p as getCommitsBetweenBranches, r as createPullRequest, s as generatePRUrl, t as copyToClipboard, u as getBranchLastCommitTime } from "./index.mjs";
+
+export { copyToClipboard, createMergeBranch, createPullRequest, formatTimestamp, generateMergeBranchName, generatePRMessage, generatePRUrl, getAllBranches, getBranchCategory, getBranchLastCommitTime, getBranchesWithInfo, getBranchesWithInfoBatch, getCommitsBetweenBranches, getGitInfo, mergeSourceToMergeBranch, parseRemoteUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qkpr",
   "type": "module",
-  "version": "1.0.5-beta.1",
+  "version": "1.0.6",
   "description": "Create a Pull Request with interactive branch selection",
   "author": "KazooTTT <work@kazoottt.top>",
   "license": "MIT",
@@ -34,6 +34,8 @@
   ],
   "dependencies": {
     "@google/generative-ai": "^0.24.1",
+    "ansi-escapes": "^7.2.0",
+    "figures": "^6.1.0",
     "inquirer": "^9.2.20",
     "inquirer-autocomplete-prompt": "^3.0.1",
     "inquirer-search-checkbox": "^1.0.0",
@@ -41,6 +43,8 @@
     "kolorist": "^1.8.0",
     "open": "^8.4.2",
     "ora": "^9.0.0",
+    "run-async": "^4.0.6",
+    "rxjs": "^7.8.2",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

package/dist/pr-C2AR97YR.mjs

@@ -1,3 +0,0 @@
-import { a as generatePRMessage, c as getBranchCategory, d as getCommitsBetweenBranches, f as getGitInfo, i as generateMergeBranchName, l as getBranchLastCommitTime, m as parseRemoteUrl, n as createMergeBranch, o as generatePRUrl, p as mergeSourceToMergeBranch, r as createPullRequest, s as getAllBranches, t as copyToClipboard, u as getBranchesWithInfo } from "./index.mjs";
-
-export { copyToClipboard, createMergeBranch, createPullRequest, generateMergeBranchName, generatePRMessage, generatePRUrl, getAllBranches, getBranchCategory, getBranchLastCommitTime, getBranchesWithInfo, getCommitsBetweenBranches, getGitInfo, mergeSourceToMergeBranch, parseRemoteUrl };