Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(sharing): accept auth device identifiers in shared tasks

DavidShene3277e4b7886
diff --git a/docs/product-rules/shared-task-mode.md b/docs/product-rules/shared-task-mode.md
index 1980bf5108..8616914ff0 100644
--- a/docs/product-rules/shared-task-mode.md
+++ b/docs/product-rules/shared-task-mode.md
@@ -37,7 +37,7 @@
- 移除或退出立即撤权;原邀请不可重入,房主生成新邀请后才能再次加入。
- 停止共享、归档、房主登出使旧邀请和成员关系失效。重新共享产生新的共享 ID。
- 归档后恢复为活动任务,可以显式重新开启共享;须先完成旧共享关闭,旧代次的请求仍然失效。
-- 房主设备的 relay 连接确认离线后,关闭该设备承载的共享,旧邀请与成员关系失效。重新上线不会恢复旧共享,需显式重新开启并发送新邀请。已由新连接接管的旧连接退出不算离线;TTL 内短暂网络抖动不承诺立即判定。
+- 房主设备的 relay 连接确认离线后有 60 秒重连宽限,期间重连保留共享、邀请与成员关系;持续离线超过宽限后由下一轮服务端扫描关闭(正常情况下确认离线后 60–90 秒)。关闭后重新上线不会恢复旧共享,需显式重新开启并发送新邀请。主动关闭与登出的显式关闭请求不等待宽限。已由新连接接管的旧连接退出不算离线;TTL 内短暂网络抖动不承诺立即判定。
- 服务端是成员关系权威;主机保存恢复与关闭记录。迟到响应、旧快照、缓存和重连不能恢复已撤销访问。
- 访客断线保留成员关系,重连后可继续访问仍有效的共享;不能影响其他访客或同账号远控。
- 正常断开触发关闭;relay 崩溃、路由过期或关闭落库失败由服务端每 30 秒扫描补偿。访客当前通过约 5 秒轮询更新界面;服务端授权在关闭提交后立即失效。
@@ -148,7 +148,7 @@
3. 房主打开已有任务,开启共享并复制邀请。访客从菜单加入,确认无需审批即可进入普通任务页,能够查看加入前的消息、工具结果和附件。
4. 同时发送不同内容,确认两个客户端看到同一 Agent 输出及正确作者。Agent 忙时编辑或撤回自己的待发送消息;修改其他成员的待发送消息应失败。编辑带图片的消息,保留旧附件并增加新附件,确认发送后和重载后都可打开。
5. 分别验证切换 Agent、模型和推理设置、停止 Agent、普通权限与 Full Access。已有审批由房主处理,访客能查看请求并继续排队发消息。
-6. 访客断网后重连,确认有效共享与历史恢复。房主退出或确认离线后共享关闭、旧邀请失效,上线后需重新开启。单个访客断线时,另一个访客及同账号远控继续工作。
+6. 访客断网后重连,确认有效共享与历史恢复。房主断线后 60 秒内重连保留共享;持续离线超过宽限后共享关闭、旧邀请失效,上线后需重新开启。房主主动关闭或退出账号立即关闭共享。单个访客断线时,另一个访客及同账号远控继续工作。
7. 验证移除、退出、停止共享、归档和登出。旧邀请不能恢复已退出或移除的身份,新邀请可以重新加入;未共享任务与主机全局设置不可经访客客户端访问。
8. 验证本地工作区及 SSH 工作区的图片、音频、视频,检查 Light/Dark 和小屏。旧服务端或旧客户端应提示升级,不得退化成全设备控制。
diff --git a/packages/device-link-protocol/src/sharedTask.ts b/packages/device-link-protocol/src/sharedTask.ts
index 624d0b70d6..afaa690c76 100644
--- a/packages/device-link-protocol/src/sharedTask.ts
+++ b/packages/device-link-protocol/src/sharedTask.ts
@@ -13,25 +13,38 @@ function identifier(value: string): string {
if (typeof value !== 'string' || !/^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(value)) throw new Error('Invalid sharedTask peer identifier');
return value;
}
+/** Matches auth-server's device claim contract; never use for internal IDs. */
+export function sharedTaskDeviceId(value: unknown): string {
+ if (typeof value !== 'string' || value.length < 1 || value.length > 128) throw new Error('Invalid sharedTask device identifier');
+ return value;
+}
+function encodeDeviceId(value: string): string {
+ const deviceId = sharedTaskDeviceId(value);
+ // Preserve the existing encoding for normal IDs. JSON quotes distinguish the
+ // extended domain and preserve every UTF-16 code unit, including surrogates.
+ const encoded = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(deviceId) ? deviceId : JSON.stringify(deviceId);
+ return encodeURIComponent(encoded).replaceAll('~', '%7E');
+}
export function sharedTaskHostPeer(sharedTaskId: string): string {
return `${SHARED_TASK_PEER_PREFIX}${encodeURIComponent(identifier(sharedTaskId))}~host`;
}
export function sharedTaskGuestPeer(sharedTaskId: string, memberId: string, deviceId: string): string {
- return `${SHARED_TASK_PEER_PREFIX}${encodeURIComponent(identifier(sharedTaskId))}~guest~${encodeURIComponent(identifier(memberId))}~${encodeURIComponent(identifier(deviceId))}`;
+ return `${SHARED_TASK_PEER_PREFIX}${encodeURIComponent(identifier(sharedTaskId))}~guest~${encodeURIComponent(identifier(memberId))}~${encodeDeviceId(deviceId)}`;
}
export function isSharedTaskPeer(value: unknown): value is `shared-task~${string}` {
return typeof value === 'string' && value.startsWith(SHARED_TASK_PEER_PREFIX);
}
/** Malformed reserved peers must be rejected, never retried as legacy device IDs. */
export function parseSharedTaskPeer(value: unknown): SharedTaskPeer | null {
- if (!isSharedTaskPeer(value) || value.length > 1600) return null;
+ if (!isSharedTaskPeer(value) || value.length > 2048) return null;
try {
const parts = value.split('~');
const sharedTaskId = identifier(decodeURIComponent(parts[1] ?? ''));
if (parts.length === 3 && parts[2] === 'host' && sharedTaskHostPeer(sharedTaskId) === value) return { sharedTaskId, role: 'host' };
if (parts.length !== 5 || parts[2] !== 'guest') return null;
const memberId = identifier(decodeURIComponent(parts[3]));
- const deviceId = identifier(decodeURIComponent(parts[4]));
+ const decodedDeviceId = decodeURIComponent(parts[4]);
+ const deviceId = sharedTaskDeviceId(decodedDeviceId.startsWith('"') ? JSON.parse(decodedDeviceId) : decodedDeviceId);
return sharedTaskGuestPeer(sharedTaskId, memberId, deviceId) === value ? { sharedTaskId, role: 'guest', memberId, deviceId } : null;
} catch { return null; }
}
diff --git a/packages/device-link/src/__tests__/sharedTask.test.ts b/packages/device-link/src/__tests__/sharedTask.test.ts
index 5e47e6589d..a340d169ce 100644
--- a/packages/device-link/src/__tests__/sharedTask.test.ts
+++ b/packages/device-link/src/__tests__/sharedTask.test.ts
@@ -18,6 +18,15 @@ const guest = { accountId: 'guest-a', deviceId: 'phone-a' };
const owner = { accountId: 'owner', deviceId: 'owner-phone' };
describe('sharedTask authorization', () => {
+ it('preserves extended device IDs and still requires the matching account', () => {
+ const value = snapshot();
+ value.hostDeviceId = '房主~desktop';
+ value.guests[0].deviceIds = [' 手机~1 '];
+ const parsed = parse(value);
+ expect(parsed.hostDeviceId).toBe(value.hostDeviceId);
+ expect(authorize(parsed, { accountId: 'guest-a', deviceId: ' 手机~1 ' }, 'session-1', 'history.read').allowed).toBe(true);
+ expect(authorize(parsed, { accountId: 'guest-b', deviceId: ' 手机~1 ' }, 'session-1', 'history.read').allowed).toBe(false);
+ });
it('keeps task subscriptions but removes the full-device list from shared peers', () => {
expect(sharedTaskTopics('shared-task~shared~host', ['sessions', 'session:task'])).toEqual(['session:task']);
expect(sharedTaskTopics('my-desktop', ['sessions', 'session:task'])).toEqual(['sessions', 'session:task']);
diff --git a/packages/device-link/src/__tests__/sharedTaskApi.test.ts b/packages/device-link/src/__tests__/sharedTaskApi.test.ts
index 44347944af..9ddd704a7a 100644
--- a/packages/device-link/src/__tests__/sharedTaskApi.test.ts
+++ b/packages/device-link/src/__tests__/sharedTaskApi.test.ts
@@ -16,6 +16,12 @@ function setup() {
} });
return { api, request, changeAccountOrRegion: () => { generation++; } };
}
+
+it('reads extended host device IDs in the shared task list', async () => {
+ const { api, request } = setup();
+ request.mockResolvedValue({ sharedTasks: [{ ...snapshot(), hostDeviceId: ' 主机~1 ' }] });
+ await expect(api.list()).resolves.toEqual([expect.objectContaining({ hostDeviceId: ' 主机~1 ' })]);
+});
describe('sharedTask management client', () => {
it('observes a late create ID for host cleanup but never returns stale UI success', async () => {
const { api, request, changeAccountOrRegion } = setup();
diff --git a/packages/device-link/src/__tests__/sharedTaskDeviceId.test.ts b/packages/device-link/src/__tests__/sharedTaskDeviceId.test.ts
new file mode 100644
index 0000000000..cbbc3676b0
--- /dev/null
+++ b/packages/device-link/src/__tests__/sharedTaskDeviceId.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest';
+import { sharedTaskDeviceId, sharedTaskGuestPeer, parseSharedTaskPeer } from '@cindy/device-link-protocol/protocol';
+
+// Keep identical fixtures in both repositories' device-link tests.
+describe('shared task device claim encoding', () => {
+ it.each(['phone:1', '_legacy', ' device ', '设备/手机', 'phone~1', '%3A', '"quoted"', '\ud800', '\u0000'.repeat(128), 'x'.repeat(128)])('round-trips the auth device domain: %j', deviceId => {
+ expect(sharedTaskDeviceId(deviceId)).toBe(deviceId);
+ const peer = sharedTaskGuestPeer('t' + ':'.repeat(127), 'm' + ':'.repeat(127), deviceId);
+ expect(peer.length).toBeLessThanOrEqual(2048);
+ expect(peer.split('~')).toHaveLength(5);
+ expect(parseSharedTaskPeer(peer)).toEqual({ sharedTaskId: 't' + ':'.repeat(127), role: 'guest', memberId: 'm' + ':'.repeat(127), deviceId });
+ });
+ it('preserves old peer encoding and rejects noncanonical aliases', () => {
+ expect(sharedTaskGuestPeer('task', 'member', 'phone:1')).toBe('shared-task~task~guest~member~phone%3A1');
+ expect(parseSharedTaskPeer('shared-task~task~guest~member~%22phone%3A1%22')).toBeNull();
+ expect(parseSharedTaskPeer('shared-task~task~guest~member~%22phone~1%22')).toBeNull();
+ expect(parseSharedTaskPeer('shared-task~task~guest~member~%5B1%5D')).toBeNull();
+ });
+ it.each(['', 'x'.repeat(129), null, 1])('rejects an invalid device claim: %j', value => {
+ expect(() => sharedTaskDeviceId(value)).toThrow();
+ });
+});
diff --git a/packages/device-link/src/protocol.ts b/packages/device-link/src/protocol.ts
index 36debcdba9..11b1c2e9c6 100644
--- a/packages/device-link/src/protocol.ts
+++ b/packages/device-link/src/protocol.ts
@@ -25,7 +25,7 @@ import {
type RelayErrorPayload,
} from '@cindy/device-link-protocol';
-export { SHARED_TASK_RELAY_CAPABILITY, SHARED_TASK_PEER_PREFIX, sharedTaskHostPeer, sharedTaskGuestPeer, isSharedTaskPeer, parseSharedTaskPeer } from '@cindy/device-link-protocol';
+export { SHARED_TASK_RELAY_CAPABILITY, SHARED_TASK_PEER_PREFIX, sharedTaskHostPeer, sharedTaskGuestPeer, sharedTaskDeviceId, isSharedTaskPeer, parseSharedTaskPeer } from '@cindy/device-link-protocol';
export type { SharedTaskPeer } from '@cindy/device-link-protocol';
export {
diff --git a/packages/device-link/src/sharedTask.ts b/packages/device-link/src/sharedTask.ts
index 24f5be7dec..833f798790 100644
--- a/packages/device-link/src/sharedTask.ts
+++ b/packages/device-link/src/sharedTask.ts
@@ -3,7 +3,7 @@
* routing: the relay and host must authenticate the source before consuming it.
* Same-account device control continues to use its existing authorization path.
*/
-import { isSharedTaskPeer } from './protocol.js';
+import { isSharedTaskPeer, sharedTaskDeviceId } from './protocol.js';
import { parseAttachmentOssRef } from './attachmentOssRef.js';
/** Only objects issued for this shared task may be materialized on its host. */
@@ -149,7 +149,7 @@ function version(value: unknown): number {
export function parseSharedTaskSnapshot(value: unknown): SharedTaskSnapshot {
const row = record(value);
const ownerAccountId = identifier(row.ownerAccountId);
- const hostDeviceId = identifier(row.hostDeviceId);
+ const hostDeviceId = sharedTaskDeviceId(row.hostDeviceId);
if (row.status !== 'active' && row.status !== 'closed') throw new Error('Invalid sharedTask status');
if (!Array.isArray(row.guests) || row.guests.length > SHARED_TASK_MAX_SNAPSHOT_GUESTS) {
throw new Error('Invalid sharedTask guests');
@@ -168,7 +168,7 @@ export function parseSharedTaskSnapshot(value: unknown): SharedTaskSnapshot {
const devices = new Set<string>();
if (!Array.isArray(guest.deviceIds) || guest.deviceIds.length > 64) throw new Error('Invalid member devices');
const deviceIds = guest.deviceIds.map((value): string => {
- const deviceId = identifier(value);
+ const deviceId = sharedTaskDeviceId(value);
if (devices.has(deviceId)) throw new Error('Duplicate sharedTask device');
devices.add(deviceId);
return deviceId;
diff --git a/packages/device-link/src/sharedTaskApi.ts b/packages/device-link/src/sharedTaskApi.ts
index 63337504da..aef40e9dd9 100644
--- a/packages/device-link/src/sharedTaskApi.ts
+++ b/packages/device-link/src/sharedTaskApi.ts
@@ -1,4 +1,5 @@
import { parseSharedTaskSnapshot, SHARED_TASK_MAX_SNAPSHOT_GUESTS, type SharedTaskIdentity, type SharedTaskSnapshot } from './sharedTask.js';
+import { sharedTaskDeviceId } from './protocol.js';
export const SHARED_TASK_HOST_CHANNEL = 'maker:shared-task';
export const SHARED_TASK_ACCOUNT_CHANNEL = 'shared-task:account';
@@ -93,7 +94,7 @@ export function createSharedTaskApi(options: SharedTaskApiOptions) {
if (seen.has(sharedTaskId)) throw new Error('Duplicate sharedTask');
seen.add(sharedTaskId);
return { sharedTaskId, sessionId: id(value.sessionId), ownerAccountId: id(value.ownerAccountId),
- hostDeviceId: id(value.hostDeviceId), title: label(value.title), revision: integer(value.revision) };
+ hostDeviceId: sharedTaskDeviceId(value.hostDeviceId), title: label(value.title), revision: integer(value.revision) };
});
},
async get(sharedTaskId: string): Promise<SharedTaskDetail> {