From b554c303193aa5d22af5f8a4b91430077113e6db Mon Sep 17 00:00:00 2001
From: ax_rd <ax_rd@aisim.cn>
Date: Thu, 03 Sep 2026 13:21:36 +0800
Subject: [PATCH] fix: search 长 CJK 词 bigram 展开统一下沉(ExpandCJKKeywords 共享 + textScore 按 Expanded 档计权 + graph query 边 provenance 填充)

---
 cmd/search.go |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/cmd/search.go b/cmd/search.go
index 51d1496..379d3cf 100644
--- a/cmd/search.go
+++ b/cmd/search.go
@@ -3,9 +3,11 @@
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/aisim/kb-cli/internal/index"
 	"github.com/aisim/kb-cli/internal/search"
+	"github.com/aisim/kb-cli/internal/llm"
 	"github.com/aisim/kb-cli/internal/output"
 	"github.com/spf13/cobra"
 )
@@ -36,6 +38,9 @@
 	searchCmd.Flags().BoolVar(&jsonOut, "json", false, "JSON 格式输出")
 	searchCmd.Flags().BoolVar(&withContent, "with-content", false, "返回完整文件内容")
 	searchCmd.Flags().BoolVar(&withLinks, "with-links", false, "显示关联文档链接")
+	
+	// 参数不足时显示 help
+	searchCmd.SetUsageTemplate(searchCmd.Long)
 }
 
 func runSearch(cmd *cobra.Command, args []string) error {
@@ -46,29 +51,47 @@
 	}
 	defer store.Close()
 
-	// 检查是否需要重建索引
-	needsRebuild, commit, err := index.NeedsRebuild(store, vaultPath)
+	// pre-flight:快速检查索引是否有变更(只 stat 比对,不读内容)
+	dirty, err := index.QuickCheck(store, vaultPath)
 	if err != nil {
 		return fmt.Errorf("检查索引状态失败: %w", err)
 	}
 
-	if needsRebuild {
-		fmt.Fprintln(os.Stderr, "索引过期,正在重建...")
-		if err := rebuildIndex(store, commit); err != nil {
-			return fmt.Errorf("重建索引失败: %w", err)
+	if dirty {
+		fmt.Fprintln(os.Stderr, "索引有变更,正在增量同步...")
+		if err := syncIndex(store); err != nil {
+			return fmt.Errorf("增量同步失败: %w", err)
 		}
 	}
 
+	// 合并所有关键词(支持空格分隔和引号分隔)
+	var allKeywords []string
+	for _, arg := range args {
+		// 如果参数包含空格,按空格分割
+		parts := strings.Fields(arg)
+		allKeywords = append(allKeywords, parts...)
+	}
+
+	if len(allKeywords) == 0 {
+		return fmt.Errorf("请提供至少一个关键词")
+	}
+
 	// 执行搜索
+	cfg := llm.LoadConfig()
+	textWeight := cfg.Search.TextWeight
+	if textWeight <= 0 || textWeight > 1 {
+		textWeight = 0.5 // 缺省 0.5
+	}
 	opts := search.SearchOptions{
 		Expanded:    expanded,
 		Symptom:     symptom,
 		TopN:        topN,
 		WithContent: withContent,
 		WithLinks:   withLinks,
+		TextWeight:  textWeight,
 	}
 
-	results, err := search.Search(store, args, opts)
+	results, err := search.Search(store, allKeywords, opts)
 	if err != nil {
 		return fmt.Errorf("搜索失败: %w", err)
 	}

--
Gitblit v1.10.0