实现 Issue #330: 修复Claude Docker容器内git safe directory错误

Dockerfile

@@ -40,5 +40,8 @@ USER codeagent
 # 设置工作目录
 WORKDIR /workspace
 
+# 配置 Git safe directory 以解决跨用户挂载的权限问题
+RUN git config --global safe.directory /workspace
+
 # 默认命令
 CMD ["tail", "-f", "/dev/null"]

internal/code/claude_docker.go

@@ -134,6 +134,12 @@ func NewClaudeDocker(workspace *models.Workspace, cfg *config.Config) (Code, err
 
 	log.Infof("docker container started successfully")
 
+	// Configure Git safe directory inside the container to fix ownership issues
+	if err := configureGitSafeDirectoryInContainer(containerName); err != nil {
+		log.Warnf("Failed to configure Git safe directory in container: %v", err)
+		// Don't fail the container creation, just warn
+	}
+
 	return &claudeCode{
 		containerName: containerName,
 	}, nil
@@ -241,3 +247,4 @@ func copyHostClaudeConfig(isolatedConfigDir string) error {
 	log.Infof("Successfully copied host Claude config to isolated directory")
 	return nil
 }
+

internal/code/gemini_docker.go

@@ -140,6 +140,12 @@ func NewGeminiDocker(workspace *models.Workspace, cfg *config.Config) (Code, err
 
 	log.Infof("docker container started successfully")
 
+	// Configure Git safe directory inside the container to fix ownership issues
+	if err := configureGitSafeDirectoryInContainer(containerName); err != nil {
+		log.Warnf("Failed to configure Git safe directory in container: %v", err)
+		// Don't fail the container creation, just warn
+	}
+
 	return &geminiDocker{
 		containerName: containerName,
 	}, nil
@@ -178,3 +184,4 @@ func (g *geminiDocker) Close() error {
 	stopCmd := exec.Command("docker", "rm", "-f", g.containerName)
 	return stopCmd.Run()
 }
+

internal/code/utils.go

@@ -1,6 +1,7 @@
 package code
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"os/exec"
@@ -212,3 +213,21 @@ func generateConfigDirName(provider, org, repoName string, workspace *models.Wor
 		return fmt.Sprintf(".%s-%s-%s-workspace-%d", provider, org, repoName, timestamp)
 	}
 }
+
+// configureGitSafeDirectoryInContainer configures Git safe directory inside the Docker container
+// to prevent "fatal: unsafe repository" errors when Git operations are performed
+func configureGitSafeDirectoryInContainer(containerName string) error {
+	// Configure Git to treat /workspace as a safe directory
+	cmd := exec.Command("docker", "exec", containerName, "git", "config", "--global", "safe.directory", "/workspace")
+
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
+
+	if err := cmd.Run(); err != nil {
+		log.Errorf("Failed to configure Git safe directory: %v, stderr: %s", err, stderr.String())
+		return fmt.Errorf("failed to configure Git safe directory: %w", err)
+	}
+
+	log.Infof("Successfully configured Git safe directory in container %s", containerName)
+	return nil
+}