@zjex/git-workflow 0.3.0 → 0.3.3

package/src/ai-service.ts

@@ -60,7 +60,7 @@ function getGitDiff(): string {
 /**
  * 构建 AI prompt
  */
-function buildPrompt(diff: string, language: string, detailedDescription: boolean = false): string {
+function buildPrompt(diff: string, language: string, detailedDescription: boolean = false, useEmoji: boolean = true): string {
   const isZh = language === "zh-CN";
 
   if (detailedDescription) {
@@ -69,7 +69,7 @@ function buildPrompt(diff: string, language: string, detailedDescription: boolea
       ? `你是一个专业的 Git commit message 生成助手。请根据提供的 git diff 生成符合 Conventional Commits 规范的详细 commit message。
 
 格式要求：
-1. 第一行：<type>(<scope>): <subject>
+1. 第一行：${useEmoji ? '<emoji> ' : ''}<type>(<scope>): <subject>
 2. 空行
 3. 详细描述：列出主要修改点，每个修改点一行，以 "- " 开头
 
@@ -80,9 +80,22 @@ function buildPrompt(diff: string, language: string, detailedDescription: boolea
 - 详细描述要列出 3-6 个主要修改点，每个修改点简洁明了
 - 如果修改较少，可以只列出 2-3 个修改点
 - 不要有其他解释或多余内容
+${useEmoji ? `
+Emoji 映射规则：
+- feat: ✨ (新功能)
+- fix: 🐛 (修复Bug)
+- docs: 📝 (文档)
+- style: 💄 (代码格式)
+- refactor: ♻️ (重构)
+- perf: ⚡️ (性能优化)
+- test: ✅ (测试)
+- build: 📦 (构建)
+- ci: 👷 (CI/CD)
+- chore: 🔧 (其他杂项)
+- revert: ⏪ (回滚)` : ''}
 
 示例：
-feat(auth): 添加用户登录功能
+${useEmoji ? '✨ ' : ''}feat(auth): 添加用户登录功能
 
 - 实现用户名密码登录接口
 - 添加登录状态验证中间件
@@ -91,7 +104,7 @@ feat(auth): 添加用户登录功能
       : `You are a professional Git commit message generator. Generate a detailed commit message following Conventional Commits specification based on the provided git diff.
 
 Format requirements:
-1. First line: <type>(<scope>): <subject>
+1. First line: ${useEmoji ? '<emoji> ' : ''}<type>(<scope>): <subject>
 2. Empty line
 3. Detailed description: List main changes, one per line, starting with "- "
 
@@ -102,9 +115,22 @@ Rules:
 - Detailed description should list 3-6 main changes, each change should be concise
 - If changes are minimal, list 2-3 changes
 - No explanations or extra content
+${useEmoji ? `
+Emoji mapping rules:
+- feat: ✨ (new feature)
+- fix: 🐛 (bug fix)
+- docs: 📝 (documentation)
+- style: 💄 (code style)
+- refactor: ♻️ (refactoring)
+- perf: ⚡️ (performance)
+- test: ✅ (testing)
+- build: 📦 (build)
+- ci: 👷 (CI/CD)
+- chore: 🔧 (chore)
+- revert: ⏪ (revert)` : ''}
 
 Example:
-feat(auth): add user login functionality
+${useEmoji ? '✨ ' : ''}feat(auth): add user login functionality
 
 - Implement username/password login API
 - Add login status validation middleware
@@ -122,31 +148,57 @@ feat(auth): add user login functionality
       ? `你是一个专业的 Git commit message 生成助手。请根据提供的 git diff 生成符合 Conventional Commits 规范的 commit message。
 
 规则：
-1. 格式：<type>(<scope>): <subject>
+1. 格式：${useEmoji ? '<emoji> ' : ''}<type>(<scope>): <subject>
 2. type 必须是以下之一：feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
 3. scope 是可选的，表示影响范围
 4. subject 用中文描述，简洁明了，不超过 50 字
 5. 只返回一条 commit message，即使有多个文件改动也要总结成一条
 6. 不要有其他解释或多余内容
+${useEmoji ? `
+Emoji 映射规则：
+- feat: ✨ (新功能)
+- fix: 🐛 (修复Bug)
+- docs: 📝 (文档)
+- style: 💄 (代码格式)
+- refactor: ♻️ (重构)
+- perf: ⚡️ (性能优化)
+- test: ✅ (测试)
+- build: 📦 (构建)
+- ci: 👷 (CI/CD)
+- chore: 🔧 (其他杂项)
+- revert: ⏪ (回滚)` : ''}
 
 示例：
-- feat(auth): 添加用户登录功能
-- fix(api): 修复数据获取失败的问题
-- docs(readme): 更新安装说明`
+- ${useEmoji ? '✨ ' : ''}feat(auth): 添加用户登录功能
+- ${useEmoji ? '🐛 ' : ''}fix(api): 修复数据获取失败的问题
+- ${useEmoji ? '📝 ' : ''}docs(readme): 更新安装说明`
       : `You are a professional Git commit message generator. Generate a commit message following Conventional Commits specification based on the provided git diff.
 
 Rules:
-1. Format: <type>(<scope>): <subject>
+1. Format: ${useEmoji ? '<emoji> ' : ''}<type>(<scope>): <subject>
 2. type must be one of: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
 3. scope is optional, indicates the affected area
 4. subject should be concise, no more than 50 characters
 5. Return only ONE commit message, even if multiple files are changed, summarize into one message
 6. No explanations or extra content
+${useEmoji ? `
+Emoji mapping rules:
+- feat: ✨ (new feature)
+- fix: 🐛 (bug fix)
+- docs: 📝 (documentation)
+- style: 💄 (code style)
+- refactor: ♻️ (refactoring)
+- perf: ⚡️ (performance)
+- test: ✅ (testing)
+- build: 📦 (build)
+- ci: 👷 (CI/CD)
+- chore: 🔧 (chore)
+- revert: ⏪ (revert)` : ''}
 
 Examples:
-- feat(auth): add user login functionality
-- fix(api): resolve data fetching failure
-- docs(readme): update installation guide`;
+- ${useEmoji ? '✨ ' : ''}feat(auth): add user login functionality
+- ${useEmoji ? '🐛 ' : ''}fix(api): resolve data fetching failure
+- ${useEmoji ? '📝 ' : ''}docs(readme): update installation guide`;
 
     const userPrompt = isZh
       ? `请根据以下 git diff 生成 commit message：\n\n${diff}`
@@ -291,10 +343,16 @@ async function callOllamaAPI(
 
 /**
  * 清理AI生成的commit message
- * 移除重复行和多余的空行
+ * 移除重复行、多余的空行和开头的特殊字符
  */
 function cleanAIResponse(response: string): string {
-  const lines = response.split('\n').map(line => line.trim()).filter(line => line);
+  // 移除开头的特殊字符（如 ...、```、等）
+  let cleaned = response.replace(/^[.\s`~-]+/, '').trim();
+  
+  // 移除结尾的特殊字符
+  cleaned = cleaned.replace(/[.\s`~-]+$/, '').trim();
+  
+  const lines = cleaned.split('\n').map(line => line.trim()).filter(line => line);
   
   // 移除重复的行
   const uniqueLines = [];
@@ -321,6 +379,9 @@ export async function generateAICommitMessage(
   const language = aiConfig.language || "zh-CN";
   const detailedDescription = aiConfig.detailedDescription !== false; // 默认启用详细描述
   const maxTokens = aiConfig.maxTokens || (detailedDescription ? 400 : 200);
+  
+  // AI emoji配置：优先使用aiCommit.useEmoji，如果未设置则使用全局useEmoji，默认true
+  const useEmoji = aiConfig.useEmoji !== undefined ? aiConfig.useEmoji : (config.useEmoji !== false);
 
   // 获取 git diff
   const diff = getGitDiff();
@@ -334,7 +395,7 @@ export async function generateAICommitMessage(
     diff.length > maxDiffLength ? diff.slice(0, maxDiffLength) + "\n..." : diff;
 
   // 构建 prompt
-  const prompt = buildPrompt(truncatedDiff, language, detailedDescription);
+  const prompt = buildPrompt(truncatedDiff, language, detailedDescription, useEmoji);
 
   // 根据提供商调用对应的 API
   const providerInfo = AI_PROVIDERS[provider];

package/src/commands/commit.ts

@@ -277,14 +277,17 @@ export async function commit(): Promise<void> {
       return;
     }
 
-    // 使用 -m 参数，需要转义引号
-    const escapedMessage = message.replace(/"/g, '\\"');
-    execSync(`git commit -m "${escapedMessage}"`, { stdio: "pipe" });
+    // 处理多行消息：使用 git commit -F - 通过 stdin 传递
+    // 这样可以正确处理包含换行符的 commit message
+    execSync(`git commit -F -`, {
+      input: message,
+    });
     spinner.succeed("提交成功");
 
     // 显示提交信息
     const commitHash = execOutput("git rev-parse --short HEAD");
     console.log(colors.dim(`commit: ${commitHash}`));
+    console.log("");
   } catch (error) {
     spinner.fail("提交失败");
     console.log("");
@@ -299,6 +302,9 @@ export async function commit(): Promise<void> {
     console.log(colors.yellow("你可以手动执行以下命令:"));
     console.log(colors.cyan(`  git commit -m "${message}"`));
     console.log("");
+
+    // 重新抛出错误，让调用者知道提交失败了
+    throw error;
   }
 }
 

package/src/commands/init.ts

@@ -283,12 +283,35 @@ export async function init(): Promise<void> {
       theme,
     });
 
+    const aiUseEmoji = await select({
+      message: "AI 生成的 commit message 是否包含 emoji?",
+      choices: [
+        { 
+          name: "是（推荐）", 
+          value: true,
+          description: "如：✨ feat(auth): 添加用户登录功能"
+        },
+        { 
+          name: "否", 
+          value: false,
+          description: "如：feat(auth): 添加用户登录功能"
+        },
+        { 
+          name: "跟随全局设置", 
+          value: undefined,
+          description: `当前全局设置：${useEmoji ? '启用' : '禁用'} emoji`
+        },
+      ],
+      theme,
+    });
+
     config.aiCommit = {
       enabled: true,
       provider: aiProvider as "github" | "openai" | "claude" | "ollama",
       apiKey: apiKey || undefined,
       language: language as "zh-CN" | "en-US",
       detailedDescription,
+      useEmoji: aiUseEmoji,
     };
 
     // 根据提供商设置默认模型