mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
> This PR was authored by Mux on behalf of Mike. Chats sharing one workspace (e.g. sibling subagents) all wrote to `/home/coder/PLAN.md`, causing plan file collisions. This change derives a unique plan path per chat from the workspace home directory and chat ID. ## Changes * `write_file`, `edit_files`, and `propose_plan` reject any `plan.md` variant (case-insensitive) at the workspace home root, with a clear error pointing to the chat-specific path. * Root chats receive a `<plan-file-path>` block inlined in the main system prompt with the concrete path. * Prompt and tool descriptions no longer hardcode `/home/coder/PLAN.md`. * Plan path handling is POSIX-only (forward-slash), relying on the contract that workspace agent paths are normalized before reaching chatd. * Updated `ProposePlanTool.stories.tsx` to use per-chat path examples. * Full test coverage for plan path detection, legacy-path rejection in all three tools, inline prompt rendering, and fallback behavior.
84 lines
2.4 KiB
Go
84 lines
2.4 KiB
Go
package chattool
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
|
|
"charm.land/fantasy"
|
|
|
|
"github.com/coder/coder/v2/codersdk/workspacesdk"
|
|
)
|
|
|
|
type EditFilesOptions struct {
|
|
GetWorkspaceConn func(context.Context) (workspacesdk.AgentConn, error)
|
|
ResolvePlanPath func(context.Context) (chatPath string, home string, err error)
|
|
}
|
|
|
|
type EditFilesArgs struct {
|
|
Files []workspacesdk.FileEdits `json:"files"`
|
|
}
|
|
|
|
func EditFiles(options EditFilesOptions) fantasy.AgentTool {
|
|
return fantasy.NewAgentTool(
|
|
"edit_files",
|
|
"Perform search-and-replace edits on one or more files in the workspace."+
|
|
" Each file can have multiple edits applied atomically.",
|
|
func(ctx context.Context, args EditFilesArgs, _ fantasy.ToolCall) (fantasy.ToolResponse, error) {
|
|
if options.GetWorkspaceConn == nil {
|
|
return fantasy.NewTextErrorResponse("workspace connection resolver is not configured"), nil
|
|
}
|
|
conn, err := options.GetWorkspaceConn(ctx)
|
|
if err != nil {
|
|
return fantasy.NewTextErrorResponse(err.Error()), nil
|
|
}
|
|
return executeEditFilesTool(ctx, conn, args, options.ResolvePlanPath)
|
|
},
|
|
)
|
|
}
|
|
|
|
func executeEditFilesTool(
|
|
ctx context.Context,
|
|
conn workspacesdk.AgentConn,
|
|
args EditFilesArgs,
|
|
resolvePlanPath func(context.Context) (chatPath string, home string, err error),
|
|
) (fantasy.ToolResponse, error) {
|
|
if len(args.Files) == 0 {
|
|
return fantasy.NewTextErrorResponse("files is required"), nil
|
|
}
|
|
|
|
var (
|
|
chatPath string
|
|
home string
|
|
planPathErr error
|
|
planPathLoaded bool
|
|
)
|
|
for i := range args.Files {
|
|
args.Files[i].Path = strings.TrimSpace(args.Files[i].Path)
|
|
file := args.Files[i]
|
|
|
|
hasPlanFileName := looksLikePlanFileName(file.Path)
|
|
if hasPlanFileName && !isAbsolutePath(file.Path) {
|
|
return fantasy.NewTextErrorResponse(
|
|
"plan files must use absolute paths; use the chat-specific absolute plan path; no files in this batch were applied",
|
|
), nil
|
|
}
|
|
if resolvePlanPath == nil || !hasPlanFileName {
|
|
continue
|
|
}
|
|
if !planPathLoaded {
|
|
chatPath, home, planPathErr = resolvePlanPath(ctx)
|
|
planPathLoaded = true
|
|
}
|
|
if resp, rejected := rejectSharedPlanPath(file.Path, home, chatPath, planPathErr); rejected {
|
|
return fantasy.NewTextErrorResponse(
|
|
resp.Content + "; no files in this batch were applied",
|
|
), nil
|
|
}
|
|
}
|
|
|
|
if err := conn.EditFiles(ctx, workspacesdk.FileEditRequest{Files: args.Files}); err != nil {
|
|
return fantasy.NewTextErrorResponse(err.Error()), nil
|
|
}
|
|
return toolResponse(map[string]any{"ok": true}), nil
|
|
}
|