From 4f0dbd129185b18fa0c06a6d8a06022d133c5862 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 13 Aug 2026 01:22:19 -0700
Subject: [PATCH] Remove unrelated merge formatting changes

---
 .../session-scanner-opencode-sources-wsl-stall.test.ts   | 4 +++-
 src/renderer/src/lib/setup-script-prompt.test.ts         | 5 ++++-
 src/renderer/src/store/slices/github.ts                  | 4 +++-
 .../src/store/slices/repos-refresh-identity.test.ts      | 9 ++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/ai-vault/session-scanner-opencode-sources-wsl-stall.test.ts b/src/main/ai-vault/session-scanner-opencode-sources-wsl-stall.test.ts
index accc60d008f..297f4b78b06 100644
--- a/src/main/ai-vault/session-scanner-opencode-sources-wsl-stall.test.ts
+++ b/src/main/ai-vault/session-scanner-opencode-sources-wsl-stall.test.ts
@@ -94,7 +94,9 @@ describe('OpenCode source discovery with a stalled WSL data directory', () => {
       // silent [] here reads as "no OpenCode sessions" on a clean scan.
       await expect(discoveries).resolves.toHaveLength(1)
       expect(
-        issues.some((issue) => issue.agent === 'opencode' && issue.path === `${WSL_HOME}/opencode`)
+        issues.some(
+          (issue) => issue.agent === 'opencode' && issue.path === `${WSL_HOME}/opencode`
+        )
       ).toBe(true)
     } finally {
       restoreEnv('XDG_DATA_HOME', previousXdg)
diff --git a/src/renderer/src/lib/setup-script-prompt.test.ts b/src/renderer/src/lib/setup-script-prompt.test.ts
index 3ce55848f1c..605142bc154 100644
--- a/src/renderer/src/lib/setup-script-prompt.test.ts
+++ b/src/renderer/src/lib/setup-script-prompt.test.ts
@@ -220,7 +220,10 @@ describe('setup script prompt inspection', () => {
       getSetupScriptPromptDismissalKey(remoteIdentity)
     ]
     expect(
-      filterSetupScriptPromptDismissalsToValidRepos(input, new Set([localIdentity, remoteIdentity]))
+      filterSetupScriptPromptDismissalsToValidRepos(
+        input,
+        new Set([localIdentity, remoteIdentity])
+      )
     ).toBe(input)
   })
 
diff --git a/src/renderer/src/store/slices/github.ts b/src/renderer/src/store/slices/github.ts
index 299e3e21bbb..24501bc23e9 100644
--- a/src/renderer/src/store/slices/github.ts
+++ b/src/renderer/src/store/slices/github.ts
@@ -2787,7 +2787,9 @@ export const createGitHubSlice: StateCreator<AppState, [], [], GitHubSlice> = (s
               ...(errorForCache
                 ? {
                     error:
-                      errorUnchanged && previousError !== undefined ? previousError : errorForCache
+                      errorUnchanged && previousError !== undefined
+                        ? previousError
+                        : errorForCache
                   }
                 : {}),
               ...(nextFellBack ? { issueSourceFellBack: true } : {})
diff --git a/src/renderer/src/store/slices/repos-refresh-identity.test.ts b/src/renderer/src/store/slices/repos-refresh-identity.test.ts
index 779f9e8d04e..193bd045ede 100644
--- a/src/renderer/src/store/slices/repos-refresh-identity.test.ts
+++ b/src/renderer/src/store/slices/repos-refresh-identity.test.ts
@@ -421,11 +421,9 @@ describe('SSH readoption catalog identity', () => {
     expect(oldSetup).toBeDefined()
     expect(newSetup).toBeDefined()
 
-    store
-      .getState()
-      .recordSshRepoReadoptions([
-        { oldTargetId: 'ssh-old', newTargetId: 'ssh-new', repoIds: [repo.id] }
-      ])
+    store.getState().recordSshRepoReadoptions([
+      { oldTargetId: 'ssh-old', newTargetId: 'ssh-new', repoIds: [repo.id] }
+    ])
 
     const next = store.getState().projectHostSetups
     expect(next).not.toBe(setups)
@@ -437,3 +435,4 @@ describe('SSH readoption catalog identity', () => {
     expect(store.getState().pendingSshRepoReadoptions).toEqual([])
   })
 })
+