@sage-rsc/talking-head-react 1.0.46 → 1.0.48

package/dist/index.js

@@ -1,5 +1,5 @@
 import { jsxs as Ce, jsx as oe } from "react/jsx-runtime";
-import { forwardRef as be, useRef as Y, useState as re, useCallback as E, useEffect as he, useImperativeHandle as Re, useLayoutEffect as Pe } from "react";
+import { forwardRef as be, useRef as X, useState as re, useCallback as E, useEffect as he, useImperativeHandle as Re, useLayoutEffect as Pe } from "react";
 import * as f from "three";
 import { OrbitControls as Be } from "three/addons/controls/OrbitControls.js";
 import { GLTFLoader as De } from "three/addons/loaders/GLTFLoader.js";
@@ -8,11 +8,11 @@ import { FBXLoader as Le } from "three/addons/loaders/FBXLoader.js";
 import { RoomEnvironment as Ne } from "three/addons/environments/RoomEnvironment.js";
 import Ue from "three/addons/libs/stats.module.js";
 let m, Q, J;
-const A = [0, 0, 0, 0], k = new f.Vector3(), me = new f.Vector3(), Z = new f.Vector3(), pe = new f.Vector3();
+const A = [0, 0, 0, 0], k = new f.Vector3(), me = new f.Vector3(), G = new f.Vector3(), pe = new f.Vector3();
 new f.Plane();
 new f.Ray();
 new f.Euler();
-const X = new f.Quaternion(), Se = new f.Quaternion(), ee = new f.Matrix4(), te = new f.Matrix4();
+const Z = new f.Quaternion(), Se = new f.Quaternion(), ee = new f.Matrix4(), te = new f.Matrix4();
 new f.Vector3();
 const ge = new f.Vector3(0, 0, 1), We = new f.Vector3(1, 0, 0), Ve = new f.Vector3(0, 1, 0), Ge = new f.Vector3(0, 0, 1);
 class Ze {
@@ -338,7 +338,7 @@ class Ze {
         ea: [0, 0, 0, 0]
         //  External acceleration [m/s^2]
       };
-      u.boneParent.matrixWorld.decompose(k, X, Z), k.copy(ge).applyQuaternion(X).setY(0).normalize(), X.premultiply(Se.setFromUnitVectors(ge, k).invert()).normalize(), u.qWorldInverseYaw = X.clone().normalize(), this.data.push(u), this.dict[h] = u;
+      u.boneParent.matrixWorld.decompose(k, Z, G), k.copy(ge).applyQuaternion(Z).setY(0).normalize(), Z.premultiply(Se.setFromUnitVectors(ge, k).invert()).normalize(), u.qWorldInverseYaw = Z.clone().normalize(), this.data.push(u), this.dict[h] = u;
       try {
         this.setValue(h, "type", s.type), this.setValue(h, "stiffness", s.stiffness), this.setValue(h, "damping", s.damping), this.setValue(h, "external", s.external), this.setValue(h, "limits", s.limits), this.setValue(h, "excludes", s.excludes), this.setValue(h, "deltaLocal", s.deltaLocal), this.setValue(h, "deltaWorld", s.deltaWorld), this.setValue(h, "pivot", s.pivot), this.setValue(h, "helper", s.helper);
       } catch (l) {
@@ -369,9 +369,9 @@ class Ze {
           o.vBasis.y + A[1],
           o.vBasis.z - A[2]
         );
-      else if (o.boneParent.quaternion.copy(o.qBasis), o.pivot && this.opt.isPivots && (o.boneParent.updateWorldMatrix(!1, !1), o.boneParent.matrixWorld.decompose(k, X, Z), k.copy(ge).applyQuaternion(X).setY(0).normalize(), X.premultiply(Se.setFromUnitVectors(ge, k).invert()).normalize(), o.boneParent.quaternion.multiply(X.invert()), o.boneParent.quaternion.multiply(o.qWorldInverseYaw)), o.isZ && (m = Math.atan(A[0] / o.l), X.setFromAxisAngle(Ge, -m), o.boneParent.quaternion.multiply(X)), o.isY && (m = o.l / 3, m = m * Math.tanh(A[1] / m), o.bone.position.setLength(o.l + m)), o.isX && (m = Math.atan(A[2] / o.l), X.setFromAxisAngle(We, -m), o.boneParent.quaternion.multiply(X)), o.isT && (m = 1.5 * Math.tanh(A[3] * 1.5), X.setFromAxisAngle(Ve, -m), o.boneParent.quaternion.multiply(X)), o.boneParent.updateWorldMatrix(!1, !0), o.excludes && this.opt.isExcludes)
+      else if (o.boneParent.quaternion.copy(o.qBasis), o.pivot && this.opt.isPivots && (o.boneParent.updateWorldMatrix(!1, !1), o.boneParent.matrixWorld.decompose(k, Z, G), k.copy(ge).applyQuaternion(Z).setY(0).normalize(), Z.premultiply(Se.setFromUnitVectors(ge, k).invert()).normalize(), o.boneParent.quaternion.multiply(Z.invert()), o.boneParent.quaternion.multiply(o.qWorldInverseYaw)), o.isZ && (m = Math.atan(A[0] / o.l), Z.setFromAxisAngle(Ge, -m), o.boneParent.quaternion.multiply(Z)), o.isY && (m = o.l / 3, m = m * Math.tanh(A[1] / m), o.bone.position.setLength(o.l + m)), o.isX && (m = Math.atan(A[2] / o.l), Z.setFromAxisAngle(We, -m), o.boneParent.quaternion.multiply(Z)), o.isT && (m = 1.5 * Math.tanh(A[3] * 1.5), Z.setFromAxisAngle(Ve, -m), o.boneParent.quaternion.multiply(Z)), o.boneParent.updateWorldMatrix(!1, !0), o.excludes && this.opt.isExcludes)
         for (i = 0, s = o.excludes.length; i < s; i++)
-          m = o.excludes[i], Z.set(0, 0, 0), m.deltaLocal && (Z.x += m.deltaLocal[0], Z.y += m.deltaLocal[1], Z.z += m.deltaLocal[2]), Z.applyMatrix4(m.bone.matrixWorld), te.copy(o.boneParent.matrixWorld).invert(), Z.applyMatrix4(te), k.copy(o.bone.position), !(k.distanceToSquared(Z) >= m.radiusSq) && (J = k.length(), Q = Z.length(), !(Q > m.radius + J) && (Q < Math.abs(m.radius - J) || (Q = (Q * Q + J * J - m.radiusSq) / (2 * Q), Z.normalize(), pe.copy(Z).multiplyScalar(Q), Q = Math.sqrt(J * J - Q * Q), k.subVectors(k, pe).projectOnPlane(Z).normalize().multiplyScalar(Q), me.subVectors(o.vBasis, pe).projectOnPlane(Z).normalize(), J = me.dot(k), J < 0 && (J = Math.sqrt(Q * Q - J * J), me.multiplyScalar(J), k.add(me)), k.add(pe).normalize(), Z.copy(o.bone.position).normalize(), X.setFromUnitVectors(Z, k), o.boneParent.quaternion.premultiply(X), o.boneParent.updateWorldMatrix(!1, !0))));
+          m = o.excludes[i], G.set(0, 0, 0), m.deltaLocal && (G.x += m.deltaLocal[0], G.y += m.deltaLocal[1], G.z += m.deltaLocal[2]), G.applyMatrix4(m.bone.matrixWorld), te.copy(o.boneParent.matrixWorld).invert(), G.applyMatrix4(te), k.copy(o.bone.position), !(k.distanceToSquared(G) >= m.radiusSq) && (J = k.length(), Q = G.length(), !(Q > m.radius + J) && (Q < Math.abs(m.radius - J) || (Q = (Q * Q + J * J - m.radiusSq) / (2 * Q), G.normalize(), pe.copy(G).multiplyScalar(Q), Q = Math.sqrt(J * J - Q * Q), k.subVectors(k, pe).projectOnPlane(G).normalize().multiplyScalar(Q), me.subVectors(o.vBasis, pe).projectOnPlane(G).normalize(), J = me.dot(k), J < 0 && (J = Math.sqrt(Q * Q - J * J), me.multiplyScalar(J), k.add(me)), k.add(pe).normalize(), G.copy(o.bone.position).normalize(), Z.setFromUnitVectors(G, k), o.boneParent.quaternion.premultiply(Z), o.boneParent.updateWorldMatrix(!1, !0))));
     }
     this.helpers.isActive && this.updateHelpers();
   }
@@ -608,8 +608,8 @@ class Xe {
         for (let l = 0; l < n / 2; l++) {
           const c = i[(h + l) * 2], d = i[(h + l) * 2 + 1], g = i[(h + l + n / 2) * 2] * a - i[(h + l + n / 2) * 2 + 1] * u, y = i[(h + l + n / 2) * 2] * u + i[(h + l + n / 2) * 2 + 1] * a;
           i[(h + l) * 2] = c + g, i[(h + l) * 2 + 1] = d + y, i[(h + l + n / 2) * 2] = c - g, i[(h + l + n / 2) * 2 + 1] = d - y;
-          const x = a * o - u * r, v = a * r + u * o;
-          a = x, u = v;
+          const x = a * o - u * r, I = a * r + u * o;
+          a = x, u = I;
         }
       }
     }
@@ -4204,13 +4204,13 @@ class He {
           const l = s.morphTargetDictionary[a], c = o.morphAttributes.position[l], d = o.morphAttributes.normal?.[l];
           r || (r = new f.Float32BufferAttribute(c.count * 3, 3), d && (h = new f.Float32BufferAttribute(c.count * 3, 3)));
           for (let g = 0; g < c.count; g++) {
-            const y = r.getX(g) + c.getX(g) * u, x = r.getY(g) + c.getY(g) * u, v = r.getZ(g) + c.getZ(g) * u;
-            r.setXYZ(g, y, x, v);
+            const y = r.getX(g) + c.getX(g) * u, x = r.getY(g) + c.getY(g) * u, I = r.getZ(g) + c.getZ(g) * u;
+            r.setXYZ(g, y, x, I);
           }
           if (d)
             for (let g = 0; g < c.count; g++) {
-              const y = h.getX(g) + d.getX(g) * u, x = h.getY(g) + d.getY(g) * u, v = h.getZ(g) + d.getZ(g) * u;
-              h.setXYZ(g, y, x, v);
+              const y = h.getX(g) + d.getX(g) * u, x = h.getY(g) + d.getY(g) * u, I = h.getZ(g) + d.getZ(g) * u;
+              h.setXYZ(g, y, x, I);
             }
         }
       if (r) {
@@ -5251,10 +5251,10 @@ class He {
     let u = "", l = "", c = 0, d = [], g = [];
     const y = Array.from(this.segmenter.segment(t), (x) => x.segment);
     for (let x = 0; x < y.length; x++) {
-      const v = x === y.length - 1, T = y[x].match(r);
+      const I = x === y.length - 1, T = y[x].match(r);
       let p = y[x].match(s);
       const F = y[x].match(h), C = y[x].match(o);
-      if (p && !v && !F && y[x + 1].match(s) && (p = !1), i && (u += y[x]), T && (!n || n.every((I) => x < I[0] || x > I[1])) && (l += y[x]), (C || p || v) && (l.length && (l = this.lipsyncPreProcessText(l, a), l.length && d.push({
+      if (p && !I && !F && y[x + 1].match(s) && (p = !1), i && (u += y[x]), T && (!n || n.every((R) => x < R[0] || x > R[1])) && (l += y[x]), (C || p || I) && (l.length && (l = this.lipsyncPreProcessText(l, a), l.length && d.push({
         mark: c,
         word: l
       })), u.length && (g.push({
@@ -5265,31 +5265,31 @@ class He {
           subtitles: [u]
         }
       }), u = ""), l.length)) {
-        const I = this.lipsyncWordsToVisemes(l, a);
-        if (I && I.visemes && I.visemes.length) {
-          const O = I.times[I.visemes.length - 1] + I.durations[I.visemes.length - 1];
-          for (let B = 0; B < I.visemes.length; B++)
+        const R = this.lipsyncWordsToVisemes(l, a);
+        if (R && R.visemes && R.visemes.length) {
+          const O = R.times[R.visemes.length - 1] + R.durations[R.visemes.length - 1];
+          for (let B = 0; B < R.visemes.length; B++)
             g.push({
               mark: c,
               template: { name: "viseme" },
-              ts: [(I.times[B] - 0.6) / O, (I.times[B] + 0.5) / O, (I.times[B] + I.durations[B] + 0.5) / O],
+              ts: [(R.times[B] - 0.6) / O, (R.times[B] + 0.5) / O, (R.times[B] + R.durations[B] + 0.5) / O],
               vs: {
-                ["viseme_" + I.visemes[B]]: [null, I.visemes[B] === "PP" || I.visemes[B] === "FF" ? 0.9 : 0.6, 0]
+                ["viseme_" + R.visemes[B]]: [null, R.visemes[B] === "PP" || R.visemes[B] === "FF" ? 0.9 : 0.6, 0]
               }
             });
         }
         l = "", c++;
       }
-      if (p || v) {
-        if (d.length || v && g.length) {
-          const I = {
+      if (p || I) {
+        if (d.length || I && g.length) {
+          const R = {
             anim: g
           };
-          i && (I.onSubtitles = i), d.length && !e.avatarMute && (I.text = d, e.avatarMood && (I.mood = e.avatarMood), e.ttsLang && (I.lang = e.ttsLang), e.ttsVoice && (I.voice = e.ttsVoice), e.ttsRate && (I.rate = e.ttsRate), e.ttsVoice && (I.pitch = e.ttsPitch), e.ttsVolume && (I.volume = e.ttsVolume)), this.speechQueue.push(I), d = [], l = "", c = 0, g = [];
+          i && (R.onSubtitles = i), d.length && !e.avatarMute && (R.text = d, e.avatarMood && (R.mood = e.avatarMood), e.ttsLang && (R.lang = e.ttsLang), e.ttsVoice && (R.voice = e.ttsVoice), e.ttsRate && (R.rate = e.ttsRate), e.ttsVoice && (R.pitch = e.ttsPitch), e.ttsVolume && (R.volume = e.ttsVolume)), this.speechQueue.push(R), d = [], l = "", c = 0, g = [];
         }
         if (F) {
-          let I = this.animEmojis[y[x]];
-          I && I.link && (I = this.animEmojis[I.link]), I && this.speechQueue.push({ emoji: I });
+          let R = this.animEmojis[y[x]];
+          R && R.link && (R = this.animEmojis[R.link]), R && this.speechQueue.push({ emoji: R });
         }
         this.speechQueue.push({ break: 100 });
       }
@@ -5385,10 +5385,10 @@ class He {
             let y = 0.6 + this.convertRange(g, [0, u], [0, 0.4]);
             if (u = Math.min(u, c.visemes.length * 200), d > 0)
               for (let x = 0; x < c.visemes.length; x++) {
-                const v = a + c.times[x] / d * u, T = c.durations[x] / d * u;
+                const I = a + c.times[x] / d * u, T = c.durations[x] / d * u;
                 o.push({
                   template: { name: "viseme" },
-                  ts: [v - Math.min(60, 2 * T / 3), v + Math.min(25, T / 2), v + T + Math.min(60, T / 2)],
+                  ts: [I - Math.min(60, 2 * T / 3), I + Math.min(25, T / 2), I + T + Math.min(60, T / 2)],
                   vs: {
                     ["viseme_" + c.visemes[x]]: [null, c.visemes[x] === "PP" || c.visemes[x] === "FF" ? 0.9 : y, 0]
                   }
@@ -5482,12 +5482,12 @@ class He {
         hasVisemes: x && x.visemes && x.visemes.length > 0,
         estimatedDuration: c
       });
-      const v = [];
+      const I = [];
       if (x && x.visemes && x.visemes.length > 0) {
         const p = x.times[x.visemes.length - 1] + x.durations[x.visemes.length - 1];
         for (let F = 0; F < x.visemes.length; F++) {
-          const C = x.visemes[F], I = x.times[F] / p, O = x.durations[F] / p, B = I * c, $ = O * c;
-          v.push({
+          const C = x.visemes[F], R = x.times[F] / p, O = x.durations[F] / p, B = R * c, $ = O * c;
+          I.push({
             template: { name: "viseme" },
             ts: [B - Math.min(60, 2 * $ / 3), B + Math.min(25, $ / 2), B + $ + Math.min(60, $ / 2)],
             vs: {
@@ -5496,7 +5496,7 @@ class He {
           });
         }
       }
-      const T = [...t.anim, ...v];
+      const T = [...t.anim, ...I];
       this.audioPlaylist.push({ anim: T, audio: d }), this.onSubtitles = t.onSubtitles || null, this.resetLips(), t.mood && this.setMood(t.mood), this.playAudio(), s.onend = () => {
         e();
       }, s.onerror = (p) => {
@@ -5564,8 +5564,8 @@ class He {
       const d = e.toLowerCase().split(/\s+/), g = [];
       for (const y of d)
         for (const x of y) {
-          let v = "aa";
-          "aeiou".includes(x) ? v = "aa" : "bp".includes(x) ? v = "PP" : "fv".includes(x) ? v = "FF" : "st".includes(x) ? v = "SS" : "dln".includes(x) ? v = "DD" : "kg".includes(x) ? v = "kk" : "rw".includes(x) && (v = "RR"), g.push(v);
+          let I = "aa";
+          "aeiou".includes(x) ? I = "aa" : "bp".includes(x) ? I = "PP" : "fv".includes(x) ? I = "FF" : "st".includes(x) ? I = "SS" : "dln".includes(x) ? I = "DD" : "kg".includes(x) ? I = "kk" : "rw".includes(x) && (I = "RR"), g.push(I);
         }
       a = {
         visemes: g.map((y, x) => ({
@@ -5662,8 +5662,8 @@ class He {
       const d = e.toLowerCase().split(/\s+/), g = [];
       for (const y of d)
         for (const x of y) {
-          let v = "aa";
-          "aeiou".includes(x) ? v = "aa" : "bp".includes(x) ? v = "PP" : "fv".includes(x) ? v = "FF" : "st".includes(x) ? v = "SS" : "dln".includes(x) ? v = "DD" : "kg".includes(x) ? v = "kk" : "rw".includes(x) && (v = "RR"), g.push(v);
+          let I = "aa";
+          "aeiou".includes(x) ? I = "aa" : "bp".includes(x) ? I = "PP" : "fv".includes(x) ? I = "FF" : "st".includes(x) ? I = "SS" : "dln".includes(x) ? I = "DD" : "kg".includes(x) ? I = "kk" : "rw".includes(x) && (I = "RR"), g.push(I);
         }
       a = {
         visemes: g.map((y, x) => ({
@@ -6153,7 +6153,7 @@ class He {
     M.setFromQuaternion(h, "YXZ");
     let a = M.x / (40 / 24) + 0.2, u = M.y / (9 / 4), l = Math.min(0.6, Math.max(-0.3, a)), c = Math.min(0.8, Math.max(-0.8, u)), d = (Math.random() - 0.5) / 4, g = (Math.random() - 0.5) / 4;
     if (t) {
-      let y = this.animQueue.findIndex((v) => v.template.name === "lookat");
+      let y = this.animQueue.findIndex((I) => I.template.name === "lookat");
       y !== -1 && this.animQueue.splice(y, 1);
       const x = {
         name: "lookat",
@@ -6187,18 +6187,18 @@ class He {
     r.project(this.camera);
     let h = (r.x + 1) / 2 * n.width + n.left, a = -(r.y - 1) / 2 * n.height + n.top;
     t === null && (t = h), e === null && (e = a), N.copy(this.armature.quaternion), N.multiply(this.poseTarget.props["Hips.quaternion"]), N.multiply(this.poseTarget.props["Spine.quaternion"]), N.multiply(this.poseTarget.props["Spine1.quaternion"]), N.multiply(this.poseTarget.props["Spine2.quaternion"]), N.multiply(this.poseTarget.props["Neck.quaternion"]), N.multiply(this.poseTarget.props["Head.quaternion"]), M.setFromQuaternion(N);
-    let u = M.x / (40 / 24), l = M.y / (9 / 4), c = Math.min(0.4, Math.max(-0.4, this.camera.rotation.x)), d = Math.min(0.4, Math.max(-0.4, this.camera.rotation.y)), g = Math.max(window.innerWidth - h, h), y = Math.max(window.innerHeight - a, a), x = this.convertRange(e, [a - y, a + y], [-0.3, 0.6]) - u + c, v = this.convertRange(t, [h - g, h + g], [-0.8, 0.8]) - l + d;
-    x = Math.min(0.6, Math.max(-0.3, x)), v = Math.min(0.8, Math.max(-0.8, v));
+    let u = M.x / (40 / 24), l = M.y / (9 / 4), c = Math.min(0.4, Math.max(-0.4, this.camera.rotation.x)), d = Math.min(0.4, Math.max(-0.4, this.camera.rotation.y)), g = Math.max(window.innerWidth - h, h), y = Math.max(window.innerHeight - a, a), x = this.convertRange(e, [a - y, a + y], [-0.3, 0.6]) - u + c, I = this.convertRange(t, [h - g, h + g], [-0.8, 0.8]) - l + d;
+    x = Math.min(0.6, Math.max(-0.3, x)), I = Math.min(0.8, Math.max(-0.8, I));
     let T = (Math.random() - 0.5) / 4, p = (Math.random() - 0.5) / 4;
     if (i) {
-      let F = this.animQueue.findIndex((I) => I.template.name === "lookat");
+      let F = this.animQueue.findIndex((R) => R.template.name === "lookat");
       F !== -1 && this.animQueue.splice(F, 1);
       const C = {
         name: "lookat",
         dt: [750, i],
         vs: {
           bodyRotateX: [x + T],
-          bodyRotateY: [v + p],
+          bodyRotateY: [I + p],
           eyesRotateX: [-3 * T + 0.1],
           eyesRotateY: [-5 * p],
           browInnerUp: [[0, 0.7]],
@@ -6433,8 +6433,8 @@ class He {
           y.name = y.name.replaceAll("mixamorig", "");
           const x = y.name.split(".");
           if (x[1] === "position") {
-            for (let v = 0; v < y.values.length; v++)
-              y.values[v] = y.values[v] * s;
+            for (let I = 0; I < y.values.length; I++)
+              y.values[I] = y.values[I] * s;
             d[y.name] = new f.Vector3(y.values[0], y.values[1], y.values[2]);
           } else x[1] === "quaternion" ? d[y.name] = new f.Quaternion(y.values[0], y.values[1], y.values[2], y.values[3]) : x[1] === "rotation" && (d[x[0] + ".quaternion"] = new f.Quaternion().setFromEuler(new f.Euler(y.values[0], y.values[1], y.values[2], "XYZ")).normalize());
         });
@@ -6535,7 +6535,7 @@ class He {
           const c = [];
           for (let y = 1; y < r.ts.length; y++) c.push(r.ts[y] - r.ts[y - 1]);
           const d = o.template?.rescale || c.map((y) => y / u), g = e * 1e3 - u;
-          r.ts = r.ts.map((y, x, v) => x === 0 ? h : v[x - 1] + c[x - 1] + d[x - 1] * g);
+          r.ts = r.ts.map((y, x, I) => x === 0 ? h : I[x - 1] + c[x - 1] + d[x - 1] * g);
         } else {
           const c = e * 1e3 / u;
           r.ts = r.ts.map((d) => h + c * (d - h));
@@ -6571,18 +6571,18 @@ class He {
     const s = new f.Vector3(), o = new f.Vector3(), r = new f.Vector3(), h = new f.Vector3(), a = new f.Quaternion(), u = new f.Vector3(), l = new f.Vector3(), c = new f.Vector3(), d = this.ikMesh.getObjectByName(t.root);
     d.position.setFromMatrixPosition(this.armature.getObjectByName(t.root).matrixWorld), d.quaternion.setFromRotationMatrix(this.armature.getObjectByName(t.root).matrixWorld), e && i && e.applyQuaternion(this.armature.quaternion).add(d.position);
     const g = this.ikMesh.getObjectByName(t.effector), y = t.links;
-    y.forEach((v) => {
-      v.bone = this.ikMesh.getObjectByName(v.link), v.bone.quaternion.copy(this.getPoseTemplateProp(v.link + ".quaternion"));
+    y.forEach((I) => {
+      I.bone = this.ikMesh.getObjectByName(I.link), I.bone.quaternion.copy(this.getPoseTemplateProp(I.link + ".quaternion"));
     }), d.updateMatrixWorld(!0);
     const x = t.iterations || 10;
     if (e)
-      for (let v = 0; v < x; v++) {
+      for (let I = 0; I < x; I++) {
         let T = !1;
         for (let p = 0, F = y.length; p < F; p++) {
           const C = y[p].bone;
           C.matrixWorld.decompose(h, a, u), a.invert(), o.setFromMatrixPosition(g.matrixWorld), r.subVectors(o, h), r.applyQuaternion(a), r.normalize(), s.subVectors(e, h), s.applyQuaternion(a), s.normalize();
-          let I = s.dot(r);
-          I > 1 ? I = 1 : I < -1 && (I = -1), I = Math.acos(I), !(I < 1e-5) && (y[p].minAngle !== void 0 && I < y[p].minAngle && (I = y[p].minAngle), y[p].maxAngle !== void 0 && I > y[p].maxAngle && (I = y[p].maxAngle), l.crossVectors(r, s), l.normalize(), N.setFromAxisAngle(l, I), C.quaternion.multiply(N), C.rotation.setFromVector3(c.setFromEuler(C.rotation).clamp(new f.Vector3(
+          let R = s.dot(r);
+          R > 1 ? R = 1 : R < -1 && (R = -1), R = Math.acos(R), !(R < 1e-5) && (y[p].minAngle !== void 0 && R < y[p].minAngle && (R = y[p].minAngle), y[p].maxAngle !== void 0 && R > y[p].maxAngle && (R = y[p].maxAngle), l.crossVectors(r, s), l.normalize(), N.setFromAxisAngle(l, R), C.quaternion.multiply(N), C.rotation.setFromVector3(c.setFromEuler(C.rotation).clamp(new f.Vector3(
             y[p].minx !== void 0 ? y[p].minx : -1 / 0,
             y[p].miny !== void 0 ? y[p].miny : -1 / 0,
             y[p].minz !== void 0 ? y[p].minz : -1 / 0
@@ -6594,8 +6594,8 @@ class He {
         }
         if (!T) break;
       }
-    n && y.forEach((v) => {
-      this.poseTarget.props[v.link + ".quaternion"].copy(v.bone.quaternion), this.poseTarget.props[v.link + ".quaternion"].t = this.animClock, this.poseTarget.props[v.link + ".quaternion"].d = n;
+    n && y.forEach((I) => {
+      this.poseTarget.props[I.link + ".quaternion"].copy(I.bone.quaternion), this.poseTarget.props[I.link + ".quaternion"].t = this.animClock, this.poseTarget.props[I.link + ".quaternion"].d = n;
     });
   }
   /**
@@ -6684,8 +6684,8 @@ const Te = be(({
   className: g = "",
   style: y = {},
   animations: x = {}
-}, v) => {
-  const T = Y(null), p = Y(null), [F, C] = re(!0), [I, O] = re(null), [B, $] = re(!1), j = ve(), S = n || j.service;
+}, I) => {
+  const T = X(null), p = X(null), [F, C] = re(!0), [R, O] = re(null), [B, $] = re(!1), Y = ve(), S = n || Y.service;
   let P;
   S === "browser" ? P = {
     service: "browser",
@@ -6695,19 +6695,19 @@ const Te = be(({
   } : S === "elevenlabs" ? P = {
     service: "elevenlabs",
     endpoint: "https://api.elevenlabs.io/v1/text-to-speech",
-    apiKey: o || j.apiKey,
-    defaultVoice: s || j.defaultVoice || ae.defaultVoice,
-    voices: j.voices || ae.voices
+    apiKey: o || Y.apiKey,
+    defaultVoice: s || Y.defaultVoice || ae.defaultVoice,
+    voices: Y.voices || ae.voices
   } : S === "deepgram" ? P = {
     service: "deepgram",
     endpoint: "https://api.deepgram.com/v1/speak",
-    apiKey: o || j.apiKey,
-    defaultVoice: s || j.defaultVoice || ze.defaultVoice,
-    voices: j.voices || ze.voices
+    apiKey: o || Y.apiKey,
+    defaultVoice: s || Y.defaultVoice || ze.defaultVoice,
+    voices: Y.voices || ze.voices
   } : P = {
-    ...j,
+    ...Y,
     // Override API key if provided via props
-    apiKey: o !== null ? o : j.apiKey
+    apiKey: o !== null ? o : Y.apiKey
   };
   const W = {
     url: D,
@@ -6788,11 +6788,11 @@ const Te = be(({
         };
         if (H.onSpeechEnd && p.current) {
           const w = p.current;
-          let G = null, se = 0, ue = !1;
+          let j = null, se = 0, ue = !1;
           const Ee = 1200, Fe = 1e4;
           let Ie = 0;
           const fe = setInterval(() => {
-            Ie++, w && w.isSpeaking && (w.audioPlaylist && w.audioPlaylist.length > 0 || w.isAudioPlaying === !0) && (ue = !0, clearInterval(fe), G = setInterval(Ae, 50));
+            Ie++, w && w.isSpeaking && (w.audioPlaylist && w.audioPlaylist.length > 0 || w.isAudioPlaying === !0) && (ue = !0, clearInterval(fe), j = setInterval(Ae, 50));
             const de = !w.speechQueue || w.speechQueue.length === 0;
             if (w && !w.isSpeaking && de && (!w.audioPlaylist || w.audioPlaylist.length === 0) && (!w.isAudioPlaying || w.isAudioPlaying === !1)) {
               clearInterval(fe);
@@ -6805,7 +6805,7 @@ const Te = be(({
             }
             if (Ie * 50 > Fe) {
               if (clearInterval(fe), w && w.isSpeaking)
-                ue = !0, G = setInterval(Ae, 50);
+                ue = !0, j = setInterval(Ae, 50);
               else if (w && !w.isSpeaking && de && (!w.audioPlaylist || w.audioPlaylist.length === 0) && (!w.isAudioPlaying || w.isAudioPlaying === !1))
                 try {
                   H.onSpeechEnd();
@@ -6815,7 +6815,7 @@ const Te = be(({
             }
           }, 50), Ae = () => {
             if (se++, se > Ee) {
-              G && (clearInterval(G), G = null);
+              j && (clearInterval(j), j = null);
               try {
                 H.onSpeechEnd();
               } catch (xe) {
@@ -6826,7 +6826,7 @@ const Te = be(({
             if (!ue)
               return;
             const de = !w.speechQueue || w.speechQueue.length === 0;
-            w && (!w.isSpeaking || w.isSpeaking === !1) && (!w.audioPlaylist || w.audioPlaylist.length === 0) && (!w.isAudioPlaying || w.isAudioPlaying === !1) && de && (G && (clearInterval(G), G = null), setTimeout(() => {
+            w && (!w.isSpeaking || w.isSpeaking === !1) && (!w.audioPlaylist || w.audioPlaylist.length === 0) && (!w.isAudioPlaying || w.isAudioPlaying === !1) && de && (j && (clearInterval(j), j = null), setTimeout(() => {
               try {
                 H.onSpeechEnd();
               } catch (xe) {
@@ -6847,7 +6847,7 @@ const Te = be(({
     p.current && p.current.setMood(L);
   }, []), b = E((L) => {
     p.current && p.current.setSlowdownRate && p.current.setSlowdownRate(L);
-  }, []), R = E((L, H = !1) => {
+  }, []), v = E((L, H = !1) => {
     if (p.current && p.current.playAnimation) {
       if (x && x[L] && (L = x[L]), p.current.setShowFullAvatar)
         try {
@@ -6862,20 +6862,20 @@ const Te = be(({
           console.warn(`Failed to play ${L}:`, w);
           try {
             p.current.setBodyMovement("idle");
-          } catch (G) {
-            console.warn("Fallback animation also failed:", G);
+          } catch (j) {
+            console.warn("Fallback animation also failed:", j);
           }
         }
       else {
         const w = [".fbx", ".glb", ".gltf"];
-        let G = !1;
+        let j = !1;
         for (const se of w)
           try {
-            p.current.playAnimation(L + se, null, 10, 0, 0.01, H), G = !0;
+            p.current.playAnimation(L + se, null, 10, 0, 0.01, H), j = !0;
             break;
           } catch {
           }
-        if (!G) {
+        if (!j) {
           console.warn("Animation not found:", L);
           try {
             p.current.setBodyMovement("idle");
@@ -6888,13 +6888,13 @@ const Te = be(({
   }, [x]), z = E(() => {
     p.current && p.current.onResize && p.current.onResize();
   }, []);
-  return Re(v, () => ({
+  return Re(I, () => ({
     speakText: le,
     stopSpeaking: ye,
     resumeAudioContext: _,
     setMood: K,
     setTimingAdjustment: b,
-    playAnimation: R,
+    playAnimation: v,
     isReady: B,
     talkingHead: p.current,
     handleResize: z,
@@ -6987,7 +6987,7 @@ const Te = be(({
           fontSize: "18px",
           zIndex: 10
         }, children: "Loading avatar..." }),
-        I && /* @__PURE__ */ oe("div", { className: "error-overlay", style: {
+        R && /* @__PURE__ */ oe("div", { className: "error-overlay", style: {
           position: "absolute",
           top: "50%",
           left: "50%",
@@ -6998,7 +6998,7 @@ const Te = be(({
           zIndex: 10,
           padding: "20px",
           borderRadius: "8px"
-        }, children: I })
+        }, children: R })
       ]
     }
   );
@@ -7016,7 +7016,7 @@ const ot = be(({
   style: s = {},
   avatarConfig: o = {}
 }, r) => {
-  const h = Y(null), a = Y(null), [u, l] = re(!0), [c, d] = re(null), [g, y] = re(!1), x = ve(), v = o.ttsService || x.service, T = v === "browser" ? {
+  const h = X(null), a = X(null), [u, l] = re(!0), [c, d] = re(null), [g, y] = re(!1), x = ve(), I = o.ttsService || x.service, T = I === "browser" ? {
     endpoint: "",
     apiKey: null,
     defaultVoice: "Google US English"
@@ -7025,13 +7025,13 @@ const ot = be(({
     // Override API key if provided via avatarConfig
     apiKey: o.ttsApiKey !== void 0 && o.ttsApiKey !== null ? o.ttsApiKey : x.apiKey,
     // Override endpoint for ElevenLabs if service is explicitly set
-    endpoint: v === "elevenlabs" && o.ttsApiKey ? "https://api.elevenlabs.io/v1/text-to-speech" : x.endpoint
+    endpoint: I === "elevenlabs" && o.ttsApiKey ? "https://api.elevenlabs.io/v1/text-to-speech" : x.endpoint
   }, p = {
     url: "/avatars/brunette.glb",
     // Use brunette avatar (working glTF file)
     body: "F",
     avatarMood: "neutral",
-    ttsLang: v === "browser" ? "en-US" : "en",
+    ttsLang: I === "browser" ? "en-US" : "en",
     ttsVoice: o.ttsVoice || T.defaultVoice,
     lipsyncLang: "en",
     // English lip-sync
@@ -7043,7 +7043,7 @@ const ot = be(({
   }, F = {
     ttsEndpoint: T.endpoint,
     ttsApikey: T.apiKey,
-    ttsService: v,
+    ttsService: I,
     lipsyncModules: ["en"],
     cameraView: "upper"
   }, C = E(async () => {
@@ -7085,7 +7085,7 @@ const ot = be(({
   he(() => (C(), () => {
     a.current && (a.current.stop(), a.current.dispose(), a.current = null);
   }), [C]);
-  const I = E((S) => {
+  const R = E((S) => {
     if (a.current && g)
       try {
         console.log("Speaking text:", S), console.log("Avatar config:", p), console.log("TalkingHead instance:", a.current), a.current.lipsync && Object.keys(a.current.lipsync).length > 0 ? (console.log("Lip-sync modules loaded:", Object.keys(a.current.lipsync)), a.current.setSlowdownRate && (a.current.setSlowdownRate(1.05), console.log("Applied timing adjustment for better lip-sync")), a.current.speakText(S)) : (console.warn("Lip-sync modules not ready, waiting..."), setTimeout(() => {
@@ -7102,7 +7102,7 @@ const ot = be(({
     a.current && a.current.setMood(S);
   }, []), $ = E((S) => {
     a.current && a.current.setSlowdownRate && (a.current.setSlowdownRate(S), console.log("Timing adjustment set to:", S));
-  }, []), j = E((S, P = !1) => {
+  }, []), Y = E((S, P = !1) => {
     if (a.current && a.current.playAnimation) {
       if (a.current.setShowFullAvatar)
         try {
@@ -7144,11 +7144,11 @@ const ot = be(({
       console.warn("Animation system not available or animation not found:", S);
   }, []);
   return Re(r, () => ({
-    speakText: I,
+    speakText: R,
     stopSpeaking: O,
     setMood: B,
     setTimingAdjustment: $,
-    playAnimation: j,
+    playAnimation: Y,
     isReady: g,
     talkingHead: a.current,
     setBodyMovement: (S) => {
@@ -7261,7 +7261,7 @@ const st = be(({
   },
   autoStart: h = !1
 }, a) => {
-  const u = Y(null), l = Y({
+  const u = X(null), l = X({
     currentModuleIndex: 0,
     currentLessonIndex: 0,
     currentQuestionIndex: 0,
@@ -7271,18 +7271,18 @@ const st = be(({
     curriculumCompleted: !1,
     score: 0,
     totalQuestions: 0
-  }), c = Y({
+  }), c = X({
     onLessonStart: i,
     onLessonComplete: n,
     onQuestionAnswer: s,
     onCurriculumComplete: o,
     onCustomAction: r
-  }), d = Y(null), g = Y(null), y = Y(null), x = Y(null), v = Y(null), T = Y(null), p = Y(null), F = Y(D?.curriculum || {
+  }), d = X(null), g = X(null), y = X(null), x = X(null), I = X(null), T = X(null), p = X(null), F = X(D?.curriculum || {
     title: "Default Curriculum",
     description: "No curriculum data provided",
     language: "en",
     modules: []
-  }), C = Y({
+  }), C = X({
     avatarUrl: t.avatarUrl || "/avatars/brunette.glb",
     avatarBody: t.avatarBody || "F",
     mood: t.mood || "happy",
@@ -7292,7 +7292,7 @@ const st = be(({
     ttsApiKey: t.ttsApiKey || null,
     bodyMovement: t.bodyMovement || "gesturing",
     movementIntensity: t.movementIntensity || 0.7,
-    showFullAvatar: t.showFullAvatar !== void 0 ? t.showFullAvatar : !0,
+    showFullAvatar: t.showFullAvatar !== void 0 ? t.showFullAvatar : !1,
     animations: e,
     lipsyncLang: "en"
   });
@@ -7320,16 +7320,16 @@ const st = be(({
       ttsApiKey: t.ttsApiKey || null,
       bodyMovement: t.bodyMovement || "gesturing",
       movementIntensity: t.movementIntensity || 0.7,
-      showFullAvatar: t.showFullAvatar !== void 0 ? t.showFullAvatar : !0,
+      showFullAvatar: t.showFullAvatar !== void 0 ? t.showFullAvatar : !1,
       animations: e,
       lipsyncLang: "en"
     };
   }, [D, t, e]);
-  const I = E(() => (F.current || { modules: [] }).modules[l.current.currentModuleIndex]?.lessons[l.current.currentLessonIndex], []), O = E(() => I()?.questions[l.current.currentQuestionIndex], [I]), B = E((b, R) => R.type === "multiple_choice" || R.type === "true_false" ? b === R.answer : R.type === "code_test" && typeof b == "object" && b !== null ? b.passed === !0 : !1, []), $ = E(() => {
+  const R = E(() => (F.current || { modules: [] }).modules[l.current.currentModuleIndex]?.lessons[l.current.currentLessonIndex], []), O = E(() => R()?.questions[l.current.currentQuestionIndex], [R]), B = E((b, v) => v.type === "multiple_choice" || v.type === "true_false" ? b === v.answer : v.type === "code_test" && typeof b == "object" && b !== null ? b.passed === !0 : !1, []), $ = E(() => {
     l.current.lessonCompleted = !0, l.current.isQuestionMode = !1;
     const b = l.current.totalQuestions > 0 ? Math.round(l.current.score / l.current.totalQuestions * 100) : 100;
-    let R = "Congratulations! You've completed this lesson";
-    if (l.current.totalQuestions > 0 ? R += ` with a score of ${l.current.score} out of ${l.current.totalQuestions} (${b}%). ` : R += "! ", b >= 80 ? R += "Excellent work! You have a great understanding of this topic." : b >= 60 ? R += "Good job! You understand most of the concepts." : R += "Keep practicing! You're making progress.", c.current.onLessonComplete({
+    let v = "Congratulations! You've completed this lesson";
+    if (l.current.totalQuestions > 0 ? v += ` with a score of ${l.current.score} out of ${l.current.totalQuestions} (${b}%). ` : v += "! ", b >= 80 ? v += "Excellent work! You have a great understanding of this topic." : b >= 60 ? v += "Good job! You understand most of the concepts." : v += "Keep practicing! You're making progress.", c.current.onLessonComplete({
       moduleIndex: l.current.currentModuleIndex,
       lessonIndex: l.current.currentLessonIndex,
       score: l.current.score,
@@ -7349,25 +7349,28 @@ const st = be(({
         } catch {
           u.current.playCelebration();
         }
-      const z = F.current || { modules: [] }, L = z.modules[l.current.currentModuleIndex], H = l.current.currentLessonIndex < (L?.lessons?.length || 0) - 1, U = l.current.currentModuleIndex < (z.modules?.length || 0) - 1, w = H || U, G = C.current || { lipsyncLang: "en" };
-      w ? u.current.speakText(R, {
-        lipsyncLang: G.lipsyncLang,
+      const z = F.current || { modules: [] }, L = z.modules[l.current.currentModuleIndex], H = l.current.currentLessonIndex < (L?.lessons?.length || 0) - 1, U = l.current.currentModuleIndex < (z.modules?.length || 0) - 1, w = H || U, j = C.current || { lipsyncLang: "en" };
+      u.current.speakText(v, {
+        lipsyncLang: j.lipsyncLang,
         onSpeechEnd: () => {
-          g.current && g.current();
-        }
-      }) : u.current.speakText(R, {
-        lipsyncLang: G.lipsyncLang,
-        onSpeechEnd: () => {
-          v.current && v.current();
+          c.current.onCustomAction({
+            type: "lessonCompleteFeedbackDone",
+            moduleIndex: l.current.currentModuleIndex,
+            lessonIndex: l.current.currentLessonIndex,
+            score: l.current.score,
+            totalQuestions: l.current.totalQuestions,
+            percentage: b,
+            hasNextLesson: w
+          });
         }
       });
     }
-  }, [e.lessonComplete]), j = E(() => {
+  }, [e.lessonComplete]), Y = E(() => {
     l.current.curriculumCompleted = !0;
     const b = F.current || { modules: [] };
     if (c.current.onCurriculumComplete({
       modules: b.modules.length,
-      totalLessons: b.modules.reduce((R, z) => R + z.lessons.length, 0)
+      totalLessons: b.modules.reduce((v, z) => v + z.lessons.length, 0)
     }), u.current) {
       if (u.current.setMood("celebrating"), e.curriculumComplete)
         try {
@@ -7375,21 +7378,21 @@ const st = be(({
         } catch {
           u.current.playCelebration();
         }
-      const R = C.current || { lipsyncLang: "en" };
-      u.current.speakText("Amazing! You've completed the entire curriculum! You're now ready to move on to more advanced topics. Well done!", { lipsyncLang: R.lipsyncLang });
+      const v = C.current || { lipsyncLang: "en" };
+      u.current.speakText("Amazing! You've completed the entire curriculum! You're now ready to move on to more advanced topics. Well done!", { lipsyncLang: v.lipsyncLang });
     }
   }, [e.curriculumComplete]), S = E(() => {
-    const b = I();
+    const b = R();
     l.current.isQuestionMode = !0, l.current.currentQuestionIndex = 0, l.current.totalQuestions = b?.questions?.length || 0;
-    const R = O();
-    if (R && c.current.onCustomAction({
+    const v = O();
+    if (v && c.current.onCustomAction({
       type: "questionStart",
       moduleIndex: l.current.currentModuleIndex,
       lessonIndex: l.current.currentLessonIndex,
       questionIndex: l.current.currentQuestionIndex,
       totalQuestions: l.current.totalQuestions,
-      question: R
-    }), u.current && u.current.isReady && R) {
+      question: v
+    }), u.current && u.current.isReady && v) {
       if (u.current.setMood("curious"), e.questionStart)
         try {
           u.current.playAnimation(e.questionStart, !0);
@@ -7397,7 +7400,7 @@ const st = be(({
           console.warn("Failed to play questionStart animation:", L);
         }
       const z = C.current || { lipsyncLang: "en" };
-      R.type === "code_test" ? u.current.speakText(`Let's test your coding skills! Here's your first challenge: ${R.question}`, { lipsyncLang: z.lipsyncLang }) : R.type === "multiple_choice" ? u.current.speakText(`Now let me ask you some questions. Here's the first one: ${R.question}`, { lipsyncLang: z.lipsyncLang }) : R.type === "true_false" ? u.current.speakText(`Let's start with some true or false questions. First question: ${R.question}`, { lipsyncLang: z.lipsyncLang }) : u.current.speakText(`Now let me ask you some questions. Here's the first one: ${R.question}`, { lipsyncLang: z.lipsyncLang });
+      v.type === "code_test" ? u.current.speakText(`Let's test your coding skills! Here's your first challenge: ${v.question}`, { lipsyncLang: z.lipsyncLang }) : v.type === "multiple_choice" ? u.current.speakText(`Now let me ask you some questions. Here's the first one: ${v.question}`, { lipsyncLang: z.lipsyncLang }) : v.type === "true_false" ? u.current.speakText(`Let's start with some true or false questions. First question: ${v.question}`, { lipsyncLang: z.lipsyncLang }) : u.current.speakText(`Now let me ask you some questions. Here's the first one: ${v.question}`, { lipsyncLang: z.lipsyncLang });
     } else if (u.current && u.current.isReady) {
       const z = C.current || { lipsyncLang: "en" };
       u.current.speakText("Now let me ask you some questions to test your understanding.", { lipsyncLang: z.lipsyncLang });
@@ -7405,19 +7408,19 @@ const st = be(({
       setTimeout(() => {
         T.current && T.current();
       }, 100);
-  }, [e.questionStart, I, O]), P = E(() => {
-    const b = I();
+  }, [e.questionStart, R, O]), P = E(() => {
+    const b = R();
     if (l.current.currentQuestionIndex < (b?.questions?.length || 0) - 1) {
       l.current.currentQuestionIndex += 1;
-      const R = O();
-      if (R && c.current.onCustomAction({
+      const v = O();
+      if (v && c.current.onCustomAction({
         type: "nextQuestion",
         moduleIndex: l.current.currentModuleIndex,
         lessonIndex: l.current.currentLessonIndex,
         questionIndex: l.current.currentQuestionIndex,
         totalQuestions: l.current.totalQuestions,
-        question: R
-      }), u.current && R) {
+        question: v
+      }), u.current && v) {
         if (u.current.setMood("happy"), u.current.setBodyMovement("idle"), e.nextQuestion)
           try {
             u.current.playAnimation(e.nextQuestion, !0);
@@ -7425,38 +7428,52 @@ const st = be(({
             console.warn("Failed to play nextQuestion animation:", L);
           }
         const z = C.current || { lipsyncLang: "en" };
-        R.type === "code_test" ? u.current.speakText(`Great! Now let's move on to your next coding challenge: ${R.question}`, {
+        v.type === "code_test" ? u.current.speakText(`Great! Now let's move on to your next coding challenge: ${v.question}`, {
           lipsyncLang: z.lipsyncLang
-        }) : R.type === "multiple_choice" ? u.current.speakText(`Alright! Here's your next question: ${R.question}`, {
+        }) : v.type === "multiple_choice" ? u.current.speakText(`Alright! Here's your next question: ${v.question}`, {
           lipsyncLang: z.lipsyncLang
-        }) : R.type === "true_false" ? u.current.speakText(`Now let's try this one: ${R.question}`, {
+        }) : v.type === "true_false" ? u.current.speakText(`Now let's try this one: ${v.question}`, {
           lipsyncLang: z.lipsyncLang
-        }) : u.current.speakText(`Here's the next question: ${R.question}`, {
+        }) : u.current.speakText(`Here's the next question: ${v.question}`, {
           lipsyncLang: z.lipsyncLang
         });
       }
     } else
-      y.current && y.current();
-  }, [e.nextQuestion, I, O]), W = E(() => {
-    const b = F.current || { modules: [] }, R = b.modules[l.current.currentModuleIndex];
-    l.current.currentLessonIndex < (R?.lessons?.length || 0) - 1 ? (l.current.currentLessonIndex += 1, l.current.currentQuestionIndex = 0, l.current.lessonCompleted = !1, l.current.isQuestionMode = !1, l.current.isTeaching = !1, l.current.score = 0, l.current.totalQuestions = 0, c.current.onCustomAction({
+      c.current.onCustomAction({
+        type: "allQuestionsComplete",
+        moduleIndex: l.current.currentModuleIndex,
+        lessonIndex: l.current.currentLessonIndex,
+        totalQuestions: l.current.totalQuestions,
+        score: l.current.score
+      });
+  }, [e.nextQuestion, R, O]), W = E(() => {
+    const b = F.current || { modules: [] }, v = b.modules[l.current.currentModuleIndex];
+    l.current.currentLessonIndex < (v?.lessons?.length || 0) - 1 ? (l.current.currentLessonIndex += 1, l.current.currentQuestionIndex = 0, l.current.lessonCompleted = !1, l.current.isQuestionMode = !1, l.current.isTeaching = !1, l.current.score = 0, l.current.totalQuestions = 0, c.current.onCustomAction({
       type: "lessonStart",
       moduleIndex: l.current.currentModuleIndex,
       lessonIndex: l.current.currentLessonIndex
-    }), u.current && (u.current.setMood("happy"), u.current.setBodyMovement("idle"), d.current && d.current())) : l.current.currentModuleIndex < (b.modules?.length || 0) - 1 ? (l.current.currentModuleIndex += 1, l.current.currentLessonIndex = 0, l.current.currentQuestionIndex = 0, l.current.lessonCompleted = !1, l.current.isQuestionMode = !1, l.current.isTeaching = !1, l.current.score = 0, l.current.totalQuestions = 0, c.current.onCustomAction({
+    }), c.current.onLessonStart({
+      moduleIndex: l.current.currentModuleIndex,
+      lessonIndex: l.current.currentLessonIndex,
+      lesson: R()
+    }), u.current && (u.current.setMood("happy"), u.current.setBodyMovement("idle"))) : l.current.currentModuleIndex < (b.modules?.length || 0) - 1 ? (l.current.currentModuleIndex += 1, l.current.currentLessonIndex = 0, l.current.currentQuestionIndex = 0, l.current.lessonCompleted = !1, l.current.isQuestionMode = !1, l.current.isTeaching = !1, l.current.score = 0, l.current.totalQuestions = 0, c.current.onCustomAction({
       type: "lessonStart",
       moduleIndex: l.current.currentModuleIndex,
       lessonIndex: l.current.currentLessonIndex
-    }), u.current && (u.current.setMood("happy"), u.current.setBodyMovement("idle"), d.current && d.current())) : v.current && v.current();
+    }), c.current.onLessonStart({
+      moduleIndex: l.current.currentModuleIndex,
+      lessonIndex: l.current.currentLessonIndex,
+      lesson: R()
+    }), u.current && (u.current.setMood("happy"), u.current.setBodyMovement("idle"))) : I.current && I.current();
   }, []), V = E(() => {
-    const b = I();
-    let R = null;
+    const b = R();
+    let v = null;
     if (b?.avatar_script && b?.body) {
       const z = b.avatar_script.trim(), L = b.body.trim(), H = z.match(/[.!?]$/) ? " " : ". ";
-      R = `${z}${H}${L}`;
+      v = `${z}${H}${L}`;
     } else
-      R = b?.avatar_script || b?.body || null;
-    if (u.current && u.current.isReady && R) {
+      v = b?.avatar_script || b?.body || null;
+    if (u.current && u.current.isReady && v) {
       l.current.isTeaching = !0, l.current.isQuestionMode = !1, u.current.setMood("happy");
       let z = !1;
       if (e.teaching)
@@ -7476,22 +7493,28 @@ const st = be(({
         moduleIndex: l.current.currentModuleIndex,
         lessonIndex: l.current.currentLessonIndex,
         lesson: b
-      }), u.current.speakText(R, {
+      }), u.current.speakText(v, {
         lipsyncLang: L.lipsyncLang,
         onSpeechEnd: () => {
-          l.current.isTeaching = !1, b.questions && b.questions.length > 0 ? T.current && T.current() : y.current && y.current();
+          l.current.isTeaching = !1, c.current.onCustomAction({
+            type: "teachingComplete",
+            moduleIndex: l.current.currentModuleIndex,
+            lessonIndex: l.current.currentLessonIndex,
+            lesson: b,
+            hasQuestions: b.questions && b.questions.length > 0
+          });
         }
       });
     }
-  }, [e.teaching, I]), q = E((b) => {
-    const R = O(), z = B(b, R);
+  }, [e.teaching, R]), q = E((b) => {
+    const v = O(), z = B(b, v);
     if (z && (l.current.score += 1), c.current.onQuestionAnswer({
       moduleIndex: l.current.currentModuleIndex,
       lessonIndex: l.current.currentLessonIndex,
       questionIndex: l.current.currentQuestionIndex,
       answer: b,
       isCorrect: z,
-      question: R
+      question: v
     }), u.current)
       if (z) {
         if (u.current.setMood("happy"), e.correct)
@@ -7501,11 +7524,18 @@ const st = be(({
             u.current.setBodyMovement("happy");
           }
         u.current.setBodyMovement("gesturing");
-        const L = R.type === "code_test" ? `Great job! Your code passed all the tests! ${R.explanation || ""}` : `Excellent! That's correct! ${R.explanation || ""}`, H = C.current || { lipsyncLang: "en" };
+        const L = v.type === "code_test" ? `Great job! Your code passed all the tests! ${v.explanation || ""}` : `Excellent! That's correct! ${v.explanation || ""}`, H = C.current || { lipsyncLang: "en" };
         u.current.speakText(L, {
           lipsyncLang: H.lipsyncLang,
           onSpeechEnd: () => {
-            x.current && x.current();
+            c.current.onCustomAction({
+              type: "answerFeedbackComplete",
+              moduleIndex: l.current.currentModuleIndex,
+              lessonIndex: l.current.currentLessonIndex,
+              questionIndex: l.current.currentQuestionIndex,
+              isCorrect: !0,
+              hasNextQuestion: l.current.currentQuestionIndex < (R()?.questions?.length || 0) - 1
+            });
           }
         });
       } else {
@@ -7516,23 +7546,38 @@ const st = be(({
             u.current.setBodyMovement("idle");
           }
         u.current.setBodyMovement("gesturing");
-        const L = R.type === "code_test" ? `Your code didn't pass all the tests. ${R.explanation || "Try again!"}` : `Not quite right, but don't worry! ${R.explanation || ""} Let's move on to the next question.`, H = C.current || { lipsyncLang: "en" };
+        const L = v.type === "code_test" ? `Your code didn't pass all the tests. ${v.explanation || "Try again!"}` : `Not quite right, but don't worry! ${v.explanation || ""} Let's move on to the next question.`, H = C.current || { lipsyncLang: "en" };
         u.current.speakText(L, {
           lipsyncLang: H.lipsyncLang,
           onSpeechEnd: () => {
-            x.current && x.current();
+            c.current.onCustomAction({
+              type: "answerFeedbackComplete",
+              moduleIndex: l.current.currentModuleIndex,
+              lessonIndex: l.current.currentLessonIndex,
+              questionIndex: l.current.currentQuestionIndex,
+              isCorrect: !1,
+              hasNextQuestion: l.current.currentQuestionIndex < (R()?.questions?.length || 0) - 1
+            });
           }
         });
       }
     else
-      x.current && x.current();
-  }, [e.correct, e.incorrect, O, B]), _ = E((b) => {
-    const R = O();
+      c.current.onCustomAction({
+        type: "answerFeedbackComplete",
+        moduleIndex: l.current.currentModuleIndex,
+        lessonIndex: l.current.currentLessonIndex,
+        questionIndex: l.current.currentQuestionIndex,
+        isCorrect: z,
+        hasNextQuestion: l.current.currentQuestionIndex < (R()?.questions?.length || 0) - 1,
+        avatarNotReady: !0
+      });
+  }, [e.correct, e.incorrect, O, R, B]), _ = E((b) => {
+    const v = O();
     if (!b || typeof b != "object") {
       console.error("Invalid code test result format. Expected object with {passed: boolean, ...}");
       return;
     }
-    if (R?.type !== "code_test") {
+    if (v?.type !== "code_test") {
       console.warn("Current question is not a code test. Use handleAnswerSelect for other question types.");
       return;
     }
@@ -7552,19 +7597,19 @@ const st = be(({
       lessonIndex: l.current.currentLessonIndex,
       questionIndex: l.current.currentQuestionIndex,
       testResult: z,
-      question: R
+      question: v
     }), p.current && p.current(z);
   }, [O, B]), le = E(() => {
     l.current.currentModuleIndex = 0, l.current.currentLessonIndex = 0, l.current.currentQuestionIndex = 0, l.current.isTeaching = !1, l.current.isQuestionMode = !1, l.current.lessonCompleted = !1, l.current.curriculumCompleted = !1, l.current.score = 0, l.current.totalQuestions = 0;
   }, []), ye = E((b) => {
     console.log("Avatar is ready!", b);
-    const R = I(), z = R?.avatar_script || R?.body;
+    const v = R(), z = v?.avatar_script || v?.body;
     h && z && setTimeout(() => {
       d.current && d.current();
     }, 10);
-  }, [h, I]);
+  }, [h, R]);
   Pe(() => {
-    d.current = V, g.current = W, y.current = $, x.current = P, v.current = j, T.current = S, p.current = q;
+    d.current = V, g.current = W, y.current = $, x.current = P, I.current = Y, T.current = S, p.current = q;
   }), Re(a, () => ({
     // Curriculum control methods
     startTeaching: V,
@@ -7574,28 +7619,28 @@ const st = be(({
     nextQuestion: P,
     nextLesson: W,
     completeLesson: $,
-    completeCurriculum: j,
+    completeCurriculum: Y,
     resetCurriculum: le,
     getState: () => ({ ...l.current }),
     getCurrentQuestion: () => O(),
-    getCurrentLesson: () => I(),
+    getCurrentLesson: () => R(),
     // Direct access to avatar ref (always returns current value)
     getAvatarRef: () => u.current,
     // Convenience methods that delegate to avatar (always check current ref)
-    speakText: async (b, R = {}) => {
+    speakText: async (b, v = {}) => {
       await u.current?.resumeAudioContext?.();
       const z = C.current || { lipsyncLang: "en" };
-      u.current?.speakText(b, { ...R, lipsyncLang: R.lipsyncLang || z.lipsyncLang });
+      u.current?.speakText(b, { ...v, lipsyncLang: v.lipsyncLang || z.lipsyncLang });
     },
     resumeAudioContext: async () => {
       if (u.current?.resumeAudioContext)
         return await u.current.resumeAudioContext();
       const b = u.current?.talkingHead;
       if (b?.audioCtx) {
-        const R = b.audioCtx;
-        if (R.state === "suspended" || R.state === "interrupted")
+        const v = b.audioCtx;
+        if (v.state === "suspended" || v.state === "interrupted")
           try {
-            await R.resume(), console.log("Audio context resumed via talkingHead");
+            await v.resume(), console.log("Audio context resumed via talkingHead");
           } catch (z) {
             console.warn("Failed to resume audio context:", z);
           }
@@ -7604,7 +7649,7 @@ const st = be(({
     },
     stopSpeaking: () => u.current?.stopSpeaking(),
     setMood: (b) => u.current?.setMood(b),
-    playAnimation: (b, R) => u.current?.playAnimation(b, R),
+    playAnimation: (b, v) => u.current?.playAnimation(b, v),
     setBodyMovement: (b) => u.current?.setBodyMovement(b),
     setMovementIntensity: (b) => u.current?.setMovementIntensity(b),
     playRandomDance: () => u.current?.playRandomDance(),
@@ -7615,10 +7660,10 @@ const st = be(({
     lockAvatarPosition: () => u.current?.lockAvatarPosition(),
     unlockAvatarPosition: () => u.current?.unlockAvatarPosition(),
     // Custom action trigger
-    triggerCustomAction: (b, R) => {
+    triggerCustomAction: (b, v) => {
       c.current.onCustomAction({
         type: b,
-        ...R,
+        ...v,
         state: { ...l.current }
       });
     },
@@ -7626,7 +7671,7 @@ const st = be(({
     handleResize: () => u.current?.handleResize(),
     // Avatar readiness check (always returns current value)
     isAvatarReady: () => u.current?.isReady || !1
-  }), [V, S, q, _, P, W, $, j, le, O, I]);
+  }), [V, S, q, _, P, W, $, Y, le, O, R]);
   const K = C.current || {
     avatarUrl: "/avatars/brunette.glb",
     avatarBody: "F",
@@ -7637,7 +7682,7 @@ const st = be(({
     ttsApiKey: null,
     bodyMovement: "gesturing",
     movementIntensity: 0.7,
-    showFullAvatar: !0,
+    showFullAvatar: !1,
     animations: e
   };
   return /* @__PURE__ */ oe("div", { style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ oe(