@clowder-ai/companion 0.1.0-alpha.13 → 0.1.0-alpha.14

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "pluginId": "official.companion",
-  "version": "0.1.0-alpha.13",
+  "version": "0.1.0-alpha.14",
   "contractVersion": "0.1.0",
   "name": "猫猫球",
   "icon": {
@@ -40,7 +40,7 @@
       "bridgeVersion": "1.3.0",
       "surface": {
         "entrypoint": "renderer/index.html",
-        "integrity": "sha256-vGmfNZUU2zOlDNsQUqPjrvcwmO6p+Qdi3aPwlI8Wcyc="
+        "integrity": "sha256-UH8VFfr3q9a5gI2pPPXinKzCTjaGI8ZdvrJngy6i+M0="
       },
       "presentation": {
         "width": 300,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clowder-ai/companion",
-  "version": "0.1.0-alpha.13",
+  "version": "0.1.0-alpha.14",
   "description": "The desktop voice body for your Clowder companion",
   "license": "MIT",
   "type": "module",
@@ -21,13 +21,15 @@
   "scripts": {
     "build": "node scripts/build.mjs",
     "test": "node --test test/*.test.mjs",
+    "test:browser": "pnpm build && node --test test/panel-layout.browser.mjs",
     "typecheck": "node scripts/check.mjs",
     "lint": "node scripts/check.mjs",
     "prepack": "pnpm build"
   },
   "devDependencies": {
-    "@clowder-ai/plugin-contract": "0.1.0-beta.21",
-    "@clowder-ai/plugin-sdk": "0.1.0-beta.17"
+    "@clowder-ai/plugin-contract": "0.1.0-beta.23",
+    "@clowder-ai/plugin-sdk": "0.1.0-beta.19",
+    "playwright": "1.61.1"
   },
   "repository": {
     "type": "git",

package/plugin.yaml

@@ -1,6 +1,6 @@
 {
   "pluginId": "official.companion",
-  "version": "0.1.0-alpha.13",
+  "version": "0.1.0-alpha.14",
   "contractVersion": "0.1.0",
   "name": "猫猫球",
   "icon": {
@@ -40,7 +40,7 @@
       "bridgeVersion": "1.3.0",
       "surface": {
         "entrypoint": "renderer/index.html",
-        "integrity": "sha256-vGmfNZUU2zOlDNsQUqPjrvcwmO6p+Qdi3aPwlI8Wcyc="
+        "integrity": "sha256-UH8VFfr3q9a5gI2pPPXinKzCTjaGI8ZdvrJngy6i+M0="
       },
       "presentation": {
         "width": 300,

package/renderer/call-transcript-view.mjs

@@ -0,0 +1,238 @@
+const MAX_LIVE_ROWS = 8;
+
+/**
+ * Projection of the Host-bound transcript for one trusted call.
+ *
+ * Durable rows are keyed only by Host messageId. Ephemeral audio is keyed by
+ * provider item/turn identity and is discarded when the Host projects the
+ * matching durable source. Text equality is deliberately never used.
+ */
+export class CallTranscriptView {
+  constructor(container, { onUnread = () => {} } = {}) {
+    this.container = container;
+    this.onUnread = onUnread;
+    this.durableRows = new Map();
+    this.liveRows = new Map();
+    this.liveSequence = 0;
+    this.optimisticIds = new Set();
+    this.unread = 0;
+    this.initialized = false;
+    container.addEventListener?.('scroll', () => {
+      if (this.nearBottom()) this.setUnread(0);
+    });
+  }
+
+  setCall(callId) {
+    if (this.callId === callId) return;
+    this.callId = callId ?? null;
+    this.scope = undefined;
+    this.durableRows.clear();
+    this.liveRows.clear();
+    this.liveSequence = 0;
+    this.optimisticIds.clear();
+    this.initialized = false;
+    this.container.replaceChildren();
+    this.container.dataset.callId = this.callId ?? '';
+    this.container.dataset.hasMore = 'false';
+    this.setUnread(0);
+  }
+
+  reset() { this.setCall(null); }
+
+  nearBottom() {
+    return this.container.scrollHeight - this.container.scrollTop - this.container.clientHeight < 32;
+  }
+
+  scrollToBottom() {
+    this.container.scrollTop = this.container.scrollHeight;
+    this.setUnread(0);
+  }
+
+  setUnread(count) {
+    if (this.unread === count) return;
+    this.unread = count;
+    this.onUnread(count);
+  }
+
+  visibleAnchor() {
+    const viewport = this.container.getBoundingClientRect?.();
+    if (!viewport) return null;
+    for (const [id, row] of this.durableRows) {
+      const rect = row.getBoundingClientRect?.();
+      if (rect && rect.bottom > viewport.top && rect.top < viewport.bottom) {
+        return { id, offset: rect.top - viewport.top };
+      }
+    }
+    return null;
+  }
+
+  createRow() {
+    return this.container.ownerDocument.createElement('p');
+  }
+
+  updateDurable(row, value) {
+    row.className = `call-transcript-row ${value.source.kind} ${value.role}`;
+    row.textContent = value.text;
+    row.dataset.messageId = value.messageId;
+    row.dataset.source = value.source.kind;
+    row.dataset.role = value.role;
+    delete row.dataset.live;
+    delete row.dataset.itemId;
+    delete row.dataset.turnId;
+    delete row.dataset.optimistic;
+    if (value.source.kind === 'voice') {
+      row.dataset.itemId = value.source.nativeItemId;
+      if (value.source.nativeTurnId) row.dataset.turnId = value.source.nativeTurnId;
+      delete row.dataset.clientMessageId;
+    } else {
+      row.dataset.clientMessageId = value.source.clientMessageId;
+    }
+    row.setAttribute?.('aria-label', value.source.kind === 'typed'
+      ? `你打字说：${value.text}`
+      : value.role === 'assistant' ? `猫猫：${value.text}` : `语音转写：${value.text}`);
+    return row;
+  }
+
+  removeReconciledLive(source) {
+    if (source.kind !== 'voice') return false;
+    let removed = false;
+    for (const [key, row] of this.liveRows) {
+      if ((row.dataset.itemId && row.dataset.itemId === source.nativeItemId)
+        || (source.nativeTurnId && row.dataset.turnId === source.nativeTurnId)) {
+        this.liveRows.delete(key);
+        removed = true;
+      }
+    }
+    return removed;
+  }
+
+  render() {
+    this.container.replaceChildren(...this.durableRows.values(), ...this.liveRows.values());
+  }
+
+  load(reply) {
+    if (!this.callId || reply?.kind !== 'transcript' || reply.scope?.callId !== this.callId) return false;
+    const pinned = this.nearBottom();
+    const readingPosition = this.container.scrollTop;
+    const anchor = pinned ? null : this.visibleAnchor();
+    const previous = this.durableRows;
+    const previousIds = new Set(previous.keys());
+    const next = new Map();
+    let added = 0;
+
+    for (const value of reply.rows) {
+      const reconciledLive = this.removeReconciledLive(value.source);
+      const row = previous.get(value.messageId) ?? this.createRow();
+      this.updateDurable(row, value);
+      this.optimisticIds.delete(value.messageId);
+      next.set(value.messageId, row);
+      if (this.initialized && !previousIds.has(value.messageId) && !reconciledLive) added += 1;
+    }
+    // An accepted delivery already has a durable Host messageId. A transcript
+    // read can race the MessageStore projection, so keep that exact row until
+    // the same id appears; never fall back to matching its text.
+    for (const id of this.optimisticIds) {
+      const row = previous.get(id);
+      if (row && !next.has(id)) next.set(id, row);
+    }
+
+    this.scope = reply.scope;
+    this.durableRows = next;
+    this.container.dataset.callId = reply.scope.callId;
+    this.container.dataset.hasMore = String(reply.hasMore);
+    this.render();
+
+    if (pinned) {
+      this.container.scrollTop = this.container.scrollHeight;
+      this.setUnread(0);
+    } else if (anchor) {
+      const row = this.durableRows.get(anchor.id) ?? this.durableRows.values().next().value;
+      const rect = row?.getBoundingClientRect?.();
+      const viewport = this.container.getBoundingClientRect?.();
+      this.container.scrollTop = rect && viewport
+        ? this.container.scrollTop + rect.top - viewport.top - anchor.offset
+        : readingPosition;
+      if (added) this.setUnread(this.unread + added);
+    } else {
+      this.container.scrollTop = readingPosition;
+      if (added) this.setUnread(this.unread + added);
+    }
+    this.initialized = true;
+    return true;
+  }
+
+  liveKey(event) {
+    if (event.itemId) return `item:${event.itemId}`;
+    if (event.turnId) return `turn:${event.turnId}`;
+    return `ephemeral:${++this.liveSequence}`;
+  }
+
+  appendLive(event) {
+    if (!this.callId || event?.type !== 'transcript' || event.callId !== this.callId) return false;
+    const pinned = this.nearBottom();
+    const key = this.liveKey(event);
+    let row = this.liveRows.get(key);
+    const isNew = !row;
+    if (!row) {
+      row = this.createRow();
+      row.className = `call-transcript-row voice ${event.role}`;
+      row.dataset.live = 'true';
+      row.dataset.source = 'voice';
+      row.dataset.role = event.role;
+      if (event.itemId) row.dataset.itemId = event.itemId;
+      if (event.turnId) row.dataset.turnId = event.turnId;
+      this.liveRows.set(key, row);
+      while (this.liveRows.size > MAX_LIVE_ROWS) this.liveRows.delete(this.liveRows.keys().next().value);
+    }
+    row.textContent = `${row.textContent}${event.text}`.slice(-16000);
+    row.setAttribute?.('aria-label', `${event.role === 'assistant' ? '猫猫' : '语音转写'}，实时：${row.textContent}`);
+    this.render();
+    if (pinned) {
+      this.container.scrollTop = this.container.scrollHeight;
+      this.setUnread(0);
+    } else if (isNew) this.setUnread(this.unread + 1);
+    return true;
+  }
+
+  appendTyped({ receipt, text }) {
+    if (!this.callId || receipt?.delivery !== 'accepted' || receipt.callId !== this.callId) return false;
+    const pinned = this.nearBottom();
+    let row = this.durableRows.get(receipt.messageId);
+    const isNew = !row;
+    if (!row) {
+      row = this.createRow();
+      this.durableRows.set(receipt.messageId, row);
+    }
+    this.updateDurable(row, {
+      messageId: receipt.messageId,
+      role: 'user',
+      text,
+      source: { kind: 'typed', clientMessageId: receipt.clientMessageId, callId: receipt.callId },
+    });
+    row.dataset.optimistic = 'true';
+    this.optimisticIds.add(receipt.messageId);
+    while (this.optimisticIds.size > MAX_LIVE_ROWS) {
+      const oldest = this.optimisticIds.values().next().value;
+      this.optimisticIds.delete(oldest);
+      if (this.durableRows.get(oldest)?.dataset.optimistic === 'true') this.durableRows.delete(oldest);
+    }
+    this.render();
+    if (pinned) {
+      this.container.scrollTop = this.container.scrollHeight;
+      this.setUnread(0);
+    } else if (isNew) this.setUnread(this.unread + 1);
+    return true;
+  }
+
+  finish(event) {
+    if (!this.callId || event?.type !== 'turn-done' || event.callId !== this.callId) return false;
+    for (const row of this.liveRows.values()) {
+      const matchesTurn = event.turnId && row.dataset.turnId === event.turnId;
+      const matchesUnkeyedRole = !event.turnId && event.role && !row.dataset.itemId
+        && !row.dataset.turnId && row.dataset.role === event.role;
+      if (matchesTurn || matchesUnkeyedRole) row.dataset.complete = 'true';
+    }
+    this.render();
+    return true;
+  }
+}

package/renderer/client.mjs

@@ -42,7 +42,12 @@ export function createCompanionClient(bridge) {
         layout: (panel, width, height) => invoke({ kind: 'view.layout', panel, width, height }, 'layout'),
         drag: (phase) => invoke({ kind: 'view.drag', phase }, 'ok'),
         hide: () => invoke({ kind: 'view.hide' }, 'ok'),
+        resetPosition: () => invoke({ kind: 'view.reset' }, 'ok'),
+        readSettings: () => invoke({ kind: 'settings.read' }, 'settings'),
+        updateSetting: (field, value) => invoke({ kind: 'settings.update', field, value }, 'settings-update'),
+        disableCompanion: () => invoke({ kind: 'companion.disable' }, 'companion-lifecycle'),
         readConversation: () => invoke({ kind: 'conversation.read' }, 'conversation'),
+        readTranscript: () => invoke({ kind: 'transcript.read' }, 'transcript'),
         subscribe: (listener) => bridge.subscribe(listener),
     };
 }

package/renderer/conversation.mjs

@@ -12,11 +12,14 @@ export class CompanionConversation {
     this.muted = false;
     this.silent = false;
     this.failed = false;
+    this.recovering = false;
+    this.retiredCallId = null;
   }
   show(message) {
     this.message = message;
     this.render({ phase: this.phase, identity: this.identity, audioMode: this.audioMode, retryMode: this.retryMode,
-      muted: this.muted, silent: this.silent, failed: this.failed, message });
+      muted: this.muted, silent: this.silent, failed: this.failed, recovering: this.recovering,
+      callId: this.callId, message });
   }
   current(generation) { return this.active && generation === this.generation; }
   listening() {
@@ -26,7 +29,33 @@ export class CompanionConversation {
   retrying(prefix) {
     return this.audioMode === 'receive_only'
       ? `${prefix} · 麦克风未启用，点击只听重试`
-      : `${prefix} · 点击语音聊重试`;
+      : `${prefix} · 点击语音通话重试`;
+  }
+  stoppedMessage() {
+    return this.audioMode === 'receive_only'
+      ? '只听已结束 · 麦克风未启用'
+      : '语音通话已结束 · 麦克风已关闭';
+  }
+  expectHostStop() {
+    if (!this.active) return false;
+    this.expectedHostStop = { generation: this.generation, pending: true };
+    return true;
+  }
+  async settleExpectedHostStop(callStopped) {
+    const expected = this.expectedHostStop;
+    if (!expected || expected.generation !== this.generation) return;
+    if (callStopped === false) {
+      this.expectedHostStop = undefined;
+      return;
+    }
+    if (callStopped === null) {
+      expected.pending = false;
+      return;
+    }
+    this.expectedHostStop = undefined;
+    if (!this.active) return;
+    this.failed = false;
+    await this.releaseLocal(this.stoppedMessage());
   }
   async begin(mode = 'duplex') {
     if (this.active || this.stopping || this.changingDocuments) return;
@@ -36,7 +65,10 @@ export class CompanionConversation {
     this.audioMode = mode;
     this.retryMode = null;
     this.failed = false;
+    this.recovering = false;
     this.phase = 'connecting';
+    this.callId = null;
+    this.expectedHostStop = undefined;
     const generation = ++this.generation;
     // Must reach the isolated preload while the click still has user activation.
     const preparation = this.client.prepare();
@@ -45,11 +77,27 @@ export class CompanionConversation {
     try {
       const peer = this.createPeer(event => {
         if (!this.current(generation)) return;
-        if (event.type === 'connected') { clearTimeout(this.deadline); this.phase = 'talking'; this.show(this.listening()); }
-        if (event.type === 'recovering') this.show('连接暂时中断 · 正在等待恢复');
-        if (event.type === 'recovered') this.show(this.listening());
+        if (event.type === 'error' && !this.callId && event.callId === this.retiredCallId) return;
+        if (event.type === 'connected') {
+          if (this.callId && this.callId !== event.callId) return;
+          this.callId = event.callId;
+          this.recovering = false;
+          clearTimeout(this.deadline); this.phase = 'talking'; this.show(this.listening());
+        }
+        if (event.type === 'error' && (!event.callId || !this.callId || event.callId === this.callId)) {
+          void this.end(explainError(event), true);
+          return;
+        }
+        if (!this.callId || event.callId !== this.callId) return;
+        if (event.type === 'recovering') {
+          this.recovering = true;
+          this.show('恢复后通话继续，无需重新连接');
+        }
+        if (event.type === 'recovered') {
+          this.recovering = false;
+          this.show(this.listening());
+        }
         if (event.type === 'transcript' || event.type === 'turn-done') this.transcript(event);
-        if (event.type === 'error') void this.end(explainError(event), true);
       });
       this.peer = peer;
       if (mode === 'duplex') peer.muteMic(this.muted);
@@ -68,6 +116,8 @@ export class CompanionConversation {
   }
   async releaseLocal(message) {
     this.active = false;
+    this.expectedHostStop = undefined;
+    if (this.callId) this.retiredCallId = this.callId;
     ++this.generation;
     this.pendingText = undefined;
     clearTimeout(this.deadline);
@@ -77,13 +127,15 @@ export class CompanionConversation {
     this.audioMode = null;
     this.retryMode = this.failed ? releasedMode : null;
     this.phase = 'idle';
+    this.recovering = false;
+    this.callId = null;
     this.show(message);
     await Promise.allSettled([peer?.close(), this.stopScreen()]);
   }
   async end(message, failed = false) {
     if (this.stopping) return this.stopping;
     const receiveOnly = this.audioMode === 'receive_only';
-    message ??= this.audioMode === 'receive_only' ? '只听已结束 · 麦克风未启用' : '语音已结束 · 麦克风已关闭';
+    message ??= this.stoppedMessage();
     this.failed = failed;
     const local = this.releaseLocal(message);
     const operation = Promise.all([local, this.client.stop()]);
@@ -95,20 +147,26 @@ export class CompanionConversation {
   async hostStopped(reason) {
     // Stop echoes must not erase a more useful local failure or manual ending.
     if (!this.active) return;
+    if (reason === 'revoked' && this.expectedHostStop?.generation === this.generation) {
+      this.expectedHostStop = undefined;
+      this.failed = false;
+      await this.releaseLocal(this.stoppedMessage());
+      return;
+    }
     const receiveOnly = this.audioMode === 'receive_only';
     const messages = receiveOnly ? {
       locked: '屏幕已锁定 · 只听已停止，解锁后可点击只听继续',
       suspended: '电脑已休眠 · 只听已停止，可点击只听继续',
       hidden: '猫猫已收起 · 只听已停止',
     } : {
-      locked: '屏幕已锁定 · 语音已停止，解锁后可点击语音聊继续',
-      suspended: '电脑已休眠 · 语音已停止，可点击语音聊继续',
-      hidden: '猫猫已收起 · 语音已停止',
+      locked: '屏幕已锁定 · 语音通话已停止，解锁后可点击语音通话继续',
+      suspended: '电脑已休眠 · 语音通话已停止，可点击语音通话继续',
+      hidden: '猫猫已收起 · 语音通话已停止',
     };
     this.failed = !Object.hasOwn(messages, reason);
     await this.releaseLocal(messages[reason] ?? (receiveOnly
       ? '只听连接已中断 · 麦克风未启用，点击只听重试'
-      : '语音连接已中断 · 麦克风已关闭，点击语音聊重试'));
+      : '语音通话已中断 · 麦克风已关闭，点击语音通话重试'));
   }
   async refresh() {
     if (this.refreshing) return;
@@ -120,8 +178,16 @@ export class CompanionConversation {
       this.identity = identity;
       if (this.active && identity.audio?.activeMode) this.audioMode = identity.audio.activeMode;
       if (this.active && ['closed', 'failed', 'idle'].includes(identity.phase)) {
-        await this.end(this.retrying('语音连接已中断'), true);
-      } else this.show(this.message ?? '点开始聊天，直接对我说话');
+        if (this.expectedHostStop?.generation === this.generation) {
+          this.expectedHostStop = undefined;
+          this.failed = false;
+          await this.releaseLocal(this.stoppedMessage());
+        } else await this.end(this.retrying('语音连接已中断'), true);
+      } else {
+        if (this.expectedHostStop?.generation === this.generation && !this.expectedHostStop.pending)
+          this.expectedHostStop = undefined;
+        this.show(this.message ?? '点击语音通话，直接对我说话');
+      }
     } catch (error) {
       if (generation === this.generation) {
         if (this.active) await this.end(explainError(error), true);
@@ -139,7 +205,7 @@ export class CompanionConversation {
       const identity = await changing;
       await local;
       this.identity = identity;
-      this.show(allowed ? '资料查询已开启 · 点击开始聊天继续' : '资料查询已暂停 · 点击开始聊天继续');
+      this.show(allowed ? '资料查询已开启 · 点击语音通话继续' : '资料查询已暂停 · 点击语音通话继续');
     } catch (error) { this.show(explainError(error)); }
     finally { this.changingDocuments = false; }
   }
@@ -151,12 +217,16 @@ export class CompanionConversation {
     const generation = this.generation;
     this.sending = true;
     try {
-      await this.client.text(input.text, input.id);
+      const receipt = await this.client.text(input.text, input.id);
+      if (receipt?.delivery !== 'accepted') {
+        if (generation === this.generation) this.show(explainError({ code: 'unconfirmed' }));
+        return false;
+      }
       if (this.pendingText === input) this.pendingText = undefined;
       // Voice may have ended; an accepted message still retires this draft.
       // Keep the newer voice status rather than announcing that we are listening.
       if (generation !== this.generation) return true;
-      this.transcript({ type: 'transcript', role: 'user', text, typed: true });
+      this.transcript({ type: 'typed', role: 'user', text, receipt });
       this.show(this.active ? this.listening() : '已发送 · 回答会留在同一段聊天中');
       return true;
     } catch (error) {

package/renderer/decision-view.mjs

@@ -1,13 +1,11 @@
 /** F246 remains the decision truth; linked F310 receipts are enrichment, not another item. */
 export function decisionBadge(page) {
   if (!page || page.status !== 'available')
-    return { visible: true, label: '?', title: '待决事项暂不可读' };
-  const total = page.approvalCount + page.otherNeedsMeCount;
-  return {
-    visible: total > 0,
-    label: total > 99 ? '99+' : String(total),
-    title: `${page.approvalCount} 项审批事项，${page.otherNeedsMeCount} 项其他待处理`,
-  };
+    return { visible: true, label: '?', title: '待办暂不可读', state: 'unavailable' };
+  const hasKnownRows = (page.approvals?.length ?? 0) > 0 || (page.otherNeedsMe?.length ?? 0) > 0
+    || page.approvalCount > 0 || page.needsMeCount > 0 || page.otherNeedsMeCount > 0;
+  if (hasKnownRows) return { visible: true, label: '有待办', title: '有待办', state: 'available' };
+  return { visible: false, label: '0', title: '现在没有待办', state: 'empty' };
 }
 
 export function decisionRows(page) {
@@ -19,7 +17,7 @@ export function decisionRows(page) {
   return [
     ...page.approvals.map(item => ({
       title: item.summary || '待决策事项',
-      meta: `${item.sourceFeatureId} · ${state[item.resolution] ?? '状态待核'} · ${item.materializationState === 'outcome_unknown' ? '结果未知' : item.materializationState === 'failed' ? '执行失败' : item.linkedNeedsMe ? '已关联任务' : '原处卡片'}`,
+      meta: `审批 · ${state[item.resolution] ?? '状态待核'} · ${item.materializationState === 'outcome_unknown' ? '结果未知' : item.materializationState === 'failed' ? '执行失败' : item.linkedNeedsMe ? '已关联待办' : '原处卡片'}`,
       proposalId: item.proposalId,
       previewable: item.sourceFeatureId === 'F221' &&
         /^[A-Za-z0-9_-]{1,200}$/.test(item.proposalId) &&

package/renderer/errors.mjs

@@ -1,8 +1,8 @@
 const messages = {
-  permission_required: '请点击开始聊天，或在系统提示中允许本次使用',
-  session_required: '连接已结束 · 点击开始聊天继续',
-  busy: '上一段交流正在收尾 · 稍后再开始',
-  selection_changed: '猫猫球的选择已更新 · 点击开始聊天继续',
+  permission_required: '请点击语音通话，或在系统提示中允许本次使用',
+  session_required: '连接已结束 · 点击语音通话继续',
+  busy: '会话暂时被占用，请稍后重试',
+  selection_changed: '猫猫球的选择已更新 · 点击语音通话继续',
   carrier_unavailable: '实时语音暂不可用 · 可以打开聊天继续交流',
   cancelled: '操作已取消',
   unconfirmed: '发送尚未确认 · 文字已保留，可检查聊天记录后重试',