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): honor cleared history in file authorization

david679ed87ab7d0
diff --git a/apps/desktop/src/main/device-link/__tests__/sharedTaskMediaAccess.test.ts b/apps/desktop/src/main/device-link/__tests__/sharedTaskMediaAccess.test.ts
index 4ca3a5e22f..d44c344412 100644
--- a/apps/desktop/src/main/device-link/__tests__/sharedTaskMediaAccess.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/sharedTaskMediaAccess.test.ts
@@ -1,5 +1,6 @@
import path from 'node:path';
import { pathToFileURL } from 'node:url';
+import Database from 'better-sqlite3';
import { beforeEach, describe, expect, it, vi } from 'vitest';
const deps = vi.hoisted(() => ({ read: vi.fn(), session: vi.fn(), realpath: vi.fn(), query: vi.fn() }));
vi.mock('../../localDb/client/current.js', () => ({ getDbClient: () => ({ query: deps.query }) }));
@@ -23,6 +24,53 @@ beforeEach(() => {
deps.query.mockResolvedValue([]);
});
describe('shared task media access', () => {
+ // DB regression: /clear keeps rows but removes their authority. Exercise the
+ // production queries, including both tool-pair directions, against real SQLite.
+ it.each(['user', 'assistant', 'tool_use', 'tool_result'])('expires %s file references at the clear boundary and accepts new delivery', async (role) => {
+ const db = new Database(':memory:');
+ try {
+ db.exec(`CREATE TABLE sessions (id TEXT PRIMARY KEY, cleared_at INTEGER);
+ CREATE TABLE messages (session_id TEXT, role TEXT, content TEXT, agent_meta TEXT, tool_use_id TEXT, rewind_at INTEGER, created_at INTEGER);
+ INSERT INTO sessions VALUES ('task', NULL);`);
+ deps.query.mockImplementation(async (sql: string, params: unknown[]) => db.prepare(sql).all(...params));
+ const file = path.resolve('deliveries/report.pdf');
+ const url = 'xdt-file://local?path=' + encodeURIComponent(file);
+ const insert = db.prepare('INSERT INTO messages (session_id, role, content, tool_use_id, created_at) VALUES (?, ?, ?, ?, ?)');
+ const deliver = (time: number) => {
+ if (role === 'tool_use' || role === 'tool_result') {
+ insert.run('task', 'tool_use', JSON.stringify(role === 'tool_use'
+ ? { toolName: 'Write', input: { file_path: file, content: 'report' } }
+ : { toolName: 'Bash', input: { command: 'generate-report' } }), 'run-' + time, time);
+ insert.run('task', 'tool_result', JSON.stringify(role === 'tool_result' ? url : 'File written'), 'run-' + time, time);
+ } else insert.run('task', role, JSON.stringify(url), null, time);
+ };
+ deliver(100);
+ await expect(assertSharedTaskMedia(url, capture)).resolves.toEqual({ file });
+ db.exec("UPDATE sessions SET cleared_at = 100 WHERE id = 'task'");
+ await expect(assertSharedTaskMedia(url, capture)).rejects.toThrow('PERMISSION_DENIED');
+ deliver(101);
+ await expect(assertSharedTaskMedia(url, capture)).resolves.toEqual({ file });
+ } finally { db.close(); }
+ });
+ it.each(['tool_use', 'tool_result'])('rejects a fresh %s reference paired with a cleared tool row', async (role) => {
+ const db = new Database(':memory:');
+ try {
+ db.exec(`CREATE TABLE sessions (id TEXT PRIMARY KEY, cleared_at INTEGER);
+ CREATE TABLE messages (session_id TEXT, role TEXT, content TEXT, agent_meta TEXT, tool_use_id TEXT, rewind_at INTEGER, created_at INTEGER);
+ INSERT INTO sessions VALUES ('task', 100);`);
+ deps.query.mockImplementation(async (sql: string, params: unknown[]) => db.prepare(sql).all(...params));
+ const file = path.resolve('deliveries/report.pdf');
+ const url = 'xdt-file://local?path=' + encodeURIComponent(file);
+ const insert = db.prepare("INSERT INTO messages (session_id, role, content, tool_use_id, created_at) VALUES ('task', ?, ?, 'run', ?)");
+ insert.run('tool_use', JSON.stringify(role === 'tool_use'
+ ? { toolName: 'Write', input: { file_path: file, content: 'report' } }
+ : { toolName: 'Bash', input: { command: 'generate-report' } }), role === 'tool_use' ? 101 : 100);
+ insert.run('tool_result', JSON.stringify(role === 'tool_result' ? url : 'File written'), role === 'tool_result' ? 101 : 100);
+ await expect(assertSharedTaskMedia(url, capture)).rejects.toThrow('PERMISSION_DENIED');
+ db.exec('UPDATE messages SET created_at = 101');
+ await expect(assertSharedTaskMedia(url, capture)).resolves.toEqual({ file });
+ } finally { db.close(); }
+ });
// Regression: a delivered file outside the workdir must be readable, without
// granting its directory or trusting a guest's pasted path (unit tier).
it.each(['assistant', 'user'])('reads an outside file linked by the %s in this task', async (role) => {
diff --git a/apps/desktop/src/main/device-link/sharedTaskFileReferences.ts b/apps/desktop/src/main/device-link/sharedTaskFileReferences.ts
index 143a366e2c..79fffbc41d 100644
--- a/apps/desktop/src/main/device-link/sharedTaskFileReferences.ts
+++ b/apps/desktop/src/main/device-link/sharedTaskFileReferences.ts
@@ -12,6 +12,10 @@ import { getDbClient } from '../localDb/client/current.js';
import type { SharedTaskPeerCapture } from './sharedTaskDispatch.js';
const markdown = unified().use(remarkParse);
+// /clear retains message rows. Resolve the live boundary in each query, including
+// tool pairing, rather than reusing a snapshot from before the owner cleared it.
+const visibleHistory = `EXISTS (SELECT 1 FROM sessions s WHERE s.id = messages.session_id
+ AND (s.cleared_at IS NULL OR messages.created_at > s.cleared_at))`;
function record(value: unknown): Record<string, unknown> | null {
return value && typeof value === 'object' && !Array.isArray(value) ? value as Record<string, unknown> : null;
@@ -103,6 +107,7 @@ export async function sharedTaskReferencesFile(
const rows = await getDbClient().query<{ rowid: number; role: string; content: string; agentMeta: string | null; toolUseId: string | null }>(
`SELECT rowid, role, content, agent_meta AS agentMeta, tool_use_id AS toolUseId FROM messages
WHERE session_id = ? AND rewind_at IS NULL AND rowid > ?
+ AND ${visibleHistory}
AND role IN ('user', 'assistant', 'tool_use', 'tool_result')
AND (instr(lower(content), lower(?)) > 0 OR instr(lower(content), lower(?)) > 0 OR instr(lower(content), lower(?)) > 0 OR instr(lower(content), lower(?)) > 0)
ORDER BY rowid LIMIT 64`,
@@ -125,7 +130,8 @@ export async function sharedTaskReferencesFile(
if (!row.toolUseId) continue;
const uses = await getDbClient().query<{ content: string }>(
`SELECT content FROM messages WHERE session_id = ? AND role = 'tool_use'
- AND rewind_at IS NULL AND tool_use_id = ? AND rowid < ? ORDER BY rowid DESC LIMIT 1`,
+ AND rewind_at IS NULL AND tool_use_id = ? AND rowid < ?
+ AND ${visibleHistory} ORDER BY rowid DESC LIMIT 1`,
[capture.author.sessionId, row.toolUseId, row.rowid],
);
if (!capture.isCurrent()) return false;
@@ -140,7 +146,8 @@ export async function sharedTaskReferencesFile(
if (!tool.toolUseId) continue;
const results = await getDbClient().query<{ content: string }>(
`SELECT content FROM messages WHERE session_id = ? AND role = 'tool_result'
- AND rewind_at IS NULL AND tool_use_id = ? AND rowid > ? ORDER BY rowid LIMIT 1`,
+ AND rewind_at IS NULL AND tool_use_id = ? AND rowid > ?
+ AND ${visibleHistory} ORDER BY rowid LIMIT 1`,
[capture.author.sessionId, tool.toolUseId, row.rowid],
);
if (!capture.isCurrent()) return false;
diff --git a/docs/product-rules/shared-task-mode.md b/docs/product-rules/shared-task-mode.md
index 900e3aa399..7d9a8dd573 100644
--- a/docs/product-rules/shared-task-mode.md
+++ b/docs/product-rules/shared-task-mode.md
@@ -40,7 +40,7 @@
- 房主保留共享管理、归档/删除/导出/分支、权限模式、工作目录、插件/MCP 配置和后台/定时任务管理权限。
- 访客通过客户端接口只能直接访问共享任务及其资源,不能调用全局凭证、其他任务或任意主机文件接口。Agent 原生工具不承诺工作目录硬隔离。
- 文件浏览器(2026-10-10 用户裁决):访客可在文件浏览器中浏览和编辑本任务工作目录,读写权限与房主一致:列目录、读取、搜索、缩略图、保存、新建、重命名、删除,以及文件变化监听。主机只认本机记录的任务工作目录与执行端点(本地或任务所属 SSH 主机),访客传入的路径只用于比对;读写前复核成员资格。文件导出/文件夹下载这类导出任务仍只限同账号(它们走房主的同账号中转路径),工作目录本身的管理(更换目录)仍归房主。实现见 `sharedTaskDispatch.ts`(通道与操作)、`sharedTaskFileAccess.ts`(目录绑定)与 `file-browser/device-op.ts`。
-- 任务关联的本机文件即使位于工作目录外,访客也可经原有取件通道只读访问(2026-10-19 修复):归属由房主端当前未回退的消息记录确认,包括主机已校验并接收的结构化附件(含访客上传)、房主/Agent 明确交付的文件链接及已完成且未报错的工具产出。访客自行粘贴的路径、代码示例、其他任务记录或仅前缀相同的路径不构成授权;仅放行关联的具体文件,不开放其父目录浏览或写入。取件继续检查成员资格、敏感路径和解析后的文件身份,不缓存历史授权结论。Desktop 与 Mobile 共用房主校验,无新增 wire 字段;SSH 的工作目录限界保持原规则,不以本机路径例外绕过。实现与回归见 `sharedTaskFileReferences.ts`、`sharedTaskMediaAccess.ts` 及 `sharedTaskMediaAccess.test.ts`、`mediaFetch.test.ts`。
+- 任务关联的本机文件即使位于工作目录外,访客也可经原有取件通道只读访问(2026-10-19 修复):归属由房主端当前未回退且未被 `/clear` 隐藏的消息记录确认,包括主机已校验并接收的结构化附件(含访客上传)、房主/Agent 明确交付的文件链接及已完成且未报错的工具产出。文件引用及配对的工具调用、结果均须晚于任务的清空边界;清空前的记录即使仍在数据库中,也不再提供授权。访客自行粘贴的路径、代码示例、其他任务记录或仅前缀相同的路径不构成授权;仅放行关联的具体文件,不开放其父目录浏览或写入。取件继续检查成员资格、敏感路径和解析后的文件身份,不缓存历史授权结论。Desktop 与 Mobile 共用房主校验,无新增 wire 字段;SSH 的工作目录限界保持原规则,不以本机路径例外绕过。实现与回归见 `sharedTaskFileReferences.ts`、`sharedTaskMediaAccess.ts` 及 `sharedTaskMediaAccess.test.ts`、`mediaFetch.test.ts`。
- 消息按主机现有输入队列顺序处理,保留 clientId 幂等。访客仅编辑/撤回自己未处理消息,房主可处理全部未处理消息;直接更新内容,不显示“已编辑”。
- 发言者身份来自经过验证的账号和成员关系,不能信任消息正文或客户端自报的身份。