From 7f3ad26c4654ee9049c2eaed2d7b9769af5f7caa Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Mon, 27 Apr 2026 00:31:41 +0200
Subject: [PATCH] Improve transform session state management by explicitly
 clearing the active session reference upon state changes, clear operations,
 or errors.

---
 src/app/App.tsx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/app/App.tsx b/src/app/App.tsx
index df2735c6..9d710f50 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -6821,14 +6821,14 @@ export function App({ store, initialStatusMessage }: AppProps) {
       store.setActiveViewportPanel(transformSourcePanelId);
     }
 
-    store.setTransformSession(
-      createTransformSession({
-        source,
-        sourcePanelId: transformSourcePanelId,
-        operation,
-        target: transformTarget
-      })
-    );
+    const nextTransformSession = createTransformSession({
+      source,
+      sourcePanelId: transformSourcePanelId,
+      operation,
+      target: transformTarget
+    });
+    latestActiveTransformSessionRef.current = nextTransformSession;
+    store.setTransformSession(nextTransformSession);
     setStatusMessage(
       `${getTransformOperationLabel(operation)} ${getTransformTargetLabel(transformTarget).toLowerCase()} in ${getViewportPanelLabel(
         transformSourcePanelId
@@ -6843,6 +6843,7 @@ export function App({ store, initialStatusMessage }: AppProps) {
       return;
     }
 
+    latestActiveTransformSessionRef.current = null;
     store.clearTransformSession();
     setStatusMessage(status);
   };
@@ -6851,12 +6852,14 @@ export function App({ store, initialStatusMessage }: AppProps) {
     activeTransformSession: ActiveTransformSession
   ) => {
     if (!doesTransformSessionChangeTarget(activeTransformSession)) {
+      latestActiveTransformSessionRef.current = null;
       store.clearTransformSession();
       setStatusMessage("No transform change was committed.");
       return;
     }
 
     try {
+      latestActiveTransformSessionRef.current = null;
       store.clearTransformSession();
       store.executeCommand(
         createCommitTransformSessionCommand(
@@ -6868,6 +6871,7 @@ export function App({ store, initialStatusMessage }: AppProps) {
         `${getTransformOperationPastTense(activeTransformSession.operation)} ${getTransformTargetLabel(activeTransformSession.target).toLowerCase()}.`
       );
     } catch (error) {
+      latestActiveTransformSessionRef.current = null;
       store.clearTransformSession();
       setStatusMessage(getErrorMessage(error));
     }