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

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "pluginId": "official.companion",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.11",
   "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.11",
   "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.11",
   "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/pet-motion.mjs

@@ -179,6 +179,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 +209,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 +220,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,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 { currentCompanionIdentity } from './companion-identity.mjs';
 
 const $ = id => document.getElementById(id);
 const label = (id, text) => { $(id).querySelector('.label').textContent = text; };
@@ -108,21 +109,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));
       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');
     },