@spatialwalk/avatarkit 1.0.0-beta.62 → 1.0.0-beta.64

package/dist/core/AvatarController.d.ts

@@ -44,6 +44,8 @@ export declare class AvatarController {
         playbackMode?: DrivingServiceMode;
     });
     getCurrentConversationId(): string | null;
+    initializeAudioContext(): Promise<void>;
+    private checkAudioContextInitialized;
     start(): Promise<void>;
     send(audioData: ArrayBuffer, end?: boolean): string | null;
     close(): void;

package/dist/core/AvatarView.d.ts

@@ -26,6 +26,7 @@ export declare class AvatarView {
     private readonly endTransitionDurationMs;
     private cachedIdleFirstFrame;
     private idleCurrentFrameIndex;
+    private currentPlayingFrame;
     private characterHandle;
     private characterId;
     private isPureRenderingMode;

package/dist/{index-Bhjn1nq3.js → index-D0sXXlqd.js}

@@ -7173,11 +7173,11 @@ var ErrorCode = /* @__PURE__ */ ((ErrorCode2) => {
   ErrorCode2["failedToDownloadAvatarAssets"] = "failedToDownloadAvatarAssets";
   return ErrorCode2;
 })(ErrorCode || {});
-class SPAvatarError extends Error {
+class AvatarError extends Error {
   constructor(message, code) {
     super(message);
     this.code = code;
-    this.name = "SPAvatarError";
+    this.name = "AvatarError";
   }
 }
 {
@@ -7624,7 +7624,7 @@ const _AnimationPlayer = class _AnimationPlayer {
     if (this.streamingPlayer) {
       return;
     }
-    const { StreamingAudioPlayer } = await import("./StreamingAudioPlayer-BWsAt_s7.js");
+    const { StreamingAudioPlayer } = await import("./StreamingAudioPlayer-CugAsNXV.js");
     const { AvatarSDK: AvatarSDK2 } = await Promise.resolve().then(() => AvatarSDK$1);
     const audioFormat = AvatarSDK2.getAudioFormat();
     this.streamingPlayer = new StreamingAudioPlayer({
@@ -8180,7 +8180,7 @@ class AvatarCoreAdapter {
   }
   async loadWASMModule() {
     try {
-      const { default: AvatarCoreModule } = await import("./avatar_core_wasm-i0Ocpx6q.js");
+      const { default: AvatarCoreModule } = await import("./avatar_core_wasm-Dv943JJl.js");
       if (this.wasmConfig && Object.keys(this.wasmConfig).length > 0) {
         this.wasmModule = await AvatarCoreModule(this.wasmConfig);
       } else {
@@ -8961,7 +8961,7 @@ class AvatarSDK {
 }
 __publicField(AvatarSDK, "_isInitialized", false);
 __publicField(AvatarSDK, "_configuration", null);
-__publicField(AvatarSDK, "_version", "1.0.0-beta.62");
+__publicField(AvatarSDK, "_version", "1.0.0-beta.64");
 __publicField(AvatarSDK, "_avatarCore", null);
 __publicField(AvatarSDK, "_dynamicSdkConfig", null);
 const AvatarSDK$1 = Object.freeze(Object.defineProperty({
@@ -10156,7 +10156,7 @@ class AnimationWebSocketClient extends EventEmitter {
             });
           }
           if (sdkErrorCode) {
-            const error = new SPAvatarError(
+            const error = new AvatarError(
               reason || `WebSocket connection failed with code ${event.code}`,
               sdkErrorCode
             );
@@ -10313,7 +10313,7 @@ class NetworkLayer {
     var _a, _b, _c, _d;
     if (this.isConnecting) {
       logger.warn("[NetworkLayer] Connection already in progress, waiting for current connection to complete");
-      throw new SPAvatarError("Connection already in progress", "CONNECTION_IN_PROGRESS");
+      throw new AvatarError("Connection already in progress", "CONNECTION_IN_PROGRESS");
     }
     (_b = (_a = this.dataController).onConnectionState) == null ? void 0 : _b.call(_a, ConnectionState.connecting);
     this.isFallbackMode = false;
@@ -10391,7 +10391,7 @@ class NetworkLayer {
     const sent = this.wsClient.sendAudioData(this.currentConversationId, audioData, isLast);
     if (!sent) {
       logger.error("[NetworkLayer] Failed to send audio data to WebSocket");
-      (_b = (_a = this.dataController).onError) == null ? void 0 : _b.call(_a, new SPAvatarError("Failed to send audio data to WebSocket", "SEND_FAILED"));
+      (_b = (_a = this.dataController).onError) == null ? void 0 : _b.call(_a, new AvatarError("Failed to send audio data to WebSocket", "SEND_FAILED"));
       logEvent("send_audio_failed", "error", {
         req_id: this.currentConversationId || "",
         con_id: idManager.getConnectionId() || "",
@@ -10549,7 +10549,7 @@ class NetworkLayer {
     } else {
       sdkErrorCode = errorCodeStr || "SERVER_ERROR";
     }
-    (_b = (_a = this.dataController).onError) == null ? void 0 : _b.call(_a, new SPAvatarError(
+    (_b = (_a = this.dataController).onError) == null ? void 0 : _b.call(_a, new AvatarError(
       errorMessage,
       sdkErrorCode
     ));
@@ -10741,38 +10741,71 @@ class AvatarController {
   getCurrentConversationId() {
     return this.getEffectiveConversationId();
   }
-  async start() {
-    if (!this.networkLayer) {
-      throw new SPAvatarError(
-        "Network layer not available. Use SDK mode.",
-        "NETWORK_LAYER_NOT_AVAILABLE"
-      );
+  async initializeAudioContext() {
+    var _a;
+    if ((_a = this.animationPlayer) == null ? void 0 : _a.isStreamingReady()) {
+      return;
     }
     if (!this.animationPlayer) {
       this.animationPlayer = new AnimationPlayer();
+    }
+    if (!this.animationPlayer.isStreamingReady()) {
       try {
         await this.animationPlayer.createAndInitializeStreamingPlayer();
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        logger.error("[AvatarController] Failed to create streaming player:", message);
-        logEvent("character_player", "error", {
-          avatar_id: this.avatar.id,
-          event: "streaming_player_init_failed",
-          reason: message
-        });
-        throw error;
+        logger.error("[AvatarController] Failed to initialize audio context:", message);
+        throw new AvatarError(
+          `Failed to initialize audio context: ${message}`,
+          "AUDIO_CONTEXT_INIT_FAILED"
+        );
       }
     }
+    const streamingPlayer = this.animationPlayer.getStreamingPlayer();
+    if (streamingPlayer) {
+      const audioContext = streamingPlayer.audioContext;
+      if (audioContext && audioContext.state === "suspended") {
+        try {
+          await audioContext.resume();
+        } catch (err) {
+          logger.warn("[AvatarController] Failed to resume AudioContext during initialization:", err);
+        }
+      }
+    }
+  }
+  checkAudioContextInitialized() {
+    var _a;
+    if (!((_a = this.animationPlayer) == null ? void 0 : _a.isStreamingReady())) {
+      throw new AvatarError(
+        "Audio context not initialized. Call initializeAudioContext() in a user gesture context first.",
+        "AUDIO_CONTEXT_NOT_INITIALIZED"
+      );
+    }
+  }
+  async start() {
+    if (!this.networkLayer) {
+      throw new AvatarError(
+        "Network layer not available. Use SDK mode.",
+        "NETWORK_LAYER_NOT_AVAILABLE"
+      );
+    }
+    this.checkAudioContextInitialized();
     await this.networkLayer.connect(this.avatar.id);
   }
   send(audioData, end = false) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
+    try {
+      this.checkAudioContextInitialized();
+    } catch (error) {
+      (_a = this.onError) == null ? void 0 : _a.call(this, error);
+      return null;
+    }
     if (!this.networkLayer) {
-      (_a = this.onError) == null ? void 0 : _a.call(this, new SPAvatarError("Network layer not available", "NETWORK_LAYER_NOT_AVAILABLE"));
+      (_b = this.onError) == null ? void 0 : _b.call(this, new AvatarError("Network layer not available", "NETWORK_LAYER_NOT_AVAILABLE"));
       return null;
     }
     if (!this.networkLayer.canSend()) {
-      (_b = this.onError) == null ? void 0 : _b.call(this, new SPAvatarError("Service not connected", "NOT_CONNECTED"));
+      (_c = this.onError) == null ? void 0 : _c.call(this, new AvatarError("Service not connected", "NOT_CONNECTED"));
       logEvent("character_manager", "warning", {
         avatar_id: this.avatar.id,
         event: "send_not_connected"
@@ -10790,7 +10823,7 @@ class AvatarController {
     }
     if (!this.isPlaying && this.currentState === AvatarState.idle) {
       this.currentState = AvatarState.active;
-      (_c = this.onConversationState) == null ? void 0 : _c.call(this, this.mapToConversationState(AvatarState.active));
+      (_d = this.onConversationState) == null ? void 0 : _d.call(this, this.mapToConversationState(AvatarState.active));
     }
     return this.networkLayer.getCurrentConversationId();
   }
@@ -10810,18 +10843,13 @@ class AvatarController {
     (_a = this.onConnectionState) == null ? void 0 : _a.call(this, ConnectionState.disconnected);
   }
   async playback(initialAudioChunks, initialKeyframes) {
+    this.checkAudioContextInitialized();
     if (this.isPlaying || this.currentConversationId) {
       this.interrupt();
     }
     this.currentConversationId = this.generateAndLogNewConversationId();
     this.reqEnd = false;
     this.clearPlaybackData();
-    if (!this.animationPlayer) {
-      this.animationPlayer = new AnimationPlayer();
-    }
-    if (!this.animationPlayer.isStreamingReady()) {
-      await this.animationPlayer.createAndInitializeStreamingPlayer();
-    }
     if (initialAudioChunks && initialAudioChunks.length > 0) {
       this.pendingAudioChunks.push(...initialAudioChunks);
     }
@@ -10838,7 +10866,7 @@ class AvatarController {
       this.isAudioOnlyMode = true;
     }
     if (this.pendingAudioChunks.length === 0) {
-      throw new SPAvatarError("No audio chunks to play", "NO_AUDIO");
+      throw new AvatarError("No audio chunks to play", "NO_AUDIO");
     }
     if (this.isAudioOnlyMode) {
       await this.startAudioOnlyPlayback();
@@ -10848,7 +10876,13 @@ class AvatarController {
     return this.currentConversationId;
   }
   yieldAudioData(data, isLast = false) {
-    var _a, _b;
+    var _a, _b, _c;
+    try {
+      this.checkAudioContextInitialized();
+    } catch (error) {
+      (_a = this.onError) == null ? void 0 : _a.call(this, error);
+      return null;
+    }
     if (this.reqEnd && this.isPlaying && this.currentConversationId) {
       this.interrupt();
       this.currentConversationId = this.generateAndLogNewConversationId();
@@ -10879,12 +10913,12 @@ class AvatarController {
         metrics.tap2Timestamp = Date.now();
       }
     }
-    if (this.isPlaying && ((_a = this.animationPlayer) == null ? void 0 : _a.isStreamingReady())) {
+    if (this.isPlaying && ((_b = this.animationPlayer) == null ? void 0 : _b.isStreamingReady())) {
       this.animationPlayer.addAudioChunk(data, isLast);
     } else {
       if (data.length > 0 || isLast) {
         this.pendingAudioChunks.push({ data, isLast });
-        (_b = this.onConversationState) == null ? void 0 : _b.call(this, this.mapToConversationState(AvatarState.active));
+        (_c = this.onConversationState) == null ? void 0 : _c.call(this, this.mapToConversationState(AvatarState.active));
       }
     }
     return this.currentConversationId;
@@ -10988,7 +11022,7 @@ class AvatarController {
         var _a;
         this.isStartingPlayback = false;
         logger.error("[AvatarController] Failed to auto-start playback:", error);
-        (_a = this.onError) == null ? void 0 : _a.call(this, new SPAvatarError("Failed to start playback", "PLAYBACK_START_FAILED"));
+        (_a = this.onError) == null ? void 0 : _a.call(this, new AvatarError("Failed to start playback", "PLAYBACK_START_FAILED"));
       });
     }
   }
@@ -11237,6 +11271,7 @@ class AvatarController {
   }
   async startStreamingPlaybackInternal() {
     var _a, _b, _c;
+    this.checkAudioContextInitialized();
     if (this.isPlaying) {
       this.isStartingPlayback = false;
       return;
@@ -11245,30 +11280,15 @@ class AvatarController {
       return;
     }
     this.isStartingPlayback = true;
-    if (!this.animationPlayer) {
-      this.animationPlayer = new AnimationPlayer();
-    }
-    if (!this.animationPlayer.isStreamingReady()) {
-      try {
-        await this.animationPlayer.createAndInitializeStreamingPlayer();
-      } catch (error) {
-        this.isStartingPlayback = false;
-        const message = error instanceof Error ? error.message : String(error);
-        logger.error("[AvatarController] Failed to create streaming player:", message);
-        logEvent("character_player", "error", {
-          avatar_id: this.avatar.id,
-          event: "streaming_player_init_failed",
-          reason: message
-        });
-        throw error;
-      }
-    }
     if (!this.currentKeyframes || this.currentKeyframes.length === 0) {
       this.isStartingPlayback = false;
       logger.warn("[AvatarController] No animation data to play");
       return;
     }
     try {
+      if (!this.animationPlayer) {
+        throw new AvatarError("Animation player not initialized", "ANIMATION_PLAYER_NOT_INITIALIZED");
+      }
       await this.animationPlayer.prepareStreamingPlayer(() => {
         var _a2, _b2;
         this.isPlaying = false;
@@ -11311,7 +11331,7 @@ class AvatarController {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       logger.error("[AvatarController] Failed to start streaming playback:", message);
-      (_c = this.onError) == null ? void 0 : _c.call(this, new SPAvatarError("Failed to start streaming playback", "INIT_FAILED"));
+      (_c = this.onError) == null ? void 0 : _c.call(this, new AvatarError("Failed to start streaming playback", "INIT_FAILED"));
       this.isPlaying = false;
       this.isStartingPlayback = false;
     }
@@ -11490,21 +11510,7 @@ class AvatarController {
   async startAudioOnlyPlayback() {
     var _a, _b;
     if (!this.animationPlayer) {
-      this.animationPlayer = new AnimationPlayer();
-    }
-    if (!this.animationPlayer.isStreamingReady()) {
-      try {
-        await this.animationPlayer.createAndInitializeStreamingPlayer();
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        logger.error("[AvatarController] Failed to create streaming player for audio-only mode:", message);
-        logEvent("character_player", "error", {
-          avatar_id: this.avatar.id,
-          event: "audio_only_streaming_player_init_failed",
-          reason: message
-        });
-        throw error;
-      }
+      throw new AvatarError("Animation player not initialized", "ANIMATION_PLAYER_NOT_INITIALIZED");
     }
     try {
       await this.animationPlayer.prepareStreamingPlayer(() => {
@@ -11541,7 +11547,7 @@ class AvatarController {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       logger.error("[AvatarController] Failed to start audio-only playback:", message);
-      (_b = this.onError) == null ? void 0 : _b.call(this, new SPAvatarError("Failed to start audio-only playback", "AUDIO_ONLY_INIT_FAILED"));
+      (_b = this.onError) == null ? void 0 : _b.call(this, new AvatarError("Failed to start audio-only playback", "AUDIO_ONLY_INIT_FAILED"));
       this.isPlaying = false;
       this.isAudioOnlyMode = false;
       throw error;
@@ -11587,7 +11593,9 @@ class AvatarController {
   }
   addAudioChunkToBuffer(data, isLast) {
     if (!this.animationPlayer) {
-      this.animationPlayer = new AnimationPlayer();
+      logger.warn("[AvatarController] animationPlayer is null in addAudioChunkToBuffer, this should not happen");
+      this.pendingAudioChunks.push({ data, isLast });
+      return;
     }
     if (this.isPlaying && this.animationPlayer.isStreamingReady()) {
       this.animationPlayer.addAudioChunk(data, isLast);
@@ -12088,9 +12096,10 @@ class AvatarDownloader {
     const idleAnimationUrl = (_i2 = (_h = (_g = characterMeta.animations) == null ? void 0 : _g.frameIdle) == null ? void 0 : _h.resource) == null ? void 0 : _i2.remote;
     if (!shapeUrl || !pointCloudUrl) {
       const reason = "Missing required resources: shape or gsStandard (point cloud)";
-      logEvent("download_avatar_assets_failed", "error", {
+      logEvent("character_load", "error", {
         avatar_id: characterMeta.characterId ?? "unknown",
-        description: reason
+        description: "Character does not exist in target environment",
+        reason
       });
       throw new Error(reason);
     }
@@ -12138,6 +12147,14 @@ class AvatarDownloader {
         return { key, success: true, size: arrayBuffer.byteLength };
       } catch (error) {
         if (!optional) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          logEvent("download_avatar_assets_failed", "error", {
+            avatar_id: characterMeta.characterId ?? "unknown",
+            description: `Failed to download required resource: ${filename}`,
+            resource: key,
+            url,
+            error: errorMessage
+          });
           throw error;
         }
         logger.warn(`⚠️ Optional resource ${filename} failed to load:`, error);
@@ -12224,7 +12241,7 @@ class AvatarDownloader {
                 avatar_id: extractedCharacterId,
                 description: errorMessage
               });
-              error = new SPAvatarError(errorMessage, ErrorCode.avatarIDUnrecognized);
+              error = new AvatarError(errorMessage, ErrorCode.avatarIDUnrecognized);
             } else {
               error = new Error(`HTTP ${response.status} ${response.statusText}`);
             }
@@ -12254,7 +12271,7 @@ class AvatarDownloader {
       return response;
     } catch (error) {
       logger.errorWithError("Failed to fetch character:", error);
-      if (error instanceof SPAvatarError) {
+      if (error instanceof AvatarError) {
         logEvent("fetch_avatar_metadata_failed", "error", {
           avatar_id: characterId ?? "unknown",
           description: error.message
@@ -12380,10 +12397,6 @@ const _AvatarManager = class _AvatarManager {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       logger.error("Failed to load avatar:", message);
-      logEvent("character_load", "error", {
-        avatar_id: id,
-        reason: message
-      });
       onProgress == null ? void 0 : onProgress({ type: LoadProgress.failed, error });
       throw error;
     }
@@ -13852,6 +13865,38 @@ function lerpArrays(from, to2, progress) {
   return result2;
 }
 const clamp01 = (x2) => Math.max(0, Math.min(1, x2));
+function linearLerp(from, to2, progress) {
+  return {
+    translation: lerpArrays(from.translation || [0, 0, 0], to2.translation || [0, 0, 0], progress),
+    rotation: lerpArrays(from.rotation || [0, 0, 0], to2.rotation || [0, 0, 0], progress),
+    neckPose: lerpArrays(from.neckPose || [0, 0, 0], to2.neckPose || [0, 0, 0], progress),
+    jawPose: lerpArrays(from.jawPose || [0, 0, 0], to2.jawPose || [0, 0, 0], progress),
+    eyePose: lerpArrays(from.eyePose || [0, 0, 0, 0, 0, 0], to2.eyePose || [0, 0, 0, 0, 0, 0], progress),
+    eyeLid: (() => {
+      const fromEyelid = from.eyeLid;
+      const toEyelid = to2.eyeLid;
+      if ((fromEyelid == null ? void 0 : fromEyelid.length) && (toEyelid == null ? void 0 : toEyelid.length))
+        return lerpArrays(fromEyelid, toEyelid, progress);
+      return fromEyelid || toEyelid || [];
+    })(),
+    expression: lerpArrays(from.expression || [], to2.expression || [], progress)
+  };
+}
+function generateTransitionFramesLinear(from, to2, durationMs, fps = 25) {
+  const steps = Math.max(1, Math.floor(durationMs / 1e3 * fps));
+  const frames = Array.from({ length: steps });
+  if (steps === 1) {
+    frames[0] = to2;
+    return frames;
+  }
+  for (let i2 = 0; i2 < steps; i2++) {
+    const progress = i2 / (steps - 1);
+    frames[i2] = linearLerp(from, to2, progress);
+  }
+  frames[0] = from;
+  frames[frames.length - 1] = to2;
+  return frames;
+}
 function createBezierEasing(x1, y1, x2, y2) {
   const cx = 3 * x1;
   const bx = 3 * (x2 - x1) - cx;
@@ -13955,6 +14000,7 @@ class AvatarView {
     __publicField(this, "endTransitionDurationMs", 1600);
     __publicField(this, "cachedIdleFirstFrame", null);
     __publicField(this, "idleCurrentFrameIndex", 0);
+    __publicField(this, "currentPlayingFrame", null);
     __publicField(this, "characterHandle", null);
     __publicField(this, "characterId");
     __publicField(this, "isPureRenderingMode", false);
@@ -14009,9 +14055,14 @@ class AvatarView {
     toFixed.expression = ensureLen(toFixed.expression, exprLen);
     return { from: fromFixed, to: toFixed };
   }
-  generateAndAlignTransitionFrames(from, to2, durationMs) {
+  generateAndAlignTransitionFrames(from, to2, durationMs, useLinearInterpolation = false) {
     const aligned = this.alignFlamePair(from, to2);
-    let keyframes = generateTransitionFrames(
+    let keyframes = useLinearInterpolation ? generateTransitionFramesLinear(
+      aligned.from,
+      aligned.to,
+      durationMs,
+      APP_CONFIG.animation.fps
+    ) : generateTransitionFrames(
       aligned.from,
       aligned.to,
       durationMs,
@@ -14378,6 +14429,7 @@ class AvatarView {
           const steps = this.transitionKeyframes.length;
           const idx = Math.min(steps - 1, Math.floor(progress * (steps - 1)));
           const currentFrame = this.transitionKeyframes[idx];
+          this.currentPlayingFrame = currentFrame;
           const wasmParams = convertProtoFlameToWasmParams(currentFrame);
           const avatarCore = AvatarSDK.getAvatarCore();
           if (avatarCore) {
@@ -14450,6 +14502,7 @@ class AvatarView {
     this.lastRenderedFrameIndex = frameIndex;
     if (frameIndex >= 0 && frameIndex < this.currentKeyframes.length) {
       this.lastRealtimeProtoFrame = this.currentKeyframes[frameIndex];
+      this.currentPlayingFrame = this.lastRealtimeProtoFrame;
     }
   }
   setState(newState) {
@@ -14525,12 +14578,31 @@ class AvatarView {
         if (this.renderingState !== "transitioningToSpeaking") {
           return;
         }
-        const idleParams = await avatarCore.getCurrentFrameParams(this.idleCurrentFrameIndex, this.characterId);
-        const idleFrameProto = convertWasmParamsToProtoFlame(idleParams);
+        let fromFrame = this.currentPlayingFrame;
+        if (!fromFrame) {
+          if (state === "idle") {
+            const idleParams = await avatarCore.getCurrentFrameParams(this.idleCurrentFrameIndex, this.characterId);
+            fromFrame = convertWasmParamsToProtoFlame(idleParams);
+          } else if (state === "transitioningToIdle" || state === "transitioningToSpeaking") {
+            if (this.transitionKeyframes.length > 0) {
+              const elapsed = performance.now() - this.transitionStartTime;
+              const currentTransitionDurationMs = state === "transitioningToSpeaking" ? this.startTransitionDurationMs : this.endTransitionDurationMs;
+              const progress = Math.min(1, Math.max(0, elapsed / currentTransitionDurationMs));
+              const steps = this.transitionKeyframes.length;
+              const idx = Math.min(steps - 1, Math.floor(progress * (steps - 1)));
+              fromFrame = this.transitionKeyframes[idx];
+            }
+          }
+        }
+        if (!fromFrame) {
+          logger.warn("[AvatarView] Cannot get current playing frame, fallback to idle frame");
+          const idleParams = await avatarCore.getCurrentFrameParams(this.idleCurrentFrameIndex, this.characterId);
+          fromFrame = convertWasmParamsToProtoFlame(idleParams);
+        }
         await this.getCachedIdleFirstFrame();
         const firstSpeaking = keyframes[0];
         const firstSpeakingWithPostProcessing = this.avatarController.applyPostProcessingToFlame(firstSpeaking);
-        this.transitionKeyframes = this.generateAndAlignTransitionFrames(idleFrameProto, firstSpeakingWithPostProcessing, this.startTransitionDurationMs);
+        this.transitionKeyframes = this.generateAndAlignTransitionFrames(fromFrame, firstSpeakingWithPostProcessing, this.startTransitionDurationMs, true);
         this.transitionStartTime = performance.now();
         if (this.transitionKeyframes.length === 0) {
           this.setState("speaking");
@@ -14564,7 +14636,10 @@ class AvatarView {
     if (state === "idle" || state === "transitioningToIdle") {
       return;
     }
-    if (state !== "speaking") {
+    if (state !== "speaking" && state !== "transitioningToSpeaking") {
+      if (state === "transitioningToIdle") {
+        return;
+      }
       this.setState("idle");
       this.stopRealtimeAnimationLoop();
       this.startIdleAnimationLoop();
@@ -14578,12 +14653,33 @@ class AvatarView {
           return;
         }
         const avatarCore = AvatarSDK.getAvatarCore();
-        if (avatarCore && this.currentKeyframes.length > 0) {
-          const lastSpeakingRaw = this.lastRealtimeProtoFrame || this.currentKeyframes[Math.max(0, this.lastRenderedFrameIndex)];
-          const lastSpeaking = this.avatarController.applyPostProcessingToFlame(lastSpeakingRaw);
+        if (avatarCore) {
+          let fromFrame = this.currentPlayingFrame;
+          if (!fromFrame) {
+            if (this.lastRealtimeProtoFrame) {
+              fromFrame = this.lastRealtimeProtoFrame;
+            } else if (this.currentKeyframes.length > 0) {
+              fromFrame = this.currentKeyframes[Math.max(0, this.lastRenderedFrameIndex)];
+            }
+          }
+          if (!fromFrame && this.transitionKeyframes.length > 0) {
+            const elapsed = performance.now() - this.transitionStartTime;
+            const progress = Math.min(1, Math.max(0, elapsed / this.endTransitionDurationMs));
+            const steps = this.transitionKeyframes.length;
+            const idx = Math.min(steps - 1, Math.floor(progress * (steps - 1)));
+            fromFrame = this.transitionKeyframes[idx];
+          }
+          if (!fromFrame) {
+            logger.warn("[AvatarView] Cannot get current playing frame for transition to idle, fallback to idle frame");
+            this.setState("idle");
+            this.stopRealtimeAnimationLoop();
+            this.startIdleAnimationLoop();
+            return;
+          }
+          const fromFrameWithPostProcessing = this.avatarController.applyPostProcessingToFlame(fromFrame);
           const idleFirstProto = await this.getCachedIdleFirstFrame();
           if (idleFirstProto) {
-            this.transitionKeyframes = this.generateAndAlignTransitionFrames(lastSpeaking, idleFirstProto, this.endTransitionDurationMs);
+            this.transitionKeyframes = this.generateAndAlignTransitionFrames(fromFrameWithPostProcessing, idleFirstProto, this.endTransitionDurationMs);
             this.transitionStartTime = performance.now();
             if (this.transitionKeyframes.length > 0 && this.renderingState === "transitioningToIdle") {
               if (APP_CONFIG.debug)
@@ -14621,6 +14717,7 @@ class AvatarView {
     this.setState("idle");
     this.cachedIdleFirstFrame = null;
     this.idleCurrentFrameIndex = 0;
+    this.currentPlayingFrame = null;
     const avatarCore = AvatarSDK.getAvatarCore();
     if (avatarCore && this.characterHandle) {
       try {
@@ -14713,7 +14810,13 @@ class AvatarView {
       const to2 = transitionType === "start" ? aligned.to : aligned.from;
       const fps = APP_CONFIG.animation.fps;
       const durationMs = frameCount / fps * 1e3;
-      const transitionFrames = generateTransitionFrames(
+      const useLinear = transitionType === "start";
+      const transitionFrames = useLinear ? generateTransitionFramesLinear(
+        from,
+        to2,
+        durationMs,
+        fps
+      ) : generateTransitionFrames(
         from,
         to2,
         durationMs,
@@ -14796,7 +14899,6 @@ export {
   Environment as E,
   LogLevel as L,
   ResourceType as R,
-  SPAvatarError as S,
   logEvent as a,
   Avatar as b,
   AvatarController as c,
@@ -14809,5 +14911,6 @@ export {
   AvatarState as j,
   ErrorCode as k,
   logger as l,
-  extractResourceUrls as m
+  AvatarError as m,
+  extractResourceUrls as n
 };

package/dist/index.js

@@ -1,7 +1,8 @@
-import { b, c, f, d, j, g, C, i, D, E, k, h, L, R, S, m } from "./index-Bhjn1nq3.js";
+import { b, c, m, f, d, j, g, C, i, D, E, k, h, L, R, n } from "./index-D0sXXlqd.js";
 export {
   b as Avatar,
   c as AvatarController,
+  m as AvatarError,
   f as AvatarManager,
   d as AvatarSDK,
   j as AvatarState,
@@ -14,6 +15,5 @@ export {
   h as LoadProgress,
   L as LogLevel,
   R as ResourceType,
-  S as SPAvatarError,
-  m as extractResourceUrls
+  n as extractResourceUrls
 };

package/dist/types/index.d.ts

@@ -74,7 +74,7 @@ export declare enum ErrorCode {
 
     failedToDownloadAvatarAssets = "failedToDownloadAvatarAssets"
 }
-export declare class SPAvatarError extends Error {
+export declare class AvatarError extends Error {
     code?: (string | ErrorCode) | undefined;
     constructor(message: string, code?: (string | ErrorCode) | undefined);
 }

package/dist/utils/animation-interpolation.d.ts

@@ -1,5 +1,9 @@
 import { Flame } from '../generated/driveningress/v1/driveningress';
 
+export declare function linearLerp(from: Flame, to: Flame, progress: number): Flame;
+
+export declare function generateTransitionFramesLinear(from: Flame, to: Flame, durationMs: number, fps?: number): Flame[];
+
 export declare function bezierLerp(from: Flame, to: Flame, progress: number): Flame;
 
 export declare function generateTransitionFrames(from: Flame, to: Flame, durationMs: number, fps?: number): Flame[];

package/dist/vanilla/vite.config.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import('vite').UserConfig;
+declare const _default: any;
 export default _default;

package/dist/vite.d.ts

@@ -0,0 +1,4 @@
+import { Plugin } from 'vite';
+
+export declare function avatarkitVitePlugin(): Plugin;
+export default avatarkitVitePlugin;