chore: Resolve merge conflicts

internal/node-utils/src/git.ts

@@ -1,24 +1,32 @@
 import path from 'node:path';
 
-import { $ } from 'zx';
+import { execa } from 'execa';
 
 export * from '@changesets/git';
 
 /**
  * 获取暂存区文件
  */
-async function getStagedFiles() {
+async function getStagedFiles(): Promise<string[]> {
   try {
-    $.verbose = false;
-    const { stdout: lines } =
-      await $`git -c submodule.recurse=false diff --staged --diff-filter=ACMR --name-only --ignore-submodules -z`;
+    const { stdout } = await execa('git', [
+      '-c',
+      'submodule.recurse=false',
+      'diff',
+      '--staged',
+      '--diff-filter=ACMR',
+      '--name-only',
+      '--ignore-submodules',
+      '-z',
+    ]);
 
-    let changedList = lines ? lines.replace(/\0$/, '').split('\0') : [];
+    let changedList = stdout ? stdout.replace(/\0$/, '').split('\0') : [];
     changedList = changedList.map((item) => path.resolve(process.cwd(), item));
     const changedSet = new Set(changedList);
     changedSet.delete('');
     return [...changedSet];
-  } catch {
+  } catch (error) {
+    console.error('Failed to get staged files:', error);
     return [];
   }
 }