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

package/manifest.json

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

package/package.json

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

package/plugin.yaml

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

package/renderer/client.mjs

@@ -37,6 +37,7 @@ export function createCompanionClient(bridge) {
         screenClose: () => invoke({ kind: 'screen.close' }, 'ok'),
         openConversation: () => invoke({ kind: 'conversation.open' }, 'navigation'),
         readDecisions: (offset = 0, limit = 20) => invoke({ kind: 'decisions.read', offset, limit }, 'decisions'),
+        openDecision: (variantRef, target) => invoke({ kind: 'decision.open', variantRef, target }, 'navigation'),
         inspectF221: (proposalId) => invoke({ kind: 'f221.inspect', proposalId }, 'decision-trial'),
         resize: (expanded) => invoke({ kind: 'view.resize', expanded }, 'ok'),
         layout: (panel, width, height) => invoke({ kind: 'view.layout', panel, width, height }, 'layout'),

package/renderer/decision-view.mjs

@@ -1,28 +1,124 @@
-/** F246 remains the decision truth; linked F310 receipts are enrichment, not another item. */
+function unified(page) {
+  return page?.version === 1 && Array.isArray(page.items);
+}
+
+function knownRows(page) {
+  if (unified(page)) return page.items.length;
+  return (page?.approvals?.length ?? 0) + (page?.otherNeedsMe?.length ?? 0);
+}
+
+function authenticationRequired(page) {
+  if (!unified(page)) return false;
+  const sources = Object.values(page.sources ?? {});
+  return sources.length > 0 && sources.every(source => source.status === 'unauthenticated');
+}
+
+/** Exact totals exist only on a complete, consistent unified read. Legacy pages never invent a sum. */
 export function decisionBadge(page) {
-  if (!page || page.status !== 'available')
+  if (!page) return { visible: true, label: '?', title: '待办暂不可读', state: 'unavailable' };
+  if (unified(page)) {
+    if (page.status === 'partial') {
+      return { visible: true, label: page.items.length > 0 ? '•' : '!', title: '仅部分读取', state: 'partial' };
+    }
+    if (page.status === 'unavailable') {
+      return authenticationRequired(page)
+        ? { visible: true, label: '!', title: '需要登录', state: 'authentication' }
+        : { visible: true, label: '!', title: '待办暂不可读', state: 'unavailable' };
+    }
+    if (Number.isInteger(page.totalCount)) {
+      return page.totalCount === 0
+        ? { visible: false, label: '0', title: '暂无待办', state: 'empty' }
+        : { visible: true, label: String(page.totalCount), title: `待办 · ${page.totalCount} 件`, state: 'available' };
+    }
+    return { visible: true, label: page.items.length > 0 ? '•' : '!', title: '数量未确认', state: 'uncertain' };
+  }
+  if (page.status !== 'available')
     return { visible: true, label: '?', title: '待办暂不可读', state: 'unavailable' };
-  const hasKnownRows = (page.approvals?.length ?? 0) > 0 || (page.otherNeedsMe?.length ?? 0) > 0
+  const hasKnownRows = knownRows(page) > 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) {
-  if (!page || page.status !== 'available') return [];
+function approvalMeta(approval) {
   const state = {
     open: '待你决定', accepted: '已接纳 · 待核结果', rejected: '已拒绝',
     closed_without_decision: '已关闭',
   };
+  const materialization = approval.materializationState === 'outcome_unknown' ? '结果未知'
+    : approval.materializationState === 'failed' ? '执行失败'
+      : approval.linkedNeedsMe ? '已关联待办' : '原处卡片';
+  return `审批 · ${state[approval.resolution] ?? '状态待核'} · ${materialization}`;
+}
+
+function navigation(item) {
+  const priorities = item.kind === 'approval'
+    ? [['approval_card', '打开审批'], ['action', '打开处理入口'], ['origin', '打开原处']]
+    : [['action', '打开处理入口'], ['origin', '打开原处'], ['approval_card', '打开审批']];
+  const selected = priorities.find(([target]) => item.navigation.targets.includes(target));
+  return selected ? { variantRef: item.variantRef, target: selected[0], label: selected[1] } : undefined;
+}
+
+export function decisionRows(page) {
+  if (unified(page)) {
+    if (page.status === 'unavailable') return [];
+    return page.items.map(item => ({
+      title: item.summary || '待处理事项',
+      meta: item.kind === 'approval' ? approvalMeta(item.approval)
+        : item.kind === 'judgment' ? '等你判断 · 请在原处处理' : '需要修复 · 请在原处处理',
+      variantRef: item.variantRef,
+      navigation: navigation(item),
+      previewable: false,
+    }));
+  }
+  if (!page || page.status !== 'available') return [];
   return [
-    ...page.approvals.map(item => ({
+    ...(page.approvals ?? []).map(item => ({
       title: item.summary || '待决策事项',
-      meta: `审批 · ${state[item.resolution] ?? '状态待核'} · ${item.materializationState === 'outcome_unknown' ? '结果未知' : item.materializationState === 'failed' ? '执行失败' : item.linkedNeedsMe ? '已关联待办' : '原处卡片'}`,
+      meta: approvalMeta(item),
       proposalId: item.proposalId,
-      previewable: item.sourceFeatureId === 'F221' &&
-        /^[A-Za-z0-9_-]{1,200}$/.test(item.proposalId) &&
-        item.resolution === 'open' && item.materializationState === 'not_started',
+      previewable: item.sourceFeatureId === 'F221'
+        && /^[A-Za-z0-9_-]{1,200}$/.test(item.proposalId)
+        && item.resolution === 'open' && item.materializationState === 'not_started',
     })),
-    ...page.otherNeedsMe.map(item => ({ title: item.summary || '待处理事项', meta: '其他待处理 · 请向猫猫询问详情' })),
+    ...(page.otherNeedsMe ?? []).map(item => ({ title: item.summary || '待处理事项', meta: '其他待处理 · 请向猫猫询问详情' })),
   ];
 }
+
+export function decisionPresentation(page) {
+  const badge = decisionBadge(page);
+  if (!page) return { badge, message: '待办暂不可读 · 请稍后刷新', reloadLabel: '重试', pending: null, hasMore: false, renderRows: false };
+  if (unified(page)) {
+    const pending = Number.isInteger(page.totalCount) ? page.totalCount > 0 : page.items.length > 0 ? true : null;
+    if (page.status === 'partial') return {
+      badge, message: '仅部分读取 · 其余待办未能读取', reloadLabel: '重试', pending,
+      hasMore: page.page.hasMore, renderRows: true,
+    };
+    if (page.status === 'unavailable') return {
+      badge, message: authenticationRequired(page) ? '待办需要登录 · 请登录后重试' : '待办暂不可读 · 请稍后重试',
+      reloadLabel: '重试', pending: null, hasMore: false, renderRows: false,
+    };
+    if (page.totalCount === 0) return {
+      badge, message: '暂无待办', reloadLabel: '刷新', pending: false,
+      hasMore: page.page.hasMore, renderRows: true,
+    };
+    return {
+      badge,
+      message: Number.isInteger(page.totalCount)
+        ? `已读取 ${page.totalCount} 件待办`
+        : '已显示读取到的待办 · 数量未确认',
+      reloadLabel: '刷新', pending,
+      hasMore: page.page.hasMore, renderRows: true,
+    };
+  }
+  if (page.status !== 'available') return {
+    badge, message: '待办暂不可读 · 请稍后刷新', reloadLabel: '重试', pending: null, hasMore: false, renderRows: false,
+  };
+  return {
+    badge,
+    message: badge.state === 'empty' ? '现在没有待你处理的事项' : '已显示读取到的待办 · 暂无总数',
+    reloadLabel: '刷新', pending: badge.state === 'empty' ? false : true,
+    hasMore: page.page.hasMoreApprovals || page.page.hasMoreNeedsMe,
+    renderRows: true,
+  };
+}

package/renderer/surface.mjs

@@ -11,7 +11,7 @@ import { PetMotion } from './pet-motion.mjs';
 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 { decisionBadge, decisionPresentation, decisionRows } from './decision-view.mjs';
 import { nativeWorkLabel, normalizeNativeWork } from './native-work-motion.mjs';
 import { NativeWindowTravel } from './native-window-travel.mjs';
 import { currentCompanionIdentity } from './companion-identity.mjs';
@@ -44,6 +44,10 @@ let didMove = false, decisionLoading = false, decisionOffset = 0, threadTitle, s
 const ambientPanel = active => active ? 'actions' : 'none';
 const setTexts = (ids, text) => { for (const id of ids) $(id).textContent = text; };
 const setHidden = (ids, hidden) => { for (const id of ids) $(id).hidden = hidden; };
+const decisionReadBasis = page => page?.version === 1
+  ? [page.status, page.totalCount ?? 'unknown', ...['approvals', 'needsMe']
+    .flatMap(key => [page.sources?.[key]?.status, page.sources?.[key]?.coverage])].join('|')
+  : page ? 'legacy' : null;
 if (!window.clowderCompanion) {
   $('actions').hidden = false; $('status').hidden = false;
   status('请从 Clowder 的聊聊入口打开猫猫球');
@@ -278,20 +282,39 @@ if (!window.clowderCompanion) {
     decisionLoading = true;
     if (!more && controls.panel === 'decisions') $('decision-status').textContent = '正在读取待办…';
     try {
+      const previousReadBasis = decisionReadBasis(latestDecisionPage);
       const page = await client.readDecisions(more ? decisionOffset : 0, 10);
-      if (page.status !== 'available') throw new Error('Decision source unavailable');
+      const presentation = decisionPresentation(page);
+      const changedRead = more && presentation.renderRows && previousReadBasis !== null
+        && decisionReadBasis(page) !== previousReadBasis;
       showDecisionBadge(page);
-      motion.setPendingDecision((page.approvals?.length ?? 0) + (page.otherNeedsMe?.length ?? 0) > 0);
+      motion.setPendingDecision(presentation.pending);
       if (controls.panel !== 'decisions') return;
       const list = $('decision-list');
-      if (!more) { list.replaceChildren(); list.scrollTop = 0; }
-      for (const row of decisionRows(page)) {
+      if (!more || changedRead) { list.replaceChildren(); list.scrollTop = 0; }
+      const retainedRows = more && !presentation.renderRows && list.children.length > 0;
+      const knownVariantRefs = new Set(Array.from(list.children)
+        .map(item => item.dataset.variantRef).filter(Boolean));
+      for (const row of presentation.renderRows && !changedRead ? decisionRows(page) : []) {
+        if (row.variantRef && knownVariantRefs.has(row.variantRef)) continue;
         const item = document.createElement('li');
+        if (row.variantRef) { item.dataset.variantRef = row.variantRef; knownVariantRefs.add(row.variantRef); }
         const title = document.createElement('strong');
         const meta = document.createElement('span');
         title.textContent = row.title; meta.textContent = row.meta;
         item.append(title, meta); list.append(item);
-        if (row.previewable) {
+        if (row.navigation) {
+          const button = document.createElement('button');
+          button.type = 'button'; button.textContent = row.navigation.label;
+          button.onclick = async () => {
+            try {
+              const result = await client.openDecision(row.navigation.variantRef, row.navigation.target);
+              $('decision-status').textContent = result.delivery === 'requested'
+                ? '已请求打开对应事项' : '打开对应事项尚未确认 · 请从 Cat Café 查看';
+            } catch { $('decision-status').textContent = '暂时无法打开对应事项 · 请稍后重试'; }
+          };
+          item.append(button);
+        } else if (row.previewable) {
           const button = document.createElement('button');
           button.type = 'button'; button.textContent = '查看确认演练';
           button.onclick = async () => {
@@ -307,17 +330,25 @@ if (!window.clowderCompanion) {
           item.append(button);
         }
       }
-      decisionOffset = page.page.offset + page.page.limit;
-      const badge = decisionBadge(page);
-      $('decision-reload').textContent = '刷新';
-      $('decision-status').textContent = badge.state === 'empty'
-        ? '现在没有待你处理的事项'
-        : '已显示读取到的待办 · 暂无总数';
-      $('decision-more').hidden = !page.page.hasMoreApprovals && !page.page.hasMoreNeedsMe;
+      decisionOffset = changedRead ? 0 : page.page.offset + page.page.limit;
+      $('decision-reload').textContent = changedRead ? '刷新' : presentation.reloadLabel;
+      $('decision-status').textContent = changedRead && page.totalCount !== 0
+        ? '待办已变化 · 请刷新查看最新列表'
+        : retainedRows
+        ? `${presentation.badge.state === 'authentication' ? '待办需要登录' : '待办暂不可读'} · 以下为上次读到的内容`
+        : presentation.message;
+      $('decision-more').hidden = changedRead || !presentation.hasMore;
     } catch {
       showDecisionBadge(undefined);
       motion.setPendingDecision(null);
-      if (controls.panel === 'decisions') $('decision-status').textContent = '待办暂不可读 · 请稍后刷新';
+      if (controls.panel === 'decisions') {
+        const retained = $('decision-list').children.length > 0;
+        $('decision-status').textContent = retained
+          ? '待办暂不可读 · 以下为上次读到的内容'
+          : '待办暂不可读 · 请稍后刷新';
+        $('decision-reload').textContent = '重试';
+        $('decision-more').hidden = true;
+      }
     } finally { decisionLoading = false; }
   }
   $('share-badge').onclick = toggleScreen;