@clowder-ai/companion 0.1.0-alpha.8 → 0.1.0-alpha.9

package/README.md

@@ -24,12 +24,16 @@ Hosts reject this manifest before installation. Media admission and capture
 remain in the trusted Host; this package receives neither streams nor provider
 SDP. Hiding releases media; the existing Clowder **聊聊** entry restores the cat.
 
-Xianxian uses one layered sitting body or one VP9 clip at a time. Actual Host
-activity, durable answers and owner-scoped pending decisions select thought,
-delivery and waiting actions. Dragging selects the running clip; an explicit
-play gesture selects pounce. Reduced motion keeps the body static. Other cats
-retain their own skins. The v2 living assets and their hashes are pinned in
-`source-lock.json`; the installable renderer carries all 20 assets itself.
+Xianxian uses one layered sitting body or one VP9 clip at a time. Expiring Host
+facts with task, result and event identities select tool work, workspace fetch,
+screen reading, applied-result delivery and autonomous target movement.
+Dragging instead freezes a visibly held candidate and cancels the old target;
+it never renames the running clip. Pounce requires an explicit play gesture by
+default; optional automatic play is bounded by idle and cooldown timers.
+Reduced motion keeps semantic poses static and suppresses roaming and pounce.
+Other cats retain their own skins. The v3 living assets and their hashes are
+pinned in `source-lock.json`; the installable renderer carries all 21 assets
+itself, including the mid-edge `peek_fade` variant.
 
 The Host keeps a small transparent margin left of the pet hit target so the
 pounce's tail is visible without turning empty space into a click target.

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "pluginId": "official.companion",
-  "version": "0.1.0-alpha.8",
+  "version": "0.1.0-alpha.9",
   "contractVersion": "0.1.0",
   "name": "猫猫球",
   "icon": {
@@ -40,7 +40,7 @@
       "bridgeVersion": "1.3.0",
       "surface": {
         "entrypoint": "renderer/index.html",
-        "integrity": "sha256-I7pGRaZJIHoBrsk0si+5MAm7VCAjc3AzQNjeo+ra3Is="
+        "integrity": "sha256-x3ponGs/dhxPH5D1rT9JrLqJpFA6rxrgMjSImhksoHQ="
       },
       "presentation": {
         "width": 300,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clowder-ai/companion",
-  "version": "0.1.0-alpha.8",
+  "version": "0.1.0-alpha.9",
   "description": "The desktop voice body for your Clowder companion",
   "license": "MIT",
   "type": "module",
@@ -26,8 +26,8 @@
     "prepack": "pnpm build"
   },
   "devDependencies": {
-    "@clowder-ai/plugin-contract": "0.1.0-beta.18",
-    "@clowder-ai/plugin-sdk": "0.1.0-beta.14"
+    "@clowder-ai/plugin-contract": "0.1.0-beta.19",
+    "@clowder-ai/plugin-sdk": "0.1.0-beta.15"
   },
   "repository": {
     "type": "git",

package/plugin.yaml

@@ -1,6 +1,6 @@
 {
   "pluginId": "official.companion",
-  "version": "0.1.0-alpha.8",
+  "version": "0.1.0-alpha.9",
   "contractVersion": "0.1.0",
   "name": "猫猫球",
   "icon": {
@@ -40,7 +40,7 @@
       "bridgeVersion": "1.3.0",
       "surface": {
         "entrypoint": "renderer/index.html",
-        "integrity": "sha256-I7pGRaZJIHoBrsk0si+5MAm7VCAjc3AzQNjeo+ra3Is="
+        "integrity": "sha256-x3ponGs/dhxPH5D1rT9JrLqJpFA6rxrgMjSImhksoHQ="
       },
       "presentation": {
         "width": 300,

package/renderer/index.html

@@ -33,6 +33,7 @@
           </g>
         </svg>
         <video id="living-video" muted playsinline preload="metadata" aria-hidden="true" hidden></video>
+        <video id="living-video-transition" muted playsinline preload="metadata" aria-hidden="true" hidden></video>
       </button>
       <div id="indicators">
         <button id="call-badge" hidden aria-label="结束语音" title="结束语音"><svg viewBox="0 0 24 24" aria-hidden="true"><rect x="9" y="3" width="6" height="12" rx="3"/><path d="M5 11a7 7 0 0 0 14 0M12 18v4M8 22h8"/></svg></button>

package/renderer/living-body.mjs

@@ -1,5 +1,4 @@
-// F317 living Xianxian package v1. All clips share the layered sit's ground line.
-// Values are the package-v1 CSS anchors scaled from its 290px stage to the Host pet.
+// F317 living Xianxian package v3. Values are CSS anchors from its reviewed manifest.
 const scale = 120 / 290;
 const groundY = 10 + 262.5 * scale;
 const clips = {
@@ -7,77 +6,166 @@ const clips = {
   'running-right': { name: 'trot', size: [265, 236], ground: 234.8, centre: 132.5, loop: true },
   running: { name: 'trot', size: [265, 236], ground: 234.8, centre: 132.5, loop: true },
   play: { name: 'pounce', size: [304.8, 312.6], ground: 303.9, centre: 201.9, rate: 1.5 },
-  sleeping: { name: 'sleep', size: [468.5, 262.1], ground: 256.4, centre: 238.9, loop: true },
-  waking: { name: 'wake', size: [468.5, 262.1], ground: 256.4, centre: 238.9 },
+  sleeping: { name: 'sleep', size: [271.2, 168], ground: 161, centre: 133.2, loop: true },
+  waking: { name: 'wake', size: [400.2, 282.7], ground: 244.2, centre: 200.5,
+    endGround: 277.4, endCentre: 197.7, durationMs: 7_250, crossfadeMs: 250 },
   peek: { name: 'peek', size: [153.5, 234.3], ground: 234.3, centre: 76.75, loop: true },
+  delivering: { name: 'carry', size: [344.3, 290.9], ground: 263, centre: 198.3 },
   review: { name: 'carry', size: [344.3, 290.9], ground: 263, centre: 198.3 },
   pending_decision: { name: 'wait', size: [197.9, 252.8], ground: 249.6, centre: 98.4, loop: true },
   working: { name: 'think', size: [266.4, 256.9], ground: 253.7, centre: 132.1, loop: true },
+  fetching: { name: 'think', size: [266.4, 256.9], ground: 253.7, centre: 132.1, loop: true },
+  studying: { name: 'think', size: [266.4, 256.9], ground: 253.7, centre: 132.1, loop: true },
   staged_thought: { name: 'think', size: [266.4, 256.9], ground: 253.7, centre: 132.1, loop: true },
 };
 export const isLivingClip = action => Object.hasOwn(clips, action);
 const setHidden = (node, hidden) => {
-  // SVGElement.hidden is not consistently reflected to the HTML hidden
-  // attribute; the renderer's [hidden] rule reads the attribute itself.
+  if (!node) return;
   node.toggleAttribute?.('hidden', hidden);
   node.hidden = hidden;
 };
 
-/** One visible body: a layered sit or one muted clip, never both. */
+/** One visible body: a layered sit or one muted clip, with a bounded sleep/wake hand-off. */
 export class LivingBody {
-  constructor({ root, sit, video }) {
+  constructor({ root, sit, video, transitionVideo, setTimer = globalThis.setTimeout, clearTimer = globalThis.clearTimeout }) {
     this.root = root;
     this.sit = sit;
     this.video = video;
+    this.standby = transitionVideo;
+    this.setTimer = (callback, delay) => setTimer.call(globalThis, callback, delay);
+    this.clearTimer = id => clearTimer.call(globalThis, id);
     this.action = '';
     this.revision = 0;
   }
+
   show(action, { reducedMotion = false, onEnded = () => {} } = {}) {
     const dockEdge = this.root.dataset.dockEdge;
-    if (this.action === action && this.reducedMotion === reducedMotion && this.dockEdge === dockEdge) return;
+    const dockZone = this.root.dataset.dockZone;
+    if (this.action === action && this.reducedMotion === reducedMotion && this.dockEdge === dockEdge && this.dockZone === dockZone) return;
+    const previous = this.action;
     this.action = action;
     this.reducedMotion = reducedMotion;
     this.dockEdge = dockEdge;
+    this.dockZone = dockZone;
     const revision = ++this.revision;
-    const clip = !reducedMotion && clips[action];
-    this.root.dataset.pose = action === 'failed' ? 'scared' : action === 'waiting' ? 'listening' :
-      action === 'sleeping' ? 'sleeping' : action === 'pending_decision' ? 'pending' : 'sit';
-    this.root.dataset.direction = action === 'running-left' || (action === 'peek' && this.root.dataset.dockEdge === 'left') ? 'left' : 'right';
-    this.video.onended = null;
-    this.video.pause();
+    this.cancelFade();
+    this.root.dataset.pose = this.pose(action);
+    this.root.dataset.direction = action === 'running-left' || (action === 'peek' && dockEdge === 'left') ? 'left' : 'right';
+    const base = clips[action];
+    const clip = !reducedMotion && base
+      ? { ...base, name: action === 'peek' && dockZone !== 'corner' ? 'peek_fade' : base.name }
+      : null;
     if (!clip) {
-      setHidden(this.video, true);
+      this.hideVideos();
       setHidden(this.sit, false);
       return;
     }
-    this.video.src = `./skins/xianxian-living/clips/${clip.name}.webm`;
-    this.video.loop = clip.loop === true;
-    this.video.playbackRate = clip.rate ?? 1;
-    this.video.style.width = `${clip.size[0] * scale}px`;
-    this.video.style.height = `${clip.size[1] * scale}px`;
-    this.video.style.left = action === 'peek'
-      ? `${this.root.dataset.dockEdge === 'left' ? -32 : 128 - clip.size[0] * scale}px`
-      : `${60 - clip.centre * scale}px`;
-    this.video.style.top = `${action === 'peek' ? 138 - clip.size[1] * scale : groundY - clip.ground * scale}px`;
-    try { this.video.currentTime = 0; } catch { /* New source is not yet seekable. */ }
-    this.video.onended = () => { if (revision === this.revision) onEnded(); };
+    const crossfade = previous === 'sleeping' && action === 'waking' && this.standby;
+    if (crossfade) this.crossfade(clip, revision, onEnded);
+    else this.showClip(this.video, clip, revision, onEnded);
+  }
+
+  pose(action) {
+    if (action === 'failed') return 'scared';
+    if (action === 'waiting') return 'listening';
+    if (['sleeping', 'pending_decision', 'held', 'working', 'fetching', 'studying'].includes(action))
+      return action === 'pending_decision' ? 'pending' : action;
+    return 'sit';
+  }
+
+  showClip(video, clip, revision, onEnded) {
+    this.retireVideo(this.standby);
+    this.configure(video, clip, revision, onEnded);
+    video.style.opacity = '1';
+    setHidden(this.sit, true);
+    setHidden(video, false);
+    this.play(video, revision, onEnded);
+  }
+
+  crossfade(clip, revision, onEnded) {
+    const outgoing = this.video;
+    const incoming = this.standby;
+    this.configure(incoming, clip, revision, onEnded);
+    incoming.style.transition = `opacity ${clip.crossfadeMs}ms linear`;
+    outgoing.style.transition = `opacity ${clip.crossfadeMs}ms linear`;
+    incoming.style.opacity = '0';
+    outgoing.style.opacity = '1';
     setHidden(this.sit, true);
-    setHidden(this.video, false);
-    void this.video.play().catch(() => {
+    setHidden(outgoing, false);
+    setHidden(incoming, false);
+    this.play(incoming, revision, onEnded);
+    incoming.style.opacity = '1';
+    outgoing.style.opacity = '0';
+    this.video = incoming;
+    this.standby = outgoing;
+    this.fadeTimer = this.setTimer(() => {
+      this.fadeTimer = undefined;
       if (revision !== this.revision) return;
-      setHidden(this.video, true);
+      this.retireVideo(outgoing);
+    }, clip.crossfadeMs);
+  }
+
+  configure(video, clip, revision, onEnded) {
+    video.onended = null;
+    video.pause();
+    video.src = `./skins/xianxian-living/clips/${clip.name}.webm`;
+    video.loop = clip.loop === true;
+    video.playbackRate = clip.rate ?? 1;
+    video.style.width = `${clip.size[0] * scale}px`;
+    video.style.height = `${clip.size[1] * scale}px`;
+    const left = this.action === 'peek'
+      ? (this.root.dataset.dockEdge === 'left' ? -32 : 128 - clip.size[0] * scale)
+      : 60 - clip.centre * scale;
+    const top = this.action === 'peek' ? 138 - clip.size[1] * scale : groundY - clip.ground * scale;
+    video.style.left = `${left}px`;
+    video.style.top = `${top}px`;
+    video.style.animation = clip.endGround
+      ? `living-wake-anchor ${clip.durationMs}ms linear forwards` : 'none';
+    if (clip.endGround) {
+      video.style.setProperty?.('--living-left-start', `${left}px`);
+      video.style.setProperty?.('--living-top-start', `${top}px`);
+      video.style.setProperty?.('--living-left-end', `${60 - clip.endCentre * scale}px`);
+      video.style.setProperty?.('--living-top-end', `${groundY - clip.endGround * scale}px`);
+    }
+    try { video.currentTime = 0; } catch { /* New source is not yet seekable. */ }
+    video.onended = () => { if (revision === this.revision) onEnded(); };
+  }
+
+  play(video, revision, onEnded) {
+    void video.play().catch(() => {
+      if (revision !== this.revision) return;
+      this.hideVideos();
       setHidden(this.sit, false);
       onEnded();
     });
   }
+
+  hideVideos() {
+    for (const video of [this.video, this.standby]) {
+      this.retireVideo(video);
+    }
+  }
+
+  retireVideo(video) {
+    if (!video) return;
+    video.onended = null;
+    video.pause();
+    setHidden(video, true);
+  }
+
+  cancelFade() {
+    if (this.fadeTimer !== undefined) this.clearTimer(this.fadeTimer);
+    this.fadeTimer = undefined;
+  }
+
   close() {
     this.revision++;
-    this.video.onended = null;
-    this.video.pause();
+    this.cancelFade();
+    this.hideVideos();
   }
+
   hide() {
     this.close();
-    setHidden(this.video, true);
     setHidden(this.sit, true);
     this.action = '';
   }

package/renderer/living-edge.mjs

@@ -4,7 +4,13 @@ export function detectDockedEdge(win, petRect) {
   const width = win.screen?.availWidth;
   if (![win.screenX, left, width, petRect.left, petRect.width].every(Number.isFinite) || width <= 0) return null;
   const petLeft = win.screenX + petRect.left;
-  if (petLeft - left <= 40) return 'left';
-  if (left + width - petLeft - petRect.width <= 40) return 'right';
-  return null;
+  const edge = petLeft - left <= 40 ? 'left'
+    : left + width - petLeft - petRect.width <= 40 ? 'right' : null;
+  if (!edge) return null;
+  const top = win.screen?.availTop;
+  const height = win.screen?.availHeight;
+  const vertical = [win.screenY, top, height, petRect.top, petRect.height];
+  const atBottom = vertical.every(Number.isFinite) && height > 0
+    && top + height - (win.screenY + petRect.top + petRect.height) <= 40;
+  return { edge, zone: atBottom ? 'corner' : 'mid' };
 }

package/renderer/motion-facts.mjs

@@ -0,0 +1,79 @@
+const validId = value => typeof value === 'string' && value.length > 0 && value.length <= 256;
+const validExpiry = (value, now) => Number.isFinite(value) && value > now;
+const workKinds = new Set(['reasoning', 'tool', 'workspace', 'screen_reading']);
+
+/** A bounded, expiring projection of Host-owned motion facts. */
+export class MotionFacts {
+  constructor({ now, setTimer, clearTimer, changed }) {
+    this.now = now;
+    this.setTimer = setTimer;
+    this.clearTimer = clearTimer;
+    this.changed = changed;
+    this.snapshot = { work: null, delivery: null, travel: null };
+    this.seenResults = new Map();
+    this.suppressedTravel = new Map();
+  }
+
+  sync(value, suppressTravel = false) {
+    const now = this.now();
+    this.prune(now);
+    const input = value && typeof value === 'object' ? value : {};
+    const work = input.work;
+    const delivery = input.delivery;
+    const travel = input.travel;
+    this.snapshot = {
+      work: work && validId(work.taskId) && work.status === 'active' && workKinds.has(work.kind)
+        && validExpiry(work.expiresAt, now)
+        ? { taskId: work.taskId, kind: work.kind, expiresAt: work.expiresAt } : null,
+      delivery: delivery && validId(delivery.resultId) && delivery.status === 'applied'
+        && validExpiry(delivery.expiresAt, now)
+        ? { resultId: delivery.resultId, expiresAt: delivery.expiresAt } : null,
+      travel: travel && validId(travel.eventId) && travel.status === 'active' && Number.isFinite(travel.dx)
+        && Number.isFinite(travel.dy) && Math.hypot(travel.dx, travel.dy) >= 1
+        && validExpiry(travel.expiresAt, now) && !this.suppressedTravel.has(travel.eventId)
+        ? { eventId: travel.eventId, dx: travel.dx, dy: travel.dy, expiresAt: travel.expiresAt } : null,
+    };
+    if (suppressTravel) this.suppressTravel();
+    this.scheduleExpiry();
+  }
+
+  consumeDelivery() {
+    const delivery = this.snapshot.delivery;
+    if (!delivery || this.seenResults.has(delivery.resultId)) return null;
+    this.seenResults.set(delivery.resultId, this.now() + 3_600_000);
+    return delivery;
+  }
+
+  suppressTravel() {
+    if (!this.snapshot.travel) return;
+    this.suppressedTravel.set(this.snapshot.travel.eventId, this.now() + 3_600_000);
+    this.snapshot.travel = null;
+    this.scheduleExpiry();
+  }
+
+  close() {
+    if (this.timer !== undefined) this.clearTimer(this.timer);
+    this.timer = undefined;
+  }
+
+  scheduleExpiry() {
+    this.close();
+    const expiries = Object.values(this.snapshot).filter(Boolean).map(value => value.expiresAt);
+    if (!expiries.length) return;
+    this.timer = this.setTimer(() => {
+      this.timer = undefined;
+      const now = this.now();
+      for (const key of ['work', 'delivery', 'travel']) {
+        if (this.snapshot[key]?.expiresAt <= now) this.snapshot[key] = null;
+      }
+      this.scheduleExpiry();
+      this.changed();
+    }, Math.max(0, Math.min(...expiries) - this.now()));
+  }
+
+  prune(now) {
+    for (const collection of [this.seenResults, this.suppressedTravel]) {
+      for (const [id, expiresAt] of collection) if (expiresAt <= now) collection.delete(id);
+    }
+  }
+}

package/renderer/native-work-motion.mjs

@@ -0,0 +1,24 @@
+const priority = { reasoning: 1, tool: 2, workspace_fetch: 3, workspace_dispatch: 4, screen_read: 5 };
+const semantic = {
+  reasoning: 'reasoning',
+  tool: 'tool',
+  workspace_fetch: 'workspace',
+  workspace_dispatch: 'workspace',
+  screen_read: 'screen_reading',
+};
+
+/** Normalize the Host's bounded call snapshot; never infer work from chat text. */
+export function normalizeNativeWork(value, now = Date.now()) {
+  if (!value || typeof value !== 'object' || !Array.isArray(value.active) || !Array.isArray(value.recent)) return null;
+  const active = value.active
+    .filter(entry => entry && semantic[entry.kind] && Number.isFinite(entry.expiresAt) && entry.expiresAt > now)
+    .sort((left, right) => priority[right.kind] - priority[left.kind] || right.startedAt - left.startedAt)[0];
+  const handed = [...value.recent].reverse().find(event => event?.kind === 'result'
+    && event.phase === 'result_handed_to_voice' && typeof event.resultId === 'string'
+    && event.resultId.length > 0 && Number.isFinite(event.expiresAt) && event.expiresAt > now);
+  return {
+    work: active ? { taskId: active.taskId, kind: semantic[active.kind], status: 'active', expiresAt: active.expiresAt } : null,
+    delivery: handed ? { resultId: handed.resultId, status: 'applied', expiresAt: handed.expiresAt } : null,
+    travel: null,
+  };
+}

package/renderer/pet-motion.mjs

@@ -1,4 +1,5 @@
 import { isLivingClip } from './living-body.mjs';
+import { MotionFacts } from './motion-facts.mjs';
 
 // F229 pet.json frame durations, plus the three F258 rows pinned in source-lock.json.
 const atlas = {
@@ -17,10 +18,13 @@ const additional = {
   working: { file: 'xianxian-working-row.png', frames: [520, 560, 520, 640, 520, 560, 520, 640] },
   staged_thought: { file: 'xianxian-staged-thought-row.png', frames: [1200, 500, 700, 900, 1200, 500] },
 };
-const signals = { connected: 'waving', received: 'jumping', answered: 'review', failed: 'failed', play: 'play' };
+const visualAlias = { fetching: 'working', studying: 'staged_thought', delivering: 'review', held: 'idle' };
+const workAction = { reasoning: 'staged_thought', tool: 'working', workspace: 'fetching', screen_reading: 'studying' };
+const signals = { connected: 'waving', received: 'jumping', failed: 'failed' };
 const staticSkins = { 'ragdoll-v1': 'ragdoll-v1.png', 'yarn-ball': 'yarn-ball.png' };
+const validId = value => typeof value === 'string' && value.length > 0 && value.length <= 256;
 
-/** All animation choices come from Host state or a completed local gesture. */
+/** Select one truthful body from Host facts and local, user-controlled gestures. */
 export class PetMotion {
   constructor(element, options = {}) {
     this.element = element;
@@ -28,88 +32,206 @@ export class PetMotion {
     const clearTimer = options.clearTimer ?? globalThis.clearTimeout;
     this.setTimer = (callback, delay) => setTimer.call(globalThis, callback, delay);
     this.clearTimer = id => clearTimer.call(globalThis, id);
+    this.now = options.now ?? Date.now;
     this.livingBody = options.livingBody;
     this.reducedMotion = options.reducedMotion ?? globalThis.matchMedia?.('(prefers-reduced-motion: reduce)').matches ?? false;
+    this.autoPlay = options.autoPlay === true;
+    this.autoPlayIdleMs = Math.max(90_000, options.autoPlayIdleMs ?? 90_000);
+    this.autoPlayCooldownMs = Math.max(180_000, options.autoPlayCooldownMs ?? 180_000);
+    this.lastPlayAt = Number.NEGATIVE_INFINITY;
     this.skin = 'xianxian-codex';
     this.phase = 'idle';
     this.base = 'idle';
     this.action = '';
     this.frame = 0;
-    this.moving = false;
+    this.dragging = false;
     this.oneShot = false;
     this.pendingDecision = false;
     this.dockedEdge = null;
+    this.dockZone = null;
+    this.resting = false;
+    this.transient = null;
+    this.facts = new MotionFacts({ now: this.now, setTimer: this.setTimer, clearTimer: this.clearTimer,
+      changed: () => this.refresh() });
+    this.seenEvents = new Map();
   }
+
   setContext({ skin, phase, nativeActivity, muted }) {
-    this.context = { skin, phase, nativeActivity, muted };
-    const selectedSkin = ['xianxian-codex', 'yanyan-codex', ...Object.keys(staticSkins)].includes(skin) ? skin : 'xianxian-codex';
+    const selectedSkin = ['xianxian-codex', 'yanyan-codex', ...Object.keys(staticSkins)].includes(skin)
+      ? skin : 'xianxian-codex';
+    const wasSleeping = this.action === 'sleeping' || this.resting;
+    this.context = { skin: selectedSkin, phase, nativeActivity, muted };
     const changedSkin = selectedSkin !== this.skin;
-    const changedPhase = phase !== this.phase;
     this.skin = selectedSkin;
     this.phase = phase;
-    const requested = this.pendingDecision ? 'pending_decision' : nativeActivity === 'tool_running' ? 'working' : nativeActivity === 'reasoning' ? 'staged_thought'
-      : ['talking', 'connecting'].includes(phase) && !muted ? 'waiting' : this.dockedEdge ? 'peek' : 'idle';
-    const nextBase = this.resolve(requested);
-    const changedBase = nextBase !== this.base;
-    this.base = nextBase;
-    if (phase !== 'idle') this.cancelRest();
-    if (phase === 'idle' && changedPhase) { this.moving = false; this.oneShot = false; }
-    const waking = this.living() && !this.reducedMotion && this.action === 'sleeping' && this.base === 'waiting';
-    if (waking) { this.oneShot = true; this.play('waking'); }
-    else if (this.oneShot && this.action === 'waking' && ['working', 'staged_thought', 'pending_decision'].includes(this.base)) {
-      this.oneShot = false;
-      this.play(this.base);
-    } else if (!this.moving && !this.oneShot && (changedSkin || changedBase || changedPhase || !this.action)) this.play(this.base, changedSkin);
-    if (phase === 'idle' && this.action === 'idle') this.armRest();
+    if (phase !== 'idle' || nativeActivity !== 'none') {
+      this.resting = false;
+      this.cancelIdleTimers();
+    }
+    if (nativeActivity !== 'none' && this.transient?.action !== 'failed') this.transient = null;
+    else if (wasSleeping && ['talking', 'connecting'].includes(phase) && !muted)
+      this.transient = { action: 'waking' };
+    this.refresh(changedSkin);
   }
+
+  syncSnapshot(value) {
+    const now = this.now();
+    this.hasNativeWork = value !== null && value !== undefined;
+    for (const [id, expiresAt] of this.seenEvents) if (expiresAt <= now) this.seenEvents.delete(id);
+    this.facts.sync(value, this.dragging);
+    if (this.snapshot.work) {
+      this.resting = false;
+      this.cancelIdleTimers();
+      if (this.transient?.action !== 'failed') this.transient = null;
+    } else if (this.resting && (this.snapshot.delivery || this.snapshot.travel)) {
+      this.resting = false;
+      this.cancelRest();
+      this.transient = { action: 'waking' };
+    }
+    this.refresh();
+  }
+
   setPendingDecision(value) {
-    if (this.pendingDecision === value) return;
-    this.pendingDecision = value;
-    if (this.context) this.setContext(this.context);
-    if (value === true && this.oneShot) {
-      this.oneShot = false;
-      this.play(this.base);
+    const pending = value === true;
+    if (this.pendingDecision === pending) return;
+    this.pendingDecision = pending;
+    if (pending) {
+      this.resting = false;
+      this.transient = null;
+      this.cancelIdleTimers();
     }
+    this.refresh();
   }
+
   setDockedEdge(value) {
-    const edge = ['left', 'right'].includes(value) ? value : null;
-    if (this.dockedEdge === edge) return;
-    const previous = this.dockedEdge;
+    const candidate = typeof value === 'string' ? { edge: value, zone: 'corner' } : value;
+    const edge = ['left', 'right'].includes(candidate?.edge) ? candidate.edge : null;
+    const zone = edge && ['corner', 'mid'].includes(candidate?.zone) ? candidate.zone : edge ? 'corner' : null;
+    if (this.dockedEdge === edge && this.dockZone === zone) return;
     this.dockedEdge = edge;
-    if (this.context) this.setContext(this.context);
-    if (previous && edge && this.action === 'peek') this.play('peek', true);
+    this.dockZone = zone;
+    if (edge) this.cancelIdleTimers();
+    this.refresh(this.action === 'peek');
   }
-  signal(kind) {
-    const requested = kind === 'received' && this.living() && this.action === 'sleeping' ? 'waking' : signals[kind];
-    if (kind === 'play' && (this.pendingDecision || this.phase !== 'idle' || this.context?.nativeActivity !== 'none')) return;
-    if (!requested || this.moving || this.reducedMotion || staticSkins[this.skin]) return;
-    this.cancelRest();
-    this.oneShot = true;
-    this.play(this.resolve(requested));
+
+  signal(kind, eventId) {
+    if (kind === 'answered') return;
+    if (kind === 'connected' && this.living()) return;
+    if (kind === 'play') {
+      if (!this.canPlay()) return;
+      this.lastPlayAt = this.now();
+      this.resting = false;
+      this.cancelIdleTimers();
+      this.transient = { action: 'play' };
+      this.refresh();
+      return;
+    }
+    let requested = signals[kind];
+    if (kind === 'received' && (this.action === 'sleeping' || this.resting)) requested = 'waking';
+    if (!requested || this.dragging || staticSkins[this.skin]) return;
+    const now = this.now();
+    if (validId(eventId)) {
+      if (this.seenEvents.has(eventId)) return;
+      this.seenEvents.set(eventId, now + 3_600_000);
+    }
+    this.resting = false;
+    this.cancelIdleTimers();
+    this.transient = { action: requested };
+    this.refresh();
   }
+
   move(dx, dy) {
     if (!Number.isFinite(dx) || !Number.isFinite(dy) || Math.hypot(dx, dy) < 6) return;
-    this.moving = true;
-    this.oneShot = false;
-    this.cancelRest();
-    this.play(this.resolve(Math.abs(dx) >= Math.abs(dy) ? dx < 0 ? 'running-left' : 'running-right' : 'running'));
+    if (this.dragging) return;
+    this.dragging = true;
+    this.element.classList?.add('dragging');
+    this.element.dataset.interaction = 'held-candidate';
+    this.facts.suppressTravel();
+    this.resting = false;
+    this.transient = null;
+    this.cancelIdleTimers();
+    this.refresh();
   }
+
   stopMove() {
-    if (!this.moving) return;
-    this.moving = false;
-    this.play(this.base);
-    if (this.phase === 'idle') this.armRest();
+    if (!this.dragging) return;
+    this.dragging = false;
+    this.element.classList?.remove('dragging');
+    delete this.element.dataset.interaction;
+    this.refresh();
+  }
+
+  close() {
+    this.cancelFrame();
+    this.cancelIdleTimers();
+    this.facts.close();
+    this.livingBody?.close();
   }
-  close() { this.cancelFrame(); this.cancelRest(); this.livingBody?.close(); }
   living() { return this.skin === 'xianxian-codex' && Boolean(this.livingBody); }
   resolve(action) {
     if (action === 'pending_decision' && !this.living()) return 'waiting';
     if (action === 'peek' && !this.living()) return 'idle';
     if (staticSkins[this.skin]) return 'idle';
-    if (this.skin !== 'xianxian-codex' && action in additional)
-      return action === 'sleeping' ? 'idle' : 'review';
+    const visual = visualAlias[action] ?? action;
+    if (this.skin !== 'xianxian-codex' && visual in additional)
+      return visual === 'sleeping' ? 'idle' : 'review';
     return action;
   }
+
+  refresh(force = false) {
+    const selection = this.select();
+    this.base = this.baseAction();
+    const action = this.resolve(selection.action);
+    const changed = action !== this.action;
+    if (changed || force || selection.oneShot !== this.oneShot) {
+      this.oneShot = selection.oneShot;
+      this.play(action, force);
+    }
+    if (action === 'idle') this.armRest();
+    else if (action !== 'sleeping') this.cancelRest();
+  }
+
+  select() {
+    if (this.dragging) return { action: 'held', oneShot: false };
+    if (this.transient?.action === 'failed') return { action: 'failed', oneShot: true };
+    if (this.pendingDecision) return { action: 'pending_decision', oneShot: false };
+    const work = this.activeWorkAction();
+    if (work) return { action: work, oneShot: false };
+    if (this.transient && this.transient.action !== 'play')
+      return { action: this.transient.action, oneShot: true };
+    const delivery = this.facts.consumeDelivery();
+    if (delivery) {
+      this.transient = { action: 'delivering', resultId: delivery.resultId };
+      return { action: 'delivering', oneShot: true };
+    }
+    if (!this.reducedMotion && this.snapshot.travel) {
+      const { dx, dy } = this.snapshot.travel;
+      return { action: Math.abs(dx) >= Math.abs(dy) ? dx < 0 ? 'running-left' : 'running-right' : 'running', oneShot: false };
+    }
+    if (['talking', 'connecting'].includes(this.phase) && !this.context?.muted)
+      return { action: 'waiting', oneShot: false };
+    if (this.transient?.action === 'play') return { action: 'play', oneShot: true };
+    if (this.dockedEdge) return { action: 'peek', oneShot: false };
+    if (this.resting) return { action: 'sleeping', oneShot: false };
+    return { action: 'idle', oneShot: false };
+  }
+
+  baseAction() {
+    if (this.pendingDecision) return 'pending_decision';
+    const work = this.activeWorkAction();
+    if (work) return work;
+    if (['talking', 'connecting'].includes(this.phase) && !this.context?.muted) return 'waiting';
+    if (this.dockedEdge) return 'peek';
+    return 'idle';
+  }
+
+  activeWorkAction() {
+    if (this.snapshot.work) return workAction[this.snapshot.work.kind];
+    if (!this.hasNativeWork && this.context?.nativeActivity === 'tool_running') return 'working';
+    if (!this.hasNativeWork && this.context?.nativeActivity === 'reasoning') return 'staged_thought';
+    return null;
+  }
+
   play(action, force = false) {
     if (this.action === action && !force) return;
     this.cancelFrame();
@@ -118,11 +240,13 @@ export class PetMotion {
     this.paint();
     this.scheduleFrame();
   }
+
   paint() {
     const { style, dataset } = this.element;
     dataset.skin = this.skin;
     dataset.action = this.action;
     dataset.dockEdge = this.dockedEdge ?? 'none';
+    dataset.dockZone = this.dockZone ?? 'none';
     if (this.living()) {
       style.backgroundImage = 'none';
       this.livingBody.show(this.action, { reducedMotion: this.reducedMotion, onEnded: () => this.completeOneShot() });
@@ -136,27 +260,31 @@ export class PetMotion {
       style.backgroundPosition = 'center';
       return;
     }
-    const extra = this.skin === 'xianxian-codex' ? additional[this.action] : undefined;
+    const visual = visualAlias[this.action] ?? this.action;
+    const extra = this.skin === 'xianxian-codex' ? additional[visual] : undefined;
     style.backgroundImage = `url("./skins/${extra?.file ?? `${this.skin}.webp`}")`;
     style.backgroundSize = extra ? '960px 130px' : '960px 1170px';
-    style.backgroundPosition = `${-120 * this.frame}px ${-130 * (atlas[this.action]?.row ?? 0)}px`;
+    style.backgroundPosition = `${-120 * this.frame}px ${-130 * (atlas[visual]?.row ?? 0)}px`;
   }
+
   scheduleFrame() {
-    if (this.reducedMotion || staticSkins[this.skin]) return;
+    if (this.reducedMotion) {
+      if (this.oneShot) this.frameTimer = this.setTimer(() => { this.frameTimer = undefined; this.completeOneShot(); }, 1_000);
+      return;
+    }
+    if (staticSkins[this.skin]) return;
     if (this.living()) {
       if (isLivingClip(this.action) || !this.oneShot) return;
       this.frameTimer = this.setTimer(() => { this.frameTimer = undefined; this.completeOneShot(); }, 700);
       return;
     }
-    const frames = additional[this.action]?.frames ?? atlas[this.action]?.frames;
+    const visual = visualAlias[this.action] ?? this.action;
+    const frames = additional[visual]?.frames ?? atlas[visual]?.frames;
     if (!frames) return;
     this.frameTimer = this.setTimer(() => {
       this.frameTimer = undefined;
       if (this.frame + 1 === frames.length && this.oneShot) {
-        this.oneShot = false;
-        this.action = '';
-        this.play(this.base);
-        if (this.phase === 'idle') this.armRest();
+        this.completeOneShot();
         return;
       }
       this.frame = (this.frame + 1) % frames.length;
@@ -164,20 +292,59 @@ export class PetMotion {
       this.scheduleFrame();
     }, frames[this.frame]);
   }
-  cancelFrame() { if (this.frameTimer !== undefined) this.clearTimer(this.frameTimer); this.frameTimer = undefined; }
+
+  cancelFrame() {
+    if (this.frameTimer !== undefined) this.clearTimer(this.frameTimer);
+    this.frameTimer = undefined;
+  }
+
   completeOneShot() {
     if (!this.oneShot) return;
     this.oneShot = false;
+    this.transient = null;
     this.action = '';
-    this.play(this.base);
-    if (this.phase === 'idle') this.armRest();
+    this.refresh();
+  }
+
+  canPlay() {
+    return !this.reducedMotion && !this.dragging && !this.pendingDecision && this.phase === 'idle'
+      && !this.activeWorkAction() && !this.snapshot.delivery && !this.snapshot.travel && !this.dockedEdge
+      && !staticSkins[this.skin];
   }
+
   armRest() {
-    if (this.restTimer !== undefined || this.action === 'sleeping' || this.pendingDecision || this.dockedEdge) return;
-    this.restTimer = this.setTimer(() => {
-      this.restTimer = undefined;
-      if (this.phase === 'idle' && !this.moving && !this.oneShot) this.play(this.resolve('sleeping'));
-    }, 45_000);
+    if (this.restTimer === undefined && !this.resting && !this.pendingDecision && !this.dockedEdge) {
+      this.restTimer = this.setTimer(() => {
+        this.restTimer = undefined;
+        if (this.action === 'idle' && !this.dragging && !this.transient) {
+          this.resting = true;
+          this.refresh();
+        }
+      }, 45_000);
+    }
+    if (this.autoPlay && !this.reducedMotion && this.autoTimer === undefined) {
+      const delay = Math.max(this.autoPlayIdleMs, this.lastPlayAt + this.autoPlayCooldownMs - this.now());
+      this.autoTimer = this.setTimer(() => {
+        this.autoTimer = undefined;
+        if (!this.canPlay()) return;
+        this.lastPlayAt = this.now();
+        this.resting = false;
+        this.transient = { action: 'play' };
+        this.refresh();
+      }, delay);
+    }
   }
-  cancelRest() { if (this.restTimer !== undefined) this.clearTimer(this.restTimer); this.restTimer = undefined; }
+
+  cancelRest() {
+    if (this.restTimer !== undefined) this.clearTimer(this.restTimer);
+    this.restTimer = undefined;
+  }
+
+  cancelIdleTimers() {
+    this.cancelRest();
+    if (this.autoTimer !== undefined) this.clearTimer(this.autoTimer);
+    this.autoTimer = undefined;
+  }
+
+  get snapshot() { return this.facts.snapshot; }
 }

package/renderer/style.css

@@ -14,8 +14,9 @@ button:disabled { opacity: .45; cursor: default; }
 #pet.dragging { cursor: grabbing; }
 #pet[data-skin="xianxian-codex"] { position: relative; background-image: none; overflow: visible; }
 #living-sit { position: absolute; left: 0; bottom: 10px; width: 120px; height: 120px; overflow: visible; pointer-events: none; }
-#living-video { position: absolute; object-fit: fill; pointer-events: none; }
-#pet[data-direction="left"] #living-video { transform: scaleX(-1); }
+#living-video, #living-video-transition { position: absolute; object-fit: fill; pointer-events: none; }
+#pet[data-direction="left"] #living-video, #pet[data-direction="left"] #living-video-transition { transform: scaleX(-1); }
+#pet[data-action="held"] #living-sit { transform: translateY(-4px) scale(.98); transform-origin: 50% 80%; }
 #living-sit [data-layer="tail"] { transform-box: view-box; transform-origin: 168px 456px; animation: living-tail 3.4s ease-in-out infinite; }
 #living-sit [data-layer="head"] { transform-box: view-box; transform-origin: 300px 280px; animation: living-head 5.5s ease-in-out infinite; }
 #living-sit [data-layer="ear-left"], #living-sit [data-layer="ear-right"] { transform-box: view-box; }
@@ -40,6 +41,10 @@ button:disabled { opacity: .45; cursor: default; }
 @keyframes living-idle-ear-left { 0%, 68%, 76%, 100% { transform: rotate(0); } 71% { transform: rotate(-9deg); } 73% { transform: rotate(3deg); } }
 @keyframes living-idle-ear-right { 0%, 30%, 39%, 100% { transform: rotate(0); } 33% { transform: rotate(8deg); } 36% { transform: rotate(-3deg); } }
 @keyframes living-idle-blink { 0%, 24%, 30%, 74%, 80%, 100% { opacity: 0; } 25%, 29%, 75%, 79% { opacity: 1; } }
+@keyframes living-wake-anchor {
+  from { left: var(--living-left-start); top: var(--living-top-start); }
+  to { left: var(--living-left-end); top: var(--living-top-end); }
+}
 #indicators { position: absolute; bottom: 0; right: 0; display: flex; gap: 4px; }
 #indicators button { width: 32px; height: 32px; border: 1px solid #fff9; border-radius: 50%; display: grid; place-items: center; background: #236b59; color: white; box-shadow: 0 2px 5px #0003; }
 #indicators button:hover { background: #ab4842; }

package/renderer/surface.mjs

@@ -10,13 +10,15 @@ import { LivingBody } from './living-body.mjs';
 import { detectDockedEdge } from './living-edge.mjs';
 import { bindPetControls } from './pet-controls.mjs';
 import { decisionBadge, decisionRows } from './decision-view.mjs';
+import { normalizeNativeWork } from './native-work-motion.mjs';
 
 const $ = id => document.getElementById(id);
 const label = (id, text) => { $(id).querySelector('.label').textContent = text; };
 const status = text => { $('status').textContent = text; $('chat-status').textContent = text; $('announcement').textContent = text; };
 const transcript = new TranscriptView($('transcript'));
 const bubble = new RecentBubble([$('bubble-first'), $('bubble-second')]);
-const motion = new PetMotion($('pet'), { livingBody: new LivingBody({ root: $('pet'), sit: $('living-sit'), video: $('living-video') }) });
+const motion = new PetMotion($('pet'), { livingBody: new LivingBody({ root: $('pet'), sit: $('living-sit'),
+  video: $('living-video'), transitionVideo: $('living-video-transition') }) });
 let sharing = false, pendingScreen = false, loading = false, latestHistory, previousPhase = 'idle';
 let observedHistory = false, lastAssistantId;
 let resultPreviewUntil = 0;
@@ -38,6 +40,7 @@ if (!window.clowderCompanion) {
       motion.stopMove();
       if (!didMove) return;
       didMove = false;
+      void conversation.refresh();
       setTimeout(() => motion.setDockedEdge(detectDockedEdge(window, $('pet').getBoundingClientRect())), 100);
     },
     changed: panel => { if (panel === 'chat') void readHistory(); if (panel === 'decisions') void readDecisions(); },
@@ -79,7 +82,7 @@ if (!window.clowderCompanion) {
   const conversation = new CompanionConversation({
     client, createPeer: callback => new VoicePeer(callback, client), stopScreen: () => screen.stop(),
     transcript: event => {
-      if (event.type === 'turn-done') { transcript.finish(event); bubble.finish(event.role); if (event.role === 'assistant') motion.signal('answered'); void readHistory(); }
+      if (event.type === 'turn-done') { transcript.finish(event); bubble.finish(event.role); void readHistory(); }
       else if (event.typed) void readHistory();
       else { transcript.append(event.role, event.text, true); bubble.append(event.role, event.text); void controls.setAmbient(true); }
     },
@@ -106,6 +109,7 @@ if (!window.clowderCompanion) {
       label('speaker', value.silent ? '开启播音' : '关闭播音');
       const identity = value.identity;
       motion.setContext({ skin: identity?.skin, phase: value.phase, nativeActivity: identity?.nativeActivity ?? 'none', muted: value.muted });
+      motion.syncSnapshot(normalizeNativeWork(identity?.nativeWork));
       if (justConnected) motion.signal('connected');
       if (showFailure) motion.signal('failed');
       if (identity) {
@@ -114,7 +118,11 @@ if (!window.clowderCompanion) {
         $('pet').setAttribute('aria-label', `${identity.displayName}：点击交流，右键更多，拖动移动`);
         $('documents').querySelector('.menu-status').textContent = identity.documentsAllowed ? '开启' : '暂停';
         $('documents').setAttribute('aria-pressed', String(identity.documentsAllowed));
-        $('connection-scope').textContent = identity.duty.catId === identity.carrier.catId ? '交流保存在同一段聊天中' : `${identity.duty.displayName} · 实时语音由${identity.carrier.displayName}承载`;
+        const live = identity.liveTransport?.kind === 'gpt_live_v3'
+          ? 'GPT Live · 实时型号未证实' : '实时载体未确认';
+        $('connection-scope').textContent = identity.duty.catId === identity.carrier.catId
+          ? `${identity.duty.displayName} · ${live}`
+          : `${identity.duty.displayName} · ${live} · 绑定载体 ${identity.carrier.displayName}`;
       }
       if (showFailure) void controls.show('actions');
     },
@@ -126,7 +134,6 @@ if (!window.clowderCompanion) {
       const history = await client.readConversation();
       const assistantId = history.messages.findLast(message => message.role === 'assistant')?.id;
       if (observedHistory && assistantId && assistantId !== lastAssistantId) {
-        motion.signal('answered');
         resultPreviewUntil = Date.now() + 12_000;
       }
       observedHistory = true;

package/source-lock.json

@@ -68,8 +68,8 @@
     }
   ],
   "livingSkin": {
-    "package": "xianxian-living package-v2",
-    "manifestSha256": "08491ed557a82bc1860bbaeecd094f4a7e637479e78af8b411786f19a5164da0",
+    "package": "xianxian-living package-v3",
+    "manifestSha256": "a7434caa0cd559bfb8747a9d9391fb5219d4c4a68639b5b669008dd7c7b67aaf",
     "creator": "opus55; keyframes by codex-astra; source videos by CVO",
     "files": [
       {
@@ -130,16 +130,20 @@
       },
       {
         "destination": "assets/skins/xianxian-living/clips/sleep.webm",
-        "sha256": "e39554e7aca7b1c51b388b73f7dbc08e3fa7ddafef395cb28c1099d41a9b41d8"
+        "sha256": "f53ae41cc7722128e68f4b5cf3df980be216a79f8cc4b8dff36fa0dc029dbca9"
       },
       {
         "destination": "assets/skins/xianxian-living/clips/wake.webm",
-        "sha256": "73b455088e53edf2849e888e0ecb99953f7e5dba373592fb6232f9736b6da3a0"
+        "sha256": "8821cb764d7ca085f4b30dec2f893f2515d383cc1f2053215e91b18b86753cd7"
       },
       {
         "destination": "assets/skins/xianxian-living/clips/peek.webm",
         "sha256": "adebecf89b724eec9852d097364e10bc328d006ce3bb3bd3f4b257c095d57a92"
       },
+      {
+        "destination": "assets/skins/xianxian-living/clips/peek_fade.webm",
+        "sha256": "7880e695fa8afe783c4f1fcb4fc1c31c12d64d36f3d124dc4ef929ad09f7ffef"
+      },
       {
         "destination": "assets/skins/xianxian-living/clips/carry.webm",
         "sha256": "4fa582ab6a18b538cfe815ab19e73da30c0da061ec661bb12e4060f8b3d2e600"