Enable native git & bump to 0.33.0-beta.1 (#2095)

e2e-tests/helpers/test_helper.ts

@@ -233,11 +233,11 @@ export class PageObject {
 
   async setUp({
     autoApprove = false,
-    nativeGit = false,
+    disableNativeGit = false,
     enableAutoFixProblems = false,
   }: {
     autoApprove?: boolean;
-    nativeGit?: boolean;
+    disableNativeGit?: boolean;
     enableAutoFixProblems?: boolean;
   } = {}) {
     await this.baseSetup();
@@ -245,7 +245,7 @@ export class PageObject {
     if (autoApprove) {
       await this.toggleAutoApprove();
     }
-    if (nativeGit) {
+    if (disableNativeGit) {
       await this.toggleNativeGit();
     }
     if (enableAutoFixProblems) {

e2e-tests/supabase_migrations.spec.ts

@@ -64,9 +64,9 @@ test("supabase migrations", async ({ po }) => {
 // Skip this test on Windows because git isn't configured and
 // the mac test will catch this regression.
 testSkipIfWindows("supabase migrations with native git", async ({ po }) => {
-  // Turning on native Git to catch this edge case:
+  // Keep native Git on to catch this edge case:
   // https://github.com/dyad-sh/dyad/issues/608
-  await po.setUp({ autoApprove: true, nativeGit: true });
+  await po.setUp({ autoApprove: true, disableNativeGit: false });
   await po.sendPrompt("tc=add-supabase");
 
   // Connect to Supabase

e2e-tests/switch_versions.spec.ts

 import { PageObject, testSkipIfWindows, Timeout } from "./helpers/test_helper";
 import { expect } from "@playwright/test";
 
-const runSwitchVersionTest = async (po: PageObject, nativeGit: boolean) => {
-  await po.setUp({ autoApprove: true, nativeGit });
+const runSwitchVersionTest = async (
+  po: PageObject,
+  disableNativeGit: boolean,
+) => {
+  await po.setUp({ autoApprove: true, disableNativeGit });
   await po.sendPrompt("tc=write-index");
 
   await po.snapshotPreview({ name: `v2` });
@@ -25,10 +28,10 @@ const runSwitchVersionTest = async (po: PageObject, nativeGit: boolean) => {
   });
 };
 
-testSkipIfWindows("switch versions", async ({ po }) => {
+testSkipIfWindows("switch versions (native git)", async ({ po }) => {
   await runSwitchVersionTest(po, false);
 });
 
-testSkipIfWindows("switch versions with native git", async ({ po }) => {
+testSkipIfWindows("switch versions (isomorphic git)", async ({ po }) => {
   await runSwitchVersionTest(po, true);
 });

e2e-tests/undo.spec.ts

 import { PageObject, testSkipIfWindows, Timeout } from "./helpers/test_helper";
 import { expect } from "@playwright/test";
 
-const runUndoTest = async (po: PageObject, nativeGit: boolean) => {
-  await po.setUp({ autoApprove: true, nativeGit });
+const runUndoTest = async (po: PageObject, disableNativeGit: boolean) => {
+  await po.setUp({ autoApprove: true, disableNativeGit });
   await po.sendPrompt("tc=write-index");
   await po.sendPrompt("tc=write-index-2");
 
@@ -42,7 +42,7 @@ testSkipIfWindows("undo with native git", async ({ po }) => {
 });
 
 testSkipIfWindows("undo after assistant with no code", async ({ po }) => {
-  await po.setUp({ autoApprove: true, nativeGit: false });
+  await po.setUp({ autoApprove: true });
 
   // First prompt - no code generated
   await po.sendPrompt("tc=no-code-response");

e2e-tests/version_integrity.spec.ts

@@ -4,7 +4,7 @@ import * as eph from "electron-playwright-helpers";
 import path from "node:path";
 
 const runVersionIntegrityTest = async (po: PageObject, nativeGit: boolean) => {
-  await po.setUp({ autoApprove: true, nativeGit });
+  await po.setUp({ autoApprove: true, disableNativeGit: !nativeGit });
 
   // Importing a simple app with a few files.
   await po.page.getByRole("button", { name: "Import App" }).click();

package.json

 {
   "name": "dyad",
   "productName": "dyad",
-  "version": "0.32.0",
+  "version": "0.33.0-beta.1",
   "description": "Free, local, open-source AI app builder",
   "main": ".vite/build/main.js",
   "repository": {

src/main/settings.ts

@@ -36,6 +36,8 @@ const DEFAULT_SETTINGS: UserSettings = {
   selectedTemplateId: DEFAULT_TEMPLATE_ID,
   isRunning: false,
   lastKnownPerformance: undefined,
+  // Enabled by default in 0.33.0-beta.1
+  enableNativeGit: true,
 };
 
 const SETTINGS_FILE = "user-settings.json";