@zjex/git-workflow 0.3.6 → 0.3.8

package/dist/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --no-warnings=ExperimentalWarning
+#!/usr/bin/env -S node --disable-warning=ExperimentalWarning
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __esm = (fn, res) => function __init() {
@@ -67,6 +67,8 @@ var init_utils = __esm({
       orange: (s) => `\x1B[38;5;208m${s}\x1B[0m`,
       lightPurple: (s) => `\x1B[38;5;141m${s}\x1B[0m`,
       white: (s) => `\x1B[37m${s}\x1B[0m`,
+      brightYellow: (s) => `\x1B[93m${s}\x1B[0m`,
+      // 亮黄色
       reset: "\x1B[0m"
     };
     TODAY = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10).replace(/-/g, "");
@@ -89,9 +91,9 @@ __export(update_notifier_exports, {
   clearUpdateCache: () => clearUpdateCache
 });
 import { execSync as execSync6 } from "child_process";
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, existsSync as existsSync3, unlinkSync } from "fs";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync4, existsSync as existsSync3, unlinkSync as unlinkSync2 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import boxen from "boxen";
 import { select as select7 } from "@inquirer/prompts";
 import ora5 from "ora";
@@ -281,16 +283,16 @@ async function performUpdate(packageName) {
 }
 function clearUpdateCache() {
   try {
-    const cacheFile = join3(homedir3(), CACHE_FILE);
+    const cacheFile = join4(homedir3(), CACHE_FILE);
     if (existsSync3(cacheFile)) {
-      unlinkSync(cacheFile);
+      unlinkSync2(cacheFile);
     }
   } catch {
   }
 }
 function readCache() {
   try {
-    const cacheFile = join3(homedir3(), CACHE_FILE);
+    const cacheFile = join4(homedir3(), CACHE_FILE);
     if (!existsSync3(cacheFile)) {
       return null;
     }
@@ -302,8 +304,8 @@ function readCache() {
 }
 function writeCache(cache) {
   try {
-    const cacheFile = join3(homedir3(), CACHE_FILE);
-    writeFileSync3(cacheFile, JSON.stringify(cache), "utf-8");
+    const cacheFile = join4(homedir3(), CACHE_FILE);
+    writeFileSync4(cacheFile, JSON.stringify(cache), "utf-8");
   } catch {
   }
 }
@@ -1789,6 +1791,9 @@ async function dropStash(index) {
 // src/commands/commit.ts
 init_utils();
 import { execSync as execSync5 } from "child_process";
+import { writeFileSync as writeFileSync3, unlinkSync } from "fs";
+import { tmpdir } from "os";
+import { join as join3 } from "path";
 import { select as select6, input as input5, checkbox } from "@inquirer/prompts";
 import ora4 from "ora";
 
@@ -2196,45 +2201,39 @@ function formatFileStatus(status) {
 }
 async function commit() {
   const config2 = getConfig();
+  const autoStage = config2.autoStage ?? true;
+  if (autoStage) {
+    execSync5("git add -A", { stdio: "pipe" });
+  }
   let { staged, unstaged } = parseGitStatus();
-  if (unstaged.length > 0) {
-    const autoStage = config2.autoStage ?? true;
-    if (autoStage) {
-      execSync5("git add -A", { stdio: "pipe" });
-      console.log(colors.green("\u2714 \u5DF2\u81EA\u52A8\u6682\u5B58\u6240\u6709\u66F4\u6539"));
-      divider();
-      const newStatus = parseGitStatus();
-      staged = newStatus.staged;
-      unstaged = newStatus.unstaged;
-    } else if (staged.length === 0) {
-      console.log(colors.yellow("\u6CA1\u6709\u6682\u5B58\u7684\u66F4\u6539"));
-      divider();
-      console.log("\u672A\u6682\u5B58\u7684\u6587\u4EF6:");
-      for (const { status, file } of unstaged) {
-        console.log(`  ${formatFileStatus(status)} ${file}`);
-      }
-      divider();
-      const filesToStage = await checkbox({
-        message: "\u9009\u62E9\u8981\u6682\u5B58\u7684\u6587\u4EF6:",
-        choices: unstaged.map(({ status, file }) => ({
-          name: `${formatFileStatus(status)} ${file}`,
-          value: file,
-          checked: true
-        })),
-        theme
-      });
-      if (filesToStage.length === 0) {
-        console.log(colors.yellow("\u6CA1\u6709\u9009\u62E9\u4EFB\u4F55\u6587\u4EF6\uFF0C\u5DF2\u53D6\u6D88"));
-        return;
-      }
-      for (const file of filesToStage) {
-        execSync5(`git add "${file}"`, { stdio: "pipe" });
-      }
-      console.log(colors.green(`\u2714 \u5DF2\u6682\u5B58 ${filesToStage.length} \u4E2A\u6587\u4EF6`));
-      divider();
-      const newStatus = parseGitStatus();
-      staged = newStatus.staged;
+  if (staged.length === 0 && unstaged.length > 0 && !autoStage) {
+    console.log(colors.yellow("\u6CA1\u6709\u6682\u5B58\u7684\u66F4\u6539"));
+    divider();
+    console.log("\u672A\u6682\u5B58\u7684\u6587\u4EF6:");
+    for (const { status, file } of unstaged) {
+      console.log(`  ${formatFileStatus(status)} ${file}`);
+    }
+    divider();
+    const filesToStage = await checkbox({
+      message: "\u9009\u62E9\u8981\u6682\u5B58\u7684\u6587\u4EF6:",
+      choices: unstaged.map(({ status, file }) => ({
+        name: `${formatFileStatus(status)} ${file}`,
+        value: file,
+        checked: true
+      })),
+      theme
+    });
+    if (filesToStage.length === 0) {
+      console.log(colors.yellow("\u6CA1\u6709\u9009\u62E9\u4EFB\u4F55\u6587\u4EF6\uFF0C\u5DF2\u53D6\u6D88"));
+      return;
+    }
+    for (const file of filesToStage) {
+      execSync5(`git add "${file}"`, { stdio: "pipe" });
     }
+    console.log(colors.green(`\u2714 \u5DF2\u6682\u5B58 ${filesToStage.length} \u4E2A\u6587\u4EF6`));
+    divider();
+    const newStatus = parseGitStatus();
+    staged = newStatus.staged;
   }
   if (staged.length === 0) {
     console.log(colors.yellow("\u5DE5\u4F5C\u533A\u5E72\u51C0\uFF0C\u6CA1\u6709\u9700\u8981\u63D0\u4EA4\u7684\u66F4\u6539"));
@@ -2320,14 +2319,10 @@ async function commit() {
   }
   const spinner = ora4("\u6B63\u5728\u63D0\u4EA4...").start();
   try {
-    let finalStatus = parseGitStatus();
-    if (finalStatus.staged.length === 0 && finalStatus.unstaged.length > 0) {
-      const autoStage = config2.autoStage ?? true;
-      if (autoStage) {
-        execSync5("git add -A", { stdio: "pipe" });
-        finalStatus = parseGitStatus();
-      }
+    if (autoStage) {
+      execSync5("git add -A", { stdio: "pipe" });
     }
+    const finalStatus = parseGitStatus();
     if (finalStatus.staged.length === 0) {
       spinner.fail("\u6CA1\u6709\u6682\u5B58\u7684\u6587\u4EF6\u53EF\u4EE5\u63D0\u4EA4");
       console.log("");
@@ -2338,9 +2333,18 @@ async function commit() {
       console.log("");
       return;
     }
-    execSync5(`git commit -F -`, {
-      input: message
-    });
+    const tmpFile = join3(tmpdir(), `.gw-commit-msg-${Date.now()}`);
+    try {
+      writeFileSync3(tmpFile, message, "utf-8");
+      execSync5(`git commit -F "${tmpFile}"`, {
+        stdio: ["pipe", "pipe", "pipe"]
+      });
+    } finally {
+      try {
+        unlinkSync(tmpFile);
+      } catch {
+      }
+    }
     spinner.succeed("\u63D0\u4EA4\u6210\u529F");
     const commitHash = execOutput("git rev-parse --short HEAD");
     console.log(colors.dim(`commit: ${commitHash}`));
@@ -2447,15 +2451,15 @@ import { execSync as execSync7 } from "child_process";
 import ora6 from "ora";
 import boxen2 from "boxen";
 import semver2 from "semver";
-import { existsSync as existsSync4, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync4, unlinkSync as unlinkSync3 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 var CACHE_FILE2 = ".gw-update-check";
 function clearUpdateCache2() {
   try {
-    const cacheFile = join4(homedir4(), CACHE_FILE2);
+    const cacheFile = join5(homedir4(), CACHE_FILE2);
     if (existsSync4(cacheFile)) {
-      unlinkSync2(cacheFile);
+      unlinkSync3(cacheFile);
     }
   } catch {
   }
@@ -2602,57 +2606,49 @@ function parseGitLog(output) {
   }
   return commits;
 }
-function getCommitTypeIcon(subject) {
-  const lowerSubject = subject.toLowerCase();
-  if (lowerSubject.includes("feat") || lowerSubject.includes("feature")) return "\u2728";
-  if (lowerSubject.includes("fix") || lowerSubject.includes("bug")) return "\u{1F41B}";
-  if (lowerSubject.includes("docs") || lowerSubject.includes("doc")) return "\u{1F4DA}";
-  if (lowerSubject.includes("style")) return "\u{1F484}";
-  if (lowerSubject.includes("refactor")) return "\u267B\uFE0F";
-  if (lowerSubject.includes("test")) return "\u{1F9EA}";
-  if (lowerSubject.includes("chore")) return "\u{1F527}";
-  if (lowerSubject.includes("perf")) return "\u26A1";
-  if (lowerSubject.includes("ci")) return "\u{1F477}";
-  if (lowerSubject.includes("build")) return "\u{1F4E6}";
-  if (lowerSubject.includes("revert")) return "\u23EA";
-  if (lowerSubject.includes("merge")) return "\u{1F500}";
-  if (lowerSubject.includes("release") || lowerSubject.includes("version")) return "\u{1F516}";
-  return "\u{1F4DD}";
-}
 function groupCommitsByDate(commits) {
   const groups = /* @__PURE__ */ new Map();
+  const dateOrder = [];
   for (const commit2 of commits) {
     const date = commit2.date;
     if (!groups.has(date)) {
       groups.set(date, []);
+      dateOrder.push(date);
     }
     groups.get(date).push(commit2);
   }
-  return groups;
+  const orderedGroups = /* @__PURE__ */ new Map();
+  for (const date of dateOrder) {
+    orderedGroups.set(date, groups.get(date));
+  }
+  return orderedGroups;
 }
 function formatRelativeTime(relativeDate) {
   let result = relativeDate;
   const timeMap = {
-    "second": "\u79D2",
-    "seconds": "\u79D2",
-    "minute": "\u5206\u949F",
-    "minutes": "\u5206\u949F",
-    "hour": "\u5C0F\u65F6",
-    "hours": "\u5C0F\u65F6",
-    "day": "\u5929",
-    "days": "\u5929",
-    "week": "\u5468",
-    "weeks": "\u5468",
-    "month": "\u4E2A\u6708",
-    "months": "\u4E2A\u6708",
-    "year": "\u5E74",
-    "years": "\u5E74",
-    "ago": "\u524D"
+    second: "\u79D2",
+    seconds: "\u79D2",
+    minute: "\u5206\u949F",
+    minutes: "\u5206\u949F",
+    hour: "\u5C0F\u65F6",
+    hours: "\u5C0F\u65F6",
+    day: "\u5929",
+    days: "\u5929",
+    week: "\u5468",
+    weeks: "\u5468",
+    month: "\u4E2A\u6708",
+    months: "\u4E2A\u6708",
+    year: "\u5E74",
+    years: "\u5E74",
+    ago: "\u524D"
   };
   for (const [en, zh] of Object.entries(timeMap)) {
     result = result.replace(new RegExp(`\\b${en}\\b`, "g"), zh);
   }
-  result = result.replace(/(\d+)\s+(秒|分钟|小时|天|周|个月|年)\s+前/g, "$1$2\u524D");
+  result = result.replace(
+    /(\d+)\s+(秒|分钟|小时|天|周|个月|年)\s+前/g,
+    "$1$2\u524D"
+  );
   const match = result.match(/(\d+)(分钟|小时|天|周|个月|年)前/);
   if (match) {
     const num = parseInt(match[1]);
@@ -2699,28 +2695,25 @@ function supportsColor() {
 function formatTimelineStyle(commits) {
   const groupedCommits = groupCommitsByDate(commits);
   let output = "";
-  const sortedDates = Array.from(groupedCommits.keys()).sort(
-    (a, b) => new Date(b).getTime() - new Date(a).getTime()
-  );
+  const sortedDates = Array.from(groupedCommits.keys());
   const useColors = supportsColor() || process.env.FORCE_COLOR;
   for (let dateIndex = 0; dateIndex < sortedDates.length; dateIndex++) {
     const date = sortedDates[dateIndex];
     const dateCommits = groupedCommits.get(date);
     const dateTitle = `\u{1F4C5} Commits on ${date}`;
     if (useColors) {
-      output += "\n" + colors.bold(colors.yellow(dateTitle)) + "\n\n";
+      output += colors.bold(colors.yellow(dateTitle)) + "\n";
     } else {
-      output += "\n" + dateTitle + "\n\n";
+      output += dateTitle + "\n";
     }
     for (let commitIndex = 0; commitIndex < dateCommits.length; commitIndex++) {
       const commit2 = dateCommits[commitIndex];
-      const icon = getCommitTypeIcon(commit2.subject);
       const { title, tasks } = parseCommitSubject(commit2.subject);
       const commitContent = [];
       if (useColors) {
-        commitContent.push(`${icon} ${colors.bold(colors.white(title))}`);
+        commitContent.push(colors.bold(colors.white(title)));
       } else {
-        commitContent.push(`${icon} ${title}`);
+        commitContent.push(title);
       }
       if (tasks.length > 0) {
         commitContent.push("");
@@ -2734,8 +2727,12 @@ function formatTimelineStyle(commits) {
       }
       commitContent.push("");
       if (useColors) {
-        commitContent.push(`${colors.dim("\u{1F464}")} ${colors.blue(commit2.author)} ${colors.dim("committed")} ${colors.green(formatRelativeTime(commit2.relativeDate))}`);
-        commitContent.push(`${colors.dim("\u{1F517}")} ${colors.orange("#" + commit2.shortHash)}`);
+        commitContent.push(
+          `${colors.dim("\u{1F464}")} ${colors.blue(commit2.author)} ${colors.dim(
+            "committed"
+          )} ${colors.green(formatRelativeTime(commit2.relativeDate))}`
+        );
+        commitContent.push(`${colors.dim("\u{1F517}")} ${colors.orange(commit2.hash)}`);
         if (commit2.refs && commit2.refs.trim()) {
           const refs = commit2.refs.trim();
           const refParts = refs.split(", ");
@@ -2751,16 +2748,24 @@ function formatTimelineStyle(commits) {
             }
           });
           if (branches.length > 0) {
-            commitContent.push(`${colors.dim("\u{1F33F}")} ${colors.lightPurple(branches.join(", "))}`);
+            commitContent.push(
+              `${colors.dim("\u{1F33F}")} ${colors.lightPurple(branches.join(", "))}`
+            );
           }
           if (tags.length > 0) {
             const tagText = tags.map((tag) => `tag ${tag}`).join(", ");
-            commitContent.push(`${colors.dim("\u{1F516}")} ${colors.yellow(tagText)}`);
+            commitContent.push(
+              `${colors.dim("\u{1F516}")} ${colors.brightYellow(tagText)}`
+            );
           }
         }
       } else {
-        commitContent.push(`\u{1F464} ${commit2.author} committed ${formatRelativeTime(commit2.relativeDate)}`);
-        commitContent.push(`\u{1F517} #${commit2.shortHash}`);
+        commitContent.push(
+          `\u{1F464} ${commit2.author} committed ${formatRelativeTime(
+            commit2.relativeDate
+          )}`
+        );
+        commitContent.push(`\u{1F517} ${commit2.hash}`);
         if (commit2.refs && commit2.refs.trim()) {
           const refs = commit2.refs.trim();
           const refParts = refs.split(", ");
@@ -2786,7 +2791,7 @@ function formatTimelineStyle(commits) {
       }
       const commitBox = boxen3(commitContent.join("\n"), {
         padding: { top: 0, bottom: 0, left: 1, right: 1 },
-        margin: { top: 0, bottom: 1, left: 0, right: 0 },
+        margin: { top: 0, bottom: 0, left: 0, right: 0 },
         borderStyle: "round",
         borderColor: "gray"
       });
@@ -2802,11 +2807,17 @@ function startInteractivePager(content) {
       stdio: ["pipe", "inherit", "inherit"],
       env: { ...process.env, LESS: "-R -S -F -X -i" }
     });
+    pagerProcess.stdin.on("error", (err) => {
+      if (err.code !== "EPIPE") {
+        console.error(err);
+      }
+    });
     pagerProcess.stdin.write(content);
     pagerProcess.stdin.end();
     pagerProcess.on("exit", () => {
+      process.exit(0);
     });
-    pagerProcess.on("error", (err) => {
+    pagerProcess.on("error", () => {
       console.log(content);
     });
   } catch (error) {
@@ -2822,9 +2833,6 @@ function executeTimelineLog(options) {
     if (options.until) cmd += ` --until="${options.until}"`;
     if (options.grep) cmd += ` --grep="${options.grep}"`;
     if (options.all) cmd += ` --all`;
-    if (options.interactive && !options.limit) {
-      cmd += ` -50`;
-    }
     const output = execSync8(cmd, {
       encoding: "utf8",
       stdio: "pipe",
@@ -2833,14 +2841,6 @@ function executeTimelineLog(options) {
     if (output.trim()) {
       const commits = parseGitLog(output);
       let fullOutput = "";
-      const title = `\u{1F4CA} \u5171\u663E\u793A ${commits.length} \u4E2A\u63D0\u4EA4`;
-      fullOutput += "\n" + boxen3(title, {
-        padding: { top: 0, bottom: 0, left: 2, right: 2 },
-        margin: { top: 0, bottom: 1, left: 0, right: 0 },
-        borderStyle: "double",
-        borderColor: "green",
-        textAlignment: "center"
-      }) + "\n";
       const timelineOutput = formatTimelineStyle(commits);
       fullOutput += timelineOutput;
       if (options.interactive) {
@@ -2916,7 +2916,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.3.6" : "0.0.0-dev";
+var version = true ? "0.3.8" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.3.6",
+	"version": "0.3.8",
 	"description": "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
 	"type": "module",
 	"bin": {

package/src/commands/commit.ts

@@ -1,4 +1,7 @@
 import { execSync } from "child_process";
+import { writeFileSync, unlinkSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
 import { select, input, checkbox } from "@inquirer/prompts";
 import ora from "ora";
 import { colors, theme, execOutput, divider } from "../utils.js";
@@ -102,58 +105,52 @@ function formatFileStatus(status: string): string {
  */
 export async function commit(): Promise<void> {
   const config = getConfig();
-  let { staged, unstaged } = parseGitStatus();
-
-  // ========== 步骤 1: 处理未暂存的文件 ==========
-  if (unstaged.length > 0) {
-    const autoStage = config.autoStage ?? true;
+  const autoStage = config.autoStage ?? true;
 
-    if (autoStage) {
-      // 自动暂存所有文件
-      execSync("git add -A", { stdio: "pipe" });
-      console.log(colors.green("✔ 已自动暂存所有更改"));
-      divider();
-      // 重新获取状态
-      const newStatus = parseGitStatus();
-      staged = newStatus.staged;
-      unstaged = newStatus.unstaged;
-    } else if (staged.length === 0) {
-      // 没有暂存的文件，且不自动暂存，让用户选择
-      console.log(colors.yellow("没有暂存的更改"));
-      divider();
-      console.log("未暂存的文件:");
-      for (const { status, file } of unstaged) {
-        console.log(`  ${formatFileStatus(status)} ${file}`);
-      }
-      divider();
+  // ========== 步骤 1: 自动暂存（如果启用）==========
+  if (autoStage) {
+    execSync("git add -A", { stdio: "pipe" });
+  }
 
-      // 让用户选择要暂存的文件
-      const filesToStage = await checkbox({
-        message: "选择要暂存的文件:",
-        choices: unstaged.map(({ status, file }) => ({
-          name: `${formatFileStatus(status)} ${file}`,
-          value: file,
-          checked: true,
-        })),
-        theme,
-      });
+  // 获取当前状态
+  let { staged, unstaged } = parseGitStatus();
 
-      if (filesToStage.length === 0) {
-        console.log(colors.yellow("没有选择任何文件，已取消"));
-        return;
-      }
+  // ========== 步骤 2: 如果没有暂存文件，让用户选择 ==========
+  if (staged.length === 0 && unstaged.length > 0 && !autoStage) {
+    console.log(colors.yellow("没有暂存的更改"));
+    divider();
+    console.log("未暂存的文件:");
+    for (const { status, file } of unstaged) {
+      console.log(`  ${formatFileStatus(status)} ${file}`);
+    }
+    divider();
+
+    // 让用户选择要暂存的文件
+    const filesToStage = await checkbox({
+      message: "选择要暂存的文件:",
+      choices: unstaged.map(({ status, file }) => ({
+        name: `${formatFileStatus(status)} ${file}`,
+        value: file,
+        checked: true,
+      })),
+      theme,
+    });
 
-      // 暂存选中的文件
-      for (const file of filesToStage) {
-        execSync(`git add "${file}"`, { stdio: "pipe" });
-      }
-      console.log(colors.green(`✔ 已暂存 ${filesToStage.length} 个文件`));
-      divider();
+    if (filesToStage.length === 0) {
+      console.log(colors.yellow("没有选择任何文件，已取消"));
+      return;
+    }
 
-      // 重新获取状态
-      const newStatus = parseGitStatus();
-      staged = newStatus.staged;
+    // 暂存选中的文件
+    for (const file of filesToStage) {
+      execSync(`git add "${file}"`, { stdio: "pipe" });
     }
+    console.log(colors.green(`✔ 已暂存 ${filesToStage.length} 个文件`));
+    divider();
+
+    // 重新获取状态
+    const newStatus = parseGitStatus();
+    staged = newStatus.staged;
   }
 
   // ========== 步骤 2: 检查是否有文件可提交 ==========
@@ -264,18 +261,13 @@ export async function commit(): Promise<void> {
   const spinner = ora("正在提交...").start();
 
   try {
-    // 提交前再次检查是否有暂存的文件
-    let finalStatus = parseGitStatus();
-
-    // 如果暂存区为空，但有未暂存的更改，且开启了自动暂存，则重新暂存
-    if (finalStatus.staged.length === 0 && finalStatus.unstaged.length > 0) {
-      const autoStage = config.autoStage ?? true;
-      if (autoStage) {
-        execSync("git add -A", { stdio: "pipe" });
-        finalStatus = parseGitStatus();
-      }
+    // 提交前再次暂存所有更改（确保不会遗漏）
+    if (autoStage) {
+      execSync("git add -A", { stdio: "pipe" });
     }
 
+    // 检查是否有暂存的文件
+    const finalStatus = parseGitStatus();
     if (finalStatus.staged.length === 0) {
       spinner.fail("没有暂存的文件可以提交");
       console.log("");
@@ -287,11 +279,21 @@ export async function commit(): Promise<void> {
       return;
     }
 
-    // 处理多行消息：使用 git commit -F - 通过 stdin 传递
-    // 这样可以正确处理包含换行符的 commit message
-    execSync(`git commit -F -`, {
-      input: message,
-    });
+    // 处理多行消息：使用临时文件传递 commit message
+    const tmpFile = join(tmpdir(), `.gw-commit-msg-${Date.now()}`);
+    try {
+      writeFileSync(tmpFile, message, "utf-8");
+      execSync(`git commit -F "${tmpFile}"`, {
+        stdio: ["pipe", "pipe", "pipe"],
+      });
+    } finally {
+      // 清理临时文件
+      try {
+        unlinkSync(tmpFile);
+      } catch {
+        // 忽略删除失败
+      }
+    }
     spinner.succeed("提交成功");
 
     // 显示提交信息

package/src/commands/log.ts

@@ -1,6 +1,6 @@
 /**
  * @zjex/git-workflow - Log 命令
- * 
+ *
  * 提供GitHub风格的时间线日志查看功能
  */
 
@@ -43,13 +43,13 @@ interface CommitInfo {
  */
 function parseGitLog(output: string): CommitInfo[] {
   const commits: CommitInfo[] = [];
-  const lines = output.trim().split('\n');
-  
+  const lines = output.trim().split("\n");
+
   for (const line of lines) {
     if (!line.trim()) continue;
-    
+
     // 使用分隔符解析
-    const parts = line.split('|');
+    const parts = line.split("|");
     if (parts.length >= 6) {
       commits.push({
         hash: parts[0],
@@ -58,11 +58,11 @@ function parseGitLog(output: string): CommitInfo[] {
         author: parts[3],
         date: parts[4],
         relativeDate: parts[5],
-        refs: parts[6] || ''
+        refs: parts[6] || "",
       });
     }
   }
-  
+
   return commits;
 }
 
@@ -71,39 +71,50 @@ function parseGitLog(output: string): CommitInfo[] {
  */
 function getCommitTypeIcon(subject: string): string {
   const lowerSubject = subject.toLowerCase();
-  
-  if (lowerSubject.includes('feat') || lowerSubject.includes('feature')) return '✨';
-  if (lowerSubject.includes('fix') || lowerSubject.includes('bug')) return '🐛';
-  if (lowerSubject.includes('docs') || lowerSubject.includes('doc')) return '📚';
-  if (lowerSubject.includes('style')) return '💄';
-  if (lowerSubject.includes('refactor')) return '♻️';
-  if (lowerSubject.includes('test')) return '🧪';
-  if (lowerSubject.includes('chore')) return '🔧';
-  if (lowerSubject.includes('perf')) return '⚡';
-  if (lowerSubject.includes('ci')) return '👷';
-  if (lowerSubject.includes('build')) return '📦';
-  if (lowerSubject.includes('revert')) return '⏪';
-  if (lowerSubject.includes('merge')) return '🔀';
-  if (lowerSubject.includes('release') || lowerSubject.includes('version')) return '🔖';
-  
-  return '📝';
+
+  if (lowerSubject.includes("feat") || lowerSubject.includes("feature"))
+    return "✨";
+  if (lowerSubject.includes("fix") || lowerSubject.includes("bug")) return "🐛";
+  if (lowerSubject.includes("docs") || lowerSubject.includes("doc"))
+    return "📚";
+  if (lowerSubject.includes("style")) return "💄";
+  if (lowerSubject.includes("refactor")) return "♻️";
+  if (lowerSubject.includes("test")) return "🧪";
+  if (lowerSubject.includes("chore")) return "🔧";
+  if (lowerSubject.includes("perf")) return "⚡";
+  if (lowerSubject.includes("ci")) return "👷";
+  if (lowerSubject.includes("build")) return "📦";
+  if (lowerSubject.includes("revert")) return "⏪";
+  if (lowerSubject.includes("merge")) return "🔀";
+  if (lowerSubject.includes("release") || lowerSubject.includes("version"))
+    return "🔖";
+
+  return "📝";
 }
 
 /**
- * 按日期分组提交
+ * 按日期分组提交（保持原始提交顺序）
  */
 function groupCommitsByDate(commits: CommitInfo[]): Map<string, CommitInfo[]> {
   const groups = new Map<string, CommitInfo[]>();
-  
+  const dateOrder: string[] = []; // 记录日期出现的顺序
+
   for (const commit of commits) {
     const date = commit.date;
     if (!groups.has(date)) {
       groups.set(date, []);
+      dateOrder.push(date); // 按出现顺序记录日期
     }
     groups.get(date)!.push(commit);
   }
-  
-  return groups;
+
+  // 返回按出现顺序排列的 Map
+  const orderedGroups = new Map<string, CommitInfo[]>();
+  for (const date of dateOrder) {
+    orderedGroups.set(date, groups.get(date)!);
+  }
+
+  return orderedGroups;
 }
 
 /**
@@ -111,92 +122,101 @@ function groupCommitsByDate(commits: CommitInfo[]): Map<string, CommitInfo[]> {
  */
 function formatRelativeTime(relativeDate: string): string {
   let result = relativeDate;
-  
+
   // 先替换英文单词为中文
   const timeMap: { [key: string]: string } = {
-    'second': '秒',
-    'seconds': '秒',
-    'minute': '分钟',
-    'minutes': '分钟',
-    'hour': '小时',
-    'hours': '小时',
-    'day': '天',
-    'days': '天',
-    'week': '周',
-    'weeks': '周',
-    'month': '个月',
-    'months': '个月',
-    'year': '年',
-    'years': '年',
-    'ago': '前'
+    second: "秒",
+    seconds: "秒",
+    minute: "分钟",
+    minutes: "分钟",
+    hour: "小时",
+    hours: "小时",
+    day: "天",
+    days: "天",
+    week: "周",
+    weeks: "周",
+    month: "个月",
+    months: "个月",
+    year: "年",
+    years: "年",
+    ago: "前",
   };
-  
+
   for (const [en, zh] of Object.entries(timeMap)) {
-    result = result.replace(new RegExp(`\\b${en}\\b`, 'g'), zh);
+    result = result.replace(new RegExp(`\\b${en}\\b`, "g"), zh);
   }
-  
+
   // 去掉数字和单位之间的空格，以及单位和"前"之间的空格
   // 例如："22 分钟 前" -> "22分钟前"
-  result = result.replace(/(\d+)\s+(秒|分钟|小时|天|周|个月|年)\s+前/g, '$1$2前');
-  
+  result = result.replace(
+    /(\d+)\s+(秒|分钟|小时|天|周|个月|年)\s+前/g,
+    "$1$2前"
+  );
+
   // 简化显示格式
   const match = result.match(/(\d+)(分钟|小时|天|周|个月|年)前/);
   if (match) {
     const num = parseInt(match[1]);
     const unit = match[2];
-    
+
     // 超过60分钟显示小时
-    if (unit === '分钟' && num >= 60) {
+    if (unit === "分钟" && num >= 60) {
       const hours = Math.floor(num / 60);
       return `${hours}小时前`;
     }
-    
+
     // 超过24小时显示天数
-    if (unit === '小时' && num >= 24) {
+    if (unit === "小时" && num >= 24) {
       const days = Math.floor(num / 24);
       return `${days}天前`;
     }
-    
+
     // 超过7天显示周数
-    if (unit === '天' && num >= 7 && num < 30) {
+    if (unit === "天" && num >= 7 && num < 30) {
       const weeks = Math.floor(num / 7);
       return `${weeks}周前`;
     }
-    
+
     // 超过30天显示月数
-    if (unit === '天' && num >= 30) {
+    if (unit === "天" && num >= 30) {
       const months = Math.floor(num / 30);
       return `${months}个月前`;
     }
-    
+
     // 超过4周显示月数
-    if (unit === '周' && num >= 4) {
+    if (unit === "周" && num >= 4) {
       const months = Math.floor(num / 4);
       return `${months}个月前`;
     }
-    
+
     // 超过12个月显示年数
-    if (unit === '个月' && num >= 12) {
+    if (unit === "个月" && num >= 12) {
       const years = Math.floor(num / 12);
       return `${years}年前`;
     }
   }
-  
+
   return result;
 }
 
 /**
  * 解析提交主题，分离标题和子任务
  */
-function parseCommitSubject(subject: string): { title: string; tasks: string[] } {
+function parseCommitSubject(subject: string): {
+  title: string;
+  tasks: string[];
+} {
   // 检查是否包含 " - " 分隔的子任务
-  if (subject.includes(' - ')) {
-    const parts = subject.split(' - ');
+  if (subject.includes(" - ")) {
+    const parts = subject.split(" - ");
     const title = parts[0].trim();
-    const tasks = parts.slice(1).map(task => task.trim()).filter(task => task.length > 0);
+    const tasks = parts
+      .slice(1)
+      .map((task) => task.trim())
+      .filter((task) => task.length > 0);
     return { title, tasks };
   }
-  
+
   return { title: subject, tasks: [] };
 }
 
@@ -213,137 +233,146 @@ function supportsColor(): boolean {
  */
 function formatTimelineStyle(commits: CommitInfo[]): string {
   const groupedCommits = groupCommitsByDate(commits);
-  let output = '';
-  
-  // 按日期倒序排列
-  const sortedDates = Array.from(groupedCommits.keys()).sort((a, b) => 
-    new Date(b).getTime() - new Date(a).getTime()
-  );
-  
+  let output = "";
+
+  // 保持原始提交顺序（已在 groupCommitsByDate 中按出现顺序排列）
+  const sortedDates = Array.from(groupedCommits.keys());
+
   const useColors = supportsColor() || process.env.FORCE_COLOR;
-  
+
   for (let dateIndex = 0; dateIndex < sortedDates.length; dateIndex++) {
     const date = sortedDates[dateIndex];
     const dateCommits = groupedCommits.get(date)!;
-    
+
     // 日期标题 - 使用黄色突出显示
     const dateTitle = `📅 Commits on ${date}`;
     if (useColors) {
-      output += '\n' + colors.bold(colors.yellow(dateTitle)) + '\n\n';
+      output += colors.bold(colors.yellow(dateTitle)) + "\n";
     } else {
-      output += '\n' + dateTitle + '\n\n';
+      output += dateTitle + "\n";
     }
-    
+
     // 该日期下的提交
     for (let commitIndex = 0; commitIndex < dateCommits.length; commitIndex++) {
       const commit = dateCommits[commitIndex];
-      const icon = getCommitTypeIcon(commit.subject);
       const { title, tasks } = parseCommitSubject(commit.subject);
-      
+
       // 构建提交内容
       const commitContent = [];
-      
-      // 主标题 - 使用白色加粗
+
+      // 主标题 - 使用白色加粗，保持原始提交信息
       if (useColors) {
-        commitContent.push(`${icon} ${colors.bold(colors.white(title))}`);
+        commitContent.push(colors.bold(colors.white(title)));
       } else {
-        commitContent.push(`${icon} ${title}`);
+        commitContent.push(title);
       }
-      
+
       // 如果有子任务，添加子任务列表
       if (tasks.length > 0) {
-        commitContent.push(''); // 空行分隔
-        tasks.forEach(task => {
+        commitContent.push(""); // 空行分隔
+        tasks.forEach((task) => {
           if (useColors) {
-            commitContent.push(`  ${colors.dim('–')} ${colors.dim(task)}`);
+            commitContent.push(`  ${colors.dim("–")} ${colors.dim(task)}`);
           } else {
             commitContent.push(`  – ${task}`);
           }
         });
       }
-      
+
       // 空行分隔
-      commitContent.push('');
-      
+      commitContent.push("");
+
       // 作者和时间信息
       if (useColors) {
-        commitContent.push(`${colors.dim('👤')} ${colors.blue(commit.author)} ${colors.dim('committed')} ${colors.green(formatRelativeTime(commit.relativeDate))}`);
-        // Hash信息 - 使用橙色
-        commitContent.push(`${colors.dim('🔗')} ${colors.orange('#' + commit.shortHash)}`);
+        commitContent.push(
+          `${colors.dim("👤")} ${colors.blue(commit.author)} ${colors.dim(
+            "committed"
+          )} ${colors.green(formatRelativeTime(commit.relativeDate))}`
+        );
+        // Hash信息 - 使用橙色，显示完整 hash
+        commitContent.push(`${colors.dim("🔗")} ${colors.orange(commit.hash)}`);
         // 如果有分支/标签信息 - 区分显示
         if (commit.refs && commit.refs.trim()) {
           const refs = commit.refs.trim();
           // 解析并分别显示分支和标签
-          const refParts = refs.split(', ');
+          const refParts = refs.split(", ");
           const branches: string[] = [];
           const tags: string[] = [];
-          
-          refParts.forEach(ref => {
-            if (ref.startsWith('tag: ')) {
-              tags.push(ref.replace('tag: ', ''));
-            } else if (ref.includes('/') || ref === 'HEAD') {
+
+          refParts.forEach((ref) => {
+            if (ref.startsWith("tag: ")) {
+              tags.push(ref.replace("tag: ", ""));
+            } else if (ref.includes("/") || ref === "HEAD") {
               branches.push(ref);
             } else {
               branches.push(ref);
             }
           });
-          
+
           // 显示分支信息
           if (branches.length > 0) {
-            commitContent.push(`${colors.dim('🌿')} ${colors.lightPurple(branches.join(', '))}`);
+            commitContent.push(
+              `${colors.dim("🌿")} ${colors.lightPurple(branches.join(", "))}`
+            );
           }
-          
+
           // 显示标签信息
           if (tags.length > 0) {
-            const tagText = tags.map(tag => `tag ${tag}`).join(', ');
-            commitContent.push(`${colors.dim('🔖')} ${colors.yellow(tagText)}`);
+            const tagText = tags.map((tag) => `tag ${tag}`).join(", ");
+            commitContent.push(
+              `${colors.dim("🔖")} ${colors.brightYellow(tagText)}`
+            );
           }
         }
       } else {
-        commitContent.push(`👤 ${commit.author} committed ${formatRelativeTime(commit.relativeDate)}`);
-        commitContent.push(`🔗 #${commit.shortHash}`);
+        commitContent.push(
+          `👤 ${commit.author} committed ${formatRelativeTime(
+            commit.relativeDate
+          )}`
+        );
+        commitContent.push(`🔗 ${commit.hash}`);
         if (commit.refs && commit.refs.trim()) {
           const refs = commit.refs.trim();
           // 解析并分别显示分支和标签
-          const refParts = refs.split(', ');
+          const refParts = refs.split(", ");
           const branches: string[] = [];
           const tags: string[] = [];
-          
-          refParts.forEach(ref => {
-            if (ref.startsWith('tag: ')) {
-              tags.push(ref.replace('tag: ', ''));
-            } else if (ref.includes('/') || ref === 'HEAD') {
+
+          refParts.forEach((ref) => {
+            if (ref.startsWith("tag: ")) {
+              tags.push(ref.replace("tag: ", ""));
+            } else if (ref.includes("/") || ref === "HEAD") {
               branches.push(ref);
             } else {
               branches.push(ref);
             }
           });
-          
+
           // 显示分支信息
           if (branches.length > 0) {
-            commitContent.push(`🌿 ${branches.join(', ')}`);
+            commitContent.push(`🌿 ${branches.join(", ")}`);
           }
-          
+
           // 显示标签信息
           if (tags.length > 0) {
-            const tagText = tags.map(tag => `tag ${tag}`).join(', ');
+            const tagText = tags.map((tag) => `tag ${tag}`).join(", ");
             commitContent.push(`🔖 ${tagText}`);
           }
         }
       }
-      
+
       // 使用boxen
-      const commitBox = boxen(commitContent.join('\n'), {
+      const commitBox = boxen(commitContent.join("\n"), {
         padding: { top: 0, bottom: 0, left: 1, right: 1 },
-        margin: { top: 0, bottom: 1, left: 0, right: 0 },
-        borderStyle: 'round',
-        borderColor: 'gray'
+        margin: { top: 0, bottom: 0, left: 0, right: 0 },
+        borderStyle: "round",
+        borderColor: "gray",
       });
-      
-      output += commitBox + '\n';
+
+      output += commitBox + "\n";
     }
   }
-  
+
   return output;
 }
 
@@ -352,34 +381,42 @@ function formatTimelineStyle(commits: CommitInfo[]): string {
  */
 function startInteractivePager(content: string): void {
   // 使用系统的 less 命令作为分页器，启用颜色支持
-  const pager = process.env.PAGER || 'less';
-  
+  const pager = process.env.PAGER || "less";
+
   try {
     // -R: 支持ANSI颜色代码
     // -S: 不换行长行
     // -F: 如果内容少于一屏则直接退出
     // -X: 不清屏
     // -i: 忽略大小写搜索
-    const pagerProcess = spawn(pager, ['-R', '-S', '-F', '-X', '-i'], {
-      stdio: ['pipe', 'inherit', 'inherit'],
-      env: { ...process.env, LESS: '-R -S -F -X -i' }
+    const pagerProcess = spawn(pager, ["-R", "-S", "-F", "-X", "-i"], {
+      stdio: ["pipe", "inherit", "inherit"],
+      env: { ...process.env, LESS: "-R -S -F -X -i" },
     });
-    
+
+    // 处理 stdin 的 EPIPE 错误（当 less 提前退出时）
+    pagerProcess.stdin.on("error", (err: NodeJS.ErrnoException) => {
+      if (err.code !== "EPIPE") {
+        // 只忽略 EPIPE 错误，其他错误输出
+        console.error(err);
+      }
+    });
+
     // 将内容写入分页器
     pagerProcess.stdin.write(content);
     pagerProcess.stdin.end();
-    
+
     // 处理分页器退出
-    pagerProcess.on('exit', () => {
-      // 分页器退出后不需要额外处理
+    pagerProcess.on("exit", () => {
+      // 分页器退出后正常退出程序
+      process.exit(0);
     });
-    
+
     // 处理错误
-    pagerProcess.on('error', (err) => {
+    pagerProcess.on("error", () => {
       // 如果分页器启动失败，直接输出内容
       console.log(content);
     });
-    
   } catch (error) {
     // 如果出错，直接输出内容
     console.log(content);
@@ -393,7 +430,7 @@ function executeTimelineLog(options: LogOptions): void {
   try {
     // 构建Git命令
     let cmd = 'git log --pretty=format:"%H|%h|%s|%an|%ad|%ar|%D" --date=short';
-    
+
     // 添加选项
     if (options.limit && !options.interactive) cmd += ` -${options.limit}`;
     if (options.author) cmd += ` --author="${options.author}"`;
@@ -401,53 +438,41 @@ function executeTimelineLog(options: LogOptions): void {
     if (options.until) cmd += ` --until="${options.until}"`;
     if (options.grep) cmd += ` --grep="${options.grep}"`;
     if (options.all) cmd += ` --all`;
-    
-    // 交互式模式默认显示更多提交
-    if (options.interactive && !options.limit) {
-      cmd += ` -50`; // 默认显示50个提交
-    }
 
-    const output = execSync(cmd, { 
-      encoding: 'utf8',
-      stdio: 'pipe',
-      maxBuffer: 1024 * 1024 * 10
+    // 交互式模式默认显示全部提交（不限制数量）
+
+    const output = execSync(cmd, {
+      encoding: "utf8",
+      stdio: "pipe",
+      maxBuffer: 1024 * 1024 * 10,
     });
 
     if (output.trim()) {
       const commits = parseGitLog(output);
-      
+
       // 构建完整输出
-      let fullOutput = '';
-      
-      // 显示标题
-      const title = `📊 共显示 ${commits.length} 个提交`;
-      fullOutput += '\n' + boxen(title, {
-        padding: { top: 0, bottom: 0, left: 2, right: 2 },
-        margin: { top: 0, bottom: 1, left: 0, right: 0 },
-        borderStyle: 'double',
-        borderColor: 'green',
-        textAlignment: 'center'
-      }) + '\n';
-      
+      let fullOutput = "";
+
       // 显示时间线
       const timelineOutput = formatTimelineStyle(commits);
       fullOutput += timelineOutput;
-      
+
       // 根据是否交互式模式选择输出方式
       if (options.interactive) {
         startInteractivePager(fullOutput);
       } else {
         console.log(fullOutput);
       }
-      
     } else {
-      const noCommitsMsg = '\n' + boxen('📭 没有找到匹配的提交记录', {
-        padding: { top: 0, bottom: 0, left: 2, right: 2 },
-        borderStyle: 'round',
-        borderColor: 'yellow',
-        textAlignment: 'center'
-      });
-      
+      const noCommitsMsg =
+        "\n" +
+        boxen("📭 没有找到匹配的提交记录", {
+          padding: { top: 0, bottom: 0, left: 2, right: 2 },
+          borderStyle: "round",
+          borderColor: "yellow",
+          textAlignment: "center",
+        });
+
       if (options.interactive) {
         startInteractivePager(noCommitsMsg);
       } else {
@@ -455,20 +480,22 @@ function executeTimelineLog(options: LogOptions): void {
       }
     }
   } catch (error: any) {
-    let errorMessage = '❌ 执行失败';
+    let errorMessage = "❌ 执行失败";
     if (error.status === 128) {
-      errorMessage = '❌ Git仓库错误或没有提交记录';
+      errorMessage = "❌ Git仓库错误或没有提交记录";
     } else {
       errorMessage = `❌ 执行失败: ${error.message}`;
     }
-    
-    const errorBox = '\n' + boxen(errorMessage, {
-      padding: { top: 0, bottom: 0, left: 2, right: 2 },
-      borderStyle: 'round',
-      borderColor: 'red',
-      textAlignment: 'center'
-    });
-    
+
+    const errorBox =
+      "\n" +
+      boxen(errorMessage, {
+        padding: { top: 0, bottom: 0, left: 2, right: 2 },
+        borderStyle: "round",
+        borderColor: "red",
+        textAlignment: "center",
+      });
+
     if (options.interactive) {
       startInteractivePager(errorBox);
     } else {
@@ -485,12 +512,12 @@ export async function log(options: LogOptions = {}): Promise<void> {
   if (options.interactive === undefined) {
     options.interactive = true;
   }
-  
+
   // 交互式模式下不设置默认limit
   if (!options.interactive && !options.limit) {
     options.limit = 10;
   }
-  
+
   executeTimelineLog(options);
 }
 
@@ -500,4 +527,4 @@ export async function log(options: LogOptions = {}): Promise<void> {
 export async function quickLog(limit: number = 10): Promise<void> {
   const options: LogOptions = { limit };
   executeTimelineLog(options);
-}
+}

package/src/index.ts

@@ -356,11 +356,11 @@ cli
   .action(async (options: any) => {
     await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
-    
+
     // 构建选项对象 - 默认交互式模式
     const logOptions: any = { interactive: true };
     if (options.limit) logOptions.limit = parseInt(options.limit);
-    
+
     return log(logOptions);
   });
 

package/src/utils.ts

@@ -12,6 +12,7 @@ export interface Colors {
   orange: (s: string) => string;
   lightPurple: (s: string) => string;
   white: (s: string) => string;
+  brightYellow: (s: string) => string;
   reset: string;
 }
 
@@ -27,6 +28,7 @@ export const colors: Colors = {
   orange: (s) => `\x1b[38;5;208m${s}\x1b[0m`,
   lightPurple: (s) => `\x1b[38;5;141m${s}\x1b[0m`,
   white: (s) => `\x1b[37m${s}\x1b[0m`,
+  brightYellow: (s) => `\x1b[93m${s}\x1b[0m`, // 亮黄色
   reset: "\x1b[0m",
 };
 

package/tsup.config.ts

@@ -20,7 +20,7 @@ export default defineConfig({
     "cac",
   ],
   banner: {
-    js: "#!/usr/bin/env -S node --no-warnings=ExperimentalWarning",
+    js: "#!/usr/bin/env -S node --disable-warning=ExperimentalWarning",
   },
   define: {
     __VERSION__: JSON.stringify(pkg.version),