fix(generate): 移除stop words并改进消息提取逻辑 (#14)

* fix(generate): 移除stop words并改进消息提取逻辑

- 移除STOP_WORDS常量以避免AI思考过程中的干扰
- 将DEFAULT_MAX_TOKENS从2048增加到4096以支持更长的响应
- 重写extract_aicommit_message函数，改进提取逻辑以处理多个<aicommit>块
- 移除对lazy_static的依赖

Signed-off-by: longjin <longjin@DragonOS.org>

* chore: 更新版本号至 0.2.2

Signed-off-by: longjin <longjin@DragonOS.org>

---------

Signed-off-by: longjin <longjin@DragonOS.org>

Author: fslongjin

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "fastcommit"
-version = "0.2.1"
+version = "0.2.2"
 description = "AI-based command line tool to quickly generate standardized commit messages."
 edition = "2021"
 authors = ["longjin <fslongjin@vip.qq.com>"]

Cargo.toml

@@ -10,7 +10,7 @@ You can install `fastcommit` using the following method:
 
 ```bash
 # Install using cargo
-cargo install --git  https://github.com/fslongjin/fastcommit --tag v0.2.1
+cargo install --git  https://github.com/fslongjin/fastcommit --tag v0.2.2
 ```
 
 ## Usage

README.md

@@ -8,7 +8,7 @@
 
 ```bash
 # 使用 cargo 安装
-cargo install --git  https://github.com/fslongjin/fastcommit --tag v0.2.1
+cargo install --git  https://github.com/fslongjin/fastcommit --tag v0.2.2
 ```
 
 ## 使用

README_CN.md

@@ -90,11 +90,7 @@ impl PromptTemplateReplaceLabel {
     }
 }
 
-lazy_static! {
-    pub static ref STOP_WORDS: Vec<String> = vec![String::from("</aicommit>")];
-}
-
-pub const DEFAULT_MAX_TOKENS: u32 = 2048;
+pub const DEFAULT_MAX_TOKENS: u32 = 4096;
 
 pub const BRANCH_NAME_PROMPT: &str = r#"
 # 角色

src/constants.rs

@@ -6,9 +6,7 @@ use crate::cli;
 use crate::config::{self, Config};
 
 use crate::constants::BRANCH_NAME_PROMPT;
-use crate::constants::{
-    DEFAULT_MAX_TOKENS, DEFAULT_OPENAI_MODEL, DEFAULT_PROMPT_TEMPLATE, STOP_WORDS,
-};
+use crate::constants::{DEFAULT_MAX_TOKENS, DEFAULT_OPENAI_MODEL, DEFAULT_PROMPT_TEMPLATE};
 use crate::template_engine::{render_template, TemplateContext};
 
 async fn generate_commit_message(
@@ -59,7 +57,7 @@ async fn generate_commit_message(
         top_p: None,
         n: None,
         stream: Some(false),
-        stop: Some(STOP_WORDS.to_owned()),
+        stop: None, // 移除 stop words 以避免思考过程中的干扰
         max_tokens: Some(DEFAULT_MAX_TOKENS as i32),
         presence_penalty: None,
         frequency_penalty: None,
@@ -103,25 +101,32 @@ fn delete_thinking_contents(orig: &str) -> String {
 }
 
 fn extract_aicommit_message(response: &str) -> anyhow::Result<String> {
-    let start_tag = "<aicommit>";
-    let end_tag = "</aicommit>";
-
     let response = delete_thinking_contents(response);
 
-    let start_idx = response
-        .find(start_tag)
-        .ok_or(anyhow::anyhow!("Start tag <aicommit> not found"))?
-        + start_tag.len();
-    let end_idx = response.find(end_tag).unwrap_or_else(|| response.len());
+    // 查找所有 <aicommit>...</aicommit> 块
+    let mut matches = Vec::new();
+    let mut pos = 0;
+
+    while let Some(start_idx) = response[pos..].find("<aicommit>") {
+        let absolute_start = pos + start_idx;
+        let content_start = absolute_start + "<aicommit>".len();
 
-    if start_idx >= end_idx {
-        return Err(anyhow::anyhow!(
-            "End tag </aicommit> not found or misplaced"
-        ));
+        if let Some(end_idx) = response[content_start..].find("</aicommit>") {
+            let absolute_end = content_start + end_idx;
+            let content = &response[content_start..absolute_end];
+            matches.push(content.trim());
+            pos = absolute_end + "</aicommit>".len();
+        } else {
+            break;
+        }
     }
 
-    let commit_message = response[start_idx..end_idx].trim().to_string();
-    Ok(commit_message)
+    // 返回第一个匹配的内容
+    matches
+        .into_iter()
+        .next()
+        .map(|s| s.to_string())
+        .ok_or(anyhow::anyhow!("Start tag <aicommit> not found"))
 }
 
 fn get_diff(diff_file: Option<&str>, range: Option<&str>) -> anyhow::Result<String> {
@@ -186,7 +191,7 @@ async fn generate_branch_name_with_ai(
         top_p: None,
         n: None,
         stream: Some(false),
-        stop: Some(STOP_WORDS.to_owned()),
+        stop: None, // 移除 stop words 以避免思考过程中的干扰
         max_tokens: Some(DEFAULT_MAX_TOKENS as i32),
         presence_penalty: None,
         frequency_penalty: None,

src/generate.rs

@@ -1,9 +1,6 @@
 use clap::Parser;
 use log::error;
 
-#[macro_use]
-extern crate lazy_static;
-
 mod cli;
 mod config;
 mod constants;