@clowder-ai/companion 0.1.0-alpha.11 → 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.11",
+  "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.11",
+  "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.11",
+  "version": "0.1.0-alpha.12",
   "contractVersion": "0.1.0",
   "name": "猫猫球",
   "icon": {

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;

package/renderer/surface.mjs

@@ -11,6 +11,7 @@ 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);
@@ -20,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;
@@ -33,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;
@@ -111,7 +118,7 @@ if (!window.clowderCompanion) {
       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) {
@@ -235,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();
   });
 }