From eda4fed5980eacaba3e7bce544397f4dedd1298b Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Wed, 7 Oct 2026 13:39:16 +0400
Subject: [PATCH] refac

---
 .../workspace/Models/VoiceAvatarEditor.svelte    | 11 ++++++-----
 src/lib/utils/voice-avatar-renderer.ts           | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/lib/components/workspace/Models/VoiceAvatarEditor.svelte b/src/lib/components/workspace/Models/VoiceAvatarEditor.svelte
index 66af48a402..2ec3e9b6a9 100644
--- a/src/lib/components/workspace/Models/VoiceAvatarEditor.svelte
+++ b/src/lib/components/workspace/Models/VoiceAvatarEditor.svelte
@@ -240,11 +240,12 @@
 						</div>
 					</div>
 					<div class="flex shrink-0 items-center gap-3 text-gray-500">
-						{#if asset}<button
-								type="button"
-								disabled={!ready || animationsLoading || !!animationErrors[asset.file_id]}
-								on:click={() => preview(mode as AvatarState)}>{$i18n.t('Preview')}</button
-							>{/if}
+						<button
+							type="button"
+							aria-label={`${$i18n.t('Preview')} ${mode}`}
+							disabled={!ready || animationsLoading || !!(asset && animationErrors[asset.file_id])}
+							on:click={() => preview(mode as AvatarState)}>{$i18n.t('Preview')}</button
+						>
 						<button
 							type="button"
 							aria-label={`${$i18n.t('Upload')} ${mode} VRMA`}
diff --git a/src/lib/utils/voice-avatar-renderer.ts b/src/lib/utils/voice-avatar-renderer.ts
index dd08b5730e..e78bfbab5d 100644
--- a/src/lib/utils/voice-avatar-renderer.ts
+++ b/src/lib/utils/voice-avatar-renderer.ts
@@ -100,7 +100,9 @@ export async function createAvatarRenderer(
 		restQ: node.quaternion.clone(),
 		restP: node.position.clone(),
 		q: node.quaternion.clone(),
-		p: node.position.clone()
+		p: node.position.clone(),
+		authoredQ: node.quaternion.clone(),
+		authoredP: node.position.clone()
 	}));
 	const clips = new Map<string, THREE.AnimationClip>();
 	let current: THREE.AnimationAction | null = null;
@@ -232,10 +234,14 @@ export async function createAvatarRenderer(
 			if (rightArm) rightArm.rotation.z = 1.22 - amount * (0.015 * breath + 0.22 * rightGesture);
 			if (leftElbow) leftElbow.rotation.z = amount * 1.25 * leftGesture;
 			if (rightElbow) rightElbow.rotation.z = -amount * 1.25 * rightGesture;
-			if (current && bodyWeight > 0) {
+			if (current && (bodyWeight > 0 || authored)) {
 				for (const pose of poses) {
 					pose.q.copy(pose.node.quaternion);
 					pose.p.copy(pose.node.position);
+					// Three's mixer skips unchanged keyframes, so preserve its last output
+					// independently of procedural movement and the final blended pose.
+					pose.node.quaternion.copy(pose.authoredQ);
+					pose.node.position.copy(pose.authoredP);
 				}
 				mixer.update(dt);
 				fadeTime += dt;
@@ -244,8 +250,10 @@ export async function createAvatarRenderer(
 					outgoing = null;
 				}
 				for (const pose of poses) {
-					pose.node.quaternion.slerpQuaternions(pose.q, pose.node.quaternion, bodyWeight);
-					pose.node.position.lerpVectors(pose.p, pose.node.position, bodyWeight);
+					pose.authoredQ.copy(pose.node.quaternion);
+					pose.authoredP.copy(pose.node.position);
+					pose.node.quaternion.slerpQuaternions(pose.q, pose.authoredQ, bodyWeight);
+					pose.node.position.lerpVectors(pose.p, pose.authoredP, bodyWeight);
 				}
 			} else if (current) {
 				mixer.stopAllAction();