alihan/crush-code-agent-ide
1
0
Fork 0
mirror of https://github.com/charmbracelet/crush.git synced 2025-08-02 05:20:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor implementation

Browse Source
This commit is contained in:
Kujtim Hoxha
2025-07-31 19:16:26 +02:00
parent 3eed18432f
commit 2ddc453573
4 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/fsext/fileutil.go
View File

@@ -262,3 +262,23 @@ func DirTrim(pwd string, lim int) string {
out = filepath.Join("~", out)
return out
}
// PathOrPrefix returns the prefix if the path starts with it, or falls back to
// the path otherwise.
func PathOrPrefix(path, prefix string) string {
if HasPrefix(path, prefix) {
return prefix
}
return path
}
// HasPrefix checks if the given path starts with the specified prefix.
func HasPrefix(path, prefix string) bool {
if abs, err := filepath.Abs(path); err == nil {
path = abs
}
if abs, err := filepath.Abs(prefix); err == nil {
prefix = abs
}
return strings.HasPrefix(path, prefix)
}

20
internal/llm/tools/edit.go
View File

@@ -11,6 +11,7 @@ import (
"time"
"github.com/charmbracelet/crush/internal/diff"
"github.com/charmbracelet/crush/internal/fsext"
"github.com/charmbracelet/crush/internal/history"
"github.com/charmbracelet/crush/internal/lsp"
@@ -215,14 +216,10 @@ func (e *editTool) createNewFile(ctx context.Context, filePath, content string,
content,
strings.TrimPrefix(filePath, e.workingDir),
)
permissionPath := filePath
if strings.HasPrefix(filePath, e.workingDir) {
permissionPath = e.workingDir
}
p := e.permissions.Request(
permission.CreatePermissionRequest{
SessionID: sessionID,
Path: permissionPath,
Path: fsext.PathOrPrefix(filePath, e.workingDir),
ToolCallID: call.ID,
ToolName: EditToolName,
Action: "write",
@@ -340,15 +337,10 @@ func (e *editTool) deleteContent(ctx context.Context, filePath, oldString string
strings.TrimPrefix(filePath, e.workingDir),
)
permissionPath := filePath
if strings.HasPrefix(filePath, e.workingDir) {
permissionPath = e.workingDir
}
p := e.permissions.Request(
permission.CreatePermissionRequest{
SessionID: sessionID,
Path: permissionPath,
Path: fsext.PathOrPrefix(filePath, e.workingDir),
ToolCallID: call.ID,
ToolName: EditToolName,
Action: "write",
@@ -476,14 +468,10 @@ func (e *editTool) replaceContent(ctx context.Context, filePath, oldString, newS
strings.TrimPrefix(filePath, e.workingDir),
)
permissionPath := filePath
if strings.HasPrefix(filePath, e.workingDir) {
permissionPath = e.workingDir
}
p := e.permissions.Request(
permission.CreatePermissionRequest{
SessionID: sessionID,
Path: permissionPath,
Path: fsext.PathOrPrefix(filePath, e.workingDir),
ToolCallID: call.ID,
ToolName: EditToolName,
Action: "write",

14
internal/llm/tools/multiedit.go
View File

@@ -11,6 +11,7 @@ import (
"time"
"github.com/charmbracelet/crush/internal/diff"
"github.com/charmbracelet/crush/internal/fsext"
"github.com/charmbracelet/crush/internal/history"
"github.com/charmbracelet/crush/internal/lsp"
"github.com/charmbracelet/crush/internal/permission"
@@ -250,14 +251,9 @@ func (m *multiEditTool) processMultiEditWithCreation(ctx context.Context, params
// Check permissions
_, additions, removals := diff.GenerateDiff("", currentContent, strings.TrimPrefix(params.FilePath, m.workingDir))
permissionPath := params.FilePath
if strings.HasPrefix(params.FilePath, m.workingDir) {
permissionPath = m.workingDir
}
p := m.permissions.Request(permission.CreatePermissionRequest{
SessionID: sessionID,
Path: permissionPath,
Path: fsext.PathOrPrefix(params.FilePath, m.workingDir),
ToolCallID: call.ID,
ToolName: MultiEditToolName,
Action: "write",
@@ -364,13 +360,9 @@ func (m *multiEditTool) processMultiEditExistingFile(ctx context.Context, params
// Generate diff and check permissions
_, additions, removals := diff.GenerateDiff(oldContent, currentContent, strings.TrimPrefix(params.FilePath, m.workingDir))
permissionPath := params.FilePath
if strings.HasPrefix(params.FilePath, m.workingDir) {
permissionPath = m.workingDir
}
p := m.permissions.Request(permission.CreatePermissionRequest{
SessionID: sessionID,
Path: permissionPath,
Path: fsext.PathOrPrefix(params.FilePath, m.workingDir),
ToolCallID: call.ID,
ToolName: MultiEditToolName,
Action: "write",

8
internal/llm/tools/write.go
View File

@@ -11,6 +11,7 @@ import (
"time"
"github.com/charmbracelet/crush/internal/diff"
"github.com/charmbracelet/crush/internal/fsext"
"github.com/charmbracelet/crush/internal/history"
"github.com/charmbracelet/crush/internal/lsp"
@@ -172,15 +173,10 @@ func (w *writeTool) Run(ctx context.Context, call ToolCall) (ToolResponse, error
strings.TrimPrefix(filePath, w.workingDir),
)
permissionPath := filePath
if strings.HasPrefix(filePath, w.workingDir) {
permissionPath = w.workingDir
}
p := w.permissions.Request(
permission.CreatePermissionRequest{
SessionID: sessionID,
Path: permissionPath,
Path: fsext.PathOrPrefix(filePath, w.workingDir),
ToolCallID: call.ID,
ToolName: WriteToolName,
Action: "write",