Automatically initialize git safe directory on startup (#2152)

src/ipc/utils/git_utils.ts

@@ -7,6 +7,7 @@ import { promises as fsPromises } from "node:fs";
 import pathModule from "node:path";
 import { readSettings } from "../../main/settings";
 import log from "electron-log";
+import { normalizePath } from "../../../shared/normalizePath";
 const logger = log.scope("git_utils");
 import type {
   GitBaseParams,
@@ -63,6 +64,53 @@ export async function withGitAuthor(args: string[]): Promise<string[]> {
   ];
 }
 
+/**
+ * Adds a directory to git's global safe.directory list.
+ * This is required on Windows when git operations are performed on directories
+ * owned by different users.
+ * Only works for native git.
+ */
+export async function gitAddSafeDirectory(directory: string): Promise<void> {
+  // Normalize path to use forward slashes (important for Windows compatibility with git)
+  directory = normalizePath(directory);
+
+  try {
+    // First check if the directory is already in the safe.directory list
+    const checkResult = await exec(
+      ["config", "--global", "--get-all", "safe.directory"],
+      ".",
+    );
+
+    // Parse existing safe directories (one per line), normalizing for comparison
+    const existingSafeDirectories = checkResult.stdout
+      .split("\n")
+      .map((line) => normalizePath(line.trim()))
+      .filter((line) => line.length > 0);
+
+    // Check if already present (exact match after normalization)
+    if (existingSafeDirectories.includes(directory)) {
+      logger.debug(`Safe directory already exists: ${directory}`);
+      return;
+    }
+
+    const result = await exec(
+      ["config", "--global", "--add", "safe.directory", directory],
+      ".",
+    );
+    if (result.exitCode !== 0) {
+      logger.warn(
+        `Failed to add safe directory '${directory}': ${result.stderr.trim() || result.stdout.trim()}`,
+      );
+    } else {
+      logger.info(`Added safe directory: ${directory}`);
+    }
+  } catch (error: any) {
+    logger.warn(
+      `Failed to add safe directory '${directory}': ${error.message}`,
+    );
+  }
+}
+
 export async function getCurrentCommitHash({
   path,
   ref = "HEAD",

src/main.ts

@@ -30,6 +30,8 @@ import {
 } from "./utils/performance_monitor";
 import { cleanupOldAiMessagesJson } from "./pro/main/ipc/handlers/local_agent/ai_messages_cleanup";
 import fs from "fs";
+import { gitAddSafeDirectory } from "./ipc/utils/git_utils";
+import { getDyadAppsBaseDirectory } from "./paths/paths";
 
 log.errorHandler.startCatching();
 log.eventLogger.startLogging();
@@ -92,6 +94,13 @@ export async function onReady() {
 
   const settings = readSettings();
 
+  // Add dyad-apps directory to git safe.directory (required for Windows)
+  if (settings.enableNativeGit) {
+    // Don't need to await because this only needs to run before
+    // the user starts interacting with Dyad app and uses a git-related feature.
+    gitAddSafeDirectory(getDyadAppsBaseDirectory());
+  }
+
   // Check if app was force-closed
   if (settings.isRunning) {
     logger.warn("App was force-closed on previous run");

src/paths/paths.ts

@@ -2,17 +2,24 @@ import path from "node:path";
 import os from "node:os";
 import { IS_TEST_BUILD } from "../ipc/utils/test_utils";
 
+/**
+ * Gets the base dyad-apps directory path (without a specific app subdirectory)
+ */
+export function getDyadAppsBaseDirectory(): string {
+  if (IS_TEST_BUILD) {
+    const electron = getElectron();
+    return path.join(electron!.app.getPath("userData"), "dyad-apps");
+  }
+  return path.join(os.homedir(), "dyad-apps");
+}
+
 export function getDyadAppPath(appPath: string): string {
   // If appPath is already absolute, use it as-is
   if (path.isAbsolute(appPath)) {
     return appPath;
   }
   // Otherwise, use the default base path
-  if (IS_TEST_BUILD) {
-    const electron = getElectron();
-    return path.join(electron!.app.getPath("userData"), "dyad-apps", appPath);
-  }
-  return path.join(os.homedir(), "dyad-apps", appPath);
+  return path.join(getDyadAppsBaseDirectory(), appPath);
 }
 
 export function getTypeScriptCachePath(): string {