mirror of
https://github.com/danielmiessler/Fabric.git
synced 2026-02-13 15:34:59 -05:00
## CHANGES - Add dedicated function to fix invalid JSON escapes - Handle common \C escape sequence issue - Implement fallback parsing with comprehensive escape fixes - Track string context for accurate escape detection - Preserve valid JSON escape sequences
170 lines
4.5 KiB
Go
170 lines
4.5 KiB
Go
package common
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
// MaxFileSize is the maximum size of a file that can be created (10MB)
|
|
MaxFileSize = 10 * 1024 * 1024
|
|
)
|
|
|
|
// FileChange represents a single file change operation to be performed
|
|
type FileChange struct {
|
|
Operation string `json:"operation"` // "create" or "update"
|
|
Path string `json:"path"` // Relative path from project root
|
|
Content string `json:"content"` // New file content
|
|
}
|
|
|
|
// ParseFileChanges extracts and parses the FILE_CHANGES section from LLM output
|
|
func ParseFileChanges(output string) ([]FileChange, error) {
|
|
// Find the FILE_CHANGES: section marker
|
|
fileChangesStart := strings.Index(output, "FILE_CHANGES:")
|
|
if fileChangesStart == -1 {
|
|
return nil, nil // No file changes section found
|
|
}
|
|
|
|
// Extract the JSON part
|
|
jsonStart := fileChangesStart + len("FILE_CHANGES:")
|
|
// Find the first [ after the FILE_CHANGES: marker
|
|
jsonArrayStart := strings.Index(output[jsonStart:], "[")
|
|
if jsonArrayStart == -1 {
|
|
return nil, fmt.Errorf("invalid FILE_CHANGES format: no JSON array found")
|
|
}
|
|
jsonStart += jsonArrayStart
|
|
|
|
// Find the matching closing bracket for the array with proper bracket counting
|
|
bracketCount := 0
|
|
jsonEnd := jsonStart
|
|
for i := jsonStart; i < len(output); i++ {
|
|
if output[i] == '[' {
|
|
bracketCount++
|
|
} else if output[i] == ']' {
|
|
bracketCount--
|
|
if bracketCount == 0 {
|
|
jsonEnd = i + 1
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
if bracketCount != 0 {
|
|
return nil, fmt.Errorf("invalid FILE_CHANGES format: unbalanced brackets")
|
|
}
|
|
|
|
// Extract the JSON string and fix escape sequences
|
|
jsonStr := output[jsonStart:jsonEnd]
|
|
|
|
// Fix specific invalid escape sequences
|
|
// First try with the common \C issue
|
|
jsonStr = strings.Replace(jsonStr, `\C`, `\\C`, -1)
|
|
|
|
// Parse the JSON
|
|
var fileChanges []FileChange
|
|
err := json.Unmarshal([]byte(jsonStr), &fileChanges)
|
|
if err != nil {
|
|
// If still failing, try a more comprehensive fix
|
|
jsonStr = fixInvalidEscapes(jsonStr)
|
|
err = json.Unmarshal([]byte(jsonStr), &fileChanges)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to parse FILE_CHANGES JSON: %w", err)
|
|
}
|
|
}
|
|
|
|
// Validate file changes
|
|
for i, change := range fileChanges {
|
|
// Validate operation
|
|
if change.Operation != "create" && change.Operation != "update" {
|
|
return nil, fmt.Errorf("invalid operation for file change %d: %s", i, change.Operation)
|
|
}
|
|
|
|
// Validate path
|
|
if change.Path == "" {
|
|
return nil, fmt.Errorf("empty path for file change %d", i)
|
|
}
|
|
|
|
// Check for suspicious paths (directory traversal)
|
|
if strings.Contains(change.Path, "..") {
|
|
return nil, fmt.Errorf("suspicious path for file change %d: %s", i, change.Path)
|
|
}
|
|
|
|
// Check file size
|
|
if len(change.Content) > MaxFileSize {
|
|
return nil, fmt.Errorf("file content too large for file change %d: %d bytes", i, len(change.Content))
|
|
}
|
|
}
|
|
|
|
return fileChanges, nil
|
|
}
|
|
|
|
// fixInvalidEscapes replaces invalid escape sequences in JSON strings
|
|
func fixInvalidEscapes(jsonStr string) string {
|
|
validEscapes := []byte{'b', 'f', 'n', 'r', 't', '\\', '/', '"', 'u'}
|
|
|
|
var result strings.Builder
|
|
inQuotes := false
|
|
i := 0
|
|
|
|
for i < len(jsonStr) {
|
|
ch := jsonStr[i]
|
|
|
|
// Track whether we're inside a JSON string
|
|
if ch == '"' && (i == 0 || jsonStr[i-1] != '\\') {
|
|
inQuotes = !inQuotes
|
|
}
|
|
|
|
// Check for escape sequences only inside strings
|
|
if inQuotes && ch == '\\' && i+1 < len(jsonStr) {
|
|
nextChar := jsonStr[i+1]
|
|
isValid := false
|
|
|
|
for _, validEscape := range validEscapes {
|
|
if nextChar == validEscape {
|
|
isValid = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if !isValid {
|
|
// Invalid escape sequence - add an extra backslash
|
|
result.WriteByte('\\')
|
|
result.WriteByte('\\')
|
|
i++
|
|
continue
|
|
}
|
|
}
|
|
|
|
result.WriteByte(ch)
|
|
i++
|
|
}
|
|
|
|
return result.String()
|
|
}
|
|
|
|
// ApplyFileChanges applies the parsed file changes to the file system
|
|
func ApplyFileChanges(projectRoot string, changes []FileChange) error {
|
|
for i, change := range changes {
|
|
// Get the absolute path
|
|
absPath := filepath.Join(projectRoot, change.Path)
|
|
|
|
// Create directories if necessary
|
|
dir := filepath.Dir(absPath)
|
|
if err := os.MkdirAll(dir, 0755); err != nil {
|
|
return fmt.Errorf("failed to create directory %s for file change %d: %w", dir, i, err)
|
|
}
|
|
|
|
// Write the file
|
|
if err := os.WriteFile(absPath, []byte(change.Content), 0644); err != nil {
|
|
return fmt.Errorf("failed to write file %s for file change %d: %w", absPath, i, err)
|
|
}
|
|
|
|
fmt.Printf("Applied %s operation to %s\n", change.Operation, change.Path)
|
|
}
|
|
|
|
return nil
|
|
}
|