@infly/libs 2.0.26 → 2.0.37

package/script/git-automation/index.js

@@ -1,6 +1,10 @@
 const fs = require("fs");
 const path = require("path");
-const { execSync } = require("child_process");
+const crypto = require("crypto");
+const { execSync, exec } = require("child_process");
+const { promisify } = require("util");
+const { getGitCommonDir } = require("./git-utils");
+const execAsync = promisify(exec);
 
 /**
  * 获取当前 Git 分支名称
@@ -84,7 +88,10 @@ function getLastCommitByFile(filePath) {
  * @param {String} gitStatusLine 带文件状态的
  * @returns
  */
-function isBuildFile(targetProjectOutputDir = "", gitLine = "", sliceLen = -2) {
+function isBuildFile(targetProjectOutputDir = "", gitLine = "", sliceLen = -1) {
+  if (!targetProjectOutputDir) {
+    return true;
+  }
   // 统一路径分隔符
   targetProjectOutputDir = targetProjectOutputDir.replace(/\\/g, "/");
 
@@ -114,30 +121,36 @@ function checkGitStatus(excludeDir, extraFilter, extraParams) {
     onlyCheckStatus,
     startLogText = "Git自动提交开始执行, 正在检查非构建文件"
   } = extraParams || {};
+
+  // 如果指定了构建输出目录但目录不存在，则自动创建并初始化 Git 仓库
+  if (targetProjectOutputDir && !fs.existsSync(targetProjectOutputDir)) {
+    console.log(global.logColor.warning, `⚠️  构建目录不存在，正在自动创建：${targetProjectOutputDir}`);
+    fs.mkdirSync(targetProjectOutputDir, { recursive: true });
+    console.log(global.logColor.success, `✅ 构建目录已创建并初始化 Git 仓库：${targetProjectOutputDir}`);
+  }
+
   try {
     // 获取所有未跟踪和已修改的文件列表
     const files = execSync(`git${targetProjectOutputDirCmd} status --porcelain -z`, { encoding: "utf8" })
       .toString()
       .split("\u0000")
-      .filter((line) => line.trim());
-    // .map((line) => line.substring(3).trim()); // 提取文件路径
+      .filter((file) => file.trim() && isBuildFile(targetProjectOutputDir, file));
     const excludeFiles = []; // 非指定构建相关文件
     const includeFiles = []; // 指定的构建相关文件
 
-    if (onlyCheckStatus) {
+    if (onlyCheckStatus || targetProjectOutputDirCmd) {
       return files || [];
     }
 
     console.log(global.logColor.success, `🚀 ${startLogText}`);
 
+    // 进行当前项目文件检查，如果有其它非配置文件则取消自动提交改为用户手动确认
     files.forEach((file) => {
       const existsDelFile = deleteOldFile.find((item) => file.includes(item));
       if (
         file.includes(`${excludeDir}/`) ||
         file.includes(versionFileName) ||
         file.includes(extraFilter) ||
-        isBuildFile(targetProjectOutputDir, file) ||
-        file.includes(`${gitAutoPushRepos}/`) || // 放宽文件判断条件，因为可能存在同时构建frontend/ea、frontend/e的情况
         existsDelFile
       ) {
         includeFiles.push(file);
@@ -149,6 +162,8 @@ function checkGitStatus(excludeDir, extraFilter, extraParams) {
     if (excludeFiles.length > 0) {
       throw new Error(`存在非构建文件未提交，请手动确定提交信息，本次自动提交终止\n${excludeFiles.join("\n")}`);
     }
+
+    return includeFiles || [];
   } catch (err) {
     console.error(global.logColor.error, `❌ 自动化构建Git状态检查存在问题：${err.message}`);
     process.exit(1);
@@ -170,6 +185,56 @@ function runGitCommand(command, options = {}) {
   }
 }
 
+function hasStagedChanges(targetProjectOutputDirCmd = "") {
+  try {
+    execSync(`git${targetProjectOutputDirCmd} diff --cached --quiet`, {
+      stdio: "ignore"
+    });
+    return false;
+  } catch (error) {
+    return error.status === 1;
+  }
+}
+
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function withGitRepoLock(lockDir, lockKey, task) {
+  if (!lockDir || !lockKey) {
+    return task();
+  }
+
+  fs.mkdirSync(lockDir, { recursive: true });
+  const lockName = crypto.createHash("md5").update(lockKey).digest("hex");
+  const lockPath = path.join(lockDir, `${lockName}.lock`);
+  const startTime = Date.now();
+  const timeout = 10 * 60 * 1000;
+
+  while (true) {
+    try {
+      fs.mkdirSync(lockPath);
+      break;
+    } catch (error) {
+      if (error.code !== "EEXIST") {
+        throw error;
+      }
+
+      if (Date.now() - startTime > timeout) {
+        throw new Error(`等待 Git 仓库锁超时: ${lockKey}`);
+      }
+
+      sleepSync(500);
+    }
+  }
+
+  try {
+    return task();
+  } finally {
+    fs.rmSync(lockPath, { recursive: true, force: true });
+  }
+}
+
 /**
  * git自动推送
  * @param {String} buildFoldName 构建文件名称
@@ -187,7 +252,24 @@ function autoGitProcess(buildFoldName, newFileName, extraParams = {}) {
     gitAutoPushReposBranchMap = {},
     targetProjectOutputDirCmd = gitAutoPushRepos ? ` -C ${targetProjectOutputDir}` : "",
     projectName,
+    gitLockDir,
+    gitProcessOrder
   } = extraParams || {};
+  const appFirst = gitAutoPushRepos && gitProcessOrder === "app-first";
+  const runAppGitProcess = () => {
+    const overrideParams = {
+      ...extraParams,
+      targetProjectOutputDir: "",
+      targetProjectOutputDirCmd: "",
+      gitAutoPushRepos: false
+    };
+    autoGitProcess(buildFoldName, newFileName, overrideParams);
+  };
+
+  if (appFirst) {
+    runAppGitProcess();
+  }
+
   const { commitMsg, branch } = gitInfo || {};
   const gitRepos = gitAutoPushRepos ? `构建仓库: ${targetProjectOutputDir}` : `当前项目: ${projectName}`;
   let tempGitAutoCommitText = gitAutoCommitText ? gitAutoCommitText.replace("{version}", newVersion) : "";
@@ -201,32 +283,39 @@ function autoGitProcess(buildFoldName, newFileName, extraParams = {}) {
   const commitCmd = `git${targetProjectOutputDirCmd} commit -m "${tempGitAutoCommitText}"`;
   const pushCommand = `git${targetProjectOutputDirCmd} push origin ${tempBranch}`;
 
-  // 无分支则不执行，自动推送到单独仓库必须得配置分支枚举对应
-  /* "gitAutoPushReposBranchMap": {
-        "release-zkhTest": "develop-zkhTest"
-  }, */
   if (!tempBranch) {
     console.log(global.logColor.error, `❌ 缺少分支配置`);
     return;
   }
 
-  // 先执行构建仓库的推送，防止git提交信息被覆盖
-  runGitCommand(addCmd);
-  runGitCommand(commitCmd);
-  runGitCommand(pushCommand);
+  const checkCommitAndPush = () => {
+    const fileList = checkGitStatus(buildFoldName, newFileName, extraParams) || [];
 
-  // 后执行当前项目的分支自动推送
-  if (gitAutoPushRepos) {
-    const overrideParams = { ...extraParams, gitAutoPushRepos: false };
-    const fileList = checkGitStatus(buildFoldName, newFileName, { ...overrideParams, onlyCheckStatus: true });
-    if (fileList.length > 0) {
-      autoGitProcess(buildFoldName, newFileName, overrideParams); // 执行自动推送当前项目的git信息
+    if (fileList.length === 0) {
+      return;
+    }
+
+    runGitCommand(addCmd);
+    if (!hasStagedChanges(targetProjectOutputDirCmd)) {
+      console.log(global.logColor.warning, `⚠️  Git ${gitRepos} 没有可提交的变更，跳过自动提交`);
+    } else {
+      runGitCommand(commitCmd);
+      runGitCommand(pushCommand);
     }
+  };
+
+  if (gitAutoPushRepos) {
+    withGitRepoLock(gitLockDir, getGitCommonDir(targetProjectOutputDir), checkCommitAndPush);
+  } else {
+    checkCommitAndPush();
+  }
+
+  if (gitAutoPushRepos && !appFirst) {
+    runAppGitProcess();
   }
 
   console.log(global.logColor.success, `✅ Git \x1b[34m${gitRepos}\x1b[32m 自动提交和推送成功！`);
 }
-
 /**
  * 自动分支处理
  * @param {Object} config - 分支配置
@@ -240,6 +329,7 @@ async function autoBranchProcess(config) {
   const pullCmd = `git${targetProjectOutputDirCmd} pull origin ${tempBranch}`;
   const fileList = checkGitStatus(undefined, undefined, {
     onlyCheckStatus: true,
+    targetProjectOutputDir,
     targetProjectOutputDirCmd,
     startLogText: "Git自动化开始执行..."
   });
@@ -254,7 +344,7 @@ async function autoBranchProcess(config) {
   }
 
   if (fileList.length > 0) {
-    console.error(global.logColor.error, `❌ 构建仓库存在未提交文件，请检查`);
+    console.error(global.logColor.error, `❌ 构建仓库 ${targetProjectOutputDir} 存在未提交文件，请检查`);
     process.exit(1);
   }
 
@@ -267,7 +357,7 @@ async function autoBranchProcess(config) {
  * @param {string} packagesDir - packages 目录的绝对路径
  * @returns {Object} 检查结果
  */
-function checkPackagesGitStatus(packagesDir) {
+async function checkPackagesGitStatus(packagesDir) {
   const fs = require("fs");
 
   if (!fs.existsSync(packagesDir)) {
@@ -282,45 +372,42 @@ function checkPackagesGitStatus(packagesDir) {
 
   // console.log(global.logColor.info, `📦 检查 packages 下的 ${modules.length} 个模块...`);
 
-  const uncommittedModules = [];
-
-  for (const module of modules) {
-    const modulePath = path.join(packagesDir, module);
-    const gitPath = path.join(modulePath, ".git");
-
-    // 检查是否是 git 仓库
-    if (!fs.existsSync(gitPath)) {
-      console.log(global.logColor.warning, `⚠️  ${module}: 不是 git 仓库，跳过检查`);
-      continue;
-    }
+  const uncommittedModules = await Promise.all(
+    modules.map(async (module) => {
+      const modulePath = path.join(packagesDir, module);
+      const gitPath = path.join(modulePath, ".git");
 
-    try {
-      // 切换到模块目录并检查 git status
-      const statusOutput = execSync("git status --porcelain", {
-        cwd: modulePath,
-        encoding: "utf8"
-      }).trim();
+      // 检查是否是 git 仓库
+      if (!fs.existsSync(gitPath)) {
+        console.log(global.logColor.warning, `⚠️  ${module}: 不是 git 仓库，跳过检查`);
+        return null;
+      }
 
-      if (statusOutput) {
-        console.log(global.logColor.error, `❌ ${module}: 存在未提交的更改`);
-        console.log(global.logColor.error, `   ${statusOutput.split("\n").join("\n   ")}`);
-        uncommittedModules.push({
+      try {
+        // 切换到模块目录并检查 git status
+        const { stdout } = await execAsync("git status --porcelain", { cwd: modulePath });
+        const statusOutput = stdout.trim();
+
+        if (statusOutput) {
+          console.log(global.logColor.error, `❌ ${module}: 存在未提交的更改`);
+          console.log(global.logColor.error, `   ${statusOutput.split("\n").join("\n   ")}`);
+          return {
+            name: module,
+            path: modulePath,
+            changes: statusOutput.split("\n")
+          };
+        }
+        return null;
+      } catch (error) {
+        console.error(global.logColor.error, `❌ ${module}: 检查失败 - ${error.message}`);
+        return {
           name: module,
           path: modulePath,
-          changes: statusOutput.split("\n")
-        });
-      } else {
-        // console.log(global.logColor.success, `✅ ${module}: 工作区干净`);
+          error: error.message
+        };
       }
-    } catch (error) {
-      console.error(global.logColor.error, `❌ ${module}: 检查失败 - ${error.message}`);
-      uncommittedModules.push({
-        name: module,
-        path: modulePath,
-        error: error.message
-      });
-    }
-  }
+    })
+  ).then(results => results.filter(r => r !== null));
 
   return {
     hasUncommitted: uncommittedModules.length > 0,
@@ -335,7 +422,7 @@ function checkPackagesGitStatus(packagesDir) {
  * @param {string} packagesDir - packages 目录的绝对路径
  * @param {string} targetBranch - 目标分支名，默认为 'master'
  */
-function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
+async function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
   const fs = require("fs");
 
   if (!fs.existsSync(packagesDir)) {
@@ -350,53 +437,38 @@ function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
 
   // console.log(global.logColor.info, `🔄 切换 packages 下的模块到 ${targetBranch} 分支并拉取最新代码...`);
 
-  const results = [];
-
-  for (const module of modules) {
-    const modulePath = path.join(packagesDir, module);
-    const gitPath = path.join(modulePath, ".git");
-
-    // 检查是否是 git 仓库
-    if (!fs.existsSync(gitPath)) {
-      console.log(global.logColor.warning, `⚠️  ${module}: 不是 git 仓库，跳过操作`);
-      results.push({ module, success: false, reason: "不是 git 仓库" });
-      continue;
-    }
-
-    try {
-      // console.log(global.logColor.info, `🔄 处理模块: ${module}`);
-
-      // 获取当前分支
-      const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
-        cwd: modulePath,
-        encoding: "utf8"
-      }).trim();
-
-      // console.log(global.logColor.info, `   当前分支: ${currentBranch}`);
+  const results = await Promise.all(
+    modules.map(async (module) => {
+      const modulePath = path.join(packagesDir, module);
+      const gitPath = path.join(modulePath, ".git");
 
-      // 如果不在目标分支，则切换
-      if (currentBranch !== targetBranch) {
-        // console.log(global.logColor.info, `   切换到 ${targetBranch} 分支...`);
-        execSync(`git checkout ${targetBranch}`, {
-          cwd: modulePath,
-          stdio: "pipe"
-        });
+      // 检查是否是 git 仓库
+      if (!fs.existsSync(gitPath)) {
+        console.log(global.logColor.warning, `⚠️  ${module}: 不是 git 仓库，跳过操作`);
+        return { module, success: false, reason: "不是 git 仓库" };
       }
 
-      // 拉取最新代码
-      // console.log(global.logColor.info, `   拉取 ${targetBranch} 最新代码...`);
-      execSync(`git pull origin ${targetBranch}`, {
-        cwd: modulePath,
-        stdio: "pipe"
-      });
-
-      console.log(global.logColor.success, `✅ ${module}: 成功更新到最新代码`);
-      results.push({ module, success: true });
-    } catch (error) {
-      console.error(global.logColor.error, `❌ ${module}: 操作失败 - ${error.message}`);
-      results.push({ module, success: false, reason: error.message });
-    }
-  }
+      try {
+        // 获取当前分支
+        const { stdout: branchOut } = await execAsync("git rev-parse --abbrev-ref HEAD", { cwd: modulePath });
+        const currentBranch = branchOut.trim();
+
+        // 如果不在目标分支，则切换
+        if (currentBranch !== targetBranch) {
+          await execAsync(`git checkout ${targetBranch}`, { cwd: modulePath });
+        }
+
+        // 拉取最新代码
+        await execAsync(`git pull origin ${targetBranch}`, { cwd: modulePath });
+
+        console.log(global.logColor.success, `✅ \x1b[34m${module}\x1b[32m[${targetBranch}]: 更新到最新代码`);
+        return { module, success: true };
+      } catch (error) {
+        console.error(global.logColor.error, `❌ ${module}: 操作失败 - ${error.message}`);
+        return { module, success: false, reason: error.message };
+      }
+    })
+  );
 
   // 输出结果摘要
   const successful = results.filter((r) => r.success).length;
@@ -408,6 +480,66 @@ function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
 }
 
 // 获取 packages 目录路径（相对于当前项目根目录）
+function hasGitModules(packagesDir) {
+  if (!fs.existsSync(packagesDir)) {
+    return false;
+  }
+
+  return ["infly-libs", "infly-ui"].some((item) => fs.existsSync(path.join(packagesDir, item, ".git")));
+}
+
+function checkAndUpdateRootPackages(packagesDir, targetBranch = "master") {
+  const rootDir = path.resolve(packagesDir, "..");
+  const gitPath = path.join(rootDir, ".git");
+
+  if (!fs.existsSync(gitPath)) {
+    console.log(global.logColor.warning, `⚠️  packages 不属于独立 git 仓库，也未找到根仓库，跳过 packages 更新`);
+    return [];
+  }
+
+  const statusOutput = execSync("git status --porcelain", {
+    cwd: rootDir,
+    encoding: "utf8"
+  }).trim();
+
+  if (statusOutput) {
+    console.log(global.logColor.error, `\n❌ admin-monorepo 存在未提交的更改，无法合并 ${targetBranch}`);
+    console.log(global.logColor.error, `   ${statusOutput.split("\n").join("\n   ")}`);
+    process.exit(1);
+  }
+
+  const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
+    cwd: rootDir,
+    encoding: "utf8"
+  }).trim();
+
+  console.log(global.logColor.info, `🔄 保持当前分支 ${currentBranch}，合并 ${targetBranch} 的最新更改...`);
+
+  // 拉取远程最新的 targetBranch
+  execSync(`git fetch origin ${targetBranch}`, {
+    cwd: rootDir,
+    stdio: "inherit"
+  });
+
+  // 使用 merge-from-master.sh 脚本进行安全合并
+  const mergeScriptPath = path.join(rootDir, "script", "merge-from-master.sh");
+  if (fs.existsSync(mergeScriptPath)) {
+    execSync(`bash "${mergeScriptPath}" ${targetBranch}`, {
+      cwd: rootDir,
+      stdio: "inherit"
+    });
+  } else {
+    // 如果脚本不存在，使用基本的 merge 命令
+    execSync(`git merge origin/${targetBranch} --no-edit`, {
+      cwd: rootDir,
+      stdio: "inherit"
+    });
+  }
+
+  console.log(global.logColor.success, `✅ admin-monorepo[${currentBranch}]: 已合并 ${targetBranch} 的最新更改到 packages、docs 等目录`);
+  return [{ module: "admin-monorepo", success: true }];
+}
+
 function findPackagesDir(currentDir) {
   let searchDir = currentDir || process.cwd();
 
@@ -425,6 +557,104 @@ function findPackagesDir(currentDir) {
   return null;
 }
 
+/**
+ * 检查指定目录的 Git 状态
+ * @param {string} dirPath - 目录的绝对路径
+ * @param {string} dirName - 目录名称（用于日志显示）
+ */
+function checkSingleDirGitStatus(dirPath, dirName) {
+  const fs = require("fs");
+
+  if (!fs.existsSync(dirPath)) {
+    console.log(global.logColor.warning, `⚠️  ${dirName} 目录不存在: ${dirPath}`);
+    return { hasUncommitted: false, changes: [] };
+  }
+
+  const gitPath = path.join(dirPath, ".git");
+  if (!fs.existsSync(gitPath)) {
+    console.log(global.logColor.warning, `⚠️  ${dirName} 不是 git 仓库，跳过检查`);
+    return { hasUncommitted: false, changes: [] };
+  }
+
+  try {
+    const statusOutput = execSync("git status --porcelain", {
+      cwd: dirPath,
+      encoding: "utf8"
+    }).trim();
+
+    if (statusOutput) {
+      console.log(global.logColor.error, `❌ ${dirName}: 存在未提交的更改`);
+      console.log(global.logColor.error, `   ${statusOutput.split("\n").join("\n   ")}`);
+      return {
+        hasUncommitted: true,
+        changes: statusOutput.split("\n"),
+        path: dirPath
+      };
+    } else {
+      // console.log(global.logColor.success, `✅ ${dirName}: 工作区干净`);
+      return { hasUncommitted: false, changes: [] };
+    }
+  } catch (error) {
+    console.error(global.logColor.error, `❌ ${dirName}: 检查失败 - ${error.message}`);
+    return {
+      hasUncommitted: true,
+      error: error.message,
+      path: dirPath
+    };
+  }
+}
+
+/**
+ * 切换指定目录到目标分支并拉取最新代码
+ * @param {string} dirPath - 目录的绝对路径
+ * @param {string} dirName - 目录名称（用于日志显示）
+ * @param {string} targetBranch - 目标分支名
+ */
+function pullSingleDirFromBranch(dirPath, dirName, targetBranch = "master") {
+  const fs = require("fs");
+
+  if (!fs.existsSync(dirPath)) {
+    console.log(global.logColor.warning, `⚠️  ${dirName} 目录不存在: ${dirPath}`);
+    return { success: false, reason: "目录不存在" };
+  }
+
+  const gitPath = path.join(dirPath, ".git");
+  if (!fs.existsSync(gitPath)) {
+    console.log(global.logColor.warning, `⚠️  ${dirName} 不是 git 仓库，跳过操作`);
+    return { success: false, reason: "不是 git 仓库" };
+  }
+
+  try {
+    // 获取当前分支
+    const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
+      cwd: dirPath,
+      encoding: "utf8"
+    }).trim();
+
+    // 如果不在目标分支，则切换
+    if (currentBranch !== targetBranch) {
+      // console.log(global.logColor.info, `   ${dirName}: 切换到 ${targetBranch} 分支...`);
+      execSync(`git checkout ${targetBranch}`, {
+        cwd: dirPath,
+        stdio: "pipe"
+      });
+    }
+
+    // 拉取最新代码
+    // console.log(global.logColor.info, `   ${dirName}: 拉取 ${targetBranch} 最新代码...`);
+    execSync(`git pull origin ${targetBranch}`, {
+      cwd: dirPath,
+      stdio: "pipe"
+    });
+
+    console.log(global.logColor.success, `✅ \x1b[34m${dirName}\x1b[32m[${targetBranch}]: 更新到最新代码`);
+    return { success: true };
+  } catch (error) {
+    console.error(global.logColor.error, `❌ ${dirName}: 操作失败 - ${error.message}`);
+    return { success: false, reason: error.message };
+  }
+}
+
 /**
  * 完整的 packages 检查和更新流程
  * @param {string} packagesDir - packages 目录的绝对路径
@@ -443,7 +673,11 @@ async function checkAndUpdatePackages(outPackagesDir, targetBranch = "master") {
     console.log(global.logColor.info, `\n🚀 开始检查和更新 packages 模块...`);
 
     // 1. 检查未提交的更改
-    const checkResult = checkPackagesGitStatus(packagesDir);
+    if (!hasGitModules(packagesDir)) {
+      return checkAndUpdateRootPackages(packagesDir, targetBranch);
+    }
+
+    const checkResult = await checkPackagesGitStatus(packagesDir);
 
     if (checkResult.hasUncommitted) {
       // console.log(global.logColor.error, `\n❌ 发现 ${checkResult.modules.length} 个模块存在未提交的更改:`);
@@ -457,7 +691,7 @@ async function checkAndUpdatePackages(outPackagesDir, targetBranch = "master") {
     // console.log(global.logColor.success, `\n✅ 所有模块工作区都是干净的，继续执行...`);
 
     // 2. 切换到 master 并拉取最新代码
-    const updateResults = pullPackagesFromMaster(packagesDir, targetBranch);
+    const updateResults = await pullPackagesFromMaster(packagesDir, targetBranch);
 
     // 3. 检查是否有失败的操作
     const failedUpdates = updateResults.filter((r) => !r.success);
@@ -465,6 +699,42 @@ async function checkAndUpdatePackages(outPackagesDir, targetBranch = "master") {
       console.log(global.logColor.warning, `\n⚠️  有 ${failedUpdates.length} 个模块更新失败，但可以继续执行`);
     }
 
+    // 4. 检查和更新 postal-benefits-platform（如果当前是 postal-benefits-platform-level）
+    const currentProjectName = require(path.resolve(process.cwd(), "package.json")).name;
+    if (currentProjectName === "postal-benefits-platform-level") {
+      // console.log(global.logColor.info, `\n🚀 开始检查和更新 postal-benefits-platform...`);
+
+      // 获取 postal-benefits-platform 的路径
+      const appsDir = path.resolve(packagesDir, "..", "apps");
+      const postalPlatformDir = path.join(appsDir, "postal-benefits-platform");
+
+      // 获取 postal-benefits-platform-level 当前分支
+      const currentLevelBranch = execSync("git rev-parse --abbrev-ref HEAD", {
+        cwd: process.cwd(),
+        encoding: "utf8"
+      }).trim();
+
+      // 检查 postal-benefits-platform 是否有未提交的更改
+      const platformCheckResult = checkSingleDirGitStatus(postalPlatformDir, "postal-benefits-platform");
+
+      if (platformCheckResult.hasUncommitted) {
+        console.log(global.logColor.error, `\n❌ postal-benefits-platform 存在未提交的更改`);
+        console.log(global.logColor.error, `\n请先提交或储藏这些更改后再继续执行！`);
+        process.exit(1);
+      }
+
+      // 切换到与 postal-benefits-platform-level 相同的分支并拉取最新代码
+      const platformUpdateResult = pullSingleDirFromBranch(
+        postalPlatformDir,
+        "postal-benefits-platform",
+        currentLevelBranch
+      );
+
+      if (!platformUpdateResult.success) {
+        console.log(global.logColor.warning, `\n⚠️  postal-benefits-platform 更新失败，但可以继续执行`);
+      }
+    }
+
     // console.log(global.logColor.success, `\n🎉 packages 检查和更新流程完成！`);
     return updateResults;
   } catch (error) {
@@ -484,5 +754,7 @@ module.exports = {
   autoBranchProcess,
   checkPackagesGitStatus,
   pullPackagesFromMaster,
-  checkAndUpdatePackages
+  checkAndUpdatePackages,
+  checkSingleDirGitStatus,
+  pullSingleDirFromBranch
 };

package/script/index.js

@@ -2,25 +2,25 @@ module.exports = {
   previewList: [
     {
       key: "preview",
-      value: "@infly/libs --preview"
+      value: "infly-libs --preview"
     },
     {
       key: "preview:no-build",
-      value: "@infly/libs --preview --no-build"
+      value: "infly-libs --preview --no-build"
     }
   ],
   buildList: [
     {
-      key: "infly:build:prod",
-      value: "@infly/libs beforeBuild && vue-cli-service build && @infly/libs afterBuild"
+      key: "build:prod",
+      value: "infly-libs beforeBuild && vue-cli-service build && infly-libs afterBuild"
     },
     {
-      key: "infly:build:stage",
-      value: "@infly/libs beforeBuild && vue-cli-service build --mode staging && @infly/libs afterBuild"
+      key: "build:stage",
+      value: "infly-libs beforeBuild && vue-cli-service build --mode staging && infly-libs afterBuild"
     },
     {
-      key: "infly:build:test",
-      value: "@infly/libs beforeBuild && @infly/libs afterBuild"
+      key: "build:test",
+      value: "infly-libs beforeBuild && infly-libs afterBuild"
     }
   ]
 };