OKAN-SOFTWARE · Oct 29, 2026 · Oct 29, 2026
diff --git a/src/app/components/chat/chat.component.spec.ts b/src/app/components/chat/chat.component.spec.ts
@@ -1171,6 +1171,84 @@ describe('ChatComponent', () => {
       });
     });
   });
+  describe('Update State persistence', () => {
+    const originalState = {counter: 1};
+    const editedState = {counter: 2};
+
+    beforeEach(() => {
+      component.userId = USER_ID;
+      component.appName = TEST_APP_1_NAME;
+      component.sessionId = SESSION_1_ID;
+      component.currentSessionState = {...originalState};
+    });
+
+    it('persists edited state immediately after Save', () => {
+      mockDialog.open.and.returnValue({
+        afterClosed: () => of(editedState),
+      } as any);
+
+      component.updateState();
+
+      expect(mockSessionService.updateSession).toHaveBeenCalledOnceWith(
+          USER_ID,
+          TEST_APP_1_NAME,
+          SESSION_1_ID,
+          {stateDelta: editedState},
+      );
+
+      mockSessionService.updateSessionResponse.next({
+        id: SESSION_1_ID,
+        state: editedState,
+      } as any);
+
+      expect(component.currentSessionState).toEqual(editedState);
+      expect(component.updatedSessionState()).toBeNull();
+    });
+
+    it('does not update the session when canceled', () => {
+      mockDialog.open.and.returnValue({
+        afterClosed: () => of(null),
+      } as any);
+
+      component.updateState();
+
+      expect(mockSessionService.updateSession).not.toHaveBeenCalled();
+      expect(component.currentSessionState).toEqual(originalState);
+    });
+
+    it('preserves pending updates when no session exists', () => {
+      component.sessionId = '';
+
+      mockDialog.open.and.returnValue({
+        afterClosed: () => of(editedState),
+      } as any);
+
+      component.updateState();
+
+      expect(mockSessionService.updateSession).not.toHaveBeenCalled();
+      expect(component.updatedSessionState()).toEqual(editedState);
+    });
+
+    it('preserves state and reports API failures', () => {
+      spyOn(console, 'error');
+
+      mockDialog.open.and.returnValue({
+        afterClosed: () => of(editedState),
+      } as any);
+
+      component.updateState();
+
+      mockSessionService.updateSessionResponse.error(
+          new Error('Request failed'),
+      );
+
+      expect(component.currentSessionState).toEqual(originalState);
+      expect(mockSnackBar.open).toHaveBeenCalledWith(
+          'Failed to update session state',
+          'OK',
+      );
+    });
+  });
 
   describe('ChatPanel integration', () => {
     beforeEach(() => {

diff --git a/src/app/components/chat/chat.component.ts b/src/app/components/chat/chat.component.ts
@@ -4951,10 +4951,35 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
       },
     });
 
-    dialogRef.afterClosed().subscribe((result: any) => {
-      if (result) {
+    dialogRef.afterClosed().subscribe((result: SessionState | null) => {
+      if (result === null || result === undefined) {
+        return;
+      }
+
+      // Preserve pending updates when a session has not been created yet.
+      if (!this.sessionId) {
         this.updatedSessionState.set(result);
+        return;
       }
+
+      // Persist changes immediately instead of waiting for the next message.
+      this.sessionService
+        .updateSession(this.userId, this.appName, this.sessionId, {
+          stateDelta: result,
+        })
+        .subscribe({
+          next: (session) => {
+            this.currentSessionState = session.state || result;
+            this.updatedSessionState.set(null);
+
+            this.sessionTab?.reloadSession(this.sessionId);
+            this.drawerSessionTab()?.reloadSession(this.sessionId);
+          },
+          error: (error) => {
+            console.error('Failed to update session state:', error);
+            this.openSnackBar('Failed to update session state', 'OK');
+          },
+        });
     });
   }
 

diff --git a/src/app/core/services/testing/mock-session.service.ts b/src/app/core/services/testing/mock-session.service.ts
@@ -24,6 +24,9 @@ import {SessionService} from '../session.service';
 
 @Injectable()
 export class MockSessionService implements Partial<SessionService> {
+  updateSessionResponse = new ReplaySubject<Session>(1);
+  updateSession = jasmine.createSpy('updateSession')
+      .and.returnValue(this.updateSessionResponse);
   createSessionResponse = new ReplaySubject<Session>(1);
   createSession = jasmine.createSpy('createSession')
                       .and.returnValue(this.createSessionResponse);