@modelnex/sdk 0.5.49 → 0.5.51

package/dist/index.js

@@ -3881,16 +3881,17 @@ function compactTourForTransport(tour) {
 
 // src/utils/tourSessionPersistence.ts
 var ACTIVE_TOUR_SESSION_STORAGE_KEY = "modelnex-active-tour-session";
-var ACTIVE_TOUR_SESSION_VERSION = 1;
+var ACTIVE_TOUR_SESSION_VERSION = 2;
 var ACTIVE_TOUR_SESSION_MAX_AGE_MS = 10 * 60 * 1e3;
 function canUseSessionStorage2() {
   return typeof window !== "undefined" && typeof window.sessionStorage !== "undefined";
 }
-function persistActiveTourSession(runId) {
+function persistActiveTourSession(runId, experienceType) {
   if (!canUseSessionStorage2() || !Number.isFinite(runId)) return;
   const session = {
     version: ACTIVE_TOUR_SESSION_VERSION,
     runId,
+    experienceType,
     savedAt: Date.now()
   };
   try {
@@ -3911,7 +3912,7 @@ function readPersistedActiveTourSession() {
     const raw = window.sessionStorage.getItem(ACTIVE_TOUR_SESSION_STORAGE_KEY);
     if (!raw) return null;
     const parsed = JSON.parse(raw);
-    const isValid = parsed && parsed.version === ACTIVE_TOUR_SESSION_VERSION && typeof parsed.runId === "number" && Number.isFinite(parsed.runId) && typeof parsed.savedAt === "number" && Number.isFinite(parsed.savedAt);
+    const isValid = parsed && parsed.version === ACTIVE_TOUR_SESSION_VERSION && typeof parsed.runId === "number" && Number.isFinite(parsed.runId) && typeof parsed.experienceType === "string" && typeof parsed.savedAt === "number" && Number.isFinite(parsed.savedAt);
     if (!isValid) {
       clearPersistedActiveTourSession();
       return null;
@@ -4543,9 +4544,12 @@ function useTourPlayback({
   const pendingTourOptionsRef = (0, import_react12.useRef)(null);
   const showCaptionsRef = (0, import_react12.useRef)(showCaptions);
   const initialPersistedTourSessionRef = (0, import_react12.useRef)(readPersistedActiveTourSession());
-  const runIdRef = (0, import_react12.useRef)(initialPersistedTourSessionRef.current?.runId ?? null);
+  const runIdRef = (0, import_react12.useRef)(
+    initialPersistedTourSessionRef.current?.experienceType === experienceType ? initialPersistedTourSessionRef.current.runId : null
+  );
   const turnIdRef = (0, import_react12.useRef)(null);
   const startRequestedRef = (0, import_react12.useRef)(false);
+  const serverStateRef = (0, import_react12.useRef)(null);
   const playbackOwnerIdRef = (0, import_react12.useRef)(`playback-owner-${Math.random().toString(36).slice(2, 10)}`);
   const claimedPlaybackOwnerKeyRef = (0, import_react12.useRef)(null);
   const socketRef = (0, import_react12.useRef)(null);
@@ -4565,6 +4569,7 @@ function useTourPlayback({
   toursApiBaseRef.current = toursApiBase;
   pendingTourRef.current = pendingTour;
   showCaptionsRef.current = showCaptions;
+  serverStateRef.current = serverState;
   const releasePlaybackOwnership = (0, import_react12.useCallback)(() => {
     const claimedKey = claimedPlaybackOwnerKeyRef.current;
     if (!claimedKey) return;
@@ -4572,7 +4577,8 @@ function useTourPlayback({
     claimedPlaybackOwnerKeyRef.current = null;
   }, []);
   const emitTourInit = (0, import_react12.useCallback)((socket, currentWebsiteId, profile) => {
-    const persistedRunId = runIdRef.current ?? readPersistedActiveTourSession()?.runId ?? null;
+    const persistedSession = readPersistedActiveTourSession();
+    const persistedRunId = runIdRef.current ?? (persistedSession?.experienceType === experienceTypeRef.current ? persistedSession.runId : null);
     const payload = {};
     if (currentWebsiteId) {
       payload.websiteId = currentWebsiteId;
@@ -4605,6 +4611,7 @@ function useTourPlayback({
       emitTourInit(socket, currentWebsiteId, profile);
     };
     const handleServerState = (payload) => {
+      serverStateRef.current = payload;
       if (typeof payload?.runId === "number") {
         runIdRef.current = payload.runId;
       }
@@ -4612,7 +4619,7 @@ function useTourPlayback({
         turnIdRef.current = payload.turnId ?? null;
       }
       if (payload?.isActive && typeof payload?.runId === "number") {
-        persistActiveTourSession(payload.runId);
+        persistActiveTourSession(payload.runId, experienceTypeRef.current);
       } else if (payload?.isActive === false) {
         clearPersistedActiveTourSession();
       }
@@ -5247,7 +5254,7 @@ function useTourPlayback({
       if (isActiveRef.current) return;
       runIdRef.current = typeof tourData.runId === "number" ? tourData.runId : runIdRef.current;
       if (typeof runIdRef.current === "number") {
-        persistActiveTourSession(runIdRef.current);
+        persistActiveTourSession(runIdRef.current, experienceTypeRef.current);
       }
       const tour = tourData.tourContext ?? tourRef.current;
       const expType = experienceTypeRef.current;
@@ -5268,6 +5275,9 @@ function useTourPlayback({
       claimedPlaybackOwnerKeyRef.current = ownerKey;
       skipRequestedRef.current = false;
       startRequestedRef.current = false;
+      setPendingTour(null);
+      pendingTourRef.current = null;
+      pendingTourOptionsRef.current = null;
       const total = tourData.totalSteps ?? tour?.steps?.length ?? 0;
       const requestedStepIndex = typeof tourData.currentStepIndex === "number" ? tourData.currentStepIndex : 0;
       const clampedStepIndex = Math.max(0, Math.min(requestedStepIndex, Math.max(0, total - 1)));
@@ -5574,6 +5584,14 @@ function useTourPlayback({
       }, { devMode: devModeRef.current });
       return;
     }
+    if (serverStateRef.current?.isActive && typeof serverStateRef.current?.runId === "number") {
+      emitSdkDebugLog("[TourClient] Ignoring start request because the server already has an active run", {
+        tourId: tour.id,
+        activeRunId: serverStateRef.current.runId,
+        activeStepIndex: serverStateRef.current.stepIndex
+      }, { devMode: devModeRef.current });
+      return;
+    }
     setPendingTour(null);
     pendingTourRef.current = null;
     let retries = 0;

package/dist/index.mjs

@@ -3056,16 +3056,17 @@ function compactTourForTransport(tour) {
 
 // src/utils/tourSessionPersistence.ts
 var ACTIVE_TOUR_SESSION_STORAGE_KEY = "modelnex-active-tour-session";
-var ACTIVE_TOUR_SESSION_VERSION = 1;
+var ACTIVE_TOUR_SESSION_VERSION = 2;
 var ACTIVE_TOUR_SESSION_MAX_AGE_MS = 10 * 60 * 1e3;
 function canUseSessionStorage2() {
   return typeof window !== "undefined" && typeof window.sessionStorage !== "undefined";
 }
-function persistActiveTourSession(runId) {
+function persistActiveTourSession(runId, experienceType) {
   if (!canUseSessionStorage2() || !Number.isFinite(runId)) return;
   const session = {
     version: ACTIVE_TOUR_SESSION_VERSION,
     runId,
+    experienceType,
     savedAt: Date.now()
   };
   try {
@@ -3086,7 +3087,7 @@ function readPersistedActiveTourSession() {
     const raw = window.sessionStorage.getItem(ACTIVE_TOUR_SESSION_STORAGE_KEY);
     if (!raw) return null;
     const parsed = JSON.parse(raw);
-    const isValid = parsed && parsed.version === ACTIVE_TOUR_SESSION_VERSION && typeof parsed.runId === "number" && Number.isFinite(parsed.runId) && typeof parsed.savedAt === "number" && Number.isFinite(parsed.savedAt);
+    const isValid = parsed && parsed.version === ACTIVE_TOUR_SESSION_VERSION && typeof parsed.runId === "number" && Number.isFinite(parsed.runId) && typeof parsed.experienceType === "string" && typeof parsed.savedAt === "number" && Number.isFinite(parsed.savedAt);
     if (!isValid) {
       clearPersistedActiveTourSession();
       return null;
@@ -3714,9 +3715,12 @@ function useTourPlayback({
   const pendingTourOptionsRef = useRef7(null);
   const showCaptionsRef = useRef7(showCaptions);
   const initialPersistedTourSessionRef = useRef7(readPersistedActiveTourSession());
-  const runIdRef = useRef7(initialPersistedTourSessionRef.current?.runId ?? null);
+  const runIdRef = useRef7(
+    initialPersistedTourSessionRef.current?.experienceType === experienceType ? initialPersistedTourSessionRef.current.runId : null
+  );
   const turnIdRef = useRef7(null);
   const startRequestedRef = useRef7(false);
+  const serverStateRef = useRef7(null);
   const playbackOwnerIdRef = useRef7(`playback-owner-${Math.random().toString(36).slice(2, 10)}`);
   const claimedPlaybackOwnerKeyRef = useRef7(null);
   const socketRef = useRef7(null);
@@ -3736,6 +3740,7 @@ function useTourPlayback({
   toursApiBaseRef.current = toursApiBase;
   pendingTourRef.current = pendingTour;
   showCaptionsRef.current = showCaptions;
+  serverStateRef.current = serverState;
   const releasePlaybackOwnership = useCallback6(() => {
     const claimedKey = claimedPlaybackOwnerKeyRef.current;
     if (!claimedKey) return;
@@ -3743,7 +3748,8 @@ function useTourPlayback({
     claimedPlaybackOwnerKeyRef.current = null;
   }, []);
   const emitTourInit = useCallback6((socket, currentWebsiteId, profile) => {
-    const persistedRunId = runIdRef.current ?? readPersistedActiveTourSession()?.runId ?? null;
+    const persistedSession = readPersistedActiveTourSession();
+    const persistedRunId = runIdRef.current ?? (persistedSession?.experienceType === experienceTypeRef.current ? persistedSession.runId : null);
     const payload = {};
     if (currentWebsiteId) {
       payload.websiteId = currentWebsiteId;
@@ -3776,6 +3782,7 @@ function useTourPlayback({
       emitTourInit(socket, currentWebsiteId, profile);
     };
     const handleServerState = (payload) => {
+      serverStateRef.current = payload;
       if (typeof payload?.runId === "number") {
         runIdRef.current = payload.runId;
       }
@@ -3783,7 +3790,7 @@ function useTourPlayback({
         turnIdRef.current = payload.turnId ?? null;
       }
       if (payload?.isActive && typeof payload?.runId === "number") {
-        persistActiveTourSession(payload.runId);
+        persistActiveTourSession(payload.runId, experienceTypeRef.current);
       } else if (payload?.isActive === false) {
         clearPersistedActiveTourSession();
       }
@@ -4418,7 +4425,7 @@ function useTourPlayback({
       if (isActiveRef.current) return;
       runIdRef.current = typeof tourData.runId === "number" ? tourData.runId : runIdRef.current;
       if (typeof runIdRef.current === "number") {
-        persistActiveTourSession(runIdRef.current);
+        persistActiveTourSession(runIdRef.current, experienceTypeRef.current);
       }
       const tour = tourData.tourContext ?? tourRef.current;
       const expType = experienceTypeRef.current;
@@ -4439,6 +4446,9 @@ function useTourPlayback({
       claimedPlaybackOwnerKeyRef.current = ownerKey;
       skipRequestedRef.current = false;
       startRequestedRef.current = false;
+      setPendingTour(null);
+      pendingTourRef.current = null;
+      pendingTourOptionsRef.current = null;
       const total = tourData.totalSteps ?? tour?.steps?.length ?? 0;
       const requestedStepIndex = typeof tourData.currentStepIndex === "number" ? tourData.currentStepIndex : 0;
       const clampedStepIndex = Math.max(0, Math.min(requestedStepIndex, Math.max(0, total - 1)));
@@ -4745,6 +4755,14 @@ function useTourPlayback({
       }, { devMode: devModeRef.current });
       return;
     }
+    if (serverStateRef.current?.isActive && typeof serverStateRef.current?.runId === "number") {
+      emitSdkDebugLog("[TourClient] Ignoring start request because the server already has an active run", {
+        tourId: tour.id,
+        activeRunId: serverStateRef.current.runId,
+        activeStepIndex: serverStateRef.current.stepIndex
+      }, { devMode: devModeRef.current });
+      return;
+    }
     setPendingTour(null);
     pendingTourRef.current = null;
     let retries = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelnex/sdk",
-  "version": "0.5.49",
+  "version": "0.5.51",
   "description": "React SDK for natural language control of web apps via AI agents",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",