Merge branch 'main' into feat/more_accurate_prompt

Author: simuleite

README.md

@@ -81,8 +81,8 @@ see [UniAST Specification](docs/uniast-zh.md)
 ## Tips:
 
 - You can add more repo ASTs into the AST directory without restarting abcoder MCP server.
-
-- Try to use [the recommened prompt](llm/prompt/analyzer.md) and combine planning/memory tools like [sequential-thinking](https://github.com/modelcontextprotocol/servers/tree/main/src/sequentialthinking) in your AI agent.
+    
+- Try to use [the recommended prompt](llm/prompt/analyzer.md) and combine planning/memory tools like [sequential-thinking](https://github.com/modelcontextprotocol/servers/tree/main/src/sequentialthinking) in your AI agent.
 
 
 ## Claude Code Integration

docs/parser-en.md

@@ -38,7 +38,7 @@ type LanguageSpec interface {
     WorkSpace(root string) (map[string]string, error)
 
     // give an absolute file path and returns its module name and package path
-    // external path should alse be supported
+    // external path should also be supported
     // FIXEM: some language (like rust) may have sub-mods inside a file, but we still consider it as a unity mod here
     NameSpace(path string) (string, string, error)
 

docs/parser-zh.md

@@ -29,7 +29,7 @@
 - CheckRepo()：检查用户仓库情况，根据各语言规范额处理工具链等问题，并返回默认打开的第一个文件（用于触发 LSP server），以及等候 sever 初始化完成的时间（根据仓库大小来决定）
 - **LanguageSpec interface**: 核心模块，用于处理非 LSP 通用的语法信息、比如判断一个 token 是否是标准库的符号、函数签名解析等：
 
-### LaunguageSpec
+### LanguageSpec
 
 用于在 LSP 符号收集过程中转换为 UniAST 所需信息，并且这些信息非 LSP 通用定义
 
@@ -40,7 +40,7 @@ type LanguageSpec interface {
     WorkSpace(root string) (map[string]string, error)
 
     // give an absolute file path and returns its module name and package path
-    // external path should alse be supported
+    // external path should also be supported
     // FIXEM: some language (like rust) may have sub-mods inside a file, but we still consider it as a unity mod here
     NameSpace(path string) (string, string, error)
 

docs/uniast-en.md

@@ -154,7 +154,7 @@ An independent code compilation unit, corresponding to ModPath in Identity, cont
 - Dependencies: Dictionary of third-party dependency modules for module building {ModName}: {ModPath}
 
 
-- Packages: Contains subpackages, {PkgPath}: {Pacakge AST} dictionary
+- Packages: Contains subpackages, {PkgPath}: {Package AST} dictionary
 
 
 - Files: Module file information, where the key is the **path relative to the repo**. It is recommended to include all repository files here to facilitate writer rewriting
@@ -638,7 +638,7 @@ const (
     FUNC
     // Struct、TypeAlias、Enum...
     TYPE
-    // Global Varable or Global Const
+    // Global Variable or Global Const
     VAR
 )
 ```

docs/uniast-zh.md

@@ -154,7 +154,7 @@ Universal Abstract-Syntax-Tree 是 ABCoder 建立的一种 LLM 亲和、语言
 - Dependencies: 模块构建的第三方依赖模块字典 {ModName}: {ModPath}
 
 
-- Packages: 包含的子包，{PkgPath}: {Pacakge AST} 字典
+- Packages: 包含的子包，{PkgPath}: {Package AST} 字典
 
 
 - Files: 模块文件信息，key 为**相对 repo 的路径。**这里建议包括仓库所有文件，方便 writer 回写
@@ -638,7 +638,7 @@ const (
     FUNC
     // Struct、TypeAlias、Enum...
     TYPE
-    // Global Varable or Global Const
+    // Global Variable or Global Const
     VAR
 )
 ```

lang/golang/parser/parser.go

@@ -48,6 +48,7 @@ type GoParser struct {
 	files       map[string][]byte
 	exclues     []*regexp.Regexp
 	cgoPkgs     map[string]bool // CGO packages
+	workDirs    map[string]bool // directories that are in go.work scope
 }
 
 type moduleInfo struct {
@@ -97,10 +98,33 @@ func newGoParser(name string, homePageDir string, opts Options) *GoParser {
 }
 
 func (p *GoParser) collectGoMods(startDir string) error {
-	hasGoWork := false
+	var workFiles []string
+	err := filepath.Walk(startDir, func(path string, info fs.FileInfo, err error) error {
+		if err != nil || !strings.HasSuffix(path, "go.work") {
+			return nil
+		}
+		workFiles = append(workFiles, path)
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	p.workDirs = make(map[string]bool)
+	for _, workPath := range workFiles {
+		wf, err := parseGoWork(workPath)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "failed to parse go.work file %s: %v\n", workPath, err)
+			continue
+		}
+		for _, useDir := range wf.UseDirs {
+			p.workDirs[useDir] = true
+		}
+	}
+	fmt.Printf("go work effective dirs: %v\n", p.workDirs)
 	deps := map[string]string{}
 	var cgoPkgs map[string]bool
-	err := filepath.Walk(startDir, func(path string, info fs.FileInfo, err error) error {
+	err = filepath.Walk(startDir, func(path string, info fs.FileInfo, err error) error {
 		if err != nil || !strings.HasSuffix(path, "go.mod") {
 			return nil
 		}
@@ -117,7 +141,7 @@ func (p *GoParser) collectGoMods(startDir string) error {
 		p.repo.Modules[name] = newModule(name, rel)
 		p.modules = append(p.modules, newModuleInfo(name, rel, name))
 
-		deps, hasGoWork, cgoPkgs, err = getDeps(filepath.Dir(path), hasGoWork)
+		deps, cgoPkgs, err = getDeps(filepath.Dir(path), p.workDirs)
 		if err != nil {
 			return err
 		}
@@ -161,31 +185,40 @@ type dep struct {
 	CgoFiles []string `json:"CgoFiles"`
 }
 
-func getDeps(dir string, goWork bool) (a map[string]string, hasGoWork bool, cgoPkgs map[string]bool, err error) {
+func getDeps(dir string, workDirs map[string]bool) (a map[string]string, cgoPkgs map[string]bool, err error) {
 	cgoPkgs = make(map[string]bool)
-	// run go mod tidy first to ensure all dependencies are resolved
+	absDir, err := filepath.Abs(dir)
+	if err != nil {
+		return nil, cgoPkgs, fmt.Errorf("failed to get absolute path: %w", err)
+	}
+
+	inWorkSpace := false
+	for workDir := range workDirs {
+		if absDir == workDir || strings.HasPrefix(absDir, workDir+string(filepath.Separator)) {
+			inWorkSpace = true
+			break
+		}
+	}
+
 	cmd := exec.Command("go", "mod", "tidy", "-e")
 	cmd.Dir = dir
-	cmd.Env = append(os.Environ(), "GONOSUMDB=*")
+	cmd.Env = append(os.Environ(), "GONOSUMDB=*", "GOTOOLCHAIN=local")
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed to execute 'go mod tidy', err: %v, output: %s, remove go.sum file reexecute\n", err, string(output))
 		os.Remove(filepath.Join(dir, "go.sum"))
 		cmd = exec.Command("go", "mod", "tidy", "-e")
 		cmd.Dir = dir
-		cmd.Env = append(os.Environ(), "GOSUMDB=off")
+		cmd.Env = append(os.Environ(), "GOSUMDB=off", "GOTOOLCHAIN=local")
 		output, err = cmd.CombinedOutput()
 		if err != nil {
-			return nil, hasGoWork, cgoPkgs, fmt.Errorf("failed to execute 'go mod tidy', err: %v, output: %s", err, string(output))
+			return nil, cgoPkgs, fmt.Errorf("failed to execute 'go mod tidy', err: %v, output: %s", err, string(output))
 		}
 	}
 	if hasNoDeps(filepath.Join(dir, "go.mod")) {
-		return map[string]string{}, hasGoWork, cgoPkgs, nil
+		return map[string]string{}, cgoPkgs, nil
 	}
-	// -mod=mod to use go mod when go mod is inconsistent with go vendor
-	// if go.work exist, it's no need to set -mod=mod
-	if _, err = os.Stat(filepath.Join(dir, "go.work")); err == nil || goWork {
-		hasGoWork = true
+	if inWorkSpace {
 		cmd = exec.Command("go", "list", "-e", "-json", "all")
 	} else {
 		cmd = exec.Command("go", "list", "-e", "-json", "-mod=mod", "all")
@@ -194,12 +227,12 @@ func getDeps(dir string, goWork bool) (a map[string]string, hasGoWork bool, cgoP
 	cmd.Env = append(os.Environ(), "GOSUMDB=off")
 	output, err = cmd.CombinedOutput()
 	if err != nil {
-		return nil, hasGoWork, cgoPkgs, fmt.Errorf("failed to execute 'go list -json all', err: %v, output: %s, cmd string: %s, dir: %s", err, string(output), cmd.String(), dir)
+		return nil, cgoPkgs, fmt.Errorf("failed to execute 'go list -json all', err: %v, output: %s, cmd string: %s, dir: %s", err, string(output), cmd.String(), dir)
 	}
 	// ignore content until first open
 	index := strings.Index(string(output), "{")
 	if index == -1 {
-		return nil, hasGoWork, cgoPkgs, fmt.Errorf("failed to find '{' in output, output: %s", string(output))
+		return nil, cgoPkgs, fmt.Errorf("failed to find '{' in output, output: %s", string(output))
 	}
 	if index > 0 {
 		log.Info("go list skip prefix, output: %s", string(output[:index]))
@@ -213,7 +246,7 @@ func getDeps(dir string, goWork bool) (a map[string]string, hasGoWork bool, cgoP
 			if err.Error() == "EOF" {
 				break
 			}
-			return nil, hasGoWork, cgoPkgs, fmt.Errorf("failed to decode json: %v, output: %s", err, string(output))
+			return nil, cgoPkgs, fmt.Errorf("failed to decode json: %v, output: %s", err, string(output))
 		}
 		module := mod.Module
 		// golang internal package, ignore it.
@@ -239,7 +272,7 @@ func getDeps(dir string, goWork bool) (a map[string]string, hasGoWork bool, cgoP
 			}
 		}
 	}
-	return deps, hasGoWork, cgoPkgs, nil
+	return deps, cgoPkgs, nil
 }
 
 // ParseRepo parse the entiry repo from homePageDir recursively until end
@@ -263,6 +296,7 @@ func (p *GoParser) ParseModule(mod *Module, dir string) (err error) {
 	// run go mod tidy before parse
 	cmd := exec.Command("go", "mod", "tidy")
 	cmd.Dir = dir
+	cmd.Env = append(os.Environ(), "GOTOOLCHAIN=local")
 	buf := bytes.NewBuffer(nil)
 	cmd.Stderr = buf
 	cmd.Stdout = buf

lang/golang/parser/utils.go

@@ -23,6 +23,7 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"path/filepath"
 	"regexp"
 	"strings"
 	"sync"
@@ -319,3 +320,57 @@ func getCommitHash(dir string) (string, error) {
 	}
 	return strings.TrimSpace(string(output)), nil
 }
+
+type workFile struct {
+	Dir      string
+	UseDirs  []string
+	Replaces []workReplace
+}
+
+type workReplace struct {
+	OldPath string
+	NewPath string
+}
+
+func parseGoWork(workFilePath string) (*workFile, error) {
+	content, err := os.ReadFile(workFilePath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read go.work file: %w", err)
+	}
+
+	wf, err := modfile.ParseWork(workFilePath, content, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse go.work file: %w", err)
+	}
+
+	workDir := filepath.Dir(workFilePath)
+	result := &workFile{
+		Dir:      workDir,
+		UseDirs:  make([]string, 0, len(wf.Use)),
+		Replaces: make([]workReplace, 0, len(wf.Replace)),
+	}
+
+	for _, use := range wf.Use {
+		if use.Path == "" {
+			continue
+		}
+		usePath := use.Path
+		if !filepath.IsAbs(usePath) {
+			usePath = filepath.Join(workDir, usePath)
+		}
+		absPath, err := filepath.Abs(usePath)
+		if err != nil {
+			continue
+		}
+		result.UseDirs = append(result.UseDirs, absPath)
+	}
+
+	for _, rep := range wf.Replace {
+		result.Replaces = append(result.Replaces, workReplace{
+			OldPath: rep.Old.Path,
+			NewPath: rep.New.Path,
+		})
+	}
+
+	return result, nil
+}

llm/prompt/analyzer.md

@@ -2,7 +2,7 @@
 You are a code-analysis expert. Based on the Abstract-Syntax-Tree (AST) of a specific code repository and using relevant tools, you will answer user questions.
 
 # Available Tools
-- `list_repos`: check the avaliable repos and their correct name
+- `list_repos`: check the available repos and their correct name
 - `get_repo_structure`: Retrieve the structural information of a specified code repository, including lists of modules and packages.
 - `get_package_structure`: Obtain the structural information of a specified package, including lists of files and node names.
 - `get_ast_node`: Fetch the complete AST node information of a specified node, including its type, code, location, and related dependency (dependencies), reference (references), inheritance (inherits), implementation (implements), and grouping (groups) node IDs.

llm/tool/mcp.go

@@ -28,7 +28,7 @@ import (
 
 type MCPConfig struct {
 	Type   MCPType
-	Comand string
+	Command string
 	Args   []string
 	Envs   []string
 	SSEURL string
@@ -50,10 +50,10 @@ func NewMCPClient(opts MCPConfig) (*MCPClient, error) {
 	var err error
 	switch opts.Type {
 	case MCPTypeStdio:
-		if opts.Comand == "" {
-			return nil, errors.New("comand is empty")
+		if opts.Command == "" {
+			return nil, errors.New("command is empty")
 		}
-		cli, err = client.NewStdioMCPClient(opts.Comand, opts.Envs, opts.Args...)
+		cli, err = client.NewStdioMCPClient(opts.Command, opts.Envs, opts.Args...)
 		if err != nil {
 			return nil, err
 		}
@@ -112,7 +112,7 @@ func GetSequentialThinkingTools(ctx context.Context) ([]Tool, error) {
 	sync.OnceFunc(func() {
 		cli, err := NewMCPClient(MCPConfig{
 			Type:   MCPTypeStdio,
-			Comand: "npx",
+			Command: "npx",
 			Args: []string{
 				"-y",
 				"@modelcontextprotocol/server-sequential-thinking",
@@ -136,7 +136,7 @@ func GetGitTools(ctx context.Context) ([]Tool, error) {
 	sync.OnceFunc(func() {
 		cli, err := NewMCPClient(MCPConfig{
 			Type:   MCPTypeStdio,
-			Comand: "uvx",
+			Command: "uvx",
 			Args: []string{
 				"mcp-server-git",
 			},

llm/tool/mcp_test.go

@@ -26,7 +26,7 @@ import (
 func TestMCPClient(t *testing.T) {
 	cli, err := NewMCPClient(MCPConfig{
 		Type:   MCPTypeStdio,
-		Comand: "npx",
+		Command: "npx",
 		Args: []string{
 			"-y",
 			"@modelcontextprotocol/server-sequential-thinking",