From 5018513f827da5bb1b00085ca70c67643c4c8d4b Mon Sep 17 00:00:00 2001
From: Karan Thakur <ktthakur204@gmail.com>
Date: Sat, 29 Nov 2025 15:44:20 +0530
Subject: [PATCH 1/2] Fix false conflict detection when revisionHistory is
 empty

---
 .../core/src/projects/initialiseProjectState.ts   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/projects/initialiseProjectState.ts b/packages/core/src/projects/initialiseProjectState.ts
index a1f15c1afc..8569fde45b 100644
--- a/packages/core/src/projects/initialiseProjectState.ts
+++ b/packages/core/src/projects/initialiseProjectState.ts
@@ -1,10 +1,10 @@
 // import type {Studio} from '@theatre/studio/Studio'
 import delay from '@theatre/utils/delay'
 import type Project from './Project'
-import type {OnDiskState} from '@theatre/core/types/private/core'
-import {globals} from '@theatre/core/globals'
-import {val} from '@theatre/dataverse'
-import type {$____FixmeStudio} from '@theatre/core/types/public'
+import type { OnDiskState } from '@theatre/core/types/private/core'
+import { globals } from '@theatre/core/globals'
+import { val } from '@theatre/dataverse'
+import type { $____FixmeStudio } from '@theatre/core/types/public'
 
 type Studio = $____FixmeStudio
 
@@ -32,7 +32,7 @@ export default async function initialiseProjectState(
     (p: $____FixmeStudio) => p.coreByProject[projectId],
     {
       lastExportedObject: null,
-      loadingState: {type: 'loading'},
+      loadingState: { type: 'loading' },
     },
   )
 
@@ -49,6 +49,7 @@ export default async function initialiseProjectState(
       useBrowserState()
     } else {
       if (
+        onDiskState.revisionHistory.length > 0 &&
         browserState.revisionHistory.indexOf(onDiskState.revisionHistory[0]) ==
         -1
       ) {
@@ -60,7 +61,7 @@ export default async function initialiseProjectState(
   }
 
   function useInitialState() {
-    studio.transaction(({stateEditors}: $____FixmeStudio) => {
+    studio.transaction(({ stateEditors }: $____FixmeStudio) => {
       stateEditors.coreByProject.historic.setProjectState({
         projectId,
         state: {
@@ -79,7 +80,7 @@ export default async function initialiseProjectState(
   }
 
   function useOnDiskState(state: OnDiskState) {
-    studio.transaction(({stateEditors}: $____FixmeStudio) => {
+    studio.transaction(({ stateEditors }: $____FixmeStudio) => {
       stateEditors.coreByProject.historic.setProjectState({
         projectId,
         state,

From 1f9a3dade4577fe96eaaf141fa107fcce4093677 Mon Sep 17 00:00:00 2001
From: Karan Thakur <ktthakur204@gmail.com>
Date: Sat, 29 Nov 2025 15:50:12 +0530
Subject: [PATCH 2/2] chore: update node engine to >=20

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c3fcbf10ea..f280c6687a 100644
--- a/package.json
+++ b/package.json
@@ -63,9 +63,9 @@
   },
   "packageManager": "yarn@3.6.3",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "dependencies": {
     "@actions/core": "^1.10.0"
   }
-}
+}
\ No newline at end of file