From d4a963e2168d1d404fb23b45cc53606a5a7228f7 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Thu, 13 Aug 2026 09:35:27 -0700
Subject: [PATCH] Pass per-worktree Tauri config to dev runs

---
 scripts/run-dev.mjs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/run-dev.mjs b/scripts/run-dev.mjs
index b382b936..1c5a9950 100644
--- a/scripts/run-dev.mjs
+++ b/scripts/run-dev.mjs
@@ -39,6 +39,7 @@ const appConfigs = {
     defaultPort: "1420",
     tauriConfig: "tauri.conf.json",
     tauriDevConfig: "tauri.development.conf.json",
+    tauriWorktreeConfig: "tauri.worktree.conf.json",
   },
   proxy: {
     appDir: "crates-tauri/yaak-app-proxy",
@@ -47,6 +48,7 @@ const appConfigs = {
     defaultPort: "2420",
     tauriConfig: "tauri.conf.json",
     tauriDevConfig: "tauri.development.conf.json",
+    tauriWorktreeConfig: "tauri.worktree.conf.json",
   },
 };
 
@@ -86,6 +88,14 @@ for (let i = 0; i < additionalArgs.length; i++) {
   normalizedAdditionalArgs.push(arg);
 }
 
+// Tauri only auto-merges platform-specific config names, so the per-worktree config
+// written by the post-checkout hook has to be passed explicitly. It's gitignored, so
+// it's normally absent in the main checkout.
+const worktreeConfigArgs = [];
+if (fs.existsSync(path.join(rootDir, appConfig.appDir, appConfig.tauriWorktreeConfig))) {
+  worktreeConfigArgs.push("--config", appConfig.tauriWorktreeConfig);
+}
+
 const args = [
   "dev",
   "--no-watch",
@@ -93,6 +103,7 @@ const args = [
   appConfig.tauriConfig,
   "--config",
   appConfig.tauriDevConfig,
+  ...worktreeConfigArgs,
   "--config",
   config,
   ...normalizedAdditionalArgs,