flowpilot 0.0.2 → 0.1.16

package/dist/serve.js

@@ -4895,7 +4895,15 @@ var en_default = {
 		"createIssueFailed": "Failed to create issue",
 		"selectHistoryOrNew": "Select history for quick execute, or create new",
 		"historyNew": "Create new...",
-		"historyQuickExecute": "Quick execute"
+		"historyQuickExecute": "Quick execute",
+		"createMR": "Create Merge Request for this release?",
+		"selectSourceBranch": "Select source branch for MR",
+		"noSourceBranches": "No other branches available as MR source",
+		"selectMrBranch": "Select MR branch",
+		"confirmCreateMr": "Confirm Create MR",
+		"creatingMrBtn": "Creating MR...",
+		"mrFromTo": "MR: {{source}} → {{target}}",
+		"mrCreated": "MR created"
 	},
 	web: {
 		"flowpilot": "FlowPilot",
@@ -4967,8 +4975,13 @@ var en_default = {
 		"newModalTitle": "Create Release Request",
 		"clearSuccess": "History cleared",
 		"cancel": "Cancel",
+		"createMrCheckbox": "Create MR",
 		"endTitle": "End",
-		"endDesc": "End current task: rebase, push, create MR, update Jira."
+		"endDesc": "End current task: rebase, push, create MR, update Jira.",
+		"createMrBtn": "Create MR",
+		"creatingMrBtn": "Creating MR...",
+		"confirmCreateMr": "Confirm Create MR",
+		"loadingMr": "Loading branches..."
 	},
 	end: {
 		"notGitRepo": "Not a git repository. Run this inside a git project.",
@@ -5122,7 +5135,15 @@ var zh_CN_default = {
 		"createIssueFailed": "创建 issue 失败",
 		"selectHistoryOrNew": "选择历史记录快速执行，或新建",
 		"historyNew": "新建...",
-		"historyQuickExecute": "快速执行"
+		"historyQuickExecute": "快速执行",
+		"createMR": "为此发布创建 Merge Request？",
+		"selectSourceBranch": "选择 MR 的源分支",
+		"noSourceBranches": "没有其他分支可作为 MR 源分支",
+		"selectMrBranch": "选择 MR 分支",
+		"confirmCreateMr": "确认创建 MR",
+		"creatingMrBtn": "正在创建 MR...",
+		"mrFromTo": "MR: {{source}} → {{target}}",
+		"mrCreated": "MR 已创建"
 	},
 	web: {
 		"flowpilot": "FlowPilot",
@@ -5194,8 +5215,13 @@ var zh_CN_default = {
 		"newModalTitle": "新建发布申请",
 		"clearSuccess": "历史已清空",
 		"cancel": "取消",
+		"createMrCheckbox": "创建 MR",
 		"endTitle": "End",
-		"endDesc": "结束当前任务：rebase、推送、创建 MR、更新 Jira。"
+		"endDesc": "结束当前任务：rebase、推送、创建 MR、更新 Jira。",
+		"createMrBtn": "创建 MR",
+		"creatingMrBtn": "正在创建 MR...",
+		"confirmCreateMr": "确认创建 MR",
+		"loadingMr": "正在加载分支..."
 	},
 	end: {
 		"notGitRepo": "当前不在 git 仓库中。请在 git 项目内运行。",
@@ -18488,6 +18514,7 @@ const CONTEXT_404_MAP = {
 	gitlabFile: "error.http404File",
 	gitlabBranch: "error.http404",
 	gitlabGeneral: "error.http404",
+	gitlabMR: "error.http404",
 	jiraProject: "error.http404",
 	jiraSearch: "error.http404",
 	jiraVersion: "error.http404",
@@ -18500,6 +18527,7 @@ const CONTEXT_FALLBACK_MAP = {
 	gitlabBranch: "error.fetchBranchesFailed",
 	gitlabFile: "error.fetchPomFailed",
 	gitlabGeneral: "error.gitlabApiFailed",
+	gitlabMR: "error.gitlabApiFailed",
 	jiraProject: "error.fetchJiraProjectsFailed",
 	jiraSearch: "error.jiraSearchFailed",
 	jiraVersion: "error.jiraVersionFailed",
@@ -18956,6 +18984,35 @@ function cleanVersion(v) {
 //#region src/commands/release/routes.tsx
 const releaseStore = new Store("release-history.json");
 const dedupKey = (e) => `${e.projectId}:${e.branch}:${e.jiraProjectKey}`;
+async function createMrForRelease(git, projectId, targetBranch, jiraUrl, sourceBranchOverride) {
+	try {
+		const sourceBranch = sourceBranchOverride ?? (await git.listBranches(projectId)).find((b) => b.default)?.name;
+		if (!sourceBranch || sourceBranch === targetBranch) return void 0;
+		try {
+			const mr = await git.createMergeRequest(projectId, sourceBranch, targetBranch, `${sourceBranch} → ${targetBranch}`, { description: jiraUrl ? `Jira: ${jiraUrl}` : "" });
+			return {
+				mrUrl: mr.webUrl ?? mr.web_url,
+				sourceBranch,
+				targetBranch
+			};
+		} catch (mrErr) {
+			if ((mrErr instanceof Error ? mrErr.message : String(mrErr)).includes("already exists")) {
+				const existing = (await git.listMergeRequests({
+					projectId,
+					state: "opened"
+				})).find((m) => m.sourceBranch === sourceBranch && m.targetBranch === targetBranch);
+				if (existing) return {
+					mrUrl: existing.webUrl ?? existing.web_url ?? "",
+					sourceBranch,
+					targetBranch
+				};
+			}
+			return;
+		}
+	} catch {
+		return;
+	}
+}
 const REQUIRED_KEYS = [
 	"jiraHost",
 	"jiraName",
@@ -18995,11 +19052,14 @@ router.delete("/api/history", (c) => {
 });
 router.post("/api/history/:id/execute", async (c) => {
 	const id = c.req.param("id");
+	const createMr = (await c.req.json().catch(() => ({ createMr: false }))).createMr ?? false;
 	const entry = releaseStore.getAll().find((h) => h.id === id);
 	if (!entry) return c.json({ error: t$1("error.http404") }, 404);
 	const git = new GitlabController();
 	const jira = new JiraController();
 	const config = new ConfigJson().getConfig();
+	let mrResult;
+	if (createMr) mrResult = await createMrForRelease(git, entry.projectId, entry.branch, "", entry.mrSourceBranch);
 	let pomInfo;
 	try {
 		const file = await git.getFile(entry.projectId, "pom.xml", entry.branch);
@@ -19016,15 +19076,15 @@ router.post("/api/history/:id/execute", async (c) => {
 		if (searchResult.total > 0 && searchResult.issues?.[0]) {
 			const existingKey = searchResult.issues[0].key;
 			const jiraUrl = config.jiraHost ? `${config.jiraHost}/browse/${existingKey}` : "";
-			releaseStore.add({
-				...entry,
-				createdAt: (/* @__PURE__ */ new Date()).toISOString()
-			}, dedupKey);
 			return c.json({
 				issueKey: existingKey,
 				issueUrl: jiraUrl,
 				version: displayVersion,
-				versionCreated: false
+				versionCreated: false,
+				issueCreated: false,
+				mrUrl: mrResult?.mrUrl,
+				mrSourceBranch: mrResult?.sourceBranch,
+				mrTargetBranch: mrResult?.targetBranch
 			});
 		}
 	} catch {}
@@ -19050,15 +19110,14 @@ router.post("/api/history/:id/execute", async (c) => {
 			customfield_13341: [{ name: "licheng.li" }]
 		});
 		const jiraUrl = config.jiraHost ? `${config.jiraHost}/browse/${issue.key}` : "";
-		releaseStore.add({
-			...entry,
-			createdAt: (/* @__PURE__ */ new Date()).toISOString()
-		}, dedupKey);
 		return c.json({
 			issueKey: issue.key,
 			issueUrl: jiraUrl,
 			version: displayVersion,
-			versionCreated
+			versionCreated,
+			mrUrl: mrResult?.mrUrl,
+			mrSourceBranch: mrResult?.sourceBranch,
+			mrTargetBranch: mrResult?.targetBranch
 		});
 	} catch (e) {
 		return c.json({ error: translateApiError(e, "jiraCreateIssue") }, 500);
@@ -19081,6 +19140,49 @@ router.get("/api/projects/:id/branches", async (c) => {
 		return c.json({ error: translateApiError(e, "gitlabBranch") }, 500);
 	}
 });
+router.post("/api/create-mr", async (c) => {
+	let mrUrl = "";
+	let sourceBranch = "";
+	let targetBranch = "";
+	let projectId = 0;
+	try {
+		const body = await c.req.json();
+		projectId = Number(body.projectId);
+		targetBranch = body.targetBranch;
+		sourceBranch = body.sourceBranch;
+		const jiraUrl = body.jiraUrl ?? "";
+		const git = new GitlabController();
+		try {
+			const mr = await git.createMergeRequest(projectId, sourceBranch, targetBranch, `${sourceBranch} → ${targetBranch}`, { description: jiraUrl ? `Jira: ${jiraUrl}` : "" });
+			mrUrl = mr.webUrl ?? mr.web_url;
+		} catch (mrErr) {
+			if ((mrErr instanceof Error ? mrErr.message : String(mrErr)).includes("already exists")) try {
+				const existing = (await git.listMergeRequests({
+					projectId,
+					state: "opened"
+				})).find((m) => m.sourceBranch === sourceBranch && m.targetBranch === targetBranch);
+				if (existing) mrUrl = existing.webUrl ?? existing.web_url ?? "";
+			} catch {}
+			if (!mrUrl) return c.json({ error: translateApiError(mrErr, "gitlabMR") }, 500);
+		}
+	} catch (e) {
+		return c.json({ error: translateApiError(e, "gitlabMR") }, 500);
+	}
+	if (mrUrl && projectId) try {
+		const match = releaseStore.getAll().find((e) => Number(e.projectId) === projectId && e.branch === targetBranch);
+		if (match) releaseStore.add({
+			...match,
+			mrUrl,
+			mrSourceBranch: sourceBranch,
+			mrTargetBranch: targetBranch
+		}, dedupKey);
+	} catch {}
+	return c.json({
+		mrUrl,
+		sourceBranch,
+		targetBranch
+	});
+});
 router.get("/api/projects/:id/pom-version", async (c) => {
 	try {
 		const projectId = c.req.param("id");

package/dist/server.js

@@ -2149,7 +2149,15 @@ var en_default = {
 		"createIssueFailed": "Failed to create issue",
 		"selectHistoryOrNew": "Select history for quick execute, or create new",
 		"historyNew": "Create new...",
-		"historyQuickExecute": "Quick execute"
+		"historyQuickExecute": "Quick execute",
+		"createMR": "Create Merge Request for this release?",
+		"selectSourceBranch": "Select source branch for MR",
+		"noSourceBranches": "No other branches available as MR source",
+		"selectMrBranch": "Select MR branch",
+		"confirmCreateMr": "Confirm Create MR",
+		"creatingMrBtn": "Creating MR...",
+		"mrFromTo": "MR: {{source}} → {{target}}",
+		"mrCreated": "MR created"
 	},
 	web: {
 		"flowpilot": "FlowPilot",
@@ -2221,8 +2229,13 @@ var en_default = {
 		"newModalTitle": "Create Release Request",
 		"clearSuccess": "History cleared",
 		"cancel": "Cancel",
+		"createMrCheckbox": "Create MR",
 		"endTitle": "End",
-		"endDesc": "End current task: rebase, push, create MR, update Jira."
+		"endDesc": "End current task: rebase, push, create MR, update Jira.",
+		"createMrBtn": "Create MR",
+		"creatingMrBtn": "Creating MR...",
+		"confirmCreateMr": "Confirm Create MR",
+		"loadingMr": "Loading branches..."
 	},
 	end: {
 		"notGitRepo": "Not a git repository. Run this inside a git project.",
@@ -2376,7 +2389,15 @@ var zh_CN_default = {
 		"createIssueFailed": "创建 issue 失败",
 		"selectHistoryOrNew": "选择历史记录快速执行，或新建",
 		"historyNew": "新建...",
-		"historyQuickExecute": "快速执行"
+		"historyQuickExecute": "快速执行",
+		"createMR": "为此发布创建 Merge Request？",
+		"selectSourceBranch": "选择 MR 的源分支",
+		"noSourceBranches": "没有其他分支可作为 MR 源分支",
+		"selectMrBranch": "选择 MR 分支",
+		"confirmCreateMr": "确认创建 MR",
+		"creatingMrBtn": "正在创建 MR...",
+		"mrFromTo": "MR: {{source}} → {{target}}",
+		"mrCreated": "MR 已创建"
 	},
 	web: {
 		"flowpilot": "FlowPilot",
@@ -2448,8 +2469,13 @@ var zh_CN_default = {
 		"newModalTitle": "新建发布申请",
 		"clearSuccess": "历史已清空",
 		"cancel": "取消",
+		"createMrCheckbox": "创建 MR",
 		"endTitle": "End",
-		"endDesc": "结束当前任务：rebase、推送、创建 MR、更新 Jira。"
+		"endDesc": "结束当前任务：rebase、推送、创建 MR、更新 Jira。",
+		"createMrBtn": "创建 MR",
+		"creatingMrBtn": "正在创建 MR...",
+		"confirmCreateMr": "确认创建 MR",
+		"loadingMr": "正在加载分支..."
 	},
 	end: {
 		"notGitRepo": "当前不在 git 仓库中。请在 git 项目内运行。",
@@ -18576,6 +18602,7 @@ const CONTEXT_404_MAP = {
 	gitlabFile: "error.http404File",
 	gitlabBranch: "error.http404",
 	gitlabGeneral: "error.http404",
+	gitlabMR: "error.http404",
 	jiraProject: "error.http404",
 	jiraSearch: "error.http404",
 	jiraVersion: "error.http404",
@@ -18588,6 +18615,7 @@ const CONTEXT_FALLBACK_MAP = {
 	gitlabBranch: "error.fetchBranchesFailed",
 	gitlabFile: "error.fetchPomFailed",
 	gitlabGeneral: "error.gitlabApiFailed",
+	gitlabMR: "error.gitlabApiFailed",
 	jiraProject: "error.fetchJiraProjectsFailed",
 	jiraSearch: "error.jiraSearchFailed",
 	jiraVersion: "error.jiraVersionFailed",
@@ -18957,6 +18985,35 @@ function cleanVersion(v) {
 //#region src/commands/release/routes.tsx
 const releaseStore = new Store("release-history.json");
 const dedupKey = (e) => `${e.projectId}:${e.branch}:${e.jiraProjectKey}`;
+async function createMrForRelease(git, projectId, targetBranch, jiraUrl, sourceBranchOverride) {
+	try {
+		const sourceBranch = sourceBranchOverride ?? (await git.listBranches(projectId)).find((b) => b.default)?.name;
+		if (!sourceBranch || sourceBranch === targetBranch) return void 0;
+		try {
+			const mr = await git.createMergeRequest(projectId, sourceBranch, targetBranch, `${sourceBranch} → ${targetBranch}`, { description: jiraUrl ? `Jira: ${jiraUrl}` : "" });
+			return {
+				mrUrl: mr.webUrl ?? mr.web_url,
+				sourceBranch,
+				targetBranch
+			};
+		} catch (mrErr) {
+			if ((mrErr instanceof Error ? mrErr.message : String(mrErr)).includes("already exists")) {
+				const existing = (await git.listMergeRequests({
+					projectId,
+					state: "opened"
+				})).find((m) => m.sourceBranch === sourceBranch && m.targetBranch === targetBranch);
+				if (existing) return {
+					mrUrl: existing.webUrl ?? existing.web_url ?? "",
+					sourceBranch,
+					targetBranch
+				};
+			}
+			return;
+		}
+	} catch {
+		return;
+	}
+}
 const REQUIRED_KEYS = [
 	"jiraHost",
 	"jiraName",
@@ -18996,11 +19053,14 @@ router.delete("/api/history", (c) => {
 });
 router.post("/api/history/:id/execute", async (c) => {
 	const id = c.req.param("id");
+	const createMr = (await c.req.json().catch(() => ({ createMr: false }))).createMr ?? false;
 	const entry = releaseStore.getAll().find((h) => h.id === id);
 	if (!entry) return c.json({ error: t("error.http404") }, 404);
 	const git = new GitlabController();
 	const jira = new JiraController();
 	const config = new ConfigJson().getConfig();
+	let mrResult;
+	if (createMr) mrResult = await createMrForRelease(git, entry.projectId, entry.branch, "", entry.mrSourceBranch);
 	let pomInfo;
 	try {
 		const file = await git.getFile(entry.projectId, "pom.xml", entry.branch);
@@ -19017,15 +19077,15 @@ router.post("/api/history/:id/execute", async (c) => {
 		if (searchResult.total > 0 && searchResult.issues?.[0]) {
 			const existingKey = searchResult.issues[0].key;
 			const jiraUrl = config.jiraHost ? `${config.jiraHost}/browse/${existingKey}` : "";
-			releaseStore.add({
-				...entry,
-				createdAt: (/* @__PURE__ */ new Date()).toISOString()
-			}, dedupKey);
 			return c.json({
 				issueKey: existingKey,
 				issueUrl: jiraUrl,
 				version: displayVersion,
-				versionCreated: false
+				versionCreated: false,
+				issueCreated: false,
+				mrUrl: mrResult?.mrUrl,
+				mrSourceBranch: mrResult?.sourceBranch,
+				mrTargetBranch: mrResult?.targetBranch
 			});
 		}
 	} catch {}
@@ -19051,15 +19111,14 @@ router.post("/api/history/:id/execute", async (c) => {
 			customfield_13341: [{ name: "licheng.li" }]
 		});
 		const jiraUrl = config.jiraHost ? `${config.jiraHost}/browse/${issue.key}` : "";
-		releaseStore.add({
-			...entry,
-			createdAt: (/* @__PURE__ */ new Date()).toISOString()
-		}, dedupKey);
 		return c.json({
 			issueKey: issue.key,
 			issueUrl: jiraUrl,
 			version: displayVersion,
-			versionCreated
+			versionCreated,
+			mrUrl: mrResult?.mrUrl,
+			mrSourceBranch: mrResult?.sourceBranch,
+			mrTargetBranch: mrResult?.targetBranch
 		});
 	} catch (e) {
 		return c.json({ error: translateApiError(e, "jiraCreateIssue") }, 500);
@@ -19082,6 +19141,49 @@ router.get("/api/projects/:id/branches", async (c) => {
 		return c.json({ error: translateApiError(e, "gitlabBranch") }, 500);
 	}
 });
+router.post("/api/create-mr", async (c) => {
+	let mrUrl = "";
+	let sourceBranch = "";
+	let targetBranch = "";
+	let projectId = 0;
+	try {
+		const body = await c.req.json();
+		projectId = Number(body.projectId);
+		targetBranch = body.targetBranch;
+		sourceBranch = body.sourceBranch;
+		const jiraUrl = body.jiraUrl ?? "";
+		const git = new GitlabController();
+		try {
+			const mr = await git.createMergeRequest(projectId, sourceBranch, targetBranch, `${sourceBranch} → ${targetBranch}`, { description: jiraUrl ? `Jira: ${jiraUrl}` : "" });
+			mrUrl = mr.webUrl ?? mr.web_url;
+		} catch (mrErr) {
+			if ((mrErr instanceof Error ? mrErr.message : String(mrErr)).includes("already exists")) try {
+				const existing = (await git.listMergeRequests({
+					projectId,
+					state: "opened"
+				})).find((m) => m.sourceBranch === sourceBranch && m.targetBranch === targetBranch);
+				if (existing) mrUrl = existing.webUrl ?? existing.web_url ?? "";
+			} catch {}
+			if (!mrUrl) return c.json({ error: translateApiError(mrErr, "gitlabMR") }, 500);
+		}
+	} catch (e) {
+		return c.json({ error: translateApiError(e, "gitlabMR") }, 500);
+	}
+	if (mrUrl && projectId) try {
+		const match = releaseStore.getAll().find((e) => Number(e.projectId) === projectId && e.branch === targetBranch);
+		if (match) releaseStore.add({
+			...match,
+			mrUrl,
+			mrSourceBranch: sourceBranch,
+			mrTargetBranch: targetBranch
+		}, dedupKey);
+	} catch {}
+	return c.json({
+		mrUrl,
+		sourceBranch,
+		targetBranch
+	});
+});
 router.get("/api/projects/:id/pom-version", async (c) => {
 	try {
 		const projectId = c.req.param("id");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowpilot",
-  "version": "0.0.2",
+  "version": "0.1.16",
   "type": "module",
   "engines": {
     "node": ">=22.13"
@@ -14,7 +14,7 @@
   },
   "module": "./dist/server.js",
   "types": "./dist/server.d.ts",
-  "description": "CLI + Web Dashboard bridging Jira & GitLab for release workflow automation",
+  "description": "Jira & GitLab workflow automation — config, release, end and more",
   "bin": {
     "flowpilot": "./dist/cli.js"
   },
@@ -24,9 +24,10 @@
     "dev": "rolldown -c rolldown.config.ts --watch",
     "format": "biome format --write",
     "test": "vitest",
-    "release:major": "vitest run && pnpm build && npm version major && npm publish --registry https://registry.npmjs.org/",
-    "release:minor": "vitest run && pnpm build && npm version minor && npm publish --registry https://registry.npmjs.org/",
-    "release:patch": "vitest run && pnpm build && npm version patch && npm publish --registry https://registry.npmjs.org/",
+    "release": "vitest run && pnpm build && bash scripts/bump-version.sh | xargs npm version && git push && git push --tags",
+    "release:patch": "vitest run && pnpm build && npm version patch && git push && git push --tags",
+    "release:minor": "vitest run && pnpm build && npm version minor && git push && git push --tags",
+    "release:major": "vitest run && pnpm build && npm version major && git push && git push --tags",
     "postinstall": "node dist/cli.js serve",
     "prepublishOnly": "pnpm build"
   },
@@ -35,8 +36,23 @@
     "favicon",
     "README.md"
   ],
-  "keywords": [],
+  "keywords": [
+    "jira",
+    "gitlab",
+    "cli",
+    "release",
+    "merge-request",
+    "workflow",
+    "devops"
+  ],
   "author": "Corazon",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/FriendsA/flowpilot"
+  },
+  "publishConfig": {
+    "provenance": true
+  },
   "license": "ISC",
   "dependencies": {
     "@clack/prompts": "^1.4.0",