mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
Mathias Fredriksson
32ed9f1f39
Models frequently confuse the search and replace fields in the
edit_files tool (CODAGT-312). Rename the model-facing JSON fields
to old_text/new_text so the intent is unambiguous.
Backend: custom UnmarshalJSON on editFileEdit falls back to
deprecated search/replace when old_text/new_text are empty. The
workspace agent API is unchanged; toSDKFiles maps old_text/new_text
back to search/replace for agent/agentfiles.
Frontend: normalizeEdit in parseEditFilesArgs accepts both
old_text/new_text and search/replace, normalizing to the internal
{ search, replace } representation so streaming diff rendering
works with either field naming convention.
672 lines
22 KiB
Go
672 lines
22 KiB
Go
package chattool_test
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"charm.land/fantasy"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"go.uber.org/mock/gomock"
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/coder/coder/v2/coderd/x/chatd/chattool"
|
|
"github.com/coder/coder/v2/codersdk/workspacesdk"
|
|
"github.com/coder/coder/v2/codersdk/workspacesdk/agentconnmock"
|
|
)
|
|
|
|
func TestEditFiles(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// Verify the generated tool schema exposes old_text/new_text
|
|
// (not the deprecated search/replace) so the rename is
|
|
// auditable without running a separate program.
|
|
t.Run("SchemaUsesOldTextNewText", func(t *testing.T) {
|
|
t.Parallel()
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{})
|
|
info := tool.Info()
|
|
|
|
// Dig into: files -> items -> properties -> edits -> items -> properties
|
|
filesSchema := info.Parameters["files"]
|
|
require.NotNil(t, filesSchema, "missing files parameter")
|
|
filesMap, ok := filesSchema.(map[string]any)
|
|
require.True(t, ok)
|
|
items, ok := filesMap["items"].(map[string]any)
|
|
require.True(t, ok)
|
|
props, ok := items["properties"].(map[string]any)
|
|
require.True(t, ok)
|
|
editsSchema, ok := props["edits"].(map[string]any)
|
|
require.True(t, ok)
|
|
editItems, ok := editsSchema["items"].(map[string]any)
|
|
require.True(t, ok)
|
|
editProps, ok := editItems["properties"].(map[string]any)
|
|
require.True(t, ok)
|
|
|
|
assert.Contains(t, editProps, "old_text", "schema should expose old_text")
|
|
assert.Contains(t, editProps, "new_text", "schema should expose new_text")
|
|
assert.Contains(t, editProps, "replace_all", "schema should expose replace_all")
|
|
assert.NotContains(t, editProps, "search", "schema should not expose deprecated search")
|
|
assert.NotContains(t, editProps, "replace", "schema should not expose deprecated replace")
|
|
|
|
// Verify required fields.
|
|
editRequired, ok := editItems["required"].([]string)
|
|
require.True(t, ok)
|
|
assert.Contains(t, editRequired, "old_text")
|
|
assert.Contains(t, editRequired, "new_text")
|
|
assert.NotContains(t, editRequired, "replace_all", "replace_all should be optional")
|
|
})
|
|
|
|
t.Run("PlanTurnRejectsNonPlanPath", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
planPath := "/home/coder/.coder/plans/PLAN-test-uuid.md"
|
|
getWorkspaceConnCalled := false
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
getWorkspaceConnCalled = true
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
return planPath, "/home/coder", nil
|
|
},
|
|
IsPlanTurn: true,
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"/home/coder/README.md","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, resp.IsError)
|
|
assert.Equal(t, "during plan turns, edit_files is restricted to "+planPath, resp.Content)
|
|
assert.False(t, getWorkspaceConnCalled)
|
|
})
|
|
|
|
t.Run("PlanTurnRejectsMixedPaths", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
planPath := "/home/coder/.coder/plans/PLAN-test-uuid.md"
|
|
getWorkspaceConnCalled := false
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
getWorkspaceConnCalled = true
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
return planPath, "/home/coder", nil
|
|
},
|
|
IsPlanTurn: true,
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[` +
|
|
`{"path":"` + planPath + `","edits":[{"search":"old","replace":"new"}]},` +
|
|
`{"path":"/home/coder/README.md","edits":[{"search":"old","replace":"new"}]}` +
|
|
`]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, resp.IsError)
|
|
assert.Equal(t, "during plan turns, edit_files is restricted to "+planPath, resp.Content)
|
|
assert.False(t, getWorkspaceConnCalled)
|
|
})
|
|
|
|
t.Run("PlanTurnAllowsResolvedPlanPath", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
planPath := "/home/coder/.coder/plans/PLAN-test-uuid.md"
|
|
resolvePlanPathCalls := 0
|
|
mockConn.EXPECT().ResolvePath(gomock.Any(), planPath).Return(planPath, nil)
|
|
request := workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: planPath,
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "new",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}
|
|
mockConn.EXPECT().EditFiles(gomock.Any(), request).Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
resolvePlanPathCalls++
|
|
return planPath, "/home/coder", nil
|
|
},
|
|
IsPlanTurn: true,
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + planPath + `","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
assert.Equal(t, 1, resolvePlanPathCalls)
|
|
})
|
|
|
|
t.Run("PlanTurnAllowsLegacyAgentWithoutResolvePath", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
planPath := "/home/coder/.coder/plans/PLAN-test-uuid.md"
|
|
mockConn.EXPECT().
|
|
ResolvePath(gomock.Any(), planPath).
|
|
Return("", statusError{statusCode: http.StatusNotFound, message: "missing resolve-path endpoint"})
|
|
request := workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: planPath,
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "new",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}
|
|
mockConn.EXPECT().EditFiles(gomock.Any(), request).Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
return planPath, "/home/coder", nil
|
|
},
|
|
IsPlanTurn: true,
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + planPath + `","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
})
|
|
|
|
t.Run("PlanTurnRejectsSymlinkedPlanPath", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
planPath := "/home/coder/.coder/plans/PLAN-test-uuid.md"
|
|
mockConn.EXPECT().ResolvePath(gomock.Any(), planPath).Return("/home/coder/README.md", nil)
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
return planPath, "/home/coder", nil
|
|
},
|
|
IsPlanTurn: true,
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + planPath + `","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, resp.IsError)
|
|
assert.Equal(t, "the chat-specific plan path /home/coder/.coder/plans/PLAN-test-uuid.md resolves to /home/coder/README.md; symlinked plan paths are not allowed during plan turns", resp.Content)
|
|
})
|
|
|
|
t.Run("RejectsPlanPathsWhenResolvePlanPathIsConfigured", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
input string
|
|
expectedRejectedPath string
|
|
}{
|
|
{
|
|
name: "SingleHomeRootPlanPath",
|
|
input: `{"files":[{"path":"/Users/dev/plan.md","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
expectedRejectedPath: "/Users/dev/plan.md",
|
|
},
|
|
{
|
|
name: "MultiFileBatchWithHomeRootPlanPath",
|
|
input: `{"files":[` +
|
|
`{"path":"/Users/dev/subdir/plan.md","edits":[{"search":"old","replace":"new"}]},` +
|
|
`{"path":"/Users/dev/plan.md","edits":[{"search":"old","replace":"new"}]}` +
|
|
`]}`,
|
|
expectedRejectedPath: "/Users/dev/plan.md",
|
|
},
|
|
}
|
|
|
|
for _, testCase := range tests {
|
|
t.Run(testCase.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
resolvePlanPathCalls := 0
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
resolvePlanPathCalls++
|
|
return "/Users/dev/.coder/plans/PLAN-chat.md", "/Users/dev", nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: testCase.input,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, resp.IsError)
|
|
assert.Equal(t, 1, resolvePlanPathCalls)
|
|
assert.Equal(
|
|
t,
|
|
editFilesBatchRejectedMessage(sharedPlanPathResolvedMessage(
|
|
testCase.expectedRejectedPath,
|
|
"/Users/dev/.coder/plans/PLAN-chat.md",
|
|
)),
|
|
resp.Content,
|
|
)
|
|
})
|
|
}
|
|
})
|
|
|
|
t.Run("RejectsSharedPlanPathWhenResolverFails", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
return "", "", xerrors.New("workspace unavailable")
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"/home/coder/plan.md","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, resp.IsError)
|
|
assert.Equal(t, editFilesBatchRejectedMessage(planPathVerificationMessage("/home/coder/plan.md")), resp.Content)
|
|
})
|
|
|
|
t.Run("RejectsRelativePlanPathsWhenResolvePlanPathIsConfigured", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
resolvePlanPathCalled := false
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
resolvePlanPathCalled = true
|
|
return "/home/coder/.coder/plans/PLAN-chat.md", "/home/coder", nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"plan.md","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.True(t, resp.IsError)
|
|
assert.False(t, resolvePlanPathCalled)
|
|
assert.Equal(t, editFilesBatchRejectedMessage(relativePlanPathMessage()), resp.Content)
|
|
})
|
|
|
|
t.Run("PerChatPlanPathIsAllowed", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
chatPlanPath := "/home/coder/.coder/plans/PLAN-123e4567-e89b-12d3-a456-426614174000.md"
|
|
request := workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: chatPlanPath,
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "new",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}
|
|
mockConn.EXPECT().EditFiles(gomock.Any(), request).Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
resolvePlanPathCalled := false
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
resolvePlanPathCalled = true
|
|
return chatPlanPath, "/home/coder", nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + chatPlanPath + `","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
assert.False(t, resolvePlanPathCalled)
|
|
})
|
|
|
|
t.Run("NestedPlanPathAllowedWhenResolverFails", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
request := workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: "/home/coder/myproject/plan.md",
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "new",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}
|
|
mockConn.EXPECT().EditFiles(gomock.Any(), request).Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
return "", "", xerrors.New("workspace unavailable")
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"/home/coder/myproject/plan.md","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
})
|
|
|
|
t.Run("NestedPlanPathUnderHomeIsAllowed", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
request := workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: "/home/coder/myproject/plan.md",
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "new",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}
|
|
mockConn.EXPECT().EditFiles(gomock.Any(), request).Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
planPathCalled := false
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
planPathCalled = true
|
|
return "/home/coder/.coder/plans/PLAN-chat.md", "/home/coder", nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"/home/coder/myproject/plan.md","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
assert.True(t, planPathCalled)
|
|
})
|
|
|
|
t.Run("AllowsNonSharedPath", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
request := workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: "/home/dev/my-plan.md",
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "new",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}
|
|
mockConn.EXPECT().EditFiles(gomock.Any(), request).Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
resolvePlanPathCalled := false
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
ResolvePlanPath: func(context.Context) (string, string, error) {
|
|
resolvePlanPathCalled = true
|
|
return "", "", xerrors.New("should not be called")
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"/home/dev/my-plan.md","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
assert.False(t, resolvePlanPathCalled)
|
|
})
|
|
|
|
t.Run("AllowsSharedPlanPathWhenResolvePlanPathIsNil", func(t *testing.T) {
|
|
t.Parallel()
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
request := workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: chattool.LegacySharedPlanPath,
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "new",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}
|
|
mockConn.EXPECT().EditFiles(gomock.Any(), request).Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + chattool.LegacySharedPlanPath + `","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
})
|
|
}
|
|
|
|
func TestEditFiles_OldTextNewTextFieldsPreferred(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
targetPath := "/home/coder/main.go"
|
|
|
|
// The agent API should map old_text->Search and new_text->Replace.
|
|
mockConn.EXPECT().
|
|
EditFiles(gomock.Any(), workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: targetPath,
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old content",
|
|
Replace: "new content",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}).
|
|
Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + targetPath + `","edits":[{"old_text":"old content","new_text":"new content"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
}
|
|
|
|
func TestEditFiles_DeprecatedSearchReplaceFieldsStillWork(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
targetPath := "/home/coder/main.go"
|
|
|
|
// Agents with cached schemas may still send "search"/"replace".
|
|
// Also exercises replace_all through the new unmarshal+convert path.
|
|
mockConn.EXPECT().
|
|
EditFiles(gomock.Any(), workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: targetPath,
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "replacement",
|
|
ReplaceAll: true,
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}).
|
|
Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + targetPath + `","edits":[{"search":"old","replace":"replacement","replace_all":true}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
}
|
|
|
|
func TestEditFiles_NewFieldNamesTakePrecedenceOverOld(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
targetPath := "/home/coder/main.go"
|
|
|
|
// If both old and new field names are present, new names win.
|
|
mockConn.EXPECT().
|
|
EditFiles(gomock.Any(), workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: targetPath,
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "from-oldText",
|
|
Replace: "from-newText",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}).
|
|
Return(workspacesdk.FileEditResponse{}, nil)
|
|
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + targetPath + `","edits":[{"old_text":"from-oldText","search":"from-search","new_text":"from-newText","replace":"from-replace"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
}
|
|
|
|
func TestEditFiles_ToolResponseCarriesFileResults(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
ctrl := gomock.NewController(t)
|
|
mockConn := agentconnmock.NewMockAgentConn(ctrl)
|
|
targetPath := "/home/coder/target.txt"
|
|
expectedFiles := []workspacesdk.FileEditResult{
|
|
{
|
|
Path: targetPath,
|
|
Diff: "--- " + targetPath + "\n+++ " + targetPath + "\n@@ -1 +1 @@\n-old\n+new\n",
|
|
},
|
|
}
|
|
// The tool must opt into diffs (IncludeDiff: true) and forward
|
|
// the agent's per-file results through to its response.
|
|
mockConn.EXPECT().
|
|
EditFiles(gomock.Any(), workspacesdk.FileEditRequest{
|
|
Files: []workspacesdk.FileEdits{{
|
|
Path: targetPath,
|
|
Edits: []workspacesdk.FileEdit{{
|
|
Search: "old",
|
|
Replace: "new",
|
|
}},
|
|
}},
|
|
IncludeDiff: true,
|
|
}).
|
|
Return(workspacesdk.FileEditResponse{Files: expectedFiles}, nil)
|
|
|
|
tool := chattool.EditFiles(chattool.EditFilesOptions{
|
|
GetWorkspaceConn: func(context.Context) (workspacesdk.AgentConn, error) {
|
|
return mockConn, nil
|
|
},
|
|
})
|
|
|
|
resp, err := tool.Run(context.Background(), fantasy.ToolCall{
|
|
ID: "call-1",
|
|
Name: "edit_files",
|
|
Input: `{"files":[{"path":"` + targetPath + `","edits":[{"search":"old","replace":"new"}]}]}`,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.False(t, resp.IsError)
|
|
|
|
var decoded struct {
|
|
OK bool `json:"ok"`
|
|
Files []workspacesdk.FileEditResult `json:"files"`
|
|
}
|
|
require.NoError(t, json.Unmarshal([]byte(resp.Content), &decoded))
|
|
assert.True(t, decoded.OK)
|
|
require.Len(t, decoded.Files, 1)
|
|
assert.Equal(t, targetPath, decoded.Files[0].Path)
|
|
assert.Equal(t, expectedFiles[0].Diff, decoded.Files[0].Diff)
|
|
}
|