env: use alpine and ripgrep + update tool descriptions

Signed-off-by: Tibor Vass <teabee89@gmail.com>

Author: tiborvass

cmd/cu/stdio.go

@@ -39,6 +39,7 @@ var stdioCmd = &cobra.Command{
 
 func warmCache(ctx context.Context, dag *dagger.Client) {
 	environment.EditUtil(dag).Sync(ctx)
+	environment.GrepUtil(dag).Sync(ctx)
 }
 
 func init() {

environment/filesystem.go

@@ -7,13 +7,9 @@ import (
 	"strings"
 
 	"dagger.io/dagger"
-	"dagger.io/dagger/dag"
 	"github.com/dagger/container-use/edit"
 )
 
-// FIXME: See hack where it's used
-const fileUtilsBaseImage = "busybox"
-
 func (env *Environment) FileRead(ctx context.Context, targetFile string, shouldReadEntireFile bool, startLineOneIndexed int, endLineOneIndexedInclusive int) (string, error) {
 	file, err := env.container().File(targetFile).Contents(ctx)
 	if err != nil {
@@ -81,42 +77,47 @@ func (env *Environment) ls(ctx context.Context, path string, filter dagger.Direc
 
 func (env *Environment) FileGrep(ctx context.Context, path, pattern, include string) (string, error) {
 	// Hack: use busybox to run `sed` since dagger doesn't have native file editing primitives.
-	args := []string{"/bin/grep", "-E", "--", pattern, include}
+	args := []string{"/usr/bin/rg", "--no-unicode", "-g", include, "--", pattern, path}
 
 	dir := env.container().Rootfs().Directory(path)
-	out, err := dag.Container().From(fileUtilsBaseImage).WithMountedDirectory("/mnt", dir).WithWorkdir("/mnt").WithExec(args).Stdout(ctx)
+	out, err := GrepUtil(env.dag).WithMountedDirectory("/mnt", dir).WithWorkdir("/mnt").WithExec(args).Stdout(ctx)
 	if err != nil {
 		return "", err
 	}
 	return out, nil
 }
 
 type FileEdit struct {
-	Old        string
-	New        string
+	OldString  string
+	NewString  string
 	ReplaceAll bool
 }
 
 func EditUtil(dag *dagger.Client) *dagger.Container {
-	editBin := dag.Container().From("golang:alpine").
+	editBin := dag.Container().From(alpineImage).
+		WithExec([]string{"apk", "add", "-U", "go"}).
 		WithNewFile("/edit.go", edit.Src).
 		WithEnvVariable("CGO_ENABLED", "0").
 		WithExec([]string{"go", "build", "-o", "/edit", "-ldflags", "-w -s", "/edit.go"}).File("/edit")
 	return dag.Container().From("scratch").WithFile("/edit", editBin).WithEntrypoint([]string{"/edit"})
 }
 
-func (env *Environment) FileEdit(ctx context.Context, dag *dagger.Client, targetFile string, edits []FileEdit) error {
+func GrepUtil(dag *dagger.Client) *dagger.Container {
+	return dag.Container().From(alpineImage).WithExec([]string{"apk", "add", "-U", "ripgrep"})
+}
+
+func (env *Environment) FileEdit(ctx context.Context, targetFile string, edits []FileEdit) error {
 	// Hack: use busybox to run `sed` since dagger doesn't have native file editing primitives.
 	args := []string{"/edit", "/target", "/new"}
 	for _, edit := range edits {
 		replaceCount := "1"
 		if edit.ReplaceAll {
 			replaceCount = "-1"
 		}
-		args = append(args, edit.Old, edit.New, replaceCount)
+		args = append(args, edit.OldString, edit.NewString, replaceCount)
 	}
 
-	newFile := EditUtil(dag).WithMountedFile("/target", env.container().File(targetFile)).WithExec(args).File("/new")
+	newFile := EditUtil(env.dag).WithMountedFile("/target", env.container().File(targetFile)).WithExec(args).File("/new")
 	err := env.apply(ctx, env.container().WithFile(targetFile, newFile))
 	if err != nil {
 		return fmt.Errorf("failed applying file edit, skipping git propagation: %w", err)

mcpserver/tools.go

@@ -732,7 +732,7 @@ var EnvironmentFileGrepTool = &Tool{
 
 var EnvironmentFileEditTool = &Tool{
 	Definition: mcp.NewTool("environment_file_edit",
-		mcp.WithDescription("Efficiently edit the contents of a file."),
+		mcp.WithDescription("This is a tool for making single or multiple edits to a single file in one operation. It allows you to perform multiple find-and-replace operations efficiently.\n\nBefore using this tool:\n\n1. Use the Read tool to understand the file's contents and context\n2. Verify the directory path is correct\n\nTo make file edits, provide the following:\n1. file_path: The absolute path to the file to modify (must be absolute, not relative)\n2. edits: An array of edit operations to perform, where each edit contains:\n   - old_string: The text to replace (must match the file contents exactly, including all whitespace and indentation)\n   - new_string: The edited text to replace the old_string\n   - replace_all: Replace all occurences of old_string. This parameter is optional and defaults to false.\n\nIMPORTANT:\n- All edits are applied in sequence, in the order they are provided\n- Each edit operates on the result of the previous edit\n- All edits must be valid for the operation to succeed - if any edit fails, none will be applied\n- This tool is ideal when you need to make several changes to different parts of the same file\n- For Jupyter notebooks (.ipynb files), use the NotebookEdit instead\n\nCRITICAL REQUIREMENTS:\n1. All edits follow the same requirements as the single Edit tool\n2. The edits are atomic - either all succeed or none are applied\n3. Plan your edits carefully to avoid conflicts between sequential operations\n\nWARNING:\n- The tool will fail if edits.old_string doesn't match the file contents exactly (including whitespace)\n- The tool will fail if edits.old_string and edits.new_string are the same\n- Since edits are applied in sequence, ensure that earlier edits don't affect the text that later edits are trying to find\n\nWhen making edits:\n- Ensure all edits result in idiomatic, correct code\n- Do not leave the code in a broken state\n- Always use absolute file paths (starting with /)\n- Only use emojis if the user explicitly requests it. Avoid adding emojis to files unless asked.\n- Use replace_all for replacing and renaming strings across the file. This parameter is useful if you want to rename a variable for instance.\n\nIf you want to create a new file, use:\n- A new file path, including dir name if needed\n- First edit: empty old_string and the new file's contents as new_string\n- Subsequent edits: normal edit operations on the created content"),
 		mcp.WithString("explanation",
 			mcp.Description("One sentence explanation for why this file is being edited."),
 		),
@@ -749,8 +749,12 @@ var EnvironmentFileEditTool = &Tool{
 			mcp.Required(),
 		),
 		mcp.WithArray("edits",
-			mcp.Description("Array of sed search-replace operations to perform on the contents of target_file (e.g. \"s/old/new/g\").\nUses extended regex syntax."),
-			mcp.Items(map[string]any{"type": "string"}),
+			mcp.Description("An array of edit operations to perform on the contents of target_file."),
+			mcp.Items(map[string]any{"type": "object", "properties": map[string]any{
+				"old_string":  map[string]any{"type": "string", "description": "The text to replace"},
+				"new_string":  map[string]any{"type": "string", "description": "The text to replace it with"},
+				"replace_all": map[string]any{"type": "string", "description": "Replace all occurences of old_string (default false)", "default": false},
+			}}),
 			mcp.MinItems(1),
 			mcp.Required(),
 		),
@@ -761,8 +765,6 @@ var EnvironmentFileEditTool = &Tool{
 			return mcp.NewToolResultErrorFromErr("unable to open the environment", err), nil
 		}
 
-		dag, _ := ctx.Value(daggerClientKey{}).(*dagger.Client)
-
 		var args struct {
 			TargetFile string
 			Edits      []environment.FileEdit
@@ -771,7 +773,7 @@ var EnvironmentFileEditTool = &Tool{
 			return nil, fmt.Errorf("could not bind arguments")
 		}
 
-		if err := env.FileEdit(ctx, dag, args.TargetFile, args.Edits); err != nil {
+		if err := env.FileEdit(ctx, args.TargetFile, args.Edits); err != nil {
 			return mcp.NewToolResultErrorFromErr("failed to edit file", err), nil
 		}