fix: /friend motion — interrupt hold on new action, drain queue, fix emotion mapping

- MotionController: interrupt hold when new playAction arrives instead of
queueing, so LLM text-message actions are not blocked by stale 10s hold
- MotionController: drain action queue in hold timer callback to prevent
silent drop of queued actions
- App.tsx: remove hold=true from emotion-only messages — action plays once,
emotion timer handles duration independently
- App.tsx: remove awkward emotion→action mappings (neutral→salute,
relaxed→salute, sad→shy) that caused unnatural gestures

Co-Authored-By: Claude Big Pickle <noreply@anthropic.com>

src/components/friend/frontend/App.tsx

@@ -14,6 +14,8 @@ import { Menu, Move, Rotate3D, EyeOff, Settings, RefreshCw, Pin } from 'lucide-r
 const DEFAULT_MODEL = '/friend/model1.vrm'
 
 // 情绪 → 动作映射
+// 只有有明确肢体动作关联的情绪才映射；neutral/relaxed 不绑动作，
+// 避免角色在无明确意图时做出违和姿势。
 const emotionActionMap: Record<string, string> = {
   think: 'scratchHead',
   question: 'point',
@@ -22,12 +24,12 @@ const emotionActionMap: Record<string, string> = {
   surprised: 'excited',
   angry: 'angry',
   awkward: 'playFingers',
-  sad: 'shy',
   love: 'shy',
   flirty: 'shy',
   greeting: 'greeting',
-  relaxed: 'salute',
-  neutral: 'salute',
+  sad: '',
+  relaxed: '',
+  neutral: '',
 }
 
 const btnStyle: React.CSSProperties = {
@@ -122,7 +124,10 @@ export default function App() {
         if (action) sceneRef.current.playAction(action)
       } else {
         sceneRef.current.setEmotionWithReset(msg.emotion, msg.emotionDuration ?? 10000, msg.emotionIntensity)
-        if (action) sceneRef.current.playAction(action, true)
+        // No hold — action plays once, emotion timer handles duration.
+        // Hold would lock _actionPlaying for 10s, blocking text-message actions
+        // when friend_emotion tool fires before broadcastResponse.
+        if (action) sceneRef.current.playAction(action)
       }
     }
   }, [])

src/components/friend/frontend/motion-controller.ts

@@ -187,9 +187,16 @@ export class MotionController {
     const preset = actionPresets[name]
     if (!preset) { console.warn('[Motion] unknown action:', name); return }
 
-    // If already playing an action, queue instead of dropping
-    if (this._actionPlaying) {
-      // Avoid duplicate consecutive queued items
+    // If currently holding (pose frozen, not actively animating), interrupt hold
+    // and play the new action immediately. This prevents LLM text-message actions
+    // from being blocked by a stale 10s hold timer.
+    if (this._actionPlaying && this.holdTimer !== null) {
+      this.clearTimers()
+      this._actionPlaying = false
+      // fall through to play new action
+    } else if (this._actionPlaying) {
+      // Normal queue: only when an action is actively animating (e.g. two rapid
+      // LLM tool calls). Hold does NOT queue — it interrupts.
       const last = this.actionQueue[this.actionQueue.length - 1]
       if (!last || last.name !== name) {
         this.actionQueue.push({ name, hold })
@@ -247,6 +254,15 @@ export class MotionController {
     if (hold) {
       this.holdTimer = setTimeout(() => {
         if (gen !== this._actionGeneration) return
+        this.clearTimers()
+        // Drain any actions queued during hold before going idle —
+        // prevents the queue leak where LLM actions are silently dropped.
+        const queued = this.actionQueue.shift()
+        if (queued) {
+          this._actionPlaying = false
+          this.playAction(queued.name, queued.hold)
+          return
+        }
         this._actionPlaying = false
         this.startIdle()
       }, 10000)