fix vendored tool extraction and bash output formatting

Author: zhenruyan

docs/en/changelog.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## v0.1.15
+
+### 🐛 Bug Fixes
+
+- **Vendored Search Tool Availability**
+  - Fixed `grep` and `find` so they prepare embedded `rg` / `fd` binaries on demand instead of failing when vendored tools have not been extracted yet
+  - Restored executable permissions for already-extracted vendored binaries to avoid `permission denied` failures on reuse
+
+- **Bash Tool Result Handling**
+  - Fixed bash tool responses to report stdout, stderr, working directory, and exit code in a stable structured format
+  - Preserved non-zero command exits as normal tool results with explicit `exit_code` output instead of mixing shell failures into transport-level errors
+  - Standardized empty stdout/stderr rendering as `(no output)` for more predictable downstream handling
+
+---
+
 ## v0.1.14
 
 ### 🐛 Bug Fixes

docs/zh/changelog.md

@@ -1,5 +1,20 @@
 # 更新日志
 
+## v0.1.15
+
+### 🐛 问题修复
+
+- **内嵌搜索工具可用性**
+  - 修复 `grep` 和 `find`：当内嵌的 `rg` / `fd` 尚未释放到本地时，会按需准备二进制文件，而不是直接失败
+  - 为已释放的内嵌二进制补齐可执行权限，避免复用时出现 `permission denied` 错误
+
+- **Bash 工具结果处理**
+  - 修复 bash 工具返回内容，稳定输出 stdout、stderr、工作目录和退出码等结构化信息
+  - 将命令非零退出保留为正常工具结果，并通过明确的 `exit_code` 字段表达，而不是混入传输级错误
+  - 统一将空 stdout/stderr 渲染为 `(no output)`，便于下游稳定处理
+
+---
+
 ## v0.1.14
 
 ### 🐛 问题修复

internal/tools/bash.go

@@ -233,24 +233,33 @@ func (t *BashTool) Execute(ctx context.Context, params map[string]any) (ToolResu
 
 	err := cmd.Run()
 
-	output := stdout.String()
-	if stderr.Len() > 0 {
-		if output != "" {
-			output += "\n"
+	stdoutStr := strings.TrimRight(stdout.String(), "\n")
+	stderrStr := strings.TrimRight(stderr.String(), "\n")
+	if stdoutStr == "" {
+		stdoutStr = "(no output)"
+	}
+	if stderrStr == "" {
+		stderrStr = "(no output)"
+	}
+
+	exitCode := 0
+	if err != nil {
+		if exitErr, ok := err.(*exec.ExitError); ok {
+			exitCode = exitErr.ExitCode()
 		}
-		output += "STDERR:\n" + stderr.String()
 	}
 
-	// Build result with command info
 	var result strings.Builder
-	result.WriteString(fmt.Sprintf("$ %s\n", command))
-	result.WriteString(fmt.Sprintf("(in %s)\n\n", workDir))
-
-	if output == "" {
-		result.WriteString("(no output)")
-	} else {
-		result.WriteString(output)
-	}
+	result.WriteString("[command]\n")
+	result.WriteString(command)
+	result.WriteString("\n[cwd]\n")
+	result.WriteString(workDir)
+	result.WriteString("\n[stdout]\n")
+	result.WriteString(stdoutStr)
+	result.WriteString("\n[stderr]\n")
+	result.WriteString(stderrStr)
+	result.WriteString("\n[exit_code]\n")
+	result.WriteString(fmt.Sprintf("%d", exitCode))
 
 	// Truncate large outputs
 	const maxOutput = 50000
@@ -266,8 +275,8 @@ func (t *BashTool) Execute(ctx context.Context, params map[string]any) (ToolResu
 		if errors.Is(err, exec.ErrWaitDelay) {
 			return NewTextToolResult(resultStr), nil
 		}
-		if exitErr, ok := err.(*exec.ExitError); ok {
-			return NewTextToolResult(fmt.Sprintf("%s\nExit code: %d", resultStr, exitErr.ExitCode())), nil
+		if _, ok := err.(*exec.ExitError); ok {
+			return NewTextToolResult(resultStr), nil
 		}
 		return ToolResult{}, fmt.Errorf("command failed: %w\n%s", err, resultStr)
 	}

internal/tools/find.go

@@ -122,10 +122,10 @@ func (t *FindTool) Execute(ctx context.Context, params map[string]any) (ToolResu
 		maxResults = int(v)
 	}
 
-	// 获取 fd 路径
-	fdPath := vendored.FdPath()
-	if fdPath == "" {
-		return ToolResult{}, fmt.Errorf("fd 未安装，请先运行 make prepare-vendored")
+	// 选择可用的 fd 命令（优先 vendored，其次系统 fd/fdfind）
+	fdPath, err := resolveFdPath()
+	if err != nil {
+		return ToolResult{}, err
 	}
 
 	// 将 glob 模式转为正则
@@ -154,7 +154,7 @@ func (t *FindTool) Execute(ctx context.Context, params map[string]any) (ToolResu
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
 
-	err := cmd.Run()
+	err = cmd.Run()
 	if err != nil {
 		// fd 返回 1 表示没有匹配
 		if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 1 {
@@ -176,3 +176,17 @@ func (t *FindTool) Execute(ctx context.Context, params map[string]any) (ToolResu
 	// fd 输出就是每行一个路径，与原实现格式一致
 	return NewTextToolResult(output), nil
 }
+
+func resolveFdPath() (string, error) {
+	fdPath := vendored.FdPath()
+	if fdPath == "" {
+		return "", fmt.Errorf("无法确定 fd 路径")
+	}
+
+	// 缺失或不可执行时，尝试从 go:embed 释放到 ~/.vibecoding/bin/
+	if err := vendored.Ensure(); err != nil {
+		return "", fmt.Errorf("准备 fd 失败: %w", err)
+	}
+
+	return fdPath, nil
+}

internal/tools/grep.go

@@ -82,9 +82,9 @@ func (t *GrepTool) Execute(ctx context.Context, params map[string]any) (ToolResu
 	}
 
 	// 获取 rg 路径
-	rgPath := vendored.RgPath()
-	if rgPath == "" {
-		return ToolResult{}, fmt.Errorf("ripgrep (rg) 未安装，请先运行 make prepare-vendored")
+	rgPath, err := resolveRgPath()
+	if err != nil {
+		return ToolResult{}, err
 	}
 
 	// 构建 rg 命令参数
@@ -107,7 +107,7 @@ func (t *GrepTool) Execute(ctx context.Context, params map[string]any) (ToolResu
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
 
-	err := cmd.Run()
+	err = cmd.Run()
 	if err != nil {
 		// rg 返回 1 表示没有匹配，这不是错误
 		if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 1 {
@@ -130,3 +130,17 @@ func (t *GrepTool) Execute(ctx context.Context, params map[string]any) (ToolResu
 	// 与原实现格式一致: file:line: content
 	return NewTextToolResult(output), nil
 }
+
+func resolveRgPath() (string, error) {
+	rgPath := vendored.RgPath()
+	if rgPath == "" {
+		return "", fmt.Errorf("无法确定 rg 路径")
+	}
+
+	// 缺失或不可执行时，尝试从 go:embed 释放到 ~/.vibecoding/bin/
+	if err := vendored.Ensure(); err != nil {
+		return "", fmt.Errorf("准备 rg 失败: %w", err)
+	}
+
+	return rgPath, nil
+}

internal/vendored/vendored.go

@@ -87,6 +87,12 @@ func extractBinary(dest string, data []byte) error {
 	// 检查是否已存在
 	if info, err := os.Stat(dest); err == nil {
 		if info.Size() == int64(len(data)) {
+			// 确保已有文件可执行，避免 fork/exec permission denied。
+			if info.Mode()&0o111 == 0 {
+				if chmodErr := os.Chmod(dest, 0o755); chmodErr != nil {
+					return fmt.Errorf("设置 %s 可执行权限失败: %w", dest, chmodErr)
+				}
+			}
 			return nil // 已存在且大小一致，跳过
 		}
 	}