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

package/command-line.json

@@ -106,6 +106,22 @@
       "associatedCommands": ["pub"],
       "required": false
     },
+    {
+      "parameterKind": "string",
+      "longName": "--branch-prefix",
+      "description": "Git branch name prefix (default: 'release')",
+      "argumentName": "BRANCH_PREFIX",
+      "associatedCommands": ["pub"],
+      "required": false
+    },
+    {
+      "parameterKind": "flag",
+      "longName": "--release",
+      "shortName": "-l",
+      "description": "Directly publish packages (only for alpha/beta versions)",
+      "associatedCommands": ["pub"],
+      "required": false
+    },
     {
       "parameterKind": "flag",
       "longName": "--amend-commit",
@@ -141,8 +157,16 @@
       "argumentName": "REGISTRY",
       "longName": "--registry",
       "shortName": "-r",
-      "description": "Registry",
-      "associatedCommands": ["release"]
+      "description": "NPM registry URL (default: https://registry.npmjs.org)",
+      "associatedCommands": ["release", "pub"]
+    },
+    {
+      "parameterKind": "stringList",
+      "argumentName": "ALLOW_BRANCHES",
+      "longName": "--allow-branches",
+      "description": "Branches allowed for LATEST release (default: main, feat/auto-publish)",
+      "associatedCommands": ["release"],
+      "required": false
     }
   ]
 }

package/lib/action/publish/confirm.d.ts

@@ -1,2 +1,6 @@
 import { type PublishManifest } from './types';
-export declare const confirmForPublish: (publishManifest: PublishManifest[], dryRun: boolean) => Promise<boolean>;
+export interface ConfirmForPublishOptions {
+    isReleaseMode?: boolean;
+    registry?: string;
+}
+export declare const confirmForPublish: (publishManifest: PublishManifest[], dryRun: boolean, options?: ConfirmForPublishOptions) => Promise<boolean>;

package/lib/action/publish/git.d.ts

@@ -1,14 +1,10 @@
-import { type PublishManifest } from './types';
 export declare function createAndPushBranch(branchName: string, cwd: string): Promise<void>;
 interface CommitChangesOptions {
-    sessionId: string;
     files: string[];
     cwd: string;
-    publishManifests: PublishManifest[];
     branchName: string;
-    createTags: boolean;
 }
-export declare function commitChanges({ sessionId, files, cwd, publishManifests, branchName, createTags, }: CommitChangesOptions): Promise<{
+export declare function commitChanges({ files, cwd, branchName, }: CommitChangesOptions): Promise<{
     effects: string[];
     branchName: string;
 }>;

package/lib/action/publish/push-to-remote.d.ts

@@ -8,6 +8,7 @@ interface PushToRemoteOptions {
     skipCommit: boolean;
     skipPush: boolean;
     repoUrl: string;
+    branchPrefix?: string;
 }
 export declare const pushToRemote: (options: PushToRemoteOptions) => Promise<void>;
 export {};

package/lib/action/publish/types.d.ts

@@ -16,6 +16,9 @@ export interface PublishOptions {
     skipCommit?: boolean;
     skipPush?: boolean;
     repoUrl: string;
+    branchPrefix?: string;
+    release?: boolean;
+    registry?: string;
 }
 export interface PublishManifest {
     project: RushConfigurationProject;

package/lib/action/release/plan.d.ts

@@ -5,4 +5,4 @@ export declare enum ReleaseType {
     LATEST = "latest"
 }
 export declare const calReleaseType: (version: string) => ReleaseType;
-export declare const checkReleasePlan: (releaseManifests: ReleaseManifest[], branchName: string) => boolean;
+export declare const checkReleasePlan: (releaseManifests: ReleaseManifest[], branchName: string, allowBranches?: string[]) => boolean;

package/lib/action/release/types.d.ts

@@ -1,8 +1,10 @@
 import { type RushConfigurationProject } from '@rushstack/rush-sdk';
 export interface ReleaseOptions {
-    commit: string;
+    commit?: string;
     dryRun?: boolean;
     registry: string;
+    packages?: PackageToPublish[];
+    allowBranches?: string[];
 }
 export interface PackageToPublish {
     packageName: string;

package/lib/const/index.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 默认的 NPM registry 地址
+ */
+export declare const DEFAULT_NPM_REGISTRY = "https://registry.npmjs.org";
+/**
+ * 默认的 Git 分支名前缀
+ */
+export declare const DEFAULT_BRANCH_PREFIX = "bump";
+/**
+ * 默认允许发布正式版本的分支列表
+ */
+export declare const DEFAULT_ALLOW_BRANCHES: string[];

package/lib/index.js

@@ -148,6 +148,24 @@ const logger = {
 //  Copyright (c) 2025 coze-dev
 //  SPDX-License-Identifier: MIT
 
+/**
+ * 默认的 NPM registry 地址
+ */
+const DEFAULT_NPM_REGISTRY = 'https://registry.npmjs.org';
+
+/**
+ * 默认的 Git 分支名前缀
+ */
+const DEFAULT_BRANCH_PREFIX = 'bump';
+
+/**
+ * 默认允许发布正式版本的分支列表
+ */
+const DEFAULT_ALLOW_BRANCHES = ['main', 'feat/auto-publish'];
+
+//  Copyright (c) 2025 coze-dev
+//  SPDX-License-Identifier: MIT
+
 
 
 
@@ -214,6 +232,15 @@ const getCurrentBranchName = async () => {
   return stdout.trim();
 };
 
+/**
+ * 获取当前 commit hash
+ * @returns commit hash
+ */
+const getCurrentCommitHash = async () => {
+  const { stdout } = await exec('git rev-parse HEAD');
+  return stdout.trim();
+};
+
 const isMainBranch = async () => {
   const currentBranchName = await getCurrentBranchName();
   return currentBranchName === 'main';
@@ -369,7 +396,12 @@ const publishPackage = async (
     : version.includes('beta')
       ? 'beta'
       : 'latest';
-  const args = [`NPM_AUTH_TOKEN=${token}`, 'npm', 'publish', `--tag ${tag}`];
+  const setToken = `npm config set //bnpm.byted.org/:_authToken ${token}`;
+  await exec(setToken, {
+    cwd: project.projectFolder,
+  });
+
+  const args = [`NODE_AUTH_TOKEN=${token}`, 'npm', 'publish', `--tag ${tag}`];
   if (dryRun) {
     args.push('--dry-run');
   }
@@ -444,13 +476,16 @@ const calReleasePlan = (releaseManifests) => {
 const checkReleasePlan = (
   releaseManifests,
   branchName,
+  allowBranches = ['main', 'feat/auto-publish'],
 ) => {
   const releasePlan = calReleasePlan(releaseManifests);
   if (
     releasePlan === ReleaseType.LATEST &&
-    !['main', 'feat/auto-publish'].includes(branchName)
+    !allowBranches.includes(branchName)
   ) {
-    throw new Error('For LATEST release, should be on main branch only.');
+    throw new Error(
+      `For LATEST release, should be on one of these branches: ${allowBranches.join(', ')}.`,
+    );
   }
   return true;
 };
@@ -519,10 +554,32 @@ const getPackagesToPublish = async (
 
 
 async function release(options) {
-  const { commit, dryRun = false, registry } = options;
+  const {
+    dryRun = false,
+    registry,
+    packages,
+    allowBranches = DEFAULT_ALLOW_BRANCHES,
+  } = options;
+  let { commit } = options;
+  const hasPassedCommit = !!options.commit;
 
   // 1. 获取需要发布的包列表
-  const packagesToPublish = await getPackagesToPublish(commit);
+  let packagesToPublish;
+  if (packages) {
+    // 直接使用传入的包列表
+    packagesToPublish = packages;
+    logger.info('Using provided package list');
+  } else {
+    // 从 git tags 获取包列表
+    if (!hasPassedCommit) {
+      commit = await getCurrentCommitHash();
+      logger.info('Using current commit');
+    }
+    // 此时 commit 必定有值（要么传入了，要么刚获取了）
+    const commitHash = commit ;
+    packagesToPublish = await getPackagesToPublish(commitHash);
+  }
+
   if (packagesToPublish.length === 0) {
     logger.warn('No packages to publish');
     return;
@@ -538,8 +595,16 @@ async function release(options) {
     false,
   );
   const branchName = await getCurrentBranchName();
-  checkReleasePlan(releaseManifests, branchName);
-  await exec(`git checkout ${commit}`);
+  checkReleasePlan(releaseManifests, branchName, allowBranches);
+
+  // 只有在指定了 commit 且与当前 HEAD 不同时才切换
+  if (hasPassedCommit) {
+    const currentHead = await getCurrentCommitHash();
+    if (currentHead !== commit) {
+      logger.info(`Checking out commit: ${commit}`);
+      await exec(`git checkout ${commit}`);
+    }
+  }
 
   await releasePackages(releaseManifests, { dryRun, registry });
   logger.success('All packages published successfully!');
@@ -555,18 +620,19 @@ const installAction$2 = (program) => {
   program
     .command('release')
     .description('Release packages based on git tags.')
-    .requiredOption('--commit <string>', '需要执行发布的 commit id')
+    .option('--commit <string>', '需要执行发布的 commit id (默认使用当前 HEAD)')
     .option('--dry-run', '是否只执行不真实发布', false)
     .option(
       '-r, --registry <string>',
-      '发布到的 registry',
-      'https://registry.npmjs.org',
+      `发布到的 registry (默认: ${DEFAULT_NPM_REGISTRY})`,
+      DEFAULT_NPM_REGISTRY,
+    )
+    .option(
+      '--allow-branches <branches...>',
+      `允许发布正式版本的分支列表 (默认: ${DEFAULT_ALLOW_BRANCHES.join(', ')})`,
     )
     .action(async (options) => {
       try {
-        if (!options.commit) {
-          throw new Error('请提供需要发布的 commit id');
-        }
         if (!process.env.NPM_AUTH_TOKEN) {
           throw new Error('请设置 NPM_AUTH_TOKEN 环境变量');
         }
@@ -805,31 +871,15 @@ const generatePublishManifest = async (
 
 
 
-
-
-
 async function commitChanges({
-  sessionId,
   files,
   cwd,
-  publishManifests,
   branchName,
-  createTags,
 }) {
   await exec(`git add ${files.join(' ')}`, { cwd });
   await exec(`git commit -m "chore: Publish ${branchName}" -n`, { cwd });
 
-  let tags = [];
-  if (createTags) {
-    tags = publishManifests.map(
-      m => `v/${m.project.packageName}@${m.newVersion}`,
-    );
-    await exec(
-      tags.map(tag => `git tag -a ${tag} -m "Bump type ${tag}"`).join(' && '),
-      { cwd },
-    );
-  }
-  return { effects: [...tags, branchName], branchName };
+  return { effects: [branchName], branchName };
 }
 
 
@@ -859,16 +909,17 @@ async function push({ refs, cwd, repoUrl }) {
 
 
 
+
 const pushToRemote = async (options) => {
   const {
     sessionId,
     changedFiles,
     cwd,
-    publishManifests,
     bumpPolicy,
     skipCommit,
     skipPush,
     repoUrl,
+    branchPrefix = 'release',
   } = options;
   if (skipCommit) {
     return;
@@ -882,7 +933,7 @@ const pushToRemote = async (options) => {
     branchName = await getCurrentBranchName();
   } else {
     const date = dayjs().format('YYYYMMDD');
-    branchName = `release/${date}-${sessionId}`;
+    branchName = `${branchPrefix}/${date}-${sessionId}`;
     await exec(`git checkout -b ${branchName}`, { cwd });
   }
   const isTestPublish = [BumpType.ALPHA, BumpType.BETA].includes(
@@ -891,13 +942,9 @@ const pushToRemote = async (options) => {
 
   // 4. 创建并推送发布分支
   const { effects } = await commitChanges({
-    sessionId,
     files: changedFiles,
     cwd,
-    publishManifests,
     branchName,
-    // 只有 alpha、beta 需要创建 tag，正式发布会在 .github/workflows/common-pr-checks.yml 创建并发布tag
-    createTags: isTestPublish,
   });
   if (skipPush) {
     return;
@@ -1034,7 +1081,7 @@ const lookupOnly = (packageName) => {
   return projects[0];
 };
 
-function _optionalChain$1(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+function _optionalChain$2(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
 
@@ -1088,7 +1135,7 @@ const retrievePackages = (
 
 const validateAndGetPackages = (options) => {
   const retrievePatterns = Object.values(RetrievePattern);
-  if (retrievePatterns.every(pattern => (_optionalChain$1([options, 'access', _ => _[pattern], 'optionalAccess', _2 => _2.length]) || 0) <= 0)) {
+  if (retrievePatterns.every(pattern => (_optionalChain$2([options, 'access', _ => _[pattern], 'optionalAccess', _2 => _2.length]) || 0) <= 0)) {
     throw new Error('No packages to publish');
   }
   const res = retrievePatterns.reduce((acc, pattern) => {
@@ -1114,8 +1161,11 @@ const validateAndGetPackages = (options) => {
   return result;
 };
 
-//  Copyright (c) 2025 coze-dev
-//  SPDX-License-Identifier: MIT
+function _optionalChain$1(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }//  Copyright (c) 2025 coze-dev
+
+
+
+
 
 
 
@@ -1123,20 +1173,33 @@ const validateAndGetPackages = (options) => {
 const confirmForPublish = async (
   publishManifest,
   dryRun,
+  options,
 ) => {
-  console.log(chalk.gray('Will publish the following packages:'));
+  logger.info(chalk.gray('Will publish the following packages:'), false);
   publishManifest.forEach(manifest => {
-    const msg = `${manifest.project.packageName}: ${chalk.bgGreen(`${manifest.currentVersion} -> ${chalk.bold(manifest.newVersion)}`)}`;
-    console.log(`- ${msg}`);
+    const versionChange = `${manifest.currentVersion} -> ${chalk.bold(manifest.newVersion)}`;
+    const msg = `${manifest.project.packageName}: ${chalk.bgGreen(versionChange)}`;
+    logger.info(`- ${msg}`, false);
   });
+
+  // Release 模式的额外提示
+  if (_optionalChain$1([options, 'optionalAccess', _ => _.isReleaseMode])) {
+    logger.info('', false);
+    logger.warn(chalk.yellow.bold('⚠️  Release Mode Enabled:'), false);
+    const registryMsg = `   Packages will be published directly to: ${chalk.bold(options.registry || 'default registry')}`;
+    logger.warn(chalk.yellow(registryMsg), false);
+  }
+
   if (dryRun) {
     return false;
   }
 
-  console.log('\n');
+  logger.info('', false);
   try {
     const result = await prompts.confirm({
-      message: 'Are you sure to publish?',
+      message: _optionalChain$1([options, 'optionalAccess', _2 => _2.isReleaseMode])
+        ? 'Are you sure to publish directly?'
+        : 'Are you sure to publish?',
       default: true,
     });
     return result;
@@ -1500,7 +1563,10 @@ const publish = async (options) => {
   const sessionId = randomHash(6);
   const rushConfiguration = getRushConfiguration$1();
   const rushFolder = rushConfiguration.rushJsonFolder;
-  if (process.env.SKIP_UNCOMMITTED_CHECK !== 'true') {
+  if (
+    process.env.SKIP_UNCOMMITTED_CHECK !== 'true' &&
+    options.release !== true
+  ) {
     await ensureNotUncommittedChanges();
   }
 
@@ -1536,6 +1602,10 @@ const publish = async (options) => {
   const continuePublish = await confirmForPublish(
     publishManifests,
     !!options.dryRun,
+    {
+      isReleaseMode: !!options.release,
+      registry: options.registry || DEFAULT_NPM_REGISTRY,
+    },
   );
 
   if (!continuePublish) {
@@ -1551,17 +1621,46 @@ const publish = async (options) => {
     await Promise.all(postHandles.map(handle => handle(publishManifests)))
   ).flat();
 
-  // 4. 创建并推送发布分支
-  await pushToRemote({
-    publishManifests,
-    bumpPolicy: bumpPolicy ,
-    sessionId,
-    changedFiles,
-    cwd: rushFolder,
-    skipCommit: !!options.skipCommit,
-    skipPush: !!options.skipPush,
-    repoUrl: options.repoUrl,
-  });
+  // 4. 创建并推送发布分支 或 直接发布
+  let shouldRelease = false;
+  if (options.release) {
+    // 验证 release 模式的前置条件
+    if (isBetaPublish === false) {
+      logger.error(
+        'Direct release (--release) is only allowed for alpha or beta versions.',
+      );
+      logger.error(`Current bump type is: ${bumpPolicy}`);
+      logger.warn('Falling back to normal publish mode...');
+    } else {
+      shouldRelease = true;
+    }
+  }
+
+  if (shouldRelease) {
+    // Release 模式：直接发布
+    logger.info('Running in direct release mode...');
+    logger.info('Starting package release...');
+    const registry = options.registry || DEFAULT_NPM_REGISTRY;
+    // 将 PublishManifest[] 转换为 PackageToPublish[]
+    const packages = publishManifests.map(manifest => ({
+      packageName: manifest.project.packageName,
+      version: manifest.newVersion,
+    }));
+    await release({ dryRun: !!options.dryRun, registry, packages });
+  } else {
+    // 普通模式：创建并推送发布分支
+    await pushToRemote({
+      bumpPolicy: bumpPolicy ,
+      sessionId,
+      changedFiles,
+      cwd: rushFolder,
+      skipCommit: !!options.skipCommit,
+      skipPush: !!options.skipPush,
+      repoUrl: options.repoUrl,
+      branchPrefix: options.branchPrefix,
+    });
+  }
+
   logger.success('Publish success.');
 };
 
@@ -1592,6 +1691,21 @@ const installAction$1 = (program) => {
       'Git repository URL (e.g. git@github.com:coze-dev/coze-js.git)',
       undefined,
     )
+    .option(
+      '--branch-prefix <prefix>',
+      `Git branch name prefix (default: ${DEFAULT_BRANCH_PREFIX})`,
+      DEFAULT_BRANCH_PREFIX,
+    )
+    .option(
+      '-l, --release',
+      'Directly publish packages (only for alpha/beta versions)',
+      false,
+    )
+    .option(
+      '--registry <url>',
+      `NPM registry URL (default: ${DEFAULT_NPM_REGISTRY})`,
+      DEFAULT_NPM_REGISTRY,
+    )
     .action(async (options) => {
       try {
         const repoUrl = options.repoUrl || (await getCurrentOrigin());
@@ -1599,8 +1713,9 @@ const installAction$1 = (program) => {
           throw new Error('Git repository URL is required');
         }
         if (!GIT_REPO_URL_REGEX.test(repoUrl)) {
+          const expectedFormat = 'git@github.com:${org}/${repo}.git';
           throw new Error(
-            `Invalid git repository URL: ${repoUrl}, it should be follow the format: git@github.com:\${org}/\${repo}.git`,
+            `Invalid git repository URL: ${repoUrl}, it should follow the format: ${expectedFormat}`,
           );
         }
         const normalizeOptions = {

package/lib/utils/get-plugin-config.d.ts

@@ -0,0 +1,8 @@
+export interface IPublishPluginConfig {
+    branchPrefix?: string;
+}
+/**
+ * Read plugin configuration from common/config/rush-plugins/@coze-arch/rush-publish-plugin.json
+ * @returns Plugin configuration object
+ */
+export declare function getPluginConfig(): IPublishPluginConfig;

package/lib/utils/git.d.ts

@@ -4,6 +4,11 @@ export declare const getChangedFilesFromCached: () => Promise<string[]>;
  * @returns string
  */
 export declare const getCurrentBranchName: () => Promise<string>;
+/**
+ * 获取当前 commit hash
+ * @returns commit hash
+ */
+export declare const getCurrentCommitHash: () => Promise<string>;
 export declare const isMainBranch: () => Promise<boolean>;
 export declare const getChangedFiles: () => Promise<string[]>;
 /**

package/package.json

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