chore: windows compat

Author: ThomasRooney

integration/patches_git_test.go

@@ -821,11 +821,9 @@ func TestGitArchitecture_ImplicitFetchFromRemote(t *testing.T) {
 	originalID := extractGeneratedIDFromContent(content)
 	require.NotEmpty(t, originalID, "pet.go should have @generated-id")
 
-	// Add a custom method at the end of the file (after the struct closing brace)
-	// This is less likely to conflict with generator changes
-	modifiedContent := strings.Replace(string(content),
-		"}\n",
-		"}\n\n// ENVB_USER_EDIT: Developer B's customization\nfunc (p *Pet) CustomMethod() string {\n\treturn \"custom\"\n}\n", 1)
+	// Add a custom method at the end of the file
+	// We append to the very end of the file to avoid conflict with generated getters
+	modifiedContent := string(content) + "\n// ENVB_USER_EDIT: Developer B's customization\nfunc (p *Pet) CustomMethod() string {\n\treturn \"custom\"\n}\n"
 	err = os.WriteFile(petFile, []byte(modifiedContent), 0644)
 	require.NoError(t, err)
 	gitCommitAllInDir(t, envBDir, "developer B user edit")
@@ -837,10 +835,12 @@ func TestGitArchitecture_ImplicitFetchFromRemote(t *testing.T) {
 	gitCommitAllInDir(t, envBDir, "generation 2 in envB")
 
 	// Step 7: Verify user edit was preserved (proving 3-way merge worked)
-	finalContent, err := os.ReadFile(sdkFile)
+	finalContent, err := os.ReadFile(petFile)
 	require.NoError(t, err)
 	require.Contains(t, string(finalContent), "ENVB_USER_EDIT: Developer B's customization",
 		"User modification should be preserved after generation (3-way merge worked)")
+	require.Contains(t, string(finalContent), "func (p *Pet) CustomMethod()",
+		"Custom method should be preserved after generation")
 
 	// Verify ID is preserved
 	finalID := extractGeneratedIDFromContent(finalContent)

internal/git/plumbing.go

@@ -69,28 +69,27 @@ func (r *Repository) writeBlobGoGit(content []byte) (string, error) {
 }
 
 // GetBlob retrieves the content of a blob by its SHA-1 hash.
+// Uses native git commands to ensure we can read objects fetched by native git fetch.
 func (r *Repository) GetBlob(hash string) ([]byte, error) {
 	// Strip "sha1:" prefix if present (common in some systems)
 	hash = strings.TrimPrefix(hash, "sha1:")
 
-	h := plumbing.NewHash(hash)
-	blob, err := r.repo.BlobObject(h)
-	if err != nil {
-		return nil, fmt.Errorf("failed to find blob %s: %w", hash, err)
+	repoRoot := r.Root()
+	if repoRoot == "" {
+		return nil, fmt.Errorf("repository root not found")
 	}
 
-	reader, err := blob.Reader()
+	// Use native git to read blob content.
+	// This is necessary because go-git's storer may not see objects
+	// that were fetched via native git fetch commands.
+	cmd := exec.Command("git", "cat-file", "blob", hash)
+	cmd.Dir = repoRoot
+	output, err := cmd.Output()
 	if err != nil {
-		return nil, fmt.Errorf("failed to open blob reader: %w", err)
-	}
-	defer reader.Close()
-
-	buf := new(bytes.Buffer)
-	if _, err := buf.ReadFrom(reader); err != nil {
-		return nil, fmt.Errorf("failed to read blob content: %w", err)
+		return nil, fmt.Errorf("failed to read blob %s: %w", hash, err)
 	}
 
-	return buf.Bytes(), nil
+	return output, nil
 }
 
 // TreeEntry represents a file or directory in a git tree.

internal/git/repository.go

@@ -74,18 +74,26 @@ func (r *Repository) Root() string {
 }
 
 // HasObject checks if a blob or commit exists in the local object database.
+// Uses native git commands to ensure we see objects fetched by native git fetch.
 func (r *Repository) HasObject(hash string) bool {
 	if r.repo == nil {
 		return false
 	}
 
 	// Strip "sha1:" prefix if present
 	hash = strings.TrimPrefix(hash, "sha1:")
-	h := plumbing.NewHash(hash)
 
-	// Try to get the object - if it exists, return true
-	_, err := r.repo.Storer.EncodedObject(plumbing.AnyObject, h)
-	return err == nil
+	// Use native git to check object existence.
+	// This is necessary because go-git's storer may not see objects
+	// that were fetched via native git fetch commands.
+	repoRoot := r.Root()
+	if repoRoot == "" {
+		return false
+	}
+
+	cmd := exec.Command("git", "cat-file", "-e", hash)
+	cmd.Dir = repoRoot
+	return cmd.Run() == nil
 }
 
 // FetchRef fetches a specific ref from origin.