@clowder-ai/companion 0.1.0-alpha.10 → 0.1.0-alpha.12

package/README.md

@@ -26,11 +26,13 @@ SDP. Hiding releases media; the existing Clowder **聊聊** entry restores the c
 
 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.
+screen reading and applied-result delivery. Native travel is independent: the
+renderer observes the actual desktop window coordinates, so a running clip can
+appear only after the Host window really moves. Dragging suppresses that
+observer and freezes a visibly held candidate instead of renaming 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; a compatible Host also revokes its native movement lease.
 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.

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "pluginId": "official.companion",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.12",
   "contractVersion": "0.1.0",
   "name": "猫猫球",
   "icon": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clowder-ai/companion",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.12",
   "description": "The desktop voice body for your Clowder companion",
   "license": "MIT",
   "type": "module",

package/plugin.yaml

@@ -1,6 +1,6 @@
 {
   "pluginId": "official.companion",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.12",
   "contractVersion": "0.1.0",
   "name": "猫猫球",
   "icon": {

package/renderer/companion-identity.mjs

@@ -0,0 +1,41 @@
+const named = value => typeof value === 'string' && value.trim().length > 0;
+const actor = value => value && named(value.catId) && named(value.displayName);
+const model = value => value === null || (named(value) && value.length <= 160);
+
+function validSnapshot(value) {
+  return value?.v === 1 && value.name === '猫猫球'
+    && actor(value.partner) && named(value.partner.skin)
+    && actor(value.live) && value.live.transport === 'gpt_live_v3' && model(value.live.verifiedModel)
+    && actor(value.deep) && value.deep.catId === value.partner.catId && model(value.deep.verifiedModel);
+}
+
+function display(snapshot, partnerLabel) {
+  return {
+    title: snapshot.name,
+    companionKnown: true,
+    partnerLabel,
+    avatarCatId: snapshot.partner.catId,
+    skin: snapshot.partner.skin,
+    liveLabel: `Live 快端：${snapshot.live.displayName} · ${snapshot.live.verifiedModel ?? '型号未核实'}`,
+    deepLabel: `深思端：${snapshot.deep.displayName} · ${snapshot.deep.verifiedModel ?? '型号未核实'}`,
+  };
+}
+
+/** The current face comes from the Host's selected duty, never the background carrier. */
+export function currentCompanionIdentity(state) {
+  if (!actor(state?.duty) || !actor(state?.carrier) || !named(state.skin)
+    || state.liveTransport?.kind !== 'gpt_live_v3' || !model(state.liveTransport.verifiedModel)) return null;
+  const snapshot = {
+    v: 1, name: '猫猫球',
+    partner: { ...state.duty, skin: state.skin },
+    live: { ...state.carrier, transport: state.liveTransport.kind, verifiedModel: state.liveTransport.verifiedModel },
+    deep: { ...state.duty, verifiedModel: null },
+  };
+  return display(snapshot, `${snapshot.partner.displayName}陪伴中`);
+}
+
+/** A missing old snapshot never borrows today's preference. Keep the message's real author visible. */
+export function historicalCompanionIdentity(snapshot, authorLabel) {
+  if (!validSnapshot(snapshot)) return { authorLabel, companionKnown: false };
+  return { ...display(snapshot, `当时由${snapshot.partner.displayName}陪伴`), authorLabel };
+}

package/renderer/living-body.mjs

@@ -1,24 +1,5 @@
-// 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 = {
-  'running-left': { name: 'trot', size: [265, 236], ground: 234.8, centre: 132.5, loop: true },
-  '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: [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);
+import { isLivingClip, livingClipFor, placeLivingClip } from './living-geometry.mjs';
+export { isLivingClip } from './living-geometry.mjs';
 const setHidden = (node, hidden) => {
   if (!node) return;
   node.toggleAttribute?.('hidden', hidden);
@@ -51,10 +32,7 @@ export class LivingBody {
     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;
+    const clip = !reducedMotion ? livingClipFor(action, dockZone) : null;
     if (!clip) {
       this.hideVideos();
       setHidden(this.sit, false);
@@ -111,21 +89,18 @@ export class LivingBody {
     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`;
+    const placement = placeLivingClip(this.action, clip, this.root.dataset.dockEdge);
+    video.style.width = `${placement.width}px`;
+    video.style.height = `${placement.height}px`;
+    video.style.left = `${placement.left}px`;
+    video.style.top = `${placement.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`);
+      video.style.setProperty?.('--living-left-start', `${placement.left}px`);
+      video.style.setProperty?.('--living-top-start', `${placement.top}px`);
+      video.style.setProperty?.('--living-left-end', `${placement.endLeft}px`);
+      video.style.setProperty?.('--living-top-end', `${placement.endTop}px`);
     }
     try { video.currentTime = 0; } catch { /* New source is not yet seekable. */ }
     video.onended = () => { if (revision === this.revision) onEnded(); };

package/renderer/living-geometry.mjs

@@ -0,0 +1,96 @@
+// F317 living Xianxian package v3. All values are reviewed package CSS anchors;
+// every clip uses one stage scale. content bounds are the union of decoded
+// alpha pixels and exist to size the native transparent surface, not to apply
+// per-action "looks right" scaling.
+export const LIVING_GEOMETRY = Object.freeze({
+  pet: Object.freeze({ width: 120, height: 130 }),
+  stage: Object.freeze({ size: 290, centre: 145, ground: 262.5 }),
+  surface: Object.freeze({ left: -32, top: -18, right: 143, bottom: 138 }),
+  sitContent: Object.freeze({ left: 8.8, top: 3.4, right: 94.2, bottom: 109.2 }),
+});
+
+export const LIVING_SCALE = LIVING_GEOMETRY.pet.width / LIVING_GEOMETRY.stage.size;
+export const LIVING_REFERENCE = Object.freeze({
+  centre: LIVING_GEOMETRY.stage.centre * LIVING_SCALE,
+  ground: LIVING_GEOMETRY.stage.ground * LIVING_SCALE,
+});
+
+const clip = (name, size, ground, centre, content, options = {}) => Object.freeze({
+  name, size: Object.freeze(size), ground, centre, content: Object.freeze(content), ...options,
+});
+
+const library = Object.freeze({
+  trot: clip('trot', [265, 236], 234.8, 132.5,
+    { left: 1.5, top: 2, right: 263.5, bottom: 235.5 }, { loop: true }),
+  pounce: clip('pounce', [304.8, 312.6], 303.9, 201.9,
+    { left: 3, top: 0, right: 302, bottom: 312 }, { rate: 1.5 }),
+  sleep: clip('sleep', [271.2, 168], 161, 133.2,
+    { left: 2.5, top: 2.5, right: 268.5, bottom: 166.5 }, { loop: true }),
+  wake: clip('wake', [400.2, 282.7], 244.2, 200.5,
+    { left: 3, top: 3, right: 397, bottom: 280.5 },
+    { endGround: 277.4, endCentre: 197.7, durationMs: 7_250, crossfadeMs: 250 }),
+  peek: clip('peek', [153.5, 234.3], 234.3, 76.75,
+    { left: 2.5, top: 2.5, right: 153, bottom: 234 }, { loop: true }),
+  peek_fade: clip('peek_fade', [153.5, 234.3], 234.3, 76.75,
+    { left: 2.5, top: 2.5, right: 153, bottom: 231.5 }, { loop: true }),
+  carry: clip('carry', [344.3, 290.9], 263, 198.3,
+    { left: 4, top: 4, right: 340, bottom: 288.5 }),
+  wait: clip('wait', [197.9, 252.8], 249.6, 98.4,
+    { left: 4, top: 4, right: 194, bottom: 251 }, { loop: true }),
+  think: clip('think', [266.4, 256.9], 253.7, 132.1,
+    { left: 3.5, top: 3.5, right: 262, bottom: 255 }, { loop: true }),
+});
+
+const actionClip = Object.freeze({
+  'running-left': 'trot',
+  'running-right': 'trot',
+  running: 'trot',
+  play: 'pounce',
+  sleeping: 'sleep',
+  waking: 'wake',
+  peek: 'peek',
+  delivering: 'carry',
+  review: 'carry',
+  pending_decision: 'wait',
+  working: 'think',
+  fetching: 'think',
+  studying: 'think',
+  staged_thought: 'think',
+});
+
+export const isLivingClip = action => Object.hasOwn(actionClip, action);
+
+export function livingClipFor(action, dockZone) {
+  const name = action === 'peek' && dockZone !== 'corner' ? 'peek_fade' : actionClip[action];
+  return name ? library[name] : null;
+}
+
+export function placeLivingClip(action, selected, dockEdge) {
+  const width = selected.size[0] * LIVING_SCALE;
+  const height = selected.size[1] * LIVING_SCALE;
+  const left = action === 'peek'
+    ? (dockEdge === 'left' ? LIVING_GEOMETRY.surface.left : LIVING_GEOMETRY.surface.right - width)
+    : LIVING_REFERENCE.centre - selected.centre * LIVING_SCALE;
+  const top = action === 'peek'
+    ? LIVING_GEOMETRY.surface.bottom - height
+    : LIVING_REFERENCE.ground - selected.ground * LIVING_SCALE;
+  return Object.freeze({
+    left, top, width, height,
+    endLeft: selected.endCentre === undefined
+      ? undefined : LIVING_REFERENCE.centre - selected.endCentre * LIVING_SCALE,
+    endTop: selected.endGround === undefined
+      ? undefined : LIVING_REFERENCE.ground - selected.endGround * LIVING_SCALE,
+  });
+}
+
+export function livingContentRect(selected, placement, endpoint = 'start') {
+  const left = endpoint === 'end' ? placement.endLeft : placement.left;
+  const top = endpoint === 'end' ? placement.endTop : placement.top;
+  if (!Number.isFinite(left) || !Number.isFinite(top)) return null;
+  return Object.freeze({
+    left: left + selected.content.left * LIVING_SCALE,
+    top: top + selected.content.top * LIVING_SCALE,
+    right: left + selected.content.right * LIVING_SCALE,
+    bottom: top + selected.content.bottom * LIVING_SCALE,
+  });
+}

package/renderer/motion-facts.mjs

@@ -1,6 +1,11 @@
 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']);
+const normalizeTravel = (travel, now, suppressed) => 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)
+  && !suppressed.has(travel.eventId)
+  ? { eventId: travel.eventId, dx: travel.dx, dy: travel.dy, expiresAt: travel.expiresAt } : null;
 
 /** A bounded, expiring projection of Host-owned motion facts. */
 export class MotionFacts {
@@ -28,15 +33,39 @@ export class MotionFacts {
       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,
+      travel: normalizeTravel(travel, now, this.suppressedTravel),
     };
     if (suppressTravel) this.suppressTravel();
     this.scheduleExpiry();
   }
 
+  syncNative(value) {
+    const now = this.now();
+    this.prune(now);
+    const input = value && typeof value === 'object' ? value : {};
+    const work = input.work;
+    const delivery = input.delivery;
+    const travel = this.snapshot.travel?.expiresAt > now ? this.snapshot.travel : null;
+    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,
+    };
+    this.scheduleExpiry();
+  }
+
+  syncTravel(value, suppressTravel = false) {
+    const now = this.now();
+    this.prune(now);
+    this.snapshot.travel = normalizeTravel(value, now, this.suppressedTravel);
+    if (suppressTravel) this.suppressTravel();
+    this.scheduleExpiry();
+  }
+
   consumeDelivery() {
     const delivery = this.snapshot.delivery;
     if (!delivery || this.seenResults.has(delivery.resultId)) return null;

package/renderer/native-window-travel.mjs

@@ -0,0 +1,89 @@
+const validPosition = value => value && Number.isFinite(value.x) && Number.isFinite(value.y);
+
+/** Observe the native window itself. Running animation follows measured desktop
+ * movement; renderer state never invents a target or claims a move succeeded. */
+export class NativeWindowTravel {
+  constructor({
+    readPosition,
+    changed,
+    now = Date.now,
+    setTimer = globalThis.setTimeout,
+    clearTimer = globalThis.clearTimeout,
+    intervalMs = 80,
+    expiresMs = 240,
+  }) {
+    this.readPosition = readPosition;
+    this.changed = changed;
+    this.now = now;
+    this.setTimer = (callback, delay) => setTimer.call(globalThis, callback, delay);
+    this.clearTimer = id => clearTimer.call(globalThis, id);
+    this.intervalMs = Math.max(32, intervalMs);
+    this.expiresMs = Math.max(this.intervalMs, expiresMs);
+    this.sequence = 0;
+    this.manual = false;
+    this.closed = false;
+    this.active = null;
+  }
+
+  start() {
+    if (this.closed || this.timer !== undefined) return;
+    this.previous = this.read();
+    this.schedule();
+  }
+
+  setManual(value) {
+    const manual = value === true;
+    if (manual === this.manual) return;
+    this.manual = manual;
+    this.previous = this.read();
+    if (manual) this.clearActive();
+  }
+
+  tick() {
+    this.timer = undefined;
+    if (this.closed) return;
+    const next = this.read();
+    const now = this.now();
+    if (next && this.previous) {
+      const dx = next.x - this.previous.x;
+      const dy = next.y - this.previous.y;
+      if (!this.manual && Math.hypot(dx, dy) >= 1) {
+        const eventId = this.active?.eventId ?? `native-${Math.trunc(now)}-${++this.sequence}`;
+        this.active = { eventId, status: 'active', dx, dy, expiresAt: now + this.expiresMs };
+        this.changed({ ...this.active });
+      } else if (this.active && this.active.expiresAt <= now) {
+        this.clearActive();
+      }
+    }
+    this.previous = next;
+    this.schedule();
+  }
+
+  close() {
+    if (this.closed) return;
+    this.closed = true;
+    if (this.timer !== undefined) this.clearTimer(this.timer);
+    this.timer = undefined;
+    this.clearActive();
+  }
+
+  read() {
+    try {
+      const value = this.readPosition();
+      return validPosition(value) ? { x: value.x, y: value.y } : null;
+    } catch {
+      return null;
+    }
+  }
+
+  schedule() {
+    if (this.closed || this.timer !== undefined) return;
+    this.timer = this.setTimer(() => this.tick(), this.intervalMs);
+  }
+
+  clearActive() {
+    if (!this.active) return;
+    this.active = null;
+    this.changed(null);
+  }
+}

package/renderer/pet-motion-assets.mjs

@@ -0,0 +1,22 @@
+// F229 pet.json frame durations, plus the three F258 rows pinned in source-lock.json.
+export const atlas = {
+  idle: { row: 0, frames: [1200, 400, 400, 500, 500, 800] },
+  'running-right': { row: 1, frames: [120, 120, 120, 120, 120, 120, 120, 220] },
+  'running-left': { row: 2, frames: [120, 120, 120, 120, 120, 120, 120, 220] },
+  waving: { row: 3, frames: [140, 140, 140, 280] },
+  jumping: { row: 4, frames: [140, 140, 140, 140, 280] },
+  failed: { row: 5, frames: [140, 140, 140, 140, 140, 140, 140, 240] },
+  waiting: { row: 6, frames: [150, 150, 150, 150, 150, 260] },
+  running: { row: 7, frames: [120, 120, 120, 120, 120, 220] },
+  review: { row: 8, frames: [150, 150, 150, 150, 150, 280] },
+};
+export const additional = {
+  sleeping: { file: 'xianxian-sleeping-row.png', frames: [700, 700, 700, 700, 700, 700] },
+  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] },
+};
+export const visualAlias = { fetching: 'working', studying: 'staged_thought', delivering: 'review', held: 'idle' };
+export const workAction = { reasoning: 'staged_thought', tool: 'working', workspace: 'fetching', screen_reading: 'studying' };
+export const signals = { connected: 'waving', received: 'jumping', failed: 'failed' };
+export const staticSkins = { 'ragdoll-v1': 'ragdoll-v1.png', 'yarn-ball': 'yarn-ball.png' };
+export const validId = value => typeof value === 'string' && value.length > 0 && value.length <= 256;

package/renderer/pet-motion.mjs

@@ -1,28 +1,6 @@
 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 = {
-  idle: { row: 0, frames: [1200, 400, 400, 500, 500, 800] },
-  'running-right': { row: 1, frames: [120, 120, 120, 120, 120, 120, 120, 220] },
-  'running-left': { row: 2, frames: [120, 120, 120, 120, 120, 120, 120, 220] },
-  waving: { row: 3, frames: [140, 140, 140, 280] },
-  jumping: { row: 4, frames: [140, 140, 140, 140, 280] },
-  failed: { row: 5, frames: [140, 140, 140, 140, 140, 140, 140, 240] },
-  waiting: { row: 6, frames: [150, 150, 150, 150, 150, 260] },
-  running: { row: 7, frames: [120, 120, 120, 120, 120, 220] },
-  review: { row: 8, frames: [150, 150, 150, 150, 150, 280] },
-};
-const additional = {
-  sleeping: { file: 'xianxian-sleeping-row.png', frames: [700, 700, 700, 700, 700, 700] },
-  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 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;
+import { additional, atlas, signals, staticSkins, validId, visualAlias, workAction } from './pet-motion-assets.mjs';
 
 /** Select one truthful body from Host facts and local, user-controlled gestures. */
 export class PetMotion {
@@ -75,10 +53,19 @@ export class PetMotion {
   }
 
   syncSnapshot(value) {
+    this.syncFacts(value, false);
+  }
+
+  syncNativeSnapshot(value) {
+    this.syncFacts(value, true);
+  }
+
+  syncFacts(value, nativeOnly) {
     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 (nativeOnly) this.facts.syncNative(value);
+    else this.facts.sync(value, this.dragging);
     if (this.snapshot.work) {
       this.resting = false;
       this.cancelIdleTimers();
@@ -91,6 +78,16 @@ export class PetMotion {
     this.refresh();
   }
 
+  syncTravel(value) {
+    this.facts.syncTravel(value, this.dragging);
+    if (this.resting && this.snapshot.travel) {
+      this.resting = false;
+      this.cancelRest();
+      this.transient = { action: 'waking' };
+    }
+    this.refresh();
+  }
+
   setPendingDecision(value) {
     const pending = value === true;
     if (this.pendingDecision === pending) return;
@@ -179,6 +176,7 @@ export class PetMotion {
   }
 
   refresh(force = false) {
+    this.element.dataset.listening = String(this.listening());
     const selection = this.select();
     this.base = this.baseAction();
     const action = this.resolve(selection.action);
@@ -208,10 +206,9 @@ export class PetMotion {
       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.listening()) return { action: 'waiting', oneShot: false };
     if (this.resting) return { action: 'sleeping', oneShot: false };
     return { action: 'idle', oneShot: false };
   }
@@ -220,11 +217,13 @@ export class PetMotion {
     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';
+    if (this.listening()) return 'waiting';
     return 'idle';
   }
 
+  listening() { return ['talking', 'connecting'].includes(this.phase) && !this.context?.muted; }
+
   activeWorkAction() {
     if (this.snapshot.work) return workAction[this.snapshot.work.kind];
     if (!this.hasNativeWork && this.context?.nativeActivity === 'tool_running') return 'working';

package/renderer/surface.mjs

@@ -11,6 +11,8 @@ 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';
+import { NativeWindowTravel } from './native-window-travel.mjs';
+import { currentCompanionIdentity } from './companion-identity.mjs';
 
 const $ = id => document.getElementById(id);
 const label = (id, text) => { $(id).querySelector('.label').textContent = text; };
@@ -19,6 +21,10 @@ 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'), transitionVideo: $('living-video-transition') }) });
+const nativeTravel = new NativeWindowTravel({
+  readPosition: () => ({ x: window.screenX, y: window.screenY }),
+  changed: value => motion.syncTravel(value),
+});
 let sharing = false, pendingScreen = false, loading = false, latestHistory, previousPhase = 'idle';
 let observedHistory = false, lastAssistantId;
 let resultPreviewUntil = 0;
@@ -32,11 +38,13 @@ if (!window.clowderCompanion) {
   status('请从 Clowder 的聊聊入口打开猫猫球');
   document.querySelectorAll('button').forEach(button => { button.disabled = true; });
 } else {
+  nativeTravel.start();
   const client = createCompanionClient(window.clowderCompanion);
   const controls = bindPetControls(client, {
     error: error => status(explainError(error)),
     moved: (dx, dy) => {
-      if (dx !== 'stop') { didMove = true; motion.move(dx, dy); return; }
+      if (dx !== 'stop') { didMove = true; nativeTravel.setManual(true); motion.move(dx, dy); return; }
+      nativeTravel.setManual(false);
       motion.stopMove();
       if (!didMove) return;
       didMove = false;
@@ -108,21 +116,28 @@ if (!window.clowderCompanion) {
       label('mic', value.muted ? '取消静音' : '静音'); $('mic').setAttribute('aria-pressed', String(value.muted));
       label('speaker', value.silent ? '开启播音' : '关闭播音');
       const identity = value.identity;
+      const companionIdentity = currentCompanionIdentity(identity);
       motion.setContext({ skin: identity?.skin, phase: value.phase, nativeActivity: identity?.nativeActivity ?? 'none', muted: value.muted });
-      motion.syncSnapshot(normalizeNativeWork(identity?.nativeWork));
+      motion.syncNativeSnapshot(normalizeNativeWork(identity?.nativeWork));
       if (justConnected) motion.signal('connected');
       if (showFailure) motion.signal('failed');
       if (identity) {
         $('menu-play').hidden = identity.skin !== 'xianxian-codex';
-        $('chat-name').textContent = threadTitle ?? identity.displayName; $('menu-name').textContent = identity.displayName;
-        $('pet').setAttribute('aria-label', `${identity.displayName}：点击交流，右键更多，拖动移动`);
+        const companionLabel = companionIdentity
+          ? `${companionIdentity.title} · ${companionIdentity.partnerLabel}` : identity.displayName;
+        $('chat-name').textContent = threadTitle ?? companionLabel; $('menu-name').textContent = companionLabel;
+        $('pet').setAttribute('aria-label', `${companionLabel}：点击交流，右键更多，拖动移动`);
         $('documents').querySelector('.menu-status').textContent = identity.documentsAllowed ? '开启' : '暂停';
         $('documents').setAttribute('aria-pressed', String(identity.documentsAllowed));
-        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 (companionIdentity) {
+          $('connection-scope').textContent = `${companionIdentity.partnerLabel} · ${companionIdentity.liveLabel} · ${companionIdentity.deepLabel}`;
+        } else {
+          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');
     },
@@ -227,6 +242,6 @@ if (!window.clowderCompanion) {
   void conversation.refresh(); void readHistory(); void readDecisions(); void controls.show('none');
   window.addEventListener('beforeunload', () => {
     clearInterval(statusMonitor); clearInterval(historyMonitor); clearInterval(decisionMonitor);
-    unsubscribe(); motion.close(); void conversation.end();
+    unsubscribe(); nativeTravel.close(); motion.close(); void conversation.end();
   });
 }