@coze-arch/rush-publish-plugin 0.0.5-alpha.8b5f6f → 0.0.5-alpha.a5f14f

package/lib/index.js

@@ -282,6 +282,84 @@ const getCurrentOrigin = async (
   }
 };
 
+/**
+ * 解析 Git 远程仓库 URL，提取主机和仓库路径
+ * 支持 HTTP/HTTPS 和 SSH 格式
+ * @param gitUrl Git 仓库 URL
+ * @returns 包含主机和仓库路径的对象，解析失败返回 null
+ */
+const parseGitRemoteUrl = (
+  gitUrl,
+) => {
+  if (!gitUrl) {
+    return null;
+  }
+
+  const trimmedUrl = gitUrl.trim().replace(/\.git$/, '');
+
+  // 匹配 SSH 格式: git@github.com:owner/repo.git
+  const sshMatch = trimmedUrl.match(/^git@([^:]+):(.+)$/);
+  if (sshMatch) {
+    const host = sshMatch[1];
+    const path = sshMatch[2];
+    return {
+      host,
+      path,
+      fullUrl: `https://${host}/${path}`,
+    };
+  }
+
+  // 匹配 HTTP/HTTPS 格式: https://github.com/owner/repo.git
+  const httpMatch = trimmedUrl.match(/^https?:\/\/([^/]+)\/(.+)$/);
+  if (httpMatch) {
+    const host = httpMatch[1];
+    const path = httpMatch[2];
+    return {
+      host,
+      path,
+      fullUrl: `https://${host}/${path}`,
+    };
+  }
+
+  return null;
+};
+
+/**
+ * 根据仓库信息构建 MR/PR 创建链接
+ * @param repoInfo 仓库信息
+ * @param branchName 分支名称
+ * @returns MR/PR 创建链接，如果无法构建则返回 null
+ */
+const buildMergeRequestUrl = (
+  repoInfo,
+  branchName,
+) => {
+  const { host, fullUrl } = repoInfo;
+
+  // GitHub
+  if (host.includes('github.com')) {
+    return `${fullUrl}/compare/${branchName}?expand=1`;
+  }
+
+  // GitLab
+  if (host.includes('gitlab')) {
+    return `${fullUrl}/-/merge_requests/new?merge_request[source_branch]=${branchName}`;
+  }
+
+  // Gitee
+  if (host.includes('gitee.com')) {
+    return `${fullUrl}/compare/${branchName}...master`;
+  }
+
+  // Bitbucket
+  if (host.includes('bitbucket')) {
+    return `${fullUrl}/pull-requests/new?source=${branchName}`;
+  }
+
+  // 无法识别的平台
+  return null;
+};
+
 //  Copyright (c) 2025 coze-dev
 //  SPDX-License-Identifier: MIT
 
@@ -323,8 +401,7 @@ const getRushConfiguration$1 = (() => {
   };
 })();
 
-//  Copyright (c) 2025 coze-dev
-//  SPDX-License-Identifier: MIT
+function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }//  Copyright (c) 2025 coze-dev
 
 
 
@@ -355,14 +432,21 @@ const updateDependencyVersions = async (
   return Promise.resolve(packageJson);
 };
 
-const applyCozePublishConfig = async (
+/**
+ * 应用发布配置
+ * 优先使用 botPublishConfig，如果不存在则使用 cozePublishConfig
+ */
+const applyPublishConfigSettings = async (
   packageJson,
 ) => {
-  const { cozePublishConfig } = packageJson;
-  if (cozePublishConfig) {
-    const keys = Object.keys(cozePublishConfig);
+  // 优先使用 botPublishConfig，如果不存在则回退到 cozePublishConfig
+  const publishConfig =
+    _nullishCoalesce(packageJson.botPublishConfig, () => ( packageJson.cozePublishConfig));
+
+  if (publishConfig) {
+    const keys = Object.keys(publishConfig);
     for (const key of keys) {
-      packageJson[key] = cozePublishConfig[key];
+      packageJson[key] = publishConfig[key];
     }
   }
   return Promise.resolve(packageJson);
@@ -371,7 +455,7 @@ const applyCozePublishConfig = async (
 const applyPublishConfig = async (project) => {
   const jobs = [
     updateDependencyVersions,
-    applyCozePublishConfig,
+    applyPublishConfigSettings,
   ];
   const packageJsonPath = path.join(project.projectFolder, 'package.json');
   let packageJson = await readJsonFile(packageJsonPath);
@@ -484,7 +568,7 @@ const checkReleasePlan = (
     !allowBranches.includes(branchName)
   ) {
     throw new Error(
-      `For LATEST release, should be on one of these branches: ${allowBranches.join(', ')}.`,
+      `For LATEST release, should be on one of these branches: ${allowBranches.join(', ')}. Current Branch: ${branchName}`,
     );
   }
   return true;
@@ -910,6 +994,144 @@ async function push({ refs, cwd, repoUrl }) {
 
 
 
+/**
+ * 获取或创建发布分支
+ */
+const getOrCreateBranch = async (params
+
+
+
+
+) => {
+  const { bumpPolicy, sessionId, branchPrefix, cwd } = params;
+
+  if (bumpPolicy === BumpType.BETA) {
+    return await getCurrentBranchName();
+  }
+
+  const date = dayjs().format('YYYYMMDD');
+  const branchName = `${branchPrefix}/${date}-${sessionId}`;
+  await exec(`git checkout -b ${branchName}`, { cwd });
+  return branchName;
+};
+
+/**
+ * 处理 Beta 发布流程：询问并执行 git push
+ */
+const handleBetaPublish = async (
+  branchName,
+  cwd,
+) => {
+  logger.success(`Changes have been committed to branch "${branchName}".`);
+
+  const shouldPush = await prompts.confirm({
+    message: 'Do you want to push the changes now?',
+    default: true,
+  });
+
+  if (shouldPush) {
+    logger.info('Pushing changes to remote...');
+    await exec('git push', { cwd });
+    logger.success('Changes pushed successfully!');
+  } else {
+    logger.info('Please run "git push" manually when you are ready.');
+  }
+};
+
+/**
+ * 显示手动创建 MR 的提示消息
+ */
+const showManualMrMessage = (
+  branchName,
+  repositoryUrl,
+) => {
+  const baseMessage = `Please create a merge request from branch "${branchName}" to the main branch`;
+  const suffix =
+    'The release will be triggered after the merge request is merged.';
+
+  if (repositoryUrl) {
+    logger.success(
+      `Repository: ${repositoryUrl}\n${baseMessage}.\n${suffix}`,
+      false,
+    );
+  } else {
+    logger.success(`${baseMessage} in your repository.\n${suffix}`);
+  }
+};
+
+/**
+ * 显示 MR/PR 创建链接并打开浏览器
+ */
+const showMrLinkAndOpenBrowser = async (mrUrl) => {
+  const log = [
+    '************************************************',
+    '*',
+    `* Please create MR/PR: ${mrUrl}`,
+    '*',
+    '* The release will be triggered after the MR is merged.',
+    '*',
+    '************************************************',
+  ];
+  logger.success(log.join('\n'), false);
+
+  const open = await import('open');
+  await open.default(mrUrl);
+};
+
+/**
+ * 处理正式版本发布流程：提示创建 MR/PR
+ */
+const handleProductionPublish = async (
+  branchName,
+  cwd,
+) => {
+  const originUrl = await getCurrentOrigin(cwd);
+  if (!originUrl) {
+    showManualMrMessage(branchName);
+    return;
+  }
+
+  const repoInfo = parseGitRemoteUrl(originUrl);
+  if (!repoInfo) {
+    showManualMrMessage(branchName);
+    return;
+  }
+
+  const mrUrl = buildMergeRequestUrl(repoInfo, branchName);
+  if (!mrUrl) {
+    showManualMrMessage(branchName, repoInfo.fullUrl);
+    return;
+  }
+
+  await showMrLinkAndOpenBrowser(mrUrl);
+};
+
+/**
+ * 根据发布类型处理后续提示
+ */
+const handlePostPushPrompts = async (
+  bumpPolicy,
+  branchName,
+  cwd,
+) => {
+  const isAlphaPublish = bumpPolicy === BumpType.ALPHA;
+  const isBetaPublish = bumpPolicy === BumpType.BETA;
+
+  // Alpha 发布：不需要提示（会自动触发 CI 发布）
+  if (isAlphaPublish) {
+    return;
+  }
+
+  // Beta 发布：询问用户是否立即执行 git push
+  if (isBetaPublish) {
+    await handleBetaPublish(branchName, cwd);
+    return;
+  }
+
+  // 正式版本发布：提示创建 MR/PR
+  await handleProductionPublish(branchName, cwd);
+};
+
 const pushToRemote = async (options) => {
   const {
     sessionId,
@@ -921,65 +1143,39 @@ const pushToRemote = async (options) => {
     repoUrl,
     branchPrefix = 'release',
   } = options;
+
   if (skipCommit) {
     return;
   }
 
-  // 获取仓库 URL
-  const actualRepoUrl = repoUrl;
-
-  let branchName;
-  if (bumpPolicy === BumpType.BETA) {
-    branchName = await getCurrentBranchName();
-  } else {
-    const date = dayjs().format('YYYYMMDD');
-    branchName = `${branchPrefix}/${date}-${sessionId}`;
-    await exec(`git checkout -b ${branchName}`, { cwd });
-  }
-  const isTestPublish = [BumpType.ALPHA, BumpType.BETA].includes(
-    bumpPolicy ,
-  );
+  // 1. 获取或创建发布分支
+  const branchName = await getOrCreateBranch({
+    bumpPolicy,
+    sessionId,
+    branchPrefix,
+    cwd,
+  });
 
-  // 4. 创建并推送发布分支
+  // 2. 提交变更
   const { effects } = await commitChanges({
     files: changedFiles,
     cwd,
     branchName,
   });
+
   if (skipPush) {
     return;
   }
+
+  // 3. 推送变更
   await push({
     refs: effects,
     cwd,
-    repoUrl: actualRepoUrl,
+    repoUrl,
   });
 
-  // 从 git URL 提取组织和仓库名称，用于构建 GitHub 链接
-  const repoInfoMatch = actualRepoUrl.match(GIT_REPO_URL_REGEX);
-  if (!repoInfoMatch) {
-    throw new Error('Invalid git repository URL');
-  }
-  const repoOwner = repoInfoMatch[1];
-  const repoName = repoInfoMatch[2];
-
-  if (isTestPublish) {
-    logger.success(
-      `Please refer to https://github.com/${repoOwner}/${repoName}/actions/workflows/release.yml for the release progress.`,
-    );
-  } else {
-    const prUrl = `https://github.com/${repoOwner}/${repoName}/compare/${branchName}?expand=1`;
-    const log = [
-      '************************************************',
-      '*',
-      `* Please create PR: ${prUrl}`,
-      '*',
-      '************************************************',
-    ];
-    logger.success(log.join('\n'), false);
-    const open = await import('open');
-    await open.default(prUrl);
-  }
+  // 4. 根据发布类型显示不同提示
+  await handlePostPushPrompts(bumpPolicy, branchName, cwd);
 };
 
 //  Copyright (c) 2025 coze-dev
@@ -1591,7 +1787,11 @@ const publish = async (options) => {
   const isBetaPublish = [BumpType.BETA, BumpType.ALPHA].includes(
     bumpPolicy ,
   );
-  if (isBetaPublish === false && (await isMainBranch()) === false) {
+  if (
+    process.env.SKIP_BRANCH_CHECK !== 'true' &&
+    isBetaPublish === false &&
+    (await isMainBranch()) === false
+  ) {
     // 只允许在主分支发布
     logger.error(
       'You are not in main branch, please switch to main branch and try again.',

package/lib/utils/git.d.ts

@@ -22,3 +22,25 @@ export declare const ensureNotUncommittedChanges: () => Promise<boolean>;
  */
 export declare const getCurrentOrigin: (cwd?: string) => Promise<string | undefined>;
 export declare const convertGitSchemaToHttp: (gitUrl: string) => string;
+/**
+ * 解析 Git 远程仓库 URL，提取主机和仓库路径
+ * 支持 HTTP/HTTPS 和 SSH 格式
+ * @param gitUrl Git 仓库 URL
+ * @returns 包含主机和仓库路径的对象，解析失败返回 null
+ */
+export declare const parseGitRemoteUrl: (gitUrl: string) => {
+    host: string;
+    path: string;
+    fullUrl: string;
+} | null;
+/**
+ * 根据仓库信息构建 MR/PR 创建链接
+ * @param repoInfo 仓库信息
+ * @param branchName 分支名称
+ * @returns MR/PR 创建链接，如果无法构建则返回 null
+ */
+export declare const buildMergeRequestUrl: (repoInfo: {
+    host: string;
+    path: string;
+    fullUrl: string;
+}, branchName: string) => string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/rush-publish-plugin",
-  "version": "0.0.5-alpha.8b5f6f",
+  "version": "0.0.5-alpha.a5f14f",
   "description": "rush plugin to generate change log and publish packages",
   "keywords": [
     "rush",