Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(desktop): 支持为远程供应商分享用户设置备注
DavidShen59ba2cfd56fc
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.tsindex 303ff5b282..63e1be0acf 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts@@ -13,6 +13,8 @@ const listProviders = vi.hoisted(() => vi.fn());const identityCard = vi.hoisted(() => vi.fn());const remember = vi.hoisted(() => vi.fn());const usageStores = vi.hoisted(() => ({ ownHistory: vi.fn(), memberHistory: vi.fn(), pricing: vi.fn() }));+const memberNotes = vi.hoisted(() => ({ read: vi.fn(), set: vi.fn() }));+vi.mock('../providerShareMemberNotes.js', () => ({ providerShareMemberNotes: memberNotes }));vi.mock('../../appSessionState.js', () => ({activeOwnerScopeKey: () => state.owner,@@ -88,6 +90,8 @@ beforeEach(() => {api.reject.mockResolvedValue({ ok: true });api.setMember.mockResolvedValue({ status: 'removed' });host.refresh.mockResolvedValue(undefined);+ memberNotes.read.mockReturnValue({});+ memberNotes.set.mockResolvedValue(undefined);host.snapshot.mockReturnValue([{ requests: [{ requestId: 'r1' }], members: [{ memberId: 'm1' }] }]);usageStores.ownHistory.mockReturnValue({ self: { lastUsedAt: null, days: [] }, relays: [] });usageStores.memberHistory.mockReturnValue([]);@@ -162,6 +166,35 @@ describe('remote task limit management payloads', () => {});});+/* 测试价值:2026-10-19 用户备注;生产 parser/管理执行入口此前未覆盖备注。+ * 最小输入:空备注、超长/非字符串备注、不属于本机的成员,以及刷新中切账号。tier: unit。+ */+describe('member note management', () => {+ it('normalizes a single-line note and accepts clearing it', () => {+ expect(parseProviderShareCommand({ action: 'set-member-note', memberId: 'm1', note: ' Alice\nTeam ' }))+ .toEqual({ action: 'set-member-note', memberId: 'm1', note: 'Alice Team' });+ expect(parseProviderShareCommand({ action: 'set-member-note', memberId: 'm1', note: '' }))+ .toEqual({ action: 'set-member-note', memberId: 'm1', note: '' });+ });+ it.each([null, 123, 'x'.repeat(81)])('rejects an invalid note %j', (note) => {+ expect(() => parseProviderShareCommand({ action: 'set-member-note', memberId: 'm1', note })).toThrow('INVALID_PARAMS');+ });+ it('saves an existing member note without changing sharing authorization', async () => {+ await expect(executeProviderShareManagementCommand({ action: 'set-member-note', memberId: 'm1', note: 'Alice' }))+ .resolves.toEqual({ ok: true });+ expect(memberNotes.set).toHaveBeenCalledWith('m1', 'Alice', expect.any(Function));+ expect(api.setMember).not.toHaveBeenCalled();+ });+ it('refuses notes for absent members and a pending account transition', async () => {+ await expect(executeProviderShareManagementCommand({ action: 'set-member-note', memberId: 'absent', note: 'Alice' }))+ .rejects.toThrow('NOT_FOUND');+ host.refresh.mockImplementationOnce(async () => { state.boundaryPending = true; });+ await expect(executeProviderShareManagementCommand({ action: 'set-member-note', memberId: 'm1', note: 'Alice' }))+ .rejects.toThrow('PRECONDITION_FAILED');+ expect(memberNotes.set).not.toHaveBeenCalled();+ });+});+describe('same-account share management during account transitions', () => {it.each([createLink, ...mutations,diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareMemberNotes.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareMemberNotes.test.tsnew file mode 100644index 0000000000..09ef7de04a--- /dev/null+++ b/apps/desktop/src/main/device-link/__tests__/providerShareMemberNotes.test.ts@@ -0,0 +1,89 @@+import fs from 'node:fs';+import os from 'node:os';+import path from 'node:path';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++vi.mock('../../appSessionState.js', () => ({+ activeOwnerScopeKey: vi.fn(),+ ownerScopedUserDataPath: vi.fn(),+}));+vi.mock('../../logger.js', () => ({ createLogger: () => ({ info: vi.fn(), warn: vi.fn() }) }));++import * as locks from '../crossProcessLock';+import { createProviderShareMemberNotesStore } from '../providerShareMemberNotes';++/*+ * 测试价值+ * - 生产入口与可观察结果:备注存储的 set/read;重启可读、清空恢复默认、不同成员与账号互不覆盖。+ * - Bug/规则依据:2026-10-19 用户要求分享用户备注;credentials-and-local-storage 的账号隔离与原子写规则。+ * - 现有覆盖缺口:新备注文件有独立 schema 与生命周期,现有分享授权偏好测试不覆盖此存储。+ * - 最小失败输入:同一成员在两个账号保存不同备注;锁等待期间切账号;损坏的备注文件。+ * - tier:unit;唯一临时目录,无账号、网络或子进程。独立文件隔离该存储的真实文件生命周期。+ * - 实测耗时:单独 vitest run 本文件 1.38 秒(4 用例执行 464ms)。+ */+let root: string;+let owner: string;+const file = () => path.join(root, owner, 'provider-share-member-notes.json');+const makeStore = () =>+ createProviderShareMemberNotesStore({ filePath: file, scopeKey: () => owner });+const assertCurrent = () => undefined;++beforeEach(() => {+ root = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-member-notes-'));+ owner = 'owner-a';+});+afterEach(() => {+ vi.restoreAllMocks();+ fs.rmSync(root, { recursive: true, force: true });+});++describe('provider share member notes', () => {+ it('persists notes across store recreation, preserves other members and removes cleared overrides', async () => {+ const first = makeStore();+ const second = makeStore();+ expect(second.read()).toEqual({});+ await first.set('m1', 'Alice', assertCurrent);+ await second.set('m2', 'Bob', assertCurrent);+ expect(makeStore().read()).toEqual({ m1: 'Alice', m2: 'Bob' });+ await first.set('m1', '', assertCurrent);+ expect(makeStore().read()).toEqual({ m2: 'Bob' });+ });++ it('isolates the same member id by account, including a cached store', async () => {+ const store = makeStore();+ await store.set('m1', 'Alice', assertCurrent);+ owner = 'owner-b';+ expect(store.read()).toEqual({});+ await store.set('m1', 'Bob', assertCurrent);+ owner = 'owner-a';+ expect(store.read()).toEqual({ m1: 'Alice' });+ });++ it('refuses a write that crosses accounts while waiting for the file lock', async () => {+ const store = makeStore();+ await store.set('m1', 'Alice', assertCurrent);+ const originalFile = file();+ vi.spyOn(locks, 'withCrossProcessLock').mockImplementationOnce(+ async (_file, _options, task) => {+ owner = 'owner-b';+ return task({ held: true });+ },+ );+ await expect(store.set('m1', 'wrong account', assertCurrent)).rejects.toThrow(+ 'PRECONDITION_FAILED',+ );+ expect(fs.existsSync(file())).toBe(false);+ expect(JSON.parse(fs.readFileSync(originalFile, 'utf8')).notes.m1).toBe('Alice');+ });++ it('keeps an unreadable file intact and reports a save failure without exposing its contents', async () => {+ fs.mkdirSync(path.dirname(file()), { recursive: true });+ fs.writeFileSync(file(), '{private broken content');+ const store = makeStore();+ expect(store.read()).toEqual({});+ await expect(store.set('m1', 'Alice', assertCurrent)).rejects.toThrow(+ '[PRECONDITION_FAILED] Could not save provider share member note',+ );+ expect(fs.readFileSync(file(), 'utf8')).toBe('{private broken content');+ });+});diff --git a/apps/desktop/src/main/device-link/providerShareMemberNotes.ts b/apps/desktop/src/main/device-link/providerShareMemberNotes.tsnew file mode 100644index 0000000000..07a4009748--- /dev/null+++ b/apps/desktop/src/main/device-link/providerShareMemberNotes.ts@@ -0,0 +1,75 @@+/** 分享者的私人备注,按账号与成员隔离;不进入分享服务、日志或受邀者目录。 */+import { activeOwnerScopeKey, ownerScopedUserDataPath } from '../appSessionState.js';+import { createLogger } from '../logger.js';+import { createOverrideSettingsFile } from '../maker-host/override-settings-file.js';+import { captureProviderManagementScope } from '../provider-group/managementScope.js';+import { throwIpcError } from '../utils/ipcValidate.js';+import {+ normalizeProviderShareMemberNote,+ PROVIDER_SHARE_MEMBER_NOTE_MAX_LENGTH,+} from '../../shared/providerShareMemberNote.js';++interface MemberNotes {+ notes: Record<string, string>;+}++export function createProviderShareMemberNotesStore(options: {+ filePath: () => string;+ scopeKey: () => string;+}) {+ const store = createOverrideSettingsFile<MemberNotes>({+ ...options,+ defaults: () => ({ notes: {} }),+ normalize(raw) {+ const notes = (raw as Partial<MemberNotes> | null)?.notes;+ return {+ notes: Object.fromEntries(+ Object.entries(notes && typeof notes === 'object' && !Array.isArray(notes) ? notes : {})+ .filter(+ ([id, note]) =>+ id.length > 0 &&+ id.length <= 128 &&+ typeof note === 'string' &&+ note.length <= PROVIDER_SHARE_MEMBER_NOTE_MAX_LENGTH,+ )+ .map(([id, note]) => [id, normalizeProviderShareMemberNote(note)]),+ ),+ };+ },+ log: createLogger('provider-share:member-notes'),+ label: 'provider-share-member-notes',+ maxBytes: 1024 * 1024,+ preserveUnreadableFile: true,+ logLoadedValue: false,+ logReadErrorDetails: false,+ });+ return {+ read(): Record<string, string> {+ store.invalidateIfChanged();+ return store.read().notes;+ },+ async set(memberId: string, note: string, assertCurrent: () => void): Promise<void> {+ assertCurrent();+ try {+ await store.updateAtomic(({ value }) => {+ assertCurrent();+ const notes = { ...value.notes };+ if (note) notes[memberId] = note;+ else delete notes[memberId];+ return { notes };+ });+ } catch {+ throwIpcError('PRECONDITION_FAILED', 'Could not save provider share member note');+ }+ assertCurrent();+ },+ };+}++export const providerShareMemberNotes = createProviderShareMemberNotesStore({+ filePath: () => ownerScopedUserDataPath('provider-share-member-notes.json'),+ scopeKey: () => {+ captureProviderManagementScope();+ return activeOwnerScopeKey();+ },+});diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex 99af75005e..e3768b2438 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -46,6 +46,8 @@ import { getGatewayModelPricing, getModelPriceQuote } from '../usage/modelPricinimport { computePriceQuoteTurnMoney, normalizeModelIdForPricing } from '../usage/turnCostCalculator.js';import { rememberIssuedClipboardText } from '../textClipboard.js';import { ownerScopedUserDataPath } from '../appSessionState.js';+import { normalizeProviderShareMemberNote, PROVIDER_SHARE_MEMBER_NOTE_MAX_LENGTH } from '../../shared/providerShareMemberNote.js';+import { providerShareMemberNotes } from './providerShareMemberNotes.js';import { captureProviderManagementScope } from '../provider-group/managementScope.js';import { readProviderManagementShares } from '../provider-group/managementClient.js';import type { ProviderShareManagementCommand } from '../../shared/providerManagement.js';@@ -356,6 +358,12 @@ export function parseProviderShareCommand(raw: unknown): ProviderShareCommand {if (status !== 'pause' && status !== 'resume' && status !== 'remove') throwIpcError('INVALID_PARAMS', 'Invalid status');return { action: 'set-member', memberId: text(value.memberId, 'memberId', 128), status };}+ case 'set-member-note': {+ if (typeof value.note !== 'string' || value.note.length > PROVIDER_SHARE_MEMBER_NOTE_MAX_LENGTH) {+ throwIpcError('INVALID_PARAMS', 'Invalid member note');+ }+ return { action: 'set-member-note', memberId: text(value.memberId, 'memberId', 128), note: normalizeProviderShareMemberNote(value.note) };+ }case 'reshare-decide': {const decision = value.decision;if (decision !== 'approve' && decision !== 'reject') throwIpcError('INVALID_PARAMS', 'Invalid decision');@@ -407,6 +415,7 @@ async function ownerState(range: ProviderShareUsageRange): Promise<ProviderShareconst shares = getProviderShareHostSnapshot();const usage = getProviderShareUsageStore()?.query(new Set(shares.map((share) => share.shareId)), range) ?? [];const reshares = listProviderShareReshares();+ const notes = providerShareMemberNotes.read();const runningTasks = new Map<string, number>();for (const controller of providerShareActiveControllers()) {const peer = parseProviderSharePeer(controller);@@ -426,6 +435,7 @@ async function ownerState(range: ProviderShareUsageRange): Promise<ProviderShareconst record = usage.find((item) => item.shareId === share.shareId && item.memberId === member.memberId);return {...member,+ note: notes[member.memberId] ?? null,lastUsedAt: record?.lastUsedAt ?? null,runningTasks: runningTasks.get(`${share.shareId}\u0000${member.memberId}`) ?? 0,reshares: reshares@@ -717,6 +727,15 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => voidvoid refreshProviderShareHost('member');return { ok: true };}+ case 'set-member-note': {+ const assertOwner = captureProviderManagementScope();+ requireRunning();+ const member = getProviderShareHostSnapshot().some((share) => share.members.some((item) => item.memberId === command.memberId));+ if (!member) throwIpcError('NOT_FOUND', 'This shared provider member is no longer available');+ await providerShareMemberNotes.set(command.memberId, command.note, () => { assertCurrent(); assertOwner(); });+ emit(PROVIDER_SHARE_IPC.OWNED_CHANGED, null);+ return { ok: true };+ }case 'reshare-decide': {// 只改本机记录(不经服务端);撤回立即结束这个人经组转来的任务。const decided = await decideProviderShareReshare(command.id, command.decision, Date.now(), assertCurrent);@@ -761,12 +780,12 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => void*/export async function executeProviderShareManagementCommand(command: ProviderShareManagementCommand): Promise<unknown> {const assertCurrent = captureProviderManagementScope();- if (command.action === 'approve' || command.action === 'reject' || command.action === 'set-member') {+ if (command.action === 'approve' || command.action === 'reject' || command.action === 'set-member' || command.action === 'set-member-note') {requireRunning();await refreshProviderShareHost('management');assertCurrent();const shares = getProviderShareHostSnapshot();- const found = command.action === 'set-member'+ const found = command.action === 'set-member' || command.action === 'set-member-note'? shares.some((share) => share.members.some((member) => member.memberId === command.memberId)): shares.some((share) => share.requests.some((request) => request.requestId === command.requestId));if (!found) throwIpcError('NOT_FOUND', 'The share request or member is no longer on this computer');diff --git a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts b/apps/desktop/src/main/provider-group/__tests__/ipc.test.tsindex 8ecad569b8..87e2b76e01 100644--- a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts@@ -553,8 +553,11 @@ describe('provider management receiver account boundary', () => {expect(reply.result).toEqual({ providerId: 'anthropic', config, members: [] });});- it('accepts reshare decisions as owner operations and keeps forwarding operations outside the management scope', async () => {- const command = { action: 'reshare-decide', id: 'rs-pending', decision: 'approve' } as const;+ // 同账号管理:新增备注与转分享决定共用主人操作入口,受邀者读取仍不在此范围。+ it.each([+ { action: 'reshare-decide', id: 'rs-pending', decision: 'approve' },+ { action: 'set-member-note', memberId: 'm1', note: 'Alice' },+ ] as const)('accepts $action as an owner operation and keeps forwarding operations outside the management scope', async (command) => {vi.mocked(parseProviderShareCommand).mockReturnValue(command);expect(parseProviderManagementRequest({ action: 'manage-share', command })).toEqual({ action: 'manage-share', command });vi.mocked(executeProviderShareManagementCommand).mockResolvedValueOnce({ ok: true });diff --git a/apps/desktop/src/main/provider-group/management.ts b/apps/desktop/src/main/provider-group/management.tsindex ac491dd6dc..b53ab1f797 100644--- a/apps/desktop/src/main/provider-group/management.ts+++ b/apps/desktop/src/main/provider-group/management.ts@@ -20,7 +20,7 @@ export function parseProviderManagementRequest(raw: unknown): ProviderManagementreturn { action: 'manage-group', command: command as ProviderGroupManagementCommand };}const command = parseProviderShareCommand(raw.command);- if (!['owned', 'own-usage', 'usage-history', 'create-link', 'approve', 'reject', 'set-member', 'reshare-decide', 'get-run-limits', 'set-run-limits', 'reset-run-limits'].includes(command.action)) {+ if (!['owned', 'own-usage', 'usage-history', 'create-link', 'approve', 'reject', 'set-member', 'set-member-note', 'reshare-decide', 'get-run-limits', 'set-run-limits', 'reset-run-limits'].includes(command.action)) {throwIpcError('PERMISSION_DENIED', 'Only owner operations are available through management');}return { action: 'manage-share', command: command as ProviderShareManagementCommand };diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsxindex 82cdc88bb2..0ec63ba950 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx@@ -40,6 +40,8 @@ import type {ProviderUsageHistoryView,} from '../../../shared/providerShare';import { ProviderShareLinkDialog } from './ProviderShareLinkDialog';+import { ProviderShareMemberNoteDialog } from './ProviderShareMemberNoteDialog';+import { providerShareMemberName } from '../../../shared/providerShareMemberNote';import { pendingResharesFromOwned, sharesClaudeLoginEmail, type ProviderShareGate, type ProviderSharePendingRequest } from './providerShareFormat';import { ProviderUsageSection, type ProviderUsageStatus } from './ProviderUsageSection';import { presentProviderShareApproval, publishProviderShareOwnerState, removeProviderSharePendingRequest } from './providerShareStore';@@ -80,6 +82,8 @@ export function ProviderShareManagePage({: devices?.find((device) => device.isSelf)?.name ?? null;const [remoteGroup, setRemoteGroup] = useState<ProviderGroupConfig | null>(initialGroup ?? null);const [state, setState] = useState<ProviderShareOwnerState | null>(null);+ const [noteMemberId, setNoteMemberId] = useState<string | null>(null);+ const noteTriggerRef = useRef<HTMLButtonElement | null>(null);const [loadFailed, setLoadFailed] = useState(false);const [loadErrorKey, setLoadErrorKey] = useState<string | null>(null);const [history, setHistory] = useState<ProviderUsageHistoryView | null>(null);@@ -263,7 +267,7 @@ export function ProviderShareManagePage({: status === 'resume'? 'providerShare.toast.resumed': 'providerShare.toast.removed',- { name: member.displayName },+ { name: providerShareMemberName(member) },),);} catch (error) {@@ -299,9 +303,9 @@ export function ProviderShareManagePage({async (member: ProviderShareMemberView) => {const ok = await confirm({presentation: 'standard',- title: t('providerShare.manage.removeConfirm.title', { name: member.displayName }),+ title: t('providerShare.manage.removeConfirm.title', { name: providerShareMemberName(member) }),description: t('providerShare.manage.removeConfirm.description', {- name: member.displayName,+ name: providerShareMemberName(member),provider: providerName,}),confirmText: t('providerShare.manage.removeConfirm.confirm'),@@ -324,8 +328,10 @@ export function ProviderShareManagePage({canApproveReshare: providerClassificationReady,onTogglePause: (member) => void setMember(member, member.status === 'paused' ? 'resume' : 'pause'),onRemove: (member) => void removeMember(member),- onReshare: (member, reshare, decision) => void decideReshare(reshare, member.displayName, decision),+ onEditNote: (member, trigger) => { noteTriggerRef.current = trigger; setNoteMemberId(member.memberId); },+ onReshare: (member, reshare, decision) => void decideReshare(reshare, providerShareMemberName(member), decision),}), [busy, decideReshare, loadFailed, providerClassificationReady, removeMember, setMember]);+ const noteMember = members.find((member) => member.memberId === noteMemberId);return (// 这一页自己滚动(设置页外层在「模型供应商」分区不滚)。始终预留滚动条槽位:展开组内电脑的配额、@@ -459,13 +465,13 @@ export function ProviderShareManagePage({<div className="flex flex-wrap items-baseline gap-2 text-13"><span className="font-medium text-[var(--text-primary)]">{item.reshare.name}</span><span className="text-12 text-[var(--text-secondary)]">- {t('providerShare.manage.reshare.applying', { owner: item.owner.displayName })}+ {t('providerShare.manage.reshare.applying', { owner: providerShareMemberName(item.owner) })}</span></div><div className="flex flex-wrap gap-1.5 text-12 text-[var(--text-secondary)]"><span>{t('providerShare.manage.reshare.requestedAt', { time: time.relative(item.reshare.requestedAt) })}</span><span aria-hidden="true">·</span>- <span>{t('providerShare.manage.reshare.usageHint', { name: item.reshare.name, owner: item.owner.displayName })}</span>+ <span>{t('providerShare.manage.reshare.usageHint', { name: item.reshare.name, owner: providerShareMemberName(item.owner) })}</span></div></div><div className="flex shrink-0 items-center gap-1.5">@@ -474,7 +480,7 @@ export function ProviderShareManagePage({size="sm"compactdisabled={loadFailed || busy.has(item.reshare.id)}- onClick={() => void decideReshare(item.reshare, item.owner.displayName, 'reject')}+ onClick={() => void decideReshare(item.reshare, providerShareMemberName(item.owner), 'reject')}>{t('providerShare.manage.reshare.reject')}</Button>@@ -483,7 +489,7 @@ export function ProviderShareManagePage({size="sm"compactdisabled={loadFailed || !providerClassificationReady || busy.has(item.reshare.id)}- onClick={() => void decideReshare(item.reshare, item.owner.displayName, 'approve')}+ onClick={() => void decideReshare(item.reshare, providerShareMemberName(item.owner), 'approve')}>{t('providerShare.manage.reshare.approve')}</Button>@@ -522,6 +528,22 @@ export function ProviderShareManagePage({onClose={() => setLinkOpen(false)}/>)}+ {noteMember && (+ <ProviderShareMemberNoteDialog+ key={`${deviceId ?? 'local'}:${noteMember.memberId}`}+ member={noteMember}+ returnFocusTo={noteTriggerRef.current}+ deviceId={deviceId}+ onClose={() => setNoteMemberId(null)}+ onSaved={() => {+ setNoteMemberId(null);+ // 保存前发出的轮询不能把旧备注写回来;作废旧读取后再取已落盘的备注。+ loadSeq.current += 1;+ remoteLoading.current = false;+ void load();+ }}+ />+ )}</div>);}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareMemberNoteDialog.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareMemberNoteDialog.tsxnew file mode 100644index 0000000000..4d875913da--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareMemberNoteDialog.tsx@@ -0,0 +1,165 @@+import { useEffect, useRef, useState } from 'react';+import { useTranslation } from 'react-i18next';++import { Button } from '@/components/ui/button';+import { ErrorNotice } from '@/components/ui/error-notice';+import { Input } from '@/components/ui/input';+import {+ getDataOwnerGeneration,+ isDataOwnerGenerationCurrent,+} from '@/contexts/dataOwnerGeneration';+import {+ isProviderManagementOutdated,+ providerShareManagementCommand,+} from '@/features/provider-group/providerManagement';++import type { ProviderShareMemberView } from '../../../shared/providerShare';+import {+ normalizeProviderShareMemberNote,+ PROVIDER_SHARE_MEMBER_NOTE_MAX_LENGTH,+} from '../../../shared/providerShareMemberNote';+import {+ ProviderShareDialog,+ ProviderShareDialogFooter,+ ProviderShareDialogTitle,+} from './ProviderShareDialog';++export function ProviderShareMemberNoteDialog({+ member,+ deviceId,+ returnFocusTo,+ onSaved,+ onClose,+}: {+ member: ProviderShareMemberView;+ deviceId?: string;+ returnFocusTo?: HTMLElement | null;+ onSaved: () => void;+ onClose: () => void;+}) {+ const { t } = useTranslation();+ const [note, setNote] = useState(member.note ?? '');+ const [saving, setSaving] = useState(false);+ const [errorKey, setErrorKey] = useState<string | null>(null);+ const inputRef = useRef<HTMLInputElement>(null);+ const requestSeq = useRef(0);+ const inFlight = useRef(false);+ useEffect(+ () => () => {+ requestSeq.current += 1;+ },+ [],+ );++ const save = async () => {+ if (inFlight.current) return;+ inFlight.current = true;+ const seq = ++requestSeq.current;+ const owner = getDataOwnerGeneration();+ const current = () => seq === requestSeq.current && isDataOwnerGenerationCurrent(owner);+ setSaving(true);+ setErrorKey(null);+ try {+ await providerShareManagementCommand(+ {+ action: 'set-member-note',+ memberId: member.memberId,+ note: normalizeProviderShareMemberNote(note),+ },+ deviceId,+ );+ if (current()) onSaved();+ } catch (error) {+ if (current())+ setErrorKey(+ deviceId && isProviderManagementOutdated(error)+ ? 'providerGroup.management.unsupported'+ : 'providerShare.manage.memberNote.saveFailed',+ );+ } finally {+ if (current()) {+ inFlight.current = false;+ setSaving(false);+ }+ }+ };++ return (+ <ProviderShareDialog+ open+ busy={saving}+ initialFocusRef={inputRef}+ returnFocusTo={returnFocusTo}+ onOpenChange={(open) => {+ if (!open) onClose();+ }}+ >+ <ProviderShareDialogTitle>+ {t('providerShare.manage.memberNote.title')}+ </ProviderShareDialogTitle>+ <p className="mt-2 select-text text-13 leading-[1.5] text-[var(--confirm-desc)]">+ {t('providerShare.manage.memberNote.username', { name: member.displayName })}+ </p>+ <form+ onSubmit={(event) => {+ event.preventDefault();+ void save();+ }}+ >+ <label+ htmlFor="provider-share-member-note"+ className="mb-2 mt-4 block text-13 font-medium leading-[1.5] text-[var(--text-primary)]"+ >+ {t('providerShare.manage.memberNote.label')}+ </label>+ <Input+ inputRef={inputRef}+ id="provider-share-member-note"+ value={note}+ maxLength={PROVIDER_SHARE_MEMBER_NOTE_MAX_LENGTH}+ disabled={saving}+ onChange={setNote}+ aria-describedby="provider-share-member-note-hint"+ onKeyDown={(event) => {+ if (event.key === 'Enter' && (event.nativeEvent.isComposing || event.keyCode === 229))+ event.preventDefault();+ }}+ />+ <p+ id="provider-share-member-note-hint"+ className="mt-2 text-12 leading-[1.5] text-[var(--text-secondary)]"+ >+ {t('providerShare.manage.memberNote.hint', {+ count: PROVIDER_SHARE_MEMBER_NOTE_MAX_LENGTH,+ })}+ </p>+ {errorKey && <ErrorNotice role="alert" className="mt-3" message={t(errorKey)} />}+ <ProviderShareDialogFooter>+ <Button+ type="submit"+ variant="primary"+ palette="confirmation"+ size="lg"+ disabled={saving}+ >+ {t(+ saving+ ? 'providerShare.manage.memberNote.saving'+ : 'providerShare.manage.memberNote.save',+ )}+ </Button>+ <Button+ type="button"+ variant="secondary"+ palette="confirmation"+ size="lg"+ disabled={saving}+ onClick={onClose}+ >+ {t('settings.providers.button.cancel')}+ </Button>+ </ProviderShareDialogFooter>+ </form>+ </ProviderShareDialog>+ );+}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsxindex 99b4ef4d04..96f11917a7 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx@@ -42,6 +42,7 @@ import type {ProviderUsageHistoryView,} from '../../../shared/providerShare';import { DEFAULT_USAGE_CURRENCY, type RegionalMoney } from '../../../shared/regionalMoney';+import { providerShareMemberName } from '../../../shared/providerShareMemberNote';import { formatShareMoney, formatShareTokens } from './providerShareFormat';import { providerShareComputerName, useProviderShareOwnerNameOf } from './providerShareNames';import { deviceIdOfMemberKey, shareAgentDeviceIdOfMemberKey } from './providerUsageBreakdown';@@ -180,7 +181,7 @@ export function ProviderUsageSection({const usage = history?.members.find((item) => item.memberId === member.memberId);list.push({key: memberParty(member.memberId),- name: member.displayName,+ name: providerShareMemberName(member),tag: t('providerGroup.usage.shareSource'),person: { displayName: member.displayName, avatarUrl: member.avatarUrl },member,@@ -675,6 +676,11 @@ function PartyTable({<span className="text-12 text-[var(--text-secondary)]">{party.tag}</span>{member && <ShareMemberStatus member={member} />}</div>+ {member?.note && (+ <span className="truncate text-12 leading-[1.5] text-[var(--text-secondary)]" title={member.displayName}>+ {t('providerShare.manage.memberNote.username', { name: member.displayName })}+ </span>+ )}<span className="truncate text-12 text-[var(--text-secondary)]">{member? `${t('providerShare.manage.members.joined', { date: time.date(Date.parse(member.joinedAt)) })} · ${lastUsed}`@@ -703,6 +709,7 @@ function PartyTable({disabled={memberActions.busy(member.memberId)}onTogglePause={() => memberActions.onTogglePause(member)}onRemove={() => memberActions.onRemove(member)}+ onEditNote={(trigger) => memberActions.onEditNote(member, trigger)}/>)}</td>diff --git a/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx b/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsxindex 183d7f4343..8b110f31a0 100644--- a/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx@@ -3,7 +3,8 @@* 分享状态、关闭/恢复与删除(收进行内 `···`,与组内电脑一行的「移出组」同一模式),以及经这个人的供应商组* 转给别人用、已处理过的人(provider-sharing.md §4.3)。操作由「远程与分享」页执行,结果以 toast 说明。*/-import { CirclePause, CirclePlay, MoreHorizontal, Trash2 } from 'lucide-react';+import { CirclePause, CirclePlay, MoreHorizontal, Pencil, Trash2 } from 'lucide-react';+import { useRef } from 'react';import { useTranslation } from 'react-i18next';import { Button } from '@/components/ui/button';@@ -12,6 +13,7 @@ import { Tip } from '@/components/ui/tooltip';import { cn } from '@/lib/utils';import type { ProviderShareMemberView, ProviderShareReshareView } from '../../../shared/providerShare';+import { providerShareMemberName } from '../../../shared/providerShareMemberNote';import { ShareAvatar } from './ShareAvatar';export interface ProviderShareMemberActions {@@ -21,6 +23,7 @@ export interface ProviderShareMemberActions {canApproveReshare: boolean;onTogglePause: (member: ProviderShareMemberView) => void;onRemove: (member: ProviderShareMemberView) => void;+ onEditNote: (member: ProviderShareMemberView, trigger: HTMLButtonElement | null) => void;onReshare: (member: ProviderShareMemberView, reshare: ProviderShareReshareView, decision: 'approve' | 'reject') => void;}@@ -52,21 +55,25 @@ export function ShareMemberMenu({disabled,onTogglePause,onRemove,+ onEditNote,}: {member: ProviderShareMemberView;disabled: boolean;onTogglePause: () => void;onRemove: () => void;+ onEditNote: (trigger: HTMLButtonElement | null) => void;}) {const { t } = useTranslation();+ const triggerRef = useRef<HTMLButtonElement>(null);const paused = member.status === 'paused';- const label = t('providerShare.manage.members.moreAria', { name: member.displayName });+ const label = t('providerShare.manage.members.moreAria', { name: providerShareMemberName(member) });const PauseIcon = paused ? CirclePlay : CirclePause;return (<DropdownMenu><DropdownMenuTrigger asChild><Tip text={label}><button+ ref={triggerRef}type="button"aria-label={label}className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-[var(--text-tertiary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"@@ -76,6 +83,10 @@ export function ShareMemberMenu({</Tip></DropdownMenuTrigger><DropdownMenuContent align="end">+ <DropdownMenuItem disabled={disabled} onClick={() => onEditNote(triggerRef.current)}>+ <Pencil size={18} className="mr-2.5" />+ {t(member.note ? 'providerShare.manage.memberNote.edit' : 'providerShare.manage.memberNote.add')}+ </DropdownMenuItem><DropdownMenuItem disabled={disabled} onClick={onTogglePause}><PauseIcon size={18} className="mr-2.5" />{t(paused ? 'providerShare.manage.members.resume' : 'providerShare.manage.members.pause')}@@ -108,7 +119,7 @@ export function ShareMemberReshares({return (<div className={cn('flex flex-col gap-1.5', className)} data-testid="provider-share-reshare-list"><span className="text-12 text-[var(--text-tertiary)]">- {t('providerShare.manage.reshare.listTitle', { owner: member.displayName })}+ {t('providerShare.manage.reshare.listTitle', { owner: providerShareMemberName(member) })}</span>{decided.map((reshare) => {const approved = reshare.state === 'approved';diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsxindex b700f2ff74..268916ab6b 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx@@ -1,5 +1,5 @@// @vitest-environment jsdom-import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';+import { act, cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';import type { ReactNode } from 'react';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import type { ProviderView } from '@cindy/model-providers';@@ -262,6 +262,91 @@ function renderPage(}describe('ProviderShareManagePage', () => {+ /* 测试价值:2026-10-19 用户备注;生产页面的新增入口、保存/清空、原用户名与筛选同步显示。+ * 现有测试只有暂停/删除。最小输入:一个成员,分别在本机和 studio 管理。tier: unit。+ * 单文件实测 17.21 秒,其中导入 7.16 秒、30 用例 8.61 秒;复用既有页面与完整用量图表 fixture,+ * 未拆成第二套页面 fixture 或删除原断言。备注新增 4 个用例的执行合计 2.25 秒。+ */+ it.each([undefined, 'studio'])('sets and clears a member note through the managed computer (%s)', async (deviceId) => {+ const snapshot = owned();+ const staleSnapshot = owned();+ let holdNextRead = false;+ let finishOldRead!: (value: ProviderShareOwnerState) => void;+ const oldRead = new Promise<ProviderShareOwnerState>((resolve) => { finishOldRead = resolve; });+ let ownedChanged: () => void = () => undefined;+ window.electronAPI.providerShare.onOwnedChanged = (listener) => { ownedChanged = listener; return () => undefined; };+ const defaultCommand = command.getMockImplementation()!;+ command.mockImplementation(async (cmd) => {+ if (cmd.action === 'owned') {+ if (holdNextRead) { holdNextRead = false; return oldRead; }+ return snapshot;+ }+ if (cmd.action === 'set-member-note') {+ snapshot.shares[0]!.members[0]!.note = cmd.note || null;+ return { ok: true };+ }+ return defaultCommand(cmd);+ });+ const remoteCommand = vi.spyOn(window.electronAPI.providerGroup, 'command');+ if (deviceId) remoteCommand.mockImplementation(async (cmd) => {+ if (cmd.action === 'remote-manage' && cmd.request.action === 'manage-share') return command(cmd.request.command);+ return { providerId: 'xd', config: null, members: [] };+ });+ renderPage('on', { deviceId });+ fireEvent.click(within(await findMemberRow()).getByText('providerShare.manage.memberNote.add'));+ const input = await screen.findByLabelText('providerShare.manage.memberNote.label');+ expect(document.activeElement).toBe(input);+ fireEvent.change(input, { target: { value: ' Alice ' } });+ // 模拟保存前已经发出但迟迟没返回的轮询;保存后仍必须重新读,旧回包不能还原用户名。+ holdNextRead = true;+ ownedChanged();+ fireEvent.click(screen.getByText('providerShare.manage.memberNote.save'));+ await waitFor(() => expect(within(screen.getAllByTestId('provider-usage-row')[1]!).getByRole('button', { name: 'Alice' })).toBeTruthy());+ await act(async () => { finishOldRead(staleSnapshot); });+ const row = await findMemberRow();+ expect(row.textContent).toContain('providerShare.manage.memberNote.username:{"name":"Lizi"}');+ const noteCommand = { action: 'set-member-note', memberId: 'mem-1', note: 'Alice' };+ if (deviceId) expect(remoteCommand).toHaveBeenCalledWith({+ action: 'remote-manage', deviceId, request: { action: 'manage-share', command: noteCommand },+ });+ else expect(command).toHaveBeenCalledWith(noteCommand);+ fireEvent.click(within(row).getByRole('button', { name: 'Alice' }));+ expect(screen.getByRole('combobox', { name: 'providerGroup.usage.filter.partyAria' }).textContent).toContain('Alice');+ fireEvent.click(within(row).getByText('providerShare.manage.memberNote.edit'));+ const editInput = await screen.findByLabelText('providerShare.manage.memberNote.label');+ expect((editInput as HTMLInputElement).value).toBe('Alice');+ fireEvent.change(editInput, { target: { value: ' ' } });+ fireEvent.click(screen.getByText('providerShare.manage.memberNote.save'));+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());+ expect((await findMemberRow()).textContent).not.toContain('providerShare.manage.memberNote.username');+ expect(screen.getByRole('combobox', { name: 'providerGroup.usage.filter.partyAria' }).textContent).toContain('Lizi');+ });++ // 保存失败不能关闭草稿或假装已改名;旧电脑明确提示更新,不退到控制端保存。+ it.each([undefined, 'studio'])('keeps the note draft when saving fails (%s)', async (deviceId) => {+ const defaultCommand = command.getMockImplementation()!;+ command.mockImplementation(async (cmd) => {+ if (cmd.action === 'set-member-note') throw new Error(deviceId ? '[UNSUPPORTED_CAPABILITY] Unknown command' : 'disk unavailable');+ return defaultCommand(cmd);+ });+ if (deviceId) vi.spyOn(window.electronAPI.providerGroup, 'command').mockImplementation(async (cmd) => {+ if (cmd.action === 'remote-manage' && cmd.request.action === 'manage-share') return command(cmd.request.command);+ return { providerId: 'xd', config: null, members: [] };+ });+ renderPage('on', { deviceId });+ fireEvent.click(within(await findMemberRow()).getByText('providerShare.manage.memberNote.add'));+ const input = await screen.findByLabelText('providerShare.manage.memberNote.label');+ fireEvent.change(input, { target: { value: 'Alice' } });+ fireEvent.click(screen.getByText('providerShare.manage.memberNote.save'));+ expect((await screen.findByRole('alert')).textContent).toContain(deviceId ? 'providerGroup.management.unsupported' : 'providerShare.manage.memberNote.saveFailed');+ expect((input as HTMLInputElement).value).toBe('Alice');+ expect((await findMemberRow()).textContent).not.toContain('Alice');+ fireEvent.click(screen.getByText('settings.providers.button.cancel'));+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());+ await waitFor(() => expect(document.activeElement?.getAttribute('aria-label')).toContain('members.moreAria'));+ expect(command.mock.calls.filter(([cmd]) => cmd.action === 'set-member-note')).toHaveLength(1);+ });+it('lists pending requests and members for this provider only, and publishes pending requests', async () => {renderPage();await findMemberRow();diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 767d7b96f5..abd45f996e 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -280,6 +280,17 @@"toastRejected": "Declined {{name}}’s request","toastRevoked": "Withdrew agreement for {{name}}. Running sessions were stopped.","listTitle": "Using it through {{owner}}’s provider group"+ },+ "memberNote": {+ "add": "Set Note",+ "edit": "Edit Note",+ "title": "Set User Note",+ "label": "Note",+ "username": "Username: {{name}}",+ "hint": "Up to {{count}} characters. Leave blank to clear. Only visible to you.",+ "save": "Save Note",+ "saving": "Saving note…",+ "saveFailed": "Could not save note"}},"toast": {diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 5150a9f4a9..0864210826 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -276,6 +276,17 @@"toastRejected": "{{name}} のリクエストを拒否しました","toastRevoked": "{{name}} への同意を取り消しました。実行中のセッションは停止しました","listTitle": "{{owner}} のプロバイダーグループ経由で利用"+ },+ "memberNote": {+ "add": "メモを設定",+ "edit": "メモを編集",+ "title": "ユーザーのメモを設定",+ "label": "メモ",+ "username": "ユーザー名:{{name}}",+ "hint": "{{count}}文字まで。空欄で消去できます。自分にのみ表示されます。",+ "save": "メモを保存",+ "saving": "メモを保存中…",+ "saveFailed": "メモを保存できませんでした"}},"toast": {diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex bb36b0a8f9..f38b9375c0 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -276,6 +276,17 @@"toastRejected": "{{name}}님의 요청을 거절했습니다","toastRevoked": "{{name}}님에 대한 동의를 철회했습니다. 실행 중인 세션은 중지되었습니다","listTitle": "{{owner}}님의 제공자 그룹을 통해 사용"+ },+ "memberNote": {+ "add": "메모 설정",+ "edit": "메모 수정",+ "title": "사용자 메모 설정",+ "label": "메모",+ "username": "사용자 이름: {{name}}",+ "hint": "최대 {{count}}자. 비워 두면 삭제됩니다. 나에게만 표시됩니다.",+ "save": "메모 저장",+ "saving": "메모 저장 중…",+ "saveFailed": "메모를 저장할 수 없습니다"}},"toast": {diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex c3d2eea399..e3657915bb 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -276,6 +276,17 @@"toastRejected": "已拒绝 {{name}} 的请求","toastRevoked": "已撤回对 {{name}} 的同意,正在运行的任务已停止","listTitle": "经 {{owner}} 的供应商组使用"+ },+ "memberNote": {+ "add": "设置备注",+ "edit": "修改备注",+ "title": "设置用户备注",+ "label": "备注",+ "username": "用户名:{{name}}",+ "hint": "最多 {{count}} 字,留空可清除。仅你可见",+ "save": "保存备注",+ "saving": "正在保存备注…",+ "saveFailed": "未能保存备注"}},"toast": {diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 176d7f2ab1..12299aa43e 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -276,6 +276,17 @@"toastRejected": "已拒絕 {{name}} 的請求","toastRevoked": "已撤回對 {{name}} 的同意,正在執行的任務已停止","listTitle": "經 {{owner}} 的供應商組使用"+ },+ "memberNote": {+ "add": "設定備註",+ "edit": "修改備註",+ "title": "設定使用者備註",+ "label": "備註",+ "username": "使用者名稱:{{name}}",+ "hint": "最多 {{count}} 字,留空可清除。僅你可見",+ "save": "儲存備註",+ "saving": "正在儲存備註…",+ "saveFailed": "未能儲存備註"}},"toast": {diff --git a/apps/desktop/src/shared/providerManagement.ts b/apps/desktop/src/shared/providerManagement.tsindex 9238a932b3..e2b7f770ce 100644--- a/apps/desktop/src/shared/providerManagement.ts+++ b/apps/desktop/src/shared/providerManagement.ts@@ -12,7 +12,7 @@ export type ProviderGroupManagementCommand = Extract<export type ProviderShareManagementCommand = Extract<ProviderShareCommand,- { action: 'owned' | 'own-usage' | 'usage-history' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'reshare-decide' | 'get-run-limits' | 'set-run-limits' | 'reset-run-limits' }+ { action: 'owned' | 'own-usage' | 'usage-history' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'set-member-note' | 'reshare-decide' | 'get-run-limits' | 'set-run-limits' | 'reset-run-limits' }>;export type ProviderManagementRequest =diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex 72dc5f2459..e3e9c4039e 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -85,6 +85,8 @@ export interface ProviderShareReshareView {}export interface ProviderShareMemberView extends ProviderShareMember {+ /** 分享者给这个成员设置的备注;只用于管理页,不向受邀者公开。旧电脑可能缺省。 */+ note?: string | null;lastUsedAt: number | null;runningTasks: number;models: ProviderShareModelUsageView[];@@ -199,6 +201,7 @@ export type ProviderShareCommand =| { action: 'create-link'; providerId: string }| { action: 'approve' | 'reject'; requestId: string }| { action: 'set-member'; memberId: string; status: 'pause' | 'resume' | 'remove' }+ | { action: 'set-member-note'; memberId: string; note: string }/** 转分享:同意或拒绝(拒绝已同意的 = 撤回)。 */| { action: 'reshare-decide'; id: string; decision: 'approve' | 'reject' }| { action: 'received' }@@ -228,6 +231,7 @@ export interface ProviderShareCommandResult {approve: { ok: true };reject: { ok: true };'set-member': { ok: true };+ 'set-member-note': { ok: true };'reshare-decide': { ok: true };received: ProviderShareReceived[];'received-snapshot': ProviderShareReceivedSnapshot;diff --git a/apps/desktop/src/shared/providerShareMemberNote.ts b/apps/desktop/src/shared/providerShareMemberNote.tsnew file mode 100644index 0000000000..b4bd75f576--- /dev/null+++ b/apps/desktop/src/shared/providerShareMemberNote.ts@@ -0,0 +1,13 @@+/** 备注为单行、最多 80 个 UTF-16 单元,与输入框的 maxLength 一致。空串表示清除。 */+export const PROVIDER_SHARE_MEMBER_NOTE_MAX_LENGTH = 80;++export function normalizeProviderShareMemberNote(value: string): string {+ return value.replace(/[\p{Cc}\u2028\u2029]/gu, ' ').trim();+}++export function providerShareMemberName(member: {+ displayName: string;+ note?: string | null;+}): string {+ return member.note?.trim() || member.displayName;+}diff --git a/docs/dev-rules/credentials-and-local-storage.md b/docs/dev-rules/credentials-and-local-storage.mdindex d9efbaddf2..bf28444d58 100644--- a/docs/dev-rules/credentials-and-local-storage.md+++ b/docs/dev-rules/credentials-and-local-storage.md@@ -208,6 +208,7 @@ refresh 与 relay 自救节流。在途 refresh 尚未返回时收到的恢复| 旧版 worktree 回收器兼容锁 | 不再创建新的跨 profile Git 锁;保留旧回执对 `<commonGitDir>/worktrees/<id>/locked` 及更早 `.worktree-keep` 的清理。仅当最后一个共享借用结束且自建文件身份和内容仍匹配时删除,不覆盖用户锁;失败沿用 `.release` 重试。支持精确的 `bigint:dev:ino:birthtimeNs` 身份;旧数字编号为 0 或超过安全整数范围时无法证明归属,保留锁但仍释放已结束的租约,避免 Windows 编号精度丢失误删用户替换文件 || 跨 profile 的 worktree 回收日志位置 | `app.getPath('appData')/Cindy/shared-worktree-recycle-journals`,仍按日志目录哈希发布原 profile 日志位置,兼容可能同时运行的旧客户端;新客户端不再读取其他 profile 的日志来借用工程。不复制恢复状态、不代替 owner 执行恢复 || 供应商分享:分享者电脑上的受邀者用量 | `userData/remote-agent/provider-share-usage.json`,按(日期、分享、成员、Agent、供应商、模型)聚合 token 与轮次,行内 `byMember` 按组内电脑的键再分(2026-10-11 加;行键与合计不变,旧版本照常累计并原样写回,合计多出各台之和的部分算没区分电脑),原子替换写入,保留 400 天;只含服务端生成的分享与成员 id,不含昵称、对话或凭证。成员删除后保留(管理页不再显示),同一人重新加入时接续 |+| 供应商分享:分享者的用户备注 | `userData/owners/<账号>/provider-share-member-notes.json`,`notes` 按服务端成员 id 保存非空单行备注(最多 80 个 UTF-16 单元),空白保存删除对应 override;复用设置文件跨进程锁、现读与原子替换,写入前后核对账号。仅管理页及同账号管理的 `owned` 投影读取,不进入服务端、受邀者目录或日志;未显示的成员记录保留,按原成员 id 接续。损坏文件保留并拒绝覆写。实现与回归见 `device-link/providerShareMemberNotes.ts` 及其同名单测 || 供应商分享:转分享的同意 | `userData/owners/<账号>/provider-share-reshare.json`,分享者电脑上记下受邀者的组所在电脑报来的、请求经组使用的人(`provider-sharing.md` §4.3):服务端生成的分享与成员 id、那台组所在电脑的设备 id、组所在电脑给的不透明键、主人的决定与时间,以及组所在电脑转述的昵称与头像地址(只用于管理页认人,不进日志)。不含对话或凭证。原子替换写入;成员被删除或退出、启动后核对已不在这台的分享与成员时删除对应记录 || 供应商分享:短期审批弹窗归属 | `userData/owners/<账号>/provider-share-approval-windows.json`,只记供应商 id、生成端关注的供应商所在电脑 id、非秘密链接标识 `linkId`(随机邀请口令的 SHA-256 摘要)与七分钟截止时刻,不含链接口令、申请、配对码或身份。复用设置文件跨进程锁与原子替换;生成链接返回前完成保存,静默与关注均按链接区分。本机新链接仅清除旧版按供应商静默的窗口,不影响其它链接的精确归属。旧记录仍可读,无标识的旧关注只接无标识申请。完整应用重启的第一轮快照前恢复;远端读取使用新运行时的同账号只读管理通道,不恢复旧回调或重放写操作。过期记录读时忽略、下次写入清理;账号切换隔离,损坏文件保留且拒绝覆写。见 `device-link/providerShareApprovalWindows.ts`、`providerShareHost.ts` 与 `__tests__/providerShareApprovalWindows.test.ts` || 供应商组:本机组绑定待清理记录 | 复用 `userData/owners/<账号>/provider-group-prefs.json` 的可选 `bindingCleanups`,只记供应商 id、保留的组员键(整组删除为 null)、时间与不透明代次,不含消息、凭证或用户身份。与组修改共用文件锁和原子替换;组修改、清理回放与新绑定写入另共用同账号目录的 `provider-group-mutation.lock`(先取该锁,再取各文件锁),防止迟到清理误删新分配。账号切换或重启后仍使旧绑定失效;重新加入不撤销清理,多次移出的保留键取交集。新写绑定前先将旧绑定删除与解除记录原子提交,再按代次确认;写盘失败或确认中断保留意图重试,迟到确认不删除新一代记录。旧文件缺字段视为空,旧版写组设置保留未知根字段。见 `provider-group/store.ts`、`bindings.ts`、`managementScope.ts` 与 `__tests__/stores.test.ts` |diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 8aa3878174..e0a0ba0403 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1646,7 +1646,7 @@ G 与 O 之间不变。受邀者能调用的 channel 不变(仍是 `maker:remote- **`provider-group:remote` 新增 `action: 'manage-group'` / `'manage-share'`**(同一 channel、同一同账号 allowlist,受邀者与共享任务访客照旧 `CHANNEL_NOT_ALLOWED`):请求 `{ action, command }`,`command` 与本机命令同构,结构与校验在`apps/desktop/src/shared/providerManagement.ts`。`manage-group` 只收 `get` / `candidates` / `save-if-current` / `delete-if-current`;- `manage-share` 只收 `owned` / `own-usage` / `usage-history` / `create-link` / `approve` / `reject` / `set-member` / `reshare-decide`,其余回+ `manage-share` 只收 `owned` / `own-usage` / `usage-history` / `create-link` / `approve` / `reject` / `set-member` / `set-member-note` / `reshare-decide` / `get-run-limits` / `set-run-limits` / `reset-run-limits`,其余回`[PERMISSION_DENIED]`。回包 `{ result, respondedAt }`,`respondedAt` 只用于把链接有效期换算到 C 的时钟。- `usage-history`(2026-10-17,供应商组 §7):只读,`{ action, providerId }`,回这个供应商用量的按天明细`{ providerId, todayKey, coverageStart, self, relays, members }`(结构在 `apps/desktop/src/shared/providerShare.ts`),@@ -1656,6 +1656,9 @@ G 与 O 之间不变。受邀者能调用的 channel 不变(仍是 `maker:remote`[INVALID_PARAMS] Unknown command`,C 的 Main 把 `manage-share` 的这个回包统一成 `[UNSUPPORTED_CAPABILITY]`(与`unknown provider group action` 同一处),管理页退回 `own-usage` 与 `owned`(range=all)的所有时间合计并提示更新 O,不重试。旧 C 不发这个动作,照旧读 `own-usage` / `owned`,O 对两者的回包不变。+ - `set-member-note`(2026-10-19):`{ action, memberId, note }`,只允许已有成员,空字符串清除备注,最多 80 个 UTF-16 单元、保存前规范为单行。+ O 按账号保存私人备注,`owned` 的成员投影新增可选 `note: string | null`,不改服务端成员合同或受邀者目录。+ 旧 C 忽略新增字段;旧 O 不认识命令时沿用 `INVALID_PARAMS → UNSUPPORTED_CAPABILITY` 映射,C 保留草稿、提示更新,不重放或改存本机。- O 在执行前后核对账号未切换;`approve` / `reject` / `set-member` 先刷新快照,申请或成员不在 O 的分享里回 `[NOT_FOUND]`;`owned` 的回包只含 `{ ready, shares }`,不带 O 自己的弹窗安排。不再转发给第三台电脑。- `reshare-decide` 只修改 O 当前账号的本机转分享记录,写锁内和返回前继续核对账号边界;撤回由 O 停止对应中转任务。diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 82689dd4c4..328e395de6 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -298,6 +298,10 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):- **已分享的人**(2026-10-16 起不再单列,并进页面上方的「用量」块,与这个人的用量同一行,见[供应商组](provider-groups.md) §7;用户要求同一个人不在两处出现):显示头像、昵称、加入时间、最近使用、当前状态(正常/已暂停)与是否有任务正在运行;关闭与删除在这一行行尾的 `···` 里;这个人经自己的供应商组转给别人用、已处理过的请求列在这一行下方(已同意的可撤回,拒绝的可改为同意,§4.3)。+- **用户备注**(2026-10-19 用户要求):这一行的 `···` 可设置或修改备注,最多 80 个 UTF-16 单元;留空保存即清除。+ 有备注时按人列表与使用方筛选优先显示备注,列表另保留原用户名,关闭、删除等操作也用备注称呼;没有备注时沿用原昵称。+ 备注只属于分享者的这个成员关系,保存在供应商所在电脑、按账号隔离,同账号其他电脑经现有管理通道读写;不修改对方的昵称,+ 不交给分享服务、受邀者或其他账号,也不改变分享权限。旧电脑不支持保存时明确提示更新,不退到控制端保存。- **用量**(2026-10-11 起移到页面上方的「用量」块;2026-10-17 起与设置 → 用量同一套,见[供应商组](provider-groups.md) §7):标题同一行右侧筛选使用方、组内电脑、时间范围与日期,默认是所有人的合计;概览、按人(第一行是自己即当前登录账号,之后是分享的人,只显示昵称与头像,§6)、近 30 天每日 token、活跃热力图、按电脑(有组时)、按模型(含估算金额)。时间范围与设置页相同:diff --git a/docs/qa/provider-share-member-notes/dark-list.png b/docs/qa/provider-share-member-notes/dark-list.pngnew file mode 100644index 0000000000..15030b9bb5Binary files /dev/null and b/docs/qa/provider-share-member-notes/dark-list.png differdiff --git a/docs/qa/provider-share-member-notes/light-dialog.png b/docs/qa/provider-share-member-notes/light-dialog.pngnew file mode 100644index 0000000000..7631942fefBinary files /dev/null and b/docs/qa/provider-share-member-notes/light-dialog.png differ