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。

feat(plugin): 支持独立消息资料、自动标题和任务权限选择

liugaowei20b4504e9a71
diff --git a/apps/desktop/resources/system-skills/cindy-plugin-creator/references/plugin-agent-tasks.md b/apps/desktop/resources/system-skills/cindy-plugin-creator/references/plugin-agent-tasks.md
index 73cb84b8d9..b4684d7940 100644
--- a/apps/desktop/resources/system-skills/cindy-plugin-creator/references/plugin-agent-tasks.md
+++ b/apps/desktop/resources/system-skills/cindy-plugin-creator/references/plugin-agent-tasks.md
@@ -100,7 +100,8 @@ const q = await cindy.agent.queryErrand({ jobId: r.jobId });
或修复供应商连接。不静默换模型、不从报错猜凭证失效,也不把目录可用当作远端推理一定成功。
- 权限独立来自用户插件设置;旧接口缺省保留历史 plan 值及原 Agent 行为,不将它宣称为
跨 Agent 的只读保证。新插件应使用普通任务接口,其缺省为普通任务的 ask 权限。
- 用户可显式选择 ask / acceptEdits / auto;不继承调用任务的完全访问。工作目录由宿主分配。
+ 用户可显式选择默认权限(ask)、自动审批(auto)或完全访问(bypassPermissions);
+ 不继承调用任务的权限。工作目录由宿主分配。
- 目录有一个受控例外:run 请求可带 `workingDir`(绝对路径)**转述**一个目录,
让 errand 会话建在项目里(Agent 能看到代码)。这不是授权——主机只认用户
此前用 pick 能力(§4.14)在系统选目录窗口里**亲手选过**的目录(主机自己记的
@@ -213,7 +214,7 @@ const r = await cindy.agent.requestSchedule({
- `list({targetKind:'project'|'task'|'bot'})`:返回 `{targets:[{kind,id,label,detail}]}`,只含本机可用目标的名称和目录/说明,不含消息历史。插件可自行搜索和展示列表,最近活动只用于排序。
- `resolve({target:{kind,id}})`:复核已保存或本次选择的目标,返回最新 `{kind,id,label,detail}`。只查询,不创建任务、不打开 UI、不保存绑定;固定目标失效返回 TARGET_UNAVAILABLE,不自动替换。插件可将 `{kind,id}` 存入自己的配置。project 的 id 是 Cindy 已有项目目录,task/bot 的 id 是任务/伙伴标识。
-- `send({target:{kind,id},requestKey,text,title?,route?,delivery?,attachments?})`:直接指定目标,Host 当次复核。project 在目录中新建普通任务,可传统一模型目录的 route;task/bot 沿用接收方模型、权限、目录,不接受 route。`delivery` 为 `queue | steer`,缺省 queue;project 不接受 steer。steer 尝试同轮注入,不停止当前轮,空闲或插话暂不可用时入队。返回 `{taskId,accepted:true,delivery:"queue"|"steer"}` 表示实际接受路径,不表示执行完成。筛查拒绝返回 DELIVERY_REJECTED,不入队重试;ACK 未知返回 DELIVERY_UNCERTAIN,不得换键重发。不开放读取任意任务历史或改模。
+- `send({target:{kind,id},requestKey,text,context?,title?,autoTitle?,route?,permissionMode?,delivery?,attachments?})`:直接指定目标,Host 当次复核。project 在目录中新建普通任务,可传统一模型目录的 route 和已授权范围内的 permissionMode;task/bot 沿用接收方模型、权限、目录,不接受 route 或 permissionMode。`delivery` 为 `queue | steer`,缺省 queue;project 不接受 steer。steer 尝试同轮注入,不停止当前轮,空闲或插话暂不可用时入队。返回 `{taskId,accepted:true,delivery:"queue"|"steer"}` 表示实际接受路径,不表示执行完成。筛查拒绝返回 DELIVERY_REJECTED,不入队重试;ACK 未知返回 DELIVERY_UNCERTAIN,不得换键重发。不开放读取任意任务历史或改模。
- 同一次 send 重试沿用相同 requestKey、target、内容和 delivery(缺省与 queue 等价);同键参数变化返回 REQUEST_KEY_CONFLICT。Host 在执行前持久保留投递回执,重启后已接受的请求返回原结果,未确定结果的请求返回 DELIVERY_UNCERTAIN,不再次创建或投递。回执不保存正文或附件字节。不要通过更换 requestKey 绕过未知结果,应先让用户在 Cindy 检查。
- `cancel({requestKey})`:使本次请求及迟到的发送失效,仅撤回本插件该请求尚未执行的输入;不会停止接收方其他输入,也不保证撤销已经开始的工作。新操作使用新的 requestKey。
- `tasks.send` 和 `targets.send` 均支持可选 `attachments:[{base64,name?}]`:只接收插件提供的图片字节,不接受本机路径、URL、媒体 URI 或自报 MIME。Host 检测 PNG/JPEG/WebP,最多 4 张、合计 20 MiB。先检查 `tasks.capabilities().messageAttachments.kinds` 包含 image;旧客户端不支持时停止,不静默丢图或改投临时路径。截图进既有 cindy-media,作为消息附件展示并进入模型输入;不需要额外声明 media.deposit。附件内容及名称参与幂等签名,更换附件不能复用同键。
@@ -233,6 +234,50 @@ Host 只接受同账号、同安装/批准及运行代次、尚未过期且已
上述统计不覆盖插件自绘界面或自带原生程序的纯本地行为,也不要求插件迁移交互或重新授权。
+### 正文、附带资料与自动标题(可选)
+
+先检查 `tasks.capabilities().messageContext === true`。`tasks.send` 和 `targets.send` 可另外传
+`context: string`,`text` 只放要在聊天中显示的指令。Host 保留完整资料并交给 Agent,
+界面复用已有长文本胶囊,默认显示「附带资料」,点击可查看原文。截图仍走 `attachments`,
+不要把截图路径或内部诊断重新拼进可见正文。context 是插件提供的参考资料,不是系统指令
+或新的真人授权;原有来源标签和权限边界保持。context 最多 32768 个 UTF-16 字符,
+text 与 context 合计不超过 64000;tasks.send 的 text 上限仍为 32768。
+省略或传空 context 保持旧请求行为。同键重试必须携带相同资料;资料改变会触发既有幂等冲突,
+不能换键绕过未知受理结果。回执仅保存摘要,资料随普通消息和队列保留,不另建资料存储。
+
+`tasks.capabilities().autoTitle === true` 时,可用 `tasks.create({requestKey, autoTitle:true, route?})`
+新建任务,省略 title;首次消息受理后,Host 复用普通任务自动命名。`targets.send` 仅在
+`target.kind === 'project'` 时可传 `autoTitle:true` 并省略 title。生成期间先显示用户指令的简短占位,
+随后结合指令和附带资料生成标题;不会覆盖人工重命名。autoTitle 与 title 互斥,task/bot
+目标不接受 autoTitle:true,也不更改已有目标标题。
+
+默认不传 autoTitle 的存量插件保持原有命名:tasks.create 仍须传 title;项目投递缺省采用
+项目名称。新模式参与幂等摘要;旧字段组合的摘要及重放行为保持,不需要重新批准或配置。
+旧 Host 未宣告支持时,应明确提示所需客户端能力,不能静默丢弃资料或假称已经自动命名。
+
+### 新建任务的权限选择(可选)
+
+先检查 `tasks.capabilities().createPermissionMode === true`。`tasks.create` 和 project 的
+`targets.send` 可传 `permissionMode: 'ask' | 'auto' | 'bypassPermissions'`,分别对应默认权限、自动审批、完全访问,仅决定这一个新任务的权限,
+不修改插件默认设置。省略时仍使用用户的插件任务设置,未设置则为 ask。
+例如,用户已将插件权限设为 auto,插件可为某次任务选择 ask:
+
+```js
+const task = await cindy.tasks.create({
+ requestKey: 'inspect-42', title: 'Inspect the selected item', permissionMode: 'ask',
+});
+```
+
+参数不是授权凭证。Host 在创建前及异步准备后按当前用户设置复核:ask 只允许 ask,
+auto 允许 ask/auto,bypassPermissions 允许上述三档;超出范围返回 PERMISSION_DENIED,
+不会静默降档或自动更改用户设置。完全访问须由用户在插件任务设置中选择;
+既有 `requestWriteAccess` 仍只支持 acceptEdits/auto,不能请求完全访问或降低用户已授权的上限。
+历史 plan/acceptEdits 设置原样保留,但不作为此新参数的可选值;历史 acceptEdits 上限只允许新参数选择 ask。
+不接受自报 confirmed;Plan Mode 不是此参数的权限档位。
+已有 task/bot 的投递不能携带 permissionMode,也不会改动接收方权限。
+权限选择参与幂等摘要,同键改变权限返回原有冲突错误;省略新字段的旧请求摘要及重放保持不变。
+旧 Host 未宣告支持时,不发送该参数,也不能悄悄忽略用户已经选择的权限。
+
原有 `cindy.tasks` 的归属限制不变。先调用 `capabilities()` 获取实际支持操作。当前仅支持本插件创建的本机普通任务:
`models`、`create`、`get`、`setModel`、`list`、`send`、`getRun`、`listRuns`、`readMessages`、`cancel`、`setHidden`。
可对自有任务调用 `startTeam({taskId})` 启用 Orca 主任务,并用 `getTeam({taskId})` 读取实际协同状态。协调主任务需经用户授权 Auto,Worker 自动沿用 Auto。
@@ -302,14 +347,14 @@ create/send 的 requestKey 持久去重;同键不同内容拒绝。删除后
沿用当前新任务选择。可显式传
`{agentKind:'codex',providerId:'...',model:'...',effort:'high',fastMode:false}`;无推理档位模型用空 effort。
先查 `capabilities().sourceCallContext`:支持时,Agent 在途调用可在 create 中转传 `callId`。
-宿主核对同插件本机调用后读取其模型;不能自报 sourceSessionId 或权限。面板直接创建省略 callId。
+宿主核对同插件本机调用后读取其模型;不能自报 sourceSessionId 或权限授权。面板直接创建省略 callId。
新字段需该能力为 true 才发送,旧客户端不能假定支持;同 requestKey 的重放保留原创建结果。
来源/模型/强度必须当前可用,派发前再次核对;失败引导改选或修复连接,不自动换模型或账号。
已有普通任务保留自身配置,用户在任务内修复后继续使用原任务。
-工作目录由宿主分配,或沿用用户已在插件设置中选择的目录;不接受任意路径或权限覆盖。
-权限来自用户的插件任务设置,缺省使用普通任务的 ask 权限;工作区内行为及询问规则与所选
-Agent 的普通任务一致。允许用户显式选择 acceptEdits / auto,禁止 bypassPermissions,
-不继承发起任务的权限。既有任务与显式历史 plan 配置保留原行为,不自动提权;需要改变时由用户选择。
+工作目录由宿主分配,或沿用用户已在插件设置中选择的目录;不接受任意路径或超出已授权范围的权限。
+权限上限来自用户的插件任务设置;新建时可按上述参数选择更低档位,省略则沿用设置,未设置为 ask。工作区内行为及询问规则与所选
+Agent 的普通任务一致。用户可在插件设置中选择 ask / auto / bypassPermissions,
+不继承发起任务的权限。既有任务与显式历史 plan/acceptEdits 配置保留原行为,不自动提权;需要改变时由用户选择。
create 可传 `isolatedWorkspace:true`,使用宿主为该任务生成的独立空目录,忽略插件的项目目录偏好。
返回 workingDir 仅属于本插件创建的任务,可交给插件 Node 进程放入候选项目;不接受插件自报任意目录。
任务视图同时返回 permissionMode;按实际权限展示,不将历史 plan 值视作跨 Agent 的只读保证,不能暗中升级权限。
diff --git a/apps/desktop/src/main/cindy-brain/__tests__/mobileTaskSettings.test.ts b/apps/desktop/src/main/cindy-brain/__tests__/mobileTaskSettings.test.ts
index d35ab437e0..339465f653 100644
--- a/apps/desktop/src/main/cindy-brain/__tests__/mobileTaskSettings.test.ts
+++ b/apps/desktop/src/main/cindy-brain/__tests__/mobileTaskSettings.test.ts
@@ -42,6 +42,16 @@ function setup() {
};
}
describe('native mobile task preferences', () => {
+ // unit: the remote user settings use the same choices as the local picker;
+ // saving full access keeps the Host-owned directory and returns the saved mode.
+ it('offers the ordinary three modes and persists an explicit full-access choice', async () => {
+ const h = setup(), before = h.service.read('plugin', 'installed-1');
+ expect(before.permissionModes).toEqual(['ask', 'auto', 'bypassPermissions']);
+ const result = await h.service.update('plugin', 'installed-1',
+ { expectedRevision: before.revision, permissionMode: 'bypassPermissions' }, () => {});
+ expect(result.config.permissionMode).toBe('bypassPermissions');
+ expect(h.get().workingDir).toBe('/private/selected-directory');
+ });
it('never projects the private directory and pins complete validated configuration while preserving it', async () => {
const h = setup(),
before = h.service.read('plugin', 'installed-1');
diff --git a/apps/desktop/src/main/cindy-brain/__tests__/pluginTargetSlot.test.ts b/apps/desktop/src/main/cindy-brain/__tests__/pluginTargetSlot.test.ts
index 9e15e30168..fd0f7ae61c 100644
--- a/apps/desktop/src/main/cindy-brain/__tests__/pluginTargetSlot.test.ts
+++ b/apps/desktop/src/main/cindy-brain/__tests__/pluginTargetSlot.test.ts
@@ -53,13 +53,77 @@ describe('plugin target queries and delivery', () => {
{ id: 'chosen', label: 'Chosen target', detail: '/workspace/example' },
]);
const approvalRevision = vi.fn<PluginTargetAdapter['approvalRevision']>(() => 'approved-install');
- slot.adapter = { store: () => store, approvalRevision, candidates, session: async () => 'chosen', send, create, withdraw };
+ const assertCreatePermission = vi.fn();
+ slot.adapter = { store: () => store, approvalRevision, candidates, session: async () => 'chosen', send, create, withdraw, assertCreatePermission };
const guard = vi.fn();
const call = (payload: unknown, plugin = 'plugin') => slot.handle(plugin, payload, guard);
const request = { kind: 'send', target: { kind: 'task', id: 'chosen' },
requestKey: 'send', text: 'context' };
- return { slot, call, request, send, create, withdraw, candidates, guard, approvalRevision };
+ return { slot, call, request, send, create, withdraw, candidates, guard, approvalRevision, assertCreatePermission };
}
+ // unit: a project is a new task, but task/bot sends must never change recipient
+ // permissions. Prior tests did not cover a permission choice or its receipt.
+ it('forwards project creation permission once and includes it in request identity', async () => {
+ const f = fixture();
+ const request = { ...f.request, target: { kind: 'project', id: 'chosen' }, permissionMode: 'bypassPermissions' };
+ await f.call(request);
+ await f.call(request);
+ expect(f.create).toHaveBeenCalledOnce();
+ expect(f.create.mock.calls[0]?.[7]).toBe('bypassPermissions');
+ expect(f.send).toHaveBeenCalledOnce();
+ await expect(f.call({ ...request, permissionMode: 'auto' }))
+ .rejects.toMatchObject({ code: 'REQUEST_KEY_CONFLICT' });
+ });
+ it('rejects permission changes for existing targets and unsupported modes before delivery', async () => {
+ const f = fixture();
+ for (const kind of ['task', 'bot']) {
+ await expect(f.call({ ...f.request, target: { kind, id: 'chosen' }, permissionMode: 'ask' }))
+ .rejects.toMatchObject({ code: 'INVALID_PARAMS' });
+ }
+ for (const permissionMode of ['acceptEdits', 'plan', null, 1]) {
+ await expect(f.call({ ...f.request, target: { kind: 'project', id: 'chosen' }, permissionMode }))
+ .rejects.toMatchObject({ code: 'INVALID_PARAMS' });
+ }
+ expect(f.create).not.toHaveBeenCalled();
+ expect(f.send).not.toHaveBeenCalled();
+ expect(receipts.size).toBe(0);
+ });
+ it('does not consume the target request key when the creation permission is denied', async () => {
+ const f = fixture();
+ f.assertCreatePermission.mockImplementationOnce(() => { throw Object.assign(new Error('Not authorized'), { code: 'PERMISSION_DENIED' }); });
+ const request = { ...f.request, target: { kind: 'project', id: 'chosen' }, permissionMode: 'auto' };
+ await expect(f.call(request)).rejects.toMatchObject({ code: 'PERMISSION_DENIED' });
+ expect(receipts.size).toBe(0);
+ expect(f.create).not.toHaveBeenCalled();
+ await expect(f.call(request)).resolves.toMatchObject({ accepted: true });
+ });
+ // unit: actual target delivery must bind context to its receipt. Omitting the
+ // new parameter previously made changed context replay as the same message.
+ it('delivers independent context once and rejects changed context on receipt replay', async () => {
+ const f = fixture();
+ const request = { ...f.request, text: 'Look here', context: 'Window contents' };
+ await f.call(request);
+ await f.call(request);
+ expect(f.send).toHaveBeenCalledOnce();
+ expect(f.send.mock.calls[0]?.[3]).toBe('Look here');
+ expect(f.send.mock.calls[0]?.[8]).toEqual({ context: 'Window contents' });
+ await expect(f.call({ ...request, context: 'Another window' }))
+ .rejects.toMatchObject({ code: 'REQUEST_KEY_CONFLICT' });
+ });
+ it('opts new project tasks into automatic naming and never renames existing targets', async () => {
+ const f = fixture();
+ const schedule = vi.fn();
+ f.slot.adapter!.scheduleAutoTitle = schedule;
+ const request = { ...f.request, target: { kind: 'project', id: 'chosen' }, autoTitle: true };
+ await f.call(request);
+ await f.call(request);
+ expect(f.create.mock.calls[0]?.[6]).toBe(true);
+ expect(schedule).toHaveBeenCalledOnce();
+ for (const targetKind of ['task', 'bot']) {
+ await expect(f.call({ ...request, requestKey: targetKind, target: { kind: targetKind, id: 'chosen' } }))
+ .rejects.toMatchObject({ code: 'INVALID_PARAMS' });
+ }
+ });
// Unit regression: execute the real public IPC callback with the real target slot.
// Slot-only tests miss the outer error mapping; an invalid parent must not look retryable.
it.each([
diff --git a/apps/desktop/src/main/cindy-brain/__tests__/pluginTaskPrefsStore.test.ts b/apps/desktop/src/main/cindy-brain/__tests__/pluginTaskPrefsStore.test.ts
index 460d85986e..b80481e252 100644
--- a/apps/desktop/src/main/cindy-brain/__tests__/pluginTaskPrefsStore.test.ts
+++ b/apps/desktop/src/main/cindy-brain/__tests__/pluginTaskPrefsStore.test.ts
@@ -40,20 +40,20 @@ describe('normalizeConfig(单插件配置清洗)', () => {
model: '',
effort: 'unknown',
fastMode: 'yes',
- permissionMode: 'bypassPermissions',
+ permissionMode: 'unknown',
workingDir: 42,
}),
).toEqual({});
});
- it('保留普通任务的 ask 和旧 plan 配置,拒绝完全访问', () => {
+ it('保留用户选择的完全访问与旧权限配置,不自动改变权限', () => {
expect(__testing.normalizeConfig({ permissionMode: 'plan' })).toEqual({
permissionMode: 'plan',
});
expect(__testing.normalizeConfig({ permissionMode: 'auto' })).toEqual({
permissionMode: 'auto',
});
- expect(__testing.normalizeConfig({ permissionMode: 'bypassPermissions' })).toEqual({});
+ expect(__testing.normalizeConfig({ permissionMode: 'bypassPermissions' })).toEqual({ permissionMode: 'bypassPermissions' });
expect(__testing.normalizeConfig({ permissionMode: 'ask' })).toEqual({ permissionMode: 'ask' });
});
@@ -117,13 +117,13 @@ describe('validating user task preferences before saving', () => {
setPluginTaskConfigValidator(validate);
await expect(validatePluginTaskConfig({ agentKind: 'codex', model: 'selected', providerId: 'removed' }))
.rejects.toThrow('修复连接');
- await expect(validatePluginTaskConfig({ permissionMode: 'bypassPermissions' })).rejects.toThrow('permissionMode');
+ await expect(validatePluginTaskConfig({ permissionMode: 'unknown' })).rejects.toThrow('permissionMode');
expect(validate).toHaveBeenCalledOnce();
});
it('lets the user clear a broken model without losing independent permissions or directory', async () => {
const validate = vi.fn(async () => { throw new Error('model unavailable'); });
setPluginTaskConfigValidator(validate);
- await expect(validatePluginTaskConfig({ permissionMode: 'auto', workingDir: '/user-selected' })).resolves.toBeUndefined();
+ await expect(validatePluginTaskConfig({ permissionMode: 'bypassPermissions', workingDir: '/user-selected' })).resolves.toBeUndefined();
await expect(validatePluginTaskConfig(null)).resolves.toBeUndefined();
expect(validate).not.toHaveBeenCalled();
});
diff --git a/apps/desktop/src/main/cindy-brain/__tests__/taskSlot.test.ts b/apps/desktop/src/main/cindy-brain/__tests__/taskSlot.test.ts
index d98427a693..f5fa829897 100644
--- a/apps/desktop/src/main/cindy-brain/__tests__/taskSlot.test.ts
+++ b/apps/desktop/src/main/cindy-brain/__tests__/taskSlot.test.ts
@@ -2,8 +2,37 @@ import { describe, expect, it, vi } from 'vitest';
import { isPluginTeamPlanWithinBudget, PLUGIN_TEAM_PLAN_MAX_JSON_CHARS } from '../../../shared/pluginTasks.js';
import { handlePluginTaskRequest, validPluginTaskRequest } from '../taskSlot.js';
import type { InstalledGhost } from '../../../shared/ghost.js';
+import { buildPluginMessage } from '../../../shared/pluginMessage.js';
+import { parseUserContent } from '../../../renderer/lib/imageRef.js';
+import { projectPersistedAgentFacingUserText } from '@cindy/maker-shared/agent-input-projection';
describe('plugin task pipe', () => {
+ it('round-trips collapsed context with screenshots while model history retains the full material', () => {
+ const message = buildPluginMessage('Look here', 'Window text and pointer coordinates', 'Attached context');
+ const persisted = JSON.stringify({ ...message,
+ images: [{ url: 'cindy-media://blobs/example.png', mimeType: 'image/png', originalName: 'window.png' }] });
+ const parsed = parseUserContent(persisted);
+ const range = parsed.pastedTextRanges![0]!;
+ expect(parsed.text.slice(0, range.start).trim()).toBe('Look here');
+ expect(parsed.text.slice(range.start, range.end)).toContain('Window text and pointer coordinates');
+ expect(range.display).toBe('Attached context');
+ expect(parsed.images).toHaveLength(1);
+ expect(projectPersistedAgentFacingUserText(persisted)).toBe(message.text);
+ expect(buildPluginMessage('Legacy text', undefined, 'Attached context')).toEqual({ text: 'Legacy text' });
+ });
+ // unit: Ping exposed capture diagnostics as prose and pinned every new task to
+ // an emote label. Existing cases never exercised independent context/title mode.
+ it('accepts bounded separate context and explicit automatic naming without weakening legacy requests', () => {
+ const create = { type: 'tasks-request', kind: 'create', requestKey: 'new' };
+ expect(validPluginTaskRequest({ ...create, autoTitle: true })).toBe(true);
+ expect(validPluginTaskRequest(create)).toBe(false);
+ expect(validPluginTaskRequest({ ...create, title: 'Chosen title' })).toBe(true);
+ expect(validPluginTaskRequest({ ...create, autoTitle: true, title: 'Conflicting title' })).toBe(false);
+ const send = { type: 'tasks-request', kind: 'send', taskId: 'task', requestKey: 'send', expectedRevision: 1, text: 'Look here' };
+ expect(validPluginTaskRequest({ ...send, context: 'Window contents' })).toBe(true);
+ expect(validPluginTaskRequest({ ...send, context: { system: 'not allowed' } })).toBe(false);
+ expect(validPluginTaskRequest({ ...send, context: 'x'.repeat(32769) })).toBe(false);
+ });
it('bounds the complete JSON plan without truncating scope or breaking representative 200-item batches', () => {
const item = {label:'sample',workingDir:'/answer',route:{agentKind:'pi',providerId:'p',model:'m',effort:'high',fastMode:false},task:'测'.repeat(2600)};
const plan = {concurrency:4,task:'c'.repeat(8000),items:Array.from({length:200},(_,i)=>({...item,label:'w'+i}))};
@@ -15,6 +44,26 @@ describe('plugin task pipe', () => {
expect(isPluginTeamPlanWithinBudget({task:'\n'.repeat(room)})).toBe(false);
});
const ghost = { enabled: true, taskCapabilityApproved: true, approval: {state:'approved', revision:'r'}, manifest: { agent: { tasks: true } } } as InstalledGhost;
+ // unit: the creation API must accept a permission choice, without accepting a
+ // grant or a permission change on existing tasks. Legacy tests only omitted it.
+ it('advertises and forwards supported creation permissions without granting authority', async () => {
+ const handler = vi.fn(async () => ({ taskId: 'created' }));
+ const deps = { getGhost: () => ghost, handler, isCurrent: () => true };
+ const create = { type: 'tasks-request', kind: 'create', requestKey: 'new', title: 'Work' };
+ expect(await handlePluginTaskRequest('p', { type: 'tasks-request', kind: 'capabilities' }, deps))
+ .toMatchObject({ ok: true, data: { createPermissionMode: true } });
+ for (const permissionMode of ['ask', 'auto', 'bypassPermissions']) {
+ const request = { ...create, permissionMode };
+ expect(await handlePluginTaskRequest('p', request, deps)).toMatchObject({ ok: true });
+ expect(handler).toHaveBeenLastCalledWith('p', request);
+ }
+ for (const permissionMode of ['acceptEdits', 'plan', 'default', null, 1]) {
+ expect(validPluginTaskRequest({ ...create, permissionMode })).toBe(false);
+ }
+ expect(validPluginTaskRequest({ ...create, permissionMode: 'auto', confirmed: true })).toBe(false);
+ expect(validPluginTaskRequest({ type: 'tasks-request', kind: 'send', taskId: 't', requestKey: 's',
+ text: 'Continue', expectedRevision: 1, permissionMode: 'auto' })).toBe(false);
+ });
it('requires its own declared capability; errand alone grants nothing', async () => {
const handler = vi.fn();
const result = await handlePluginTaskRequest(
diff --git a/apps/desktop/src/main/cindy-brain/mobileTaskSettings.ts b/apps/desktop/src/main/cindy-brain/mobileTaskSettings.ts
index 8c384c22d1..35349c7c38 100644
--- a/apps/desktop/src/main/cindy-brain/mobileTaskSettings.ts
+++ b/apps/desktop/src/main/cindy-brain/mobileTaskSettings.ts
@@ -5,6 +5,7 @@ import {
type ProviderView,
} from '@cindy/model-providers';
import { GHOST_ERRAND_PERMISSION_MODES } from '../../shared/ghost.js';
+import { PLUGIN_TASK_PERMISSION_MODES } from '../../shared/pluginTasks.js';
import { PLUGIN_TASK_EFFORTS, type PluginTaskConfig } from './pluginTaskPrefsStore.js';
import type { PluginTaskPreferences } from '@cindy/device-link';
@@ -24,7 +25,7 @@ export class MobileTaskSettings {
return {
revision: this.revision(id, installRevision),
config,
- permissionModes: [...GHOST_ERRAND_PERMISSION_MODES],
+ permissionModes: [...PLUGIN_TASK_PERMISSION_MODES],
defaultPermissionMode: 'ask',
};
}
diff --git a/apps/desktop/src/main/cindy-brain/pluginTargetSlot.ts b/apps/desktop/src/main/cindy-brain/pluginTargetSlot.ts
index 351e5f8d0b..aaad208e6c 100644
--- a/apps/desktop/src/main/cindy-brain/pluginTargetSlot.ts
+++ b/apps/desktop/src/main/cindy-brain/pluginTargetSlot.ts
@@ -7,7 +7,9 @@ import type {
PluginTargetRequest,
PluginTargetView,
} from '../../shared/pluginTargets.js';
-import type { PluginTaskRoute } from '../../shared/pluginTasks.js';
+import { isPluginTaskPermissionMode, type PluginTaskPermissionMode, type PluginTaskRoute } from '../../shared/pluginTasks.js';
+import { DEFAULT_DRAFT_SESSION_TITLE } from '@cindy/maker-shared/session-title';
+import { pluginMessageText, validPluginMessageContext } from '../../shared/pluginMessage.js';
import { getActiveDataOwnerPushStamp, activeOwnerScopeKey } from '../appSessionState.js';
import { withParsedPluginMessageAttachments, type PluginMessageImage } from '../cindy-media/pluginMessageAttachments.js';
@@ -34,6 +36,7 @@ export interface PluginTargetAdapter {
store(): PluginTargetStore;
approvalRevision(pluginId: string): string | null;
candidates(kind: PluginTargetKind): Promise<PluginTargetCandidate[]>;
+ assertCreatePermission(pluginId: string, permissionMode: PluginTaskPermissionMode): void;
create(
pluginId: string,
project: string,
@@ -41,6 +44,8 @@ export interface PluginTargetAdapter {
title: string,
route: PluginTaskRoute | undefined,
guard: () => void,
+ autoTitle?: boolean,
+ permissionMode?: PluginTaskPermissionMode,
): Promise<void>;
session(kind: 'task' | 'bot', id: string): Promise<string>;
send(
@@ -52,10 +57,12 @@ export interface PluginTargetAdapter {
validateTarget: () => Promise<void>,
delivery: PluginTargetDelivery,
images?: PluginMessageImage[],
+ options?: { context?: string },
): Promise<PluginTargetDelivery>;
withdraw(taskId: string, clientId: string, guard: () => void): Promise<void>;
prepareInvocation?(pluginId: string, id: string, parentId?: string, operation?: string, sessionId?: string): string;
acceptInvocation?(pluginId: string, id: string): void;
+ scheduleAutoTitle?(pluginId: string, taskId: string, text: string, placeholderText: string): void;
}
const fail = (code: string): never => {
throw Object.assign(new Error(code), { code });
@@ -133,6 +140,11 @@ export class PluginTargetSlot {
if (
!isTarget(request.target) ||
typeof request.text !== 'string' || !request.text.trim() || request.text.length > 64000 ||
+ !validPluginMessageContext(request.text, request.context) ||
+ (request.autoTitle !== undefined && typeof request.autoTitle !== 'boolean') ||
+ (request.autoTitle === true && (request.target.kind !== 'project' || request.title !== undefined)) ||
+ (request.permissionMode !== undefined &&
+ (request.target.kind !== 'project' || !isPluginTaskPermissionMode(request.permissionMode))) ||
(request.delivery !== undefined && !['queue', 'steer'].includes(request.delivery)) ||
(request.invocationId !== undefined && !keyString(request.invocationId)) ||
(request.title !== undefined && (typeof request.title !== 'string' || request.title.length > 200))
@@ -155,7 +167,10 @@ export class PluginTargetSlot {
};
return withParsedPluginMessageAttachments(request.attachments, async images => {
const contentIdentity = [target.kind, target.id, request.text, request.title, route, delivery,
- images.map(({ hash, name }) => [hash, name])];
+ images.map(({ hash, name }) => [hash, name]),
+ ...(request.context ? [{ context: request.context }] : []),
+ ...(request.autoTitle ? [{ autoTitle: true }] : []),
+ ...(request.permissionMode !== undefined ? [{ permissionMode: request.permissionMode }] : [])];
const hash = createHash('sha256')
.update(JSON.stringify(request.invocationId === undefined ? contentIdentity : [...contentIdentity, request.invocationId]))
.digest('hex');
@@ -185,6 +200,7 @@ export class PluginTargetSlot {
guard();
const approvalRevision = adapter.approvalRevision(pluginId);
if (!approvalRevision) return fail('PERMISSION_DENIED');
+ if (request.permissionMode !== undefined) adapter.assertCreatePermission(pluginId, request.permissionMode);
const receipt: PluginTargetReceipt = {
id: `plugin-target:${randomUUID()}`, pluginId, requestKey: request.requestKey,
hash, target, approvalRevision, status: 'pending',
@@ -204,11 +220,17 @@ export class PluginTargetSlot {
guard();
};
await validateTarget();
- if (target.kind === 'project')
- await adapter.create(pluginId, target.id, taskId, request.title || candidate.label, route, guard);
+ if (target.kind === 'project') {
+ const title = request.autoTitle ? DEFAULT_DRAFT_SESSION_TITLE : request.title || candidate.label;
+ if (request.permissionMode !== undefined)
+ await adapter.create(pluginId, target.id, taskId, title, route, guard, request.autoTitle || undefined, request.permissionMode);
+ else if (request.autoTitle) await adapter.create(pluginId, target.id, taskId, title, route, guard, true);
+ else await adapter.create(pluginId, target.id, taskId, title, route, guard);
+ }
guard();
const actualDelivery = await adapter.send(
pluginId, taskId, receipt.id, request.text, guard, validateTarget, delivery, images,
+ request.context ? { context: request.context } : undefined,
);
authorized();
if (receipt.invocationId) {
@@ -222,6 +244,10 @@ export class PluginTargetSlot {
await adapter.withdraw(taskId, receipt.id, authorized);
return fail('SUPERSEDED');
}
+ if (request.autoTitle) {
+ try { adapter.scheduleAutoTitle?.(pluginId, taskId, pluginMessageText(request.text, request.context), request.text); }
+ catch { /* Naming failure never retries an accepted message. */ }
+ }
return { taskId, accepted: true, delivery: actualDelivery };
};
operation.result = deliver().finally(() => this.inFlight.delete(runtimeKey));
diff --git a/apps/desktop/src/main/cindy-brain/taskSlot.ts b/apps/desktop/src/main/cindy-brain/taskSlot.ts
index 1a03c47691..64634304bb 100644
--- a/apps/desktop/src/main/cindy-brain/taskSlot.ts
+++ b/apps/desktop/src/main/cindy-brain/taskSlot.ts
@@ -1,8 +1,9 @@
import { ghostDeclaresHiddenTasks, type InstalledGhost } from '../../shared/ghost.js';
import type { PluginTaskRequest, PluginTaskResult } from '../../shared/pluginTasks.js';
-import { isPluginTeamPlanWithinBudget } from '../../shared/pluginTasks.js';
+import { isPluginTaskPermissionMode, isPluginTeamPlanWithinBudget } from '../../shared/pluginTasks.js';
import { hasPluginTaskApproval } from './taskCapability.js';
import { PLUGIN_ATTACHMENT_MAX_BYTES, validPluginMessageAttachments } from '../../shared/pluginAttachments.js';
+import { validPluginMessageContext } from '../../shared/pluginMessage.js';
export const PLUGIN_TASK_OPERATIONS = [
'capabilities',
@@ -34,7 +35,7 @@ export function validPluginTaskRequest(value: unknown): value is PluginTaskReque
capabilities: [],
models: [],
setModel: ['taskId', 'expectedRevision', 'route'],
- create: ['requestKey', 'title', 'route', 'isolatedWorkspace', 'callId', 'hidden'],
+ create: ['requestKey', 'title', 'autoTitle', 'route', 'permissionMode', 'isolatedWorkspace', 'callId', 'hidden'],
list: ['after', 'limit'],
get: ['taskId'],
requestWriteAccess: ['taskId', 'mode'],
@@ -42,7 +43,7 @@ export function validPluginTaskRequest(value: unknown): value is PluginTaskReque
getTeam: ['taskId'],
setTeamPlan: ['taskId', 'plan'],
releaseWorker: ['taskId', 'workerId', 'completedAt'],
- send: ['taskId', 'requestKey', 'expectedRevision', 'text', 'attachments', 'invocationId'],
+ send: ['taskId', 'requestKey', 'expectedRevision', 'text', 'context', 'attachments', 'invocationId'],
getRun: ['runId'],
listRuns: ['taskId', 'after', 'limit'],
readMessages: ['taskId', 'after', 'limit'],
@@ -61,16 +62,20 @@ export function validPluginTaskRequest(value: unknown): value is PluginTaskReque
return false;
if (kind === 'setHidden' && typeof value.hidden !== 'boolean') return false;
if (value.hidden !== undefined && typeof value.hidden !== 'boolean') return false;
+ if (value.permissionMode !== undefined && !isPluginTaskPermissionMode(value.permissionMode)) return false;
if (['getRun', 'cancel'].includes(value.kind) && !requires('runId')) return false;
const pluginDefault = kind === 'setModel' && value.route === 'plugin-default';
if (kind === 'setModel' && ((!pluginDefault && !object(value.route)) || !Number.isSafeInteger(value.expectedRevision) || (value.expectedRevision as number) < 0)) return false;
if (value.callId !== undefined && !text(value.callId, 128)) return false;
if (value.invocationId !== undefined && !text(value.invocationId, 128)) return false;
if (value.isolatedWorkspace !== undefined && typeof value.isolatedWorkspace !== 'boolean') return false;
- if (value.kind === 'create' && !text(value.title, 100)) return false;
+ if (value.kind === 'create' && (
+ (value.autoTitle !== undefined && typeof value.autoTitle !== 'boolean') ||
+ (value.autoTitle === true ? value.title !== undefined : !text(value.title, 100))
+ )) return false;
if (
value.kind === 'send' &&
- (!text(value.text, 32768) || !validPluginMessageAttachments(value.attachments) ||
+ (!text(value.text, 32768) || !validPluginMessageContext(value.text as string, value.context) || !validPluginMessageAttachments(value.attachments) ||
!Number.isSafeInteger(value.expectedRevision) ||
(value.expectedRevision as number) < 0)
)
@@ -160,6 +165,9 @@ export async function handlePluginTaskRequest(
pluginDefaultModel: true,
sourceCallContext: true,
invocationContext: true,
+ messageContext: true,
+ autoTitle: true,
+ createPermissionMode: true,
messageAttachments: { kinds: ['image'], maxCount: 4, maxBytes: PLUGIN_ATTACHMENT_MAX_BYTES },
hiddenTasks: declaresHiddenTasks(),
},
diff --git a/apps/desktop/src/main/localDb/ipc/pluginWorkspaceSessions.ts b/apps/desktop/src/main/localDb/ipc/pluginWorkspaceSessions.ts
index d48c2e3670..18f1e4801c 100644
--- a/apps/desktop/src/main/localDb/ipc/pluginWorkspaceSessions.ts
+++ b/apps/desktop/src/main/localDb/ipc/pluginWorkspaceSessions.ts
@@ -31,6 +31,7 @@ import { upsertRecentWorkdir } from './recentWorkdirs';
import { createLogger } from '../../logger';
import { pickSessionForWorkdir } from '../pluginWorkspaceDedupe';
import { normalizeWorkingDirForStorage } from '../../../shared/workingDir.js';
+import type { GhostErrandPermissionMode } from '../../../shared/ghost.js';
const log = createLogger('plugin-workspace-sessions');
@@ -73,7 +74,7 @@ export async function createPluginDraftSession(params: {
* 由宿主解析的完整模型配置;缺省时交普通 Session 入口读取当前新任务选择。
*/
defaults?: {
- permissionMode?: 'ask' | 'plan' | 'acceptEdits' | 'auto';
+ permissionMode?: GhostErrandPermissionMode;
agentKind?: 'cc' | 'codex' | 'pi';
model?: string;
effort?: string;
@@ -146,7 +147,7 @@ export async function createPluginTaskSession(params: {
effort?: string;
fastMode?: boolean | 'ultrafast';
providerId?: string | null;
- permissionMode: 'ask' | 'plan' | 'acceptEdits' | 'auto';
+ permissionMode: GhostErrandPermissionMode;
/** 用户亲选的项目目录(绝对路径);缺省 = 专属 dialogue 目录。 */
workingDir?: string;
/**
diff --git a/apps/desktop/src/main/maker-host/built-in-skills.ts b/apps/desktop/src/main/maker-host/built-in-skills.ts
index 4846e265ad..e407ccfdd5 100644
--- a/apps/desktop/src/main/maker-host/built-in-skills.ts
+++ b/apps/desktop/src/main/maker-host/built-in-skills.ts
@@ -25,7 +25,7 @@ const VERSIONS_DIRECTORY = '.versions';
const ACTIVE_BUNDLE_LINK = '.active';
const BUILT_IN_SKILL_MUTATION_WAIT_MS = 5_000;
/** Increment whenever shipped built-in Skill bytes change between releases. */
-export const BUILT_IN_SKILLS_BUNDLE_VERSION = 22;
+export const BUILT_IN_SKILLS_BUNDLE_VERSION = 23;
const PLUGIN_CREATOR_FIRST_BUNDLE_VERSION = 13;
export interface BuiltInSkillDescriptor {
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/ghostErrandRunner.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/ghostErrandRunner.test.ts
index 30a8cb58b4..0a35ffecf8 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/ghostErrandRunner.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/ghostErrandRunner.test.ts
@@ -110,11 +110,11 @@ const REQUEST = {
};
describe('权限档钳制', () => {
- it('普通任务使用 ask;旧适配器可保留 plan;完全访问不能进入配置', () => {
+ it('普通任务使用 ask;保留旧 plan 和用户显式选择的完全访问', () => {
expect(clampPluginTaskPermissionMode(undefined)).toBe('ask');
expect(clampPluginTaskPermissionMode(undefined, 'plan')).toBe('plan');
- expect(clampPluginTaskPermissionMode('bypassPermissions')).toBe('ask');
- expect(clampPluginTaskPermissionMode('bypassPermissions', 'plan')).toBe('plan');
+ expect(clampPluginTaskPermissionMode('bypassPermissions')).toBe('bypassPermissions');
+ expect(clampPluginTaskPermissionMode('unknown', 'plan')).toBe('plan');
expect(clampPluginTaskPermissionMode('ask')).toBe('ask');
expect(clampPluginTaskPermissionMode('acceptEdits')).toBe('acceptEdits');
expect(clampPluginTaskPermissionMode('auto')).toBe('auto');
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
index bc4c12181c..aea25dc717 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
@@ -205,7 +205,132 @@ function fixture() {
};
}
+// Exercise the production Main creator with an in-memory persistence boundary;
+// service-only mocks cannot catch a permission choice being dropped by register.
+const permissionCreatorSource = readFileSync(new URL('../register.ts', import.meta.url), 'utf8');
+const permissionCreatorStart = permissionCreatorSource.indexOf(' createSession: async (pluginId, taskId, title, route,');
+const permissionCreatorCode = ts.transpileModule('return (' + permissionCreatorSource.slice(
+ permissionCreatorStart + ' createSession: '.length,
+ permissionCreatorSource.indexOf('\n },', permissionCreatorStart) + 8,
+) + ');', { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText;
+function useProductionPermissionCreator(f: ReturnType<typeof fixture>, configured: { permissionMode: string }) {
+ const snapshot = {};
+ const persist = vi.fn(async (options: { sessionId: string; title: string; permissionMode: string;
+ onPersistenceStarted(): void; shouldContinue(): boolean }) => {
+ if (!options.shouldContinue()) throw new PluginTaskError('PERMISSION_DENIED', 'Configuration changed');
+ options.onPersistenceStarted();
+ f.tasks.set(options.sessionId, { taskId: options.sessionId, title: options.title, status: 'active',
+ resolvedConfig: f.route, revision: 1, permissionMode: options.permissionMode });
+ });
+ const deps = { assertPlugin: () => {}, readPluginTaskConfig: () => ({ ...configured }),
+ resolveRoute: (...args: Parameters<typeof f.deps.resolveRoute>) => f.deps.resolveRoute(...args),
+ PluginTaskError, isPluginTaskPermissionAllowed, createPluginTaskSession: persist,
+ clampPluginTaskPermissionMode: (mode: unknown) => mode ?? 'ask', snapshot,
+ getCurrentDbClientSnapshot: () => snapshot, isPluginTaskAuthorized: () => true,
+ };
+ f.deps.readPermissionMode = () => configured.permissionMode;
+ f.deps.createSession = new Function(...Object.keys(deps), permissionCreatorCode)(...Object.values(deps));
+ return persist;
+}
+
+// unit: new per-create permissions must reach ordinary Session persistence while
+// remaining within the user policy. Previous cases only exercised the default.
+it('persists the chosen creation permission without changing defaults or duplicate requests', async () => {
+ const f = fixture(), configured = { permissionMode: 'bypassPermissions' };
+ const persist = useProductionPermissionCreator(f, configured);
+ for (const permissionMode of ['ask', 'auto', 'bypassPermissions'] as const) {
+ const request = { requestKey: permissionMode, title: 'Work', permissionMode };
+ const task = await f.service.create('p', request);
+ expect(task.permissionMode).toBe(permissionMode);
+ expect(await f.service.create('p', request)).toEqual(task);
+ await expect(f.service.create('p', { ...request, permissionMode: permissionMode === 'ask' ? 'auto' : 'ask' }))
+ .rejects.toMatchObject({ code: 'IDEMPOTENCY_CONFLICT' });
+ }
+ expect((await f.create()).permissionMode).toBe('bypassPermissions');
+ expect(await f.create()).toMatchObject({ permissionMode: 'bypassPermissions' });
+ expect(persist).toHaveBeenCalledTimes(4);
+ expect(configured).toEqual({ permissionMode: 'bypassPermissions' });
+});
+
+// unit: full access must work through ordinary send/accept, but a revoked user
+// ceiling must block the queued input before execution. No full-access path existed before.
+it('delivers an authorized full-access task and rechecks the ceiling before acceptance', async () => {
+ const f = fixture(), configured = { permissionMode: 'bypassPermissions' };
+ useProductionPermissionCreator(f, configured);
+ const task = await f.service.create('p', { requestKey: 'full', title: 'Work', permissionMode: 'bypassPermissions' });
+ const run = await f.service.send('p', { taskId: task.taskId, expectedRevision: task.revision,
+ requestKey: 'send', text: 'Continue' });
+ expect(f.deps.dispatch).toHaveBeenCalledOnce();
+ configured.permissionMode = 'auto';
+ await expect(f.service.accept(task.taskId, { clientId: run.inputMessageId }, f.execution))
+ .rejects.toMatchObject({ code: 'PERMISSION_DENIED' });
+ await expect(f.service.create('p', { requestKey: 'denied', title: 'Work', permissionMode: 'bypassPermissions' }))
+ .rejects.toMatchObject({ code: 'PERMISSION_DENIED' });
+});
+
+it('rejects an unauthorized creation permission before reserving a task', async () => {
+ const f = fixture(), configured = { permissionMode: 'ask' };
+ const persist = useProductionPermissionCreator(f, configured);
+ const request = { requestKey: 'new', title: 'Work', permissionMode: 'auto' as const };
+ await expect(f.service.create('p', request)).rejects.toMatchObject({ code: 'PERMISSION_DENIED' });
+ expect(persist).not.toHaveBeenCalled();
+ expect(f.rows.size).toBe(0);
+ configured.permissionMode = 'auto';
+ expect((await f.service.create('p', request)).permissionMode).toBe('auto');
+});
+
+it.each(['route', 'persistence'] as const)('rechecks creation permission after %s preparation', async phase => {
+ const f = fixture(), configured = { permissionMode: 'auto' };
+ const persist = useProductionPermissionCreator(f, configured);
+ if (phase === 'route') f.deps.resolveRoute = async () => { configured.permissionMode = 'ask'; return f.route; };
+ else persist.mockImplementationOnce(async options => {
+ configured.permissionMode = 'ask';
+ options.onPersistenceStarted();
+ });
+ await expect(f.service.create('p', { requestKey: 'new', title: 'Work', permissionMode: 'auto' }))
+ .rejects.toMatchObject({ code: 'PERMISSION_DENIED' });
+ expect(f.tasks.size).toBe(0);
+ expect(f.rows.size).toBe(0);
+});
+
// 通用统计:保护真实 send 接受边界,不将空任务、拒绝或同键重放计为新调用。
+// unit: new-title intent lives in the existing create receipt; context must reach
+// dispatch and participate in deduplication rather than becoming visible prose.
+it('persists automatic naming intent and dispatches separate context without duplicating title requests', async () => {
+ const f = fixture();
+ const schedule = vi.fn();
+ f.deps.scheduleAutoTitle = schedule;
+ const task = await f.service.create('p', { requestKey: 'new', autoTitle: true });
+ expect(JSON.parse(f.rows.get(task.taskId)!.payload)).toMatchObject({ autoTitle: true });
+ const request = { taskId: task.taskId, expectedRevision: task.revision, requestKey: 'send', text: 'Look here', context: 'Window contents' };
+ await f.service.send('p', request);
+ await f.service.send('p', request);
+ expect(f.deps.dispatch).toHaveBeenCalledOnce();
+ expect(vi.mocked(f.deps.dispatch).mock.calls[0]?.[5]).toBe('Window contents');
+ expect(schedule).toHaveBeenCalledOnce();
+ await expect(f.service.send('p', { ...request, context: 'Another window' }))
+ .rejects.toMatchObject({ code: 'IDEMPOTENCY_CONFLICT' });
+});
+
+// unit: a failed naming-metadata read must not leave an unsent receipt that
+// suppresses the retry. Inject the store failure after host bookkeeping starts.
+it('retries after a failed naming-metadata read without leaving an unsent receipt', async () => {
+ const f = fixture(), task = await f.create();
+ const get = f.deps.store.get;
+ let failRead = false;
+ f.deps.prepareInvocation = () => { failRead = true; return 'invocation'; };
+ f.deps.store.get = async id => {
+ if (failRead) { failRead = false; throw new Error('Store read failed'); }
+ return get(id);
+ };
+ const request = { taskId: task.taskId, expectedRevision: task.revision, requestKey: 'send', text: 'Look here' };
+ await expect(f.service.send('p', request)).rejects.toThrow('Store read failed');
+ expect([...f.rows.values()].filter(row => row.operation === 'send')).toHaveLength(0);
+ f.deps.prepareInvocation = () => 'invocation';
+ await f.service.send('p', request);
+ expect(f.deps.dispatch).toHaveBeenCalledOnce();
+});
+
// unit;现有任务测试检查任务状态,未检查宿主统计观察者收到哪些事实。
it('records one accepted input after create and does not count receipt replay or rejected dispatch', async () => {
const f = fixture();
@@ -1022,9 +1147,9 @@ describe('current plugin dispatch authority', () => {
await expect(f.service.get('p',run.taskId)).resolves.toMatchObject({planModeEnabled:true});
await expect(f.service.cancel('p',run.runId)).resolves.toMatchObject({status:'cancelled'});
});
- it.each(['plan', 'ask', 'acceptEdits', 'auto'])('allows only authority within %s configuration', configured => {
- const modes = ['plan', 'ask', 'acceptEdits', 'auto'];
- for (const mode of [...modes, 'bypassPermissions', 'unknown', undefined]) {
+ it.each(['plan', 'ask', 'acceptEdits', 'auto', 'bypassPermissions'])('allows only authority within %s configuration', configured => {
+ const modes = ['plan', 'ask', 'acceptEdits', 'auto', 'bypassPermissions'];
+ for (const mode of [...modes, 'unknown', undefined]) {
expect(isPluginTaskPermissionAllowed(mode, configured)).toBe(modes.includes(mode!) && modes.indexOf(mode!) <= modes.indexOf(configured));
}
expect(isPluginTaskPermissionAllowed('auto', undefined)).toBe(false);
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts
index 7fee62266e..e279c80e8d 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts
@@ -76,6 +76,23 @@ describe('shared-provider credential grants on permission changes', () => {
});
});
describe('plugin write confirmation interleavings', () => {
+ // unit: adding full access must not make an older write-access request lower
+ // an already granted task or the user's independent plugin permission ceiling.
+ it('keeps full-access grants when an older client requests Auto', async () => {
+ const f=fixture();f.change({permissionMode:'bypassPermissions'});
+ f.service.get.mockResolvedValue({taskId:'task',revision:1,status:'active',permissionMode:'bypassPermissions'});
+ await expect(f.run('auto')).resolves.toMatchObject({granted:true});
+ expect(f.dialog.showMessageBox).not.toHaveBeenCalled();
+ expect(f.live.setPermissionMode).not.toHaveBeenCalled();
+ expect(f.write).not.toHaveBeenCalled();
+ });
+ it('grants Auto to a task without reducing the plugin full-access ceiling', async () => {
+ const f=fixture();f.change({permissionMode:'bypassPermissions'});
+ await expect(f.run('auto')).resolves.toMatchObject({granted:true});
+ expect(f.live.setPermissionMode).toHaveBeenCalledWith('auto');
+ expect(f.config().permissionMode).toBe('bypassPermissions');
+ expect(f.write).not.toHaveBeenCalled();
+ });
it.each(['auto','acceptEdits'].flatMap(mode=>['before','dialog','lastRead'].map(point=>({mode,point}))))('rejects independent Plan Mode at $point for $mode without reporting a grant',async ({point,mode})=>{
const f=fixture();f.change({permissionMode:mode});
const planTask={taskId:'task',revision:1,status:'active',permissionMode:mode,planModeEnabled:true};
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionAutoTitle.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionAutoTitle.test.ts
index a8630c6ccf..e1f2846a36 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionAutoTitle.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionAutoTitle.test.ts
@@ -60,6 +60,15 @@ function persistCalls(deps: SessionAutoTitleDeps): Array<[string, string | undef
}
describe('runSessionAutoTitle — 用户写了字', () => {
+ // unit: plugin context should inform the generated title without flashing
+ // capture headers in the immediate sidebar placeholder.
+ it('uses the visible instruction as placeholder while naming from the full separate context', async () => {
+ const deps = makeDeps();
+ const text = 'Look here\n\nWindow details: login request failed';
+ await runSessionAutoTitle({ sessionId: 's1', text, placeholderText: 'Look here', agentKind: 'codex' }, deps);
+ expect(persistCalls(deps)[0]).toEqual(['Look here', 'New Maker']);
+ expect(deps.generateTitle).toHaveBeenCalledWith(text, 'codex', 's1');
+ });
it('先写原话占位,再用智能标题覆盖占位(期望值 = 占位串)', async () => {
const deps = makeDeps();
diff --git a/apps/desktop/src/main/maker-ipc/ghostErrandRunner.ts b/apps/desktop/src/main/maker-ipc/ghostErrandRunner.ts
index cae567ad59..c8eaf7978b 100644
--- a/apps/desktop/src/main/maker-ipc/ghostErrandRunner.ts
+++ b/apps/desktop/src/main/maker-ipc/ghostErrandRunner.ts
@@ -12,8 +12,8 @@
* → 取最终回复文字(观察器累积为主,DB 最新 assistant 消息兜底)
*
* 安全不变量(与 errandSlot 头注释同一契约):任务文本只进普通 user 消息;
- * 权限档只认 ask/plan/acceptEdits/auto(存储层与本层双重钳制,bypassPermissions
- * 在协议上不存在);errand 会话侧边栏可见,用户可旁观可随时停;工作目录
+ * 权限由用户插件设置提供(ask/auto/bypassPermissions,历史 plan/acceptEdits 保留),
+ * 插件请求不能自报授权;errand 会话侧边栏可见,用户可旁观可随时停;工作目录
* 用户配置优先,插件转述的目录只认 pick 亲选台账(isUserPickedDir),
* 台账没有即明拒——插件不能凭空指路。
*
diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
index 4d9da9bb50..21357cbd5a 100644
--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
@@ -1,9 +1,11 @@
import { createHash, randomUUID } from 'node:crypto';
import type { Session } from '@cindy/maker-core';
-import type { PluginTaskRoute, PluginTaskRun, PluginTaskView, PluginTeamPlan } from '../../shared/pluginTasks.js';
-import { isPluginTeamPlanWithinBudget, PLUGIN_TASK_RECEIPT_MAX_JSON_CHARS } from '../../shared/pluginTasks.js';
+import type { PluginTaskPermissionMode, PluginTaskRoute, PluginTaskRun, PluginTaskView, PluginTeamPlan } from '../../shared/pluginTasks.js';
+import { isPluginTaskPermissionMode, isPluginTeamPlanWithinBudget, PLUGIN_TASK_RECEIPT_MAX_JSON_CHARS } from '../../shared/pluginTasks.js';
import type { PluginMessageAttachment } from '../../shared/pluginAttachments.js';
import { withParsedPluginMessageAttachments, type PluginMessageImage } from '../cindy-media/pluginMessageAttachments.js';
+import { DEFAULT_DRAFT_SESSION_TITLE } from '@cindy/maker-shared/session-title';
+import { pluginMessageText } from '../../shared/pluginMessage.js';
import {
isSameSessionExecution,
queuedInputBelongsTo,
@@ -111,7 +113,7 @@ export function assertPluginTaskResult(result: { ok: boolean; errorCode?: string
}
/** A live task cannot exercise more authority than the plugin's current setting. */
export function isPluginTaskPermissionAllowed(taskMode: unknown, configuredMode: unknown, planModeEnabled = false): boolean {
- const rank = (mode: unknown) => mode === 'plan' ? 0 : mode === 'ask' ? 1 : mode === 'acceptEdits' ? 2 : mode === 'auto' ? 3 : -1;
+ const rank = (mode: unknown) => mode === 'plan' ? 0 : mode === 'ask' ? 1 : mode === 'acceptEdits' ? 2 : mode === 'auto' ? 3 : mode === 'bypassPermissions' ? 4 : -1;
const task = rank(taskMode);
return !planModeEnabled && task >= 0 && task <= Math.max(0, rank(configuredMode));
}
@@ -155,6 +157,7 @@ export interface PluginTaskServiceDeps {
/** Background task: the Session row is inserted with hidden_at set (never flashes into lists). */
hidden?: boolean,
targetContext?: PluginTaskCreateContext,
+ permissionMode?: PluginTaskPermissionMode,
): Promise<void>;
/**
* Re-checks `agent.hiddenTasks` (with tasks) for this plugin; throws PERMISSION_DENIED.
@@ -178,6 +181,7 @@ export interface PluginTaskServiceDeps {
clientId: string,
text: string,
images?: PluginMessageImage[],
+ context?: string,
): Promise<{ ok: boolean; message?: string }>;
inspect(
taskId: string,
@@ -193,6 +197,7 @@ export interface PluginTaskServiceDeps {
/** Host bookkeeping only; plugins cannot mint or increment usage identities. */
prepareInvocation?(pluginId: string, id: string, parentId?: string, operation?: string, sessionId?: string): string;
acceptInvocation?(pluginId: string, id: string): void;
+ scheduleAutoTitle?(pluginId: string, taskId: string, text: string, placeholderText: string): void;
}
/** Uses native input/terminal facts. Never infers completion from idle or the latest assistant. */
@@ -344,17 +349,28 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
},
create: (
pluginId: string,
- request: { requestKey: string; title: string; route?: PluginTaskRoute; isolatedWorkspace?: boolean; callId?: string; hidden?: boolean },
+ request: { requestKey: string; title?: string; autoTitle?: boolean; route?: PluginTaskRoute; permissionMode?: PluginTaskPermissionMode; isolatedWorkspace?: boolean; callId?: string; hidden?: boolean },
targetContext?: PluginTaskCreateContext,
) =>
exclusive(async () => {
targetContext?.assertCurrent();
deps.assertAuthorized(pluginId);
+ if (request.autoTitle === true ? request.title !== undefined : !request.title?.trim())
+ return fail('INVALID_REQUEST', 'Supply a title or opt into automatic naming');
+ if (request.permissionMode !== undefined && !isPluginTaskPermissionMode(request.permissionMode))
+ return fail('INVALID_REQUEST', 'Unsupported task creation permission');
+ const assertRequestedPermission = () => {
+ if (request.permissionMode === undefined) return;
+ deps.assertAuthorized(pluginId);
+ if (!isPluginTaskPermissionAllowed(request.permissionMode, deps.readPermissionMode(pluginId)))
+ fail('PERMISSION_DENIED', 'Requested permission exceeds plugin dispatch policy');
+ };
+ const title = request.autoTitle ? DEFAULT_DRAFT_SESSION_TITLE : request.title!;
const hidden = request.hidden === true;
if (hidden) assertHiddenTasksAllowed(pluginId);
// hidden:false is the default; only a background request changes the fingerprint,
// so existing visible receipts replay unchanged.
- const input = [request.title, request.route ?? null, ...(request.isolatedWorkspace ? [true] : []), ...(request.callId ? [{ callId: request.callId }] : []), ...(hidden ? [{ hidden: true }] : []), ...(targetContext ? [{ workingDir: targetContext.workingDir }] : [])];
+ const input = [request.title, request.route ?? null, ...(request.isolatedWorkspace ? [true] : []), ...(request.callId ? [{ callId: request.callId }] : []), ...(hidden ? [{ hidden: true }] : []), ...(targetContext ? [{ workingDir: targetContext.workingDir }] : []), ...(request.autoTitle ? [{ autoTitle: true }] : []), ...(request.permissionMode !== undefined ? [{ permissionMode: request.permissionMode }] : [])];
const fingerprint = hash(input);
let row = replay(
await deps.store.find(pluginId, 'create', '', request.requestKey),
@@ -366,9 +382,11 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
// Do not recreate a deleted/ambiguous task on replay.
return ownTask(pluginId, row.id);
}
+ assertRequestedPermission();
const route = await deps.resolveRoute(pluginId, request.route, request.callId);
deps.assertCurrent();
targetContext?.assertCurrent();
+ assertRequestedPermission();
const taskId = targetContext?.taskId ?? id();
row = newReceipt(
pluginId,
@@ -376,25 +394,30 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
'',
request.requestKey,
fingerprint,
- { route, title: request.title },
+ { route, title, ...(request.autoTitle ? { autoTitle: true } : {}) },
taskId,
);
await deps.store.insert(row);
let persistenceStarted = false;
try {
deps.assertCurrent();
- const onPersistenceStarted = () => { persistenceStarted = true; };
- // Visible creation keeps its original call shape; only background tasks add the flag.
- if (targetContext) {
+ const onPersistenceStarted = () => { assertRequestedPermission(); persistenceStarted = true; };
+ // Omitted new fields keep the original creator call shape.
+ if (request.permissionMode !== undefined) {
+ targetContext?.assertCurrent();
+ await deps.createSession(pluginId, taskId, title, route, targetContext ? undefined : request.isolatedWorkspace,
+ request.route, onPersistenceStarted, targetContext ? undefined : request.callId,
+ hidden || undefined, targetContext, request.permissionMode);
+ } else if (targetContext) {
targetContext.assertCurrent();
- await deps.createSession(pluginId, taskId, request.title, route, undefined, request.route,
+ await deps.createSession(pluginId, taskId, title, route, undefined, request.route,
onPersistenceStarted, undefined, undefined, targetContext);
} else if (hidden) {
assertHiddenTasksAllowed(pluginId);
- await deps.createSession(pluginId, taskId, request.title, route, request.isolatedWorkspace, request.route,
+ await deps.createSession(pluginId, taskId, title, route, request.isolatedWorkspace, request.route,
onPersistenceStarted, request.callId, true);
} else {
- await deps.createSession(pluginId, taskId, request.title, route, request.isolatedWorkspace, request.route,
+ await deps.createSession(pluginId, taskId, title, route, request.isolatedWorkspace, request.route,
onPersistenceStarted, request.callId);
}
} catch (error) {
@@ -490,13 +513,14 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
}),
send: async (
pluginId: string,
- request: { taskId: string; requestKey: string; expectedRevision: number; text: string; attachments?: PluginMessageAttachment[]; invocationId?: string },
+ request: { taskId: string; requestKey: string; expectedRevision: number; text: string; context?: string; attachments?: PluginMessageAttachment[]; invocationId?: string },
): Promise<PluginTaskRun> => completeOperation(() => withParsedPluginMessageAttachments(request.attachments, async images => {
const prepared = await exclusive(async () => {
const view = await ownTask(pluginId, request.taskId);
- const contentIdentity = images.length
+ const contentIdentity: unknown[] = images.length
? [request.text, request.expectedRevision, images.map(({ hash, name }) => [hash, name])]
: [request.text, request.expectedRevision];
+ if (request.context) contentIdentity.push({ context: request.context });
const fingerprint = hash(request.invocationId === undefined ? contentIdentity : [...contentIdentity, request.invocationId]);
const previous = replay(
await deps.store.find(pluginId, 'send', request.taskId, request.requestKey),
@@ -524,12 +548,14 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
acceptedConfig: view.resolvedConfig,
usage: { status: 'unavailable', reason: 'Per-input usage has not been reconciled.' },
};
+ const creation = await deps.store.get(view.taskId);
+ const autoTitle = !!creation && readPluginTaskPlanReceipt(creation.payload).autoTitle === true;
deps.assertAuthorized(pluginId);
assertPlanCurrent();
await deps.store.insert(
newReceipt(pluginId, 'send', view.taskId, request.requestKey, fingerprint, run, runId),
);
- return { run, dispatch: true as const, assertPlanCurrent };
+ return { run, dispatch: true as const, assertPlanCurrent, autoTitle };
});
if (!prepared.dispatch) return prepared.run;
let failure: 'failed' | 'reconciling' | undefined;
@@ -546,11 +572,18 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
prepared.run.inputMessageId,
request.text,
images,
+ request.context,
);
if (!outcome.ok) failure = 'failed';
- else if (prepared.run.invocationId) {
+ else {
// Usage persistence must never turn an accepted input into a retry.
- try { deps.acceptInvocation?.(pluginId, prepared.run.invocationId); } catch { /* Best effort, as tool recording. */ }
+ if (prepared.run.invocationId) {
+ try { deps.acceptInvocation?.(pluginId, prepared.run.invocationId); } catch { /* Best effort, as tool recording. */ }
+ }
+ if (prepared.autoTitle) {
+ try { deps.scheduleAutoTitle?.(pluginId, prepared.run.taskId, pluginMessageText(request.text, request.context), request.text); }
+ catch { /* Naming failure never retries an accepted message. */ }
+ }
}
} catch {
// Before entering dispatch, this input is known not to have reached the host.
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index eb3530c405..7ccf2a2ebb 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -51,6 +51,7 @@ import { listPluginTargetCandidates, resolvePluginTargetSession } from './plugin
import { createPluginTargetStore } from './pluginTargetStore.js';
import { collectPluginAttachmentPayloadTexts, withPluginMessageAttachments } from '../cindy-media/pluginMessageAttachments.js';
import type { PluginTaskRoute, PluginTaskRequest } from '../../shared/pluginTasks.js';
+import { buildPluginMessage } from '../../shared/pluginMessage.js';
import { createHash as pluginTaskConfigHash } from 'node:crypto';
import { finishCompanionEnvironmentRemoval } from '../bot-import/runtime.js';
import { setImportProbeConfirmation } from '../bot-import/probeAuthorization.js';
@@ -11956,6 +11957,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
targetSessionId?: string;
message: string;
persistedContent?: string;
+ pastedTextRanges?: AgentInputQueuedMessage['chatMessage']['pastedTextRanges'];
/** Host-managed images; attachment callers always use the durable queue. */
files?: AgentInputQueuedMessage['files'];
clientId?: string;
@@ -12464,6 +12466,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
botTaskCoordination: params.botTaskCoordination,
authorizationGuard: params.authorizationGuard,
files: params.files,
+ pastedTextRanges: params.pastedTextRanges,
inheritTargetPlanMode: params.inheritTargetPlanMode,
taskActionDeliveryGuard: params.taskActionDeliveryGuard,
});
@@ -13819,6 +13822,15 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
// sendToSessionInternal 这一条主机通路,因此会话恢复、繁忙排队、消息落库与
// 费用行为都和用户亲自在聊天框发送一致。runner 通过回调注入,避免
// cindy-brain 反向依赖 maker-ipc 形成模块环。
+ const schedulePluginAutoTitle = (pluginId: string, taskId: string, text: string, placeholderText: string) => {
+ const snapshot = getCurrentDbClientSnapshot();
+ const revision = pluginTaskAuthorizationRevision(pluginId);
+ void maker.getSessionMeta(taskId).then(meta => {
+ if (!meta || !snapshot || snapshot !== getCurrentDbClientSnapshot()
+ || revision !== pluginTaskAuthorizationRevision(pluginId) || !isPluginTaskAuthorized(pluginId)) return;
+ scheduleSessionAutoTitle({ sessionId: taskId, text, placeholderText, agentKind: meta.agentKind, isUserText: true });
+ }).catch(() => log.warn('Plugin task automatic naming could not be scheduled'));
+ };
setGhostAgentTurnRunner(async (request) => {
const dispositionForWakeKind = (
wakeKind: Extract<SendToSessionInternalResult, { ok: true }>['wakeKind'],
@@ -14023,9 +14035,12 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
assertCurrent();
if (workers.length || reservations.length) throw new PluginTaskError('TASK_BUSY', 'Register the team plan before creating Workers');
},
- createSession: async (pluginId, taskId, title, route, isolatedWorkspace, requestedRoute, onPersistenceStarted, callId, hidden, targetContext) => {
+ createSession: async (pluginId, taskId, title, route, isolatedWorkspace, requestedRoute, onPersistenceStarted, callId, hidden, targetContext, permissionMode) => {
assertPlugin(pluginId);
const cfg = readPluginTaskConfig(pluginId);
+ const configuredPermission = clampPluginTaskPermissionMode(cfg.permissionMode);
+ if (permissionMode !== undefined && !isPluginTaskPermissionAllowed(permissionMode, configuredPermission))
+ throw new PluginTaskError('PERMISSION_DENIED', 'Requested permission exceeds plugin dispatch policy');
const configurationIsCurrent = () => {
targetContext?.assertCurrent();
const current = readPluginTaskConfig(pluginId);
@@ -14056,7 +14071,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
await createPluginTaskSession({
ghostId: pluginId, sessionId: taskId, title, ...route,
onPersistenceStarted,
- permissionMode: clampPluginTaskPermissionMode(cfg.permissionMode),
+ permissionMode: permissionMode ?? configuredPermission,
...(workingDir ? { workingDir } : {}),
...(hidden ? { hidden: true } : {}),
shouldContinue: () => getCurrentDbClientSnapshot() === snapshot && isPluginTaskAuthorized(pluginId) && configurationIsCurrent()
@@ -14100,15 +14115,18 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
const revision = Number.parseInt(pluginTaskConfigHash('sha256').update(JSON.stringify([resolvedConfig, row.permissionMode, row.planModeEnabled, row.workingDir, row.status, row.orcaRole])).digest('hex').slice(0, 12), 16);
return { taskId, title: row.title, status: row.status, revision, resolvedConfig, workingDir: row.workingDir ?? undefined, permissionMode: row.permissionMode, planModeEnabled: !!row.planModeEnabled, hidden: row.hiddenAt != null };
},
- dispatch: async (pluginId, taskId, clientId, text, images = []) => {
+ scheduleAutoTitle: schedulePluginAutoTitle,
+ dispatch: async (pluginId, taskId, clientId, text, images = [], context) => {
assertPlugin(pluginId);
// 插件来源只用于标签与 `[消息来源]` 说明;不新增 origin 类型,也不是权限判据。
const pluginName = sanitizeSourceName(getInstalledGhostName(pluginId));
+ const message = buildPluginMessage(text, context, t('newChat.pastedText.pluginContextLabel'));
const validate = async () => { assertPlugin(pluginId); await pluginTaskServiceForCurrentOwner!().assertDispatch(pluginId, taskId); assertPlugin(pluginId); };
return withPluginMessageAttachments(images, () => assertPlugin(pluginId), async files => {
await validate();
const outcome = await sendToSessionInternal({ targetSessionId: taskId, clientId,
- message: text, autoReviewUserText: { kind: 'delegated-continuation' }, forceQueue: true, files,
+ message: message.text, pastedTextRanges: message.pastedTextRanges,
+ autoReviewUserText: { kind: 'delegated-continuation' }, forceQueue: true, files,
sourcePlugin: { pluginId, ...(pluginName ? { name: pluginName } : {}) },
authorizationGuard: { validate, assertCurrent: () => assertPlugin(pluginId) }, onAccepted: validate });
await awaitAgentInputQueueSnapshotPersistence(taskId);
@@ -14240,7 +14258,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
const mode = request.mode ?? 'acceptEdits';
const cfg = readPluginTaskConfig(pluginId);
assertCallerCurrent();
- if (isPluginTaskPermissionAllowed(task.permissionMode, cfg.permissionMode) && (mode === 'acceptEdits' ? task.permissionMode === 'acceptEdits' || task.permissionMode === 'auto' : task.permissionMode === 'auto')) return { granted: true, task };
+ if (isPluginTaskPermissionAllowed(task.permissionMode, cfg.permissionMode) && isPluginTaskPermissionAllowed(mode, task.permissionMode)) return { granted: true, task };
if (pluginPermissionRequests.size) throw new PluginTaskError('TASK_BUSY', 'A permission request is already open');
const identity = pluginWriteAccessIdentity(pluginId);
const assertRequestCurrent = () => {
@@ -14315,7 +14333,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
assertPlanInactive();
const currentConfig = readPluginTaskConfig(pluginId);
if (currentConfig.permissionMode !== cfg.permissionMode) throw new PluginTaskError('PERMISSION_DENIED', 'Permission settings changed');
- if (mode === 'auto' || ['ask', 'plan'].includes(clampPluginTaskPermissionMode(currentConfig.permissionMode))) writePluginTaskConfig(pluginId, {...currentConfig, permissionMode: mode});
+ if (!isPluginTaskPermissionAllowed(mode, clampPluginTaskPermissionMode(currentConfig.permissionMode))) writePluginTaskConfig(pluginId, {...currentConfig, permissionMode: mode});
broadcastSessionPatched(task.taskId, {permissionMode: mode});
return { granted: true, task: updatedTask };
} catch (error) {
@@ -14472,6 +14490,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
setPluginTargetAdapter({
prepareInvocation: preparePluginInvocation,
acceptInvocation: acceptPluginInvocation,
+ scheduleAutoTitle: schedulePluginAutoTitle,
store: () => {
const snapshot = getCurrentDbClientSnapshot();
if (!snapshot) throw new Error('HOST_NOT_READY');
@@ -14482,19 +14501,25 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
approvalRevision: pluginTargetAuthorizationRevision,
candidates: listPluginTargetCandidates,
session: resolvePluginTargetSession,
- create: async (pluginId, project, taskId, title, route, guard) => {
+ assertCreatePermission: (pluginId, permissionMode) => {
+ if (!isPluginTaskPermissionAllowed(permissionMode, clampPluginTaskPermissionMode(readPluginTaskConfig(pluginId).permissionMode)))
+ throw new PluginTaskError('PERMISSION_DENIED', 'Requested permission exceeds plugin dispatch policy');
+ },
+ create: async (pluginId, project, taskId, title, route, guard, autoTitle, permissionMode) => {
guard();
await pluginTaskServiceForCurrentOwner!().create(pluginId, {
- requestKey: `target-project:${taskId}`, title, route,
+ requestKey: `target-project:${taskId}`, ...(autoTitle ? { autoTitle: true } : { title }), route,
+ ...(permissionMode !== undefined ? { permissionMode } : {}),
}, { taskId, workingDir: project, assertCurrent: guard });
guard();
},
- send: async (pluginId, taskId, clientId, text, guard, validateTarget, delivery, images = []) => {
+ send: async (pluginId, taskId, clientId, text, guard, validateTarget, delivery, images = [], options) => {
guard();
const snapshot = getCurrentDbClientSnapshot();
const assertCurrent = () => { guard(); if (snapshot !== getCurrentDbClientSnapshot()) throw new Error('PERMISSION_DENIED'); };
const name = sanitizeSourceName(getInstalledGhostName(pluginId));
const sourcePlugin = { pluginId, ...(name ? { name } : {}) };
+ const message = buildPluginMessage(text, options?.context, t('newChat.pastedText.pluginContextLabel'));
const validate = async () => { assertCurrent(); await validateTarget(); assertCurrent(); };
await validate();
return withPluginMessageAttachments(images, assertCurrent, async files => {
@@ -14509,7 +14534,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
await validate();
if (!meta) throw new Error('TARGET_UNAVAILABLE');
const item = await buildSessionControlInputItem({ targetSessionId: taskId, clientId,
- message: text, persistedContent: text, meta, sourcePlugin, files,
+ message: message.text, persistedContent: message.text,
+ pastedTextRanges: message.pastedTextRanges, meta, sourcePlugin, files,
inheritTargetPlanMode: true,
autoReviewUserText: { kind: 'delegated-continuation' },
});
@@ -14529,7 +14555,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
throw new Error('DELIVERY_UNCERTAIN');
}
}
- const result = await sendToSessionInternal({ targetSessionId: taskId, clientId, message: text, files,
+ const result = await sendToSessionInternal({ targetSessionId: taskId, clientId, message: message.text,
+ pastedTextRanges: message.pastedTextRanges, files,
autoReviewUserText: { kind: 'delegated-continuation' }, forceQueue: true,
resumeWithStoredPermissionMode: true,
inheritTargetPlanMode: true,
@@ -14826,6 +14853,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
inheritTargetPlanMode?: boolean;
message: string;
persistedContent: string;
+ pastedTextRanges?: AgentInputQueuedMessage['chatMessage']['pastedTextRanges'];
files?: AgentInputQueuedMessage['files'];
clientId: string;
meta: NonNullable<Awaited<ReturnType<typeof maker.getSessionMeta>>>;
@@ -14875,6 +14903,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
inheritTargetPlanMode?: boolean;
message: string;
persistedContent: string;
+ pastedTextRanges?: AgentInputQueuedMessage['chatMessage']['pastedTextRanges'];
clientId: string;
meta: NonNullable<Awaited<ReturnType<typeof maker.getSessionMeta>>>;
files?: AgentInputQueuedMessage['files'];
@@ -14906,11 +14935,12 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
}
const fileAttachments = params.files?.flatMap((file) =>
file.category !== 'image' && file.path ? [{ name: file.name, path: file.path }] : []);
- const persistedContent = params.files?.length
+ const persistedContent = params.files?.length || params.pastedTextRanges?.length
? JSON.stringify({
text: params.persistedContent,
images: imageAttachments.filter((image) => 'url' in image),
files: fileAttachments,
+ ...(params.pastedTextRanges?.length ? { pastedTextRanges: params.pastedTextRanges } : {}),
})
: params.persistedContent;
// 主机隐藏指令(任务回执等):落库行带 [UI_ACTION_TRIGGER] 前缀、发给模型的正文不带。
@@ -14945,6 +14975,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
createdAt: new Date().toISOString(),
...(imageAttachments.length ? { images: imageAttachments } : {}),
...(fileAttachments?.length ? { files: fileAttachments } : {}),
+ ...(params.pastedTextRanges?.length ? { pastedTextRanges: params.pastedTextRanges } : {}),
},
createOpts,
...(params.origin ? { origin: modelOnlyEnvelope && (params.origin.kind === 'session' || params.origin.kind === 'orca')
diff --git a/apps/desktop/src/main/maker-ipc/sessionAutoTitle.ts b/apps/desktop/src/main/maker-ipc/sessionAutoTitle.ts
index 92520dadab..345f755fd4 100644
--- a/apps/desktop/src/main/maker-ipc/sessionAutoTitle.ts
+++ b/apps/desktop/src/main/maker-ipc/sessionAutoTitle.ts
@@ -41,6 +41,8 @@ const log = createLogger('maker-ipc/session-auto-title');
export interface SessionAutoTitleRequest {
sessionId: string;
text: string;
+ /** Readable placeholder when generation also consumes supplementary material. */
+ placeholderText?: string;
agentKind: AgentKind;
/**
* text 是否为用户真正写下的文字。false = 本地合成的描述(附件文件名 / 被引用
@@ -201,7 +203,7 @@ async function runUnsynchronized(
return { applied: false, done: true };
}
- const placeholder = normalizeAutoTitle(seedText);
+ const placeholder = normalizeAutoTitle(request.placeholderText?.trim() || seedText);
if (!placeholder) return { applied: false, done: false };
// 合成占位只允许覆写「建会话时的裸默认标题」。已经是 fork 占位或上一条附件写下的
diff --git a/apps/desktop/src/renderer/cindy-brain/PluginTaskPrefs.tsx b/apps/desktop/src/renderer/cindy-brain/PluginTaskPrefs.tsx
index 8f2007b6fd..fe3275a45a 100644
--- a/apps/desktop/src/renderer/cindy-brain/PluginTaskPrefs.tsx
+++ b/apps/desktop/src/renderer/cindy-brain/PluginTaskPrefs.tsx
@@ -19,8 +19,8 @@ import { ModelSelector } from '@/components/new-chat/ModelSelector';
import { PermissionSelector } from '@/components/new-chat/PermissionSelector';
import { getEffortForModel, getFastModeForModel } from '@/state/newMakerDraft';
import type { Effort } from '@/lib/userPreferences.types';
-
-const PERMISSION_ALLOWED = new Set(['ask', 'acceptEdits', 'auto']);
+import type { GhostErrandPermissionMode } from '../../shared/ghost.js';
+import { isPluginTaskPermissionMode, PLUGIN_TASK_PERMISSION_MODES } from '../../shared/pluginTasks.js';
/** Values accepted by the ordinary model picker and Host configuration. */
const TASK_EFFORTS = new Set(['minimal', 'low', 'medium', 'high', 'xhigh', 'max', 'ultra']);
@@ -31,7 +31,7 @@ interface TaskConfig {
effort?: string;
fastMode?: boolean | 'ultrafast';
providerId?: string;
- permissionMode?: 'ask' | 'plan' | 'acceptEdits' | 'auto';
+ permissionMode?: GhostErrandPermissionMode;
workingDir?: string;
}
@@ -267,22 +267,21 @@ export function PluginTaskPrefs({
fallbackModeLabel={
permissionMode === 'plan'
? t('settings.ghosts.detail.errandPrefs.legacyPermission')
- : undefined
+ : permissionMode === 'acceptEdits'
+ ? t('newChat.permissionSelector.modes.claude-code.acceptEdits.label')
+ : undefined
}
vendorKey={vendor}
triggerVariant="field"
ariaContext={t('settings.ghosts.detail.errandPrefs.permission')}
- disabledModes={{
- default: t('settings.ghosts.detail.errandPrefs.permissionDisabled'),
- bypassPermissions: t('settings.ghosts.detail.errandPrefs.permissionDisabled'),
- }}
+ allowedModes={PLUGIN_TASK_PERMISSION_MODES.filter(
+ (mode) => !remote || remote.value.permissionModes.includes(mode),
+ )}
onPermissionModeChange={(mode) => {
- // disabledModes 已灰置非法档;这里再执一道白名单(UI 不是安全边界,
- // 存储层与协议层各有一道,三道口径一致)。
- if (!PERMISSION_ALLOWED.has(mode)) return;
+ if (!isPluginTaskPermissionMode(mode)) return;
save({
...config,
- permissionMode: mode as 'ask' | 'acceptEdits' | 'auto',
+ permissionMode: mode,
});
}}
/>
diff --git a/apps/desktop/src/renderer/cindy-brain/__tests__/PluginTaskPrefs.test.tsx b/apps/desktop/src/renderer/cindy-brain/__tests__/PluginTaskPrefs.test.tsx
index bab6132038..7b3ddd9f69 100644
--- a/apps/desktop/src/renderer/cindy-brain/__tests__/PluginTaskPrefs.test.tsx
+++ b/apps/desktop/src/renderer/cindy-brain/__tests__/PluginTaskPrefs.test.tsx
@@ -28,8 +28,13 @@ vi.mock('@/components/new-chat/ModelSelector', () => ({ ModelSelector: (props: a
</>
) }));
vi.mock('@/components/new-chat/PermissionSelector', () => ({ PermissionSelector: (props: any) => (
+ <>
<button disabled={props.disabled} data-testid="permission" data-legacy-label={props.fallbackModeLabel}
onClick={() => props.onPermissionModeChange('ask')}>{props.permissionMode}</button>
+ {(props.allowedModes ?? ['ask', 'acceptEdits', 'auto', 'bypassPermissions']).map((mode: string) =>
+ <button key={mode} data-testid={`permission-mode-${mode}`} disabled={props.disabled || !!props.disabledModes?.[mode]}
+ onClick={() => props.onPermissionModeChange(mode)}>{mode}</button>)}
+ </>
) }));
beforeEach(() => {
@@ -42,6 +47,18 @@ beforeEach(() => {
} };
});
afterEach(cleanup);
+// unit: the shared picker must expose and persist the ordinary three modes,
+// without silently changing a retained legacy setting just by opening the page.
+it('offers full access and saves only after the user changes the legacy choice', async () => {
+ state.config = { permissionMode: 'acceptEdits' };
+ render(<PluginTaskPrefs ghostId="plugin" />);
+ expect(screen.getByTestId('permission').textContent).toBe('acceptEdits');
+ expect(screen.getByTestId('permission').getAttribute('data-legacy-label')).toBeTruthy();
+ expect(screen.queryByTestId('permission-mode-acceptEdits')).toBeNull();
+ expect(state.save).not.toHaveBeenCalled();
+ fireEvent.click(screen.getByTestId('permission-mode-bypassPermissions'));
+ await waitFor(() => expect(state.save).toHaveBeenCalledWith('plugin', { permissionMode: 'bypassPermissions' }));
+});
it.each([undefined, 'medium'])('changing Fast preserves only the configured effort (%s), never the display fallback', async effort => {
state.config = {agentKind:'codex',providerId:'openai',model:'configured-model',effort};
render(<PluginTaskPrefs ghostId="plugin" />);
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 83f27c454e..430cd87fda 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -11804,6 +11804,7 @@
"submitFeedbackAria": "Send feedback"
},
"pastedText": {
+ "pluginContextLabel": "Attached context",
"chipLabel": "Pasted text ({{lines}} lines)",
"previewTitle": "Pasted text",
"editTitle": "Edit Pasted Text",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 373d03531e..c04a64a96d 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -11769,6 +11769,7 @@
"submitFeedbackAria": "フィードバックを送信"
},
"pastedText": {
+ "pluginContextLabel": "補足資料",
"chipLabel": "貼り付けたテキスト({{lines}} 行)",
"previewTitle": "貼り付けたテキスト",
"editTitle": "貼り付けたテキストを編集",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index a07c6c1380..306a15d5a8 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -11769,6 +11769,7 @@
"submitFeedbackAria": "피드백 보내기"
},
"pastedText": {
+ "pluginContextLabel": "첨부 자료",
"chipLabel": "붙여넣은 텍스트({{lines}}줄)",
"previewTitle": "붙여넣은 텍스트",
"editTitle": "붙여넣은 텍스트 편집",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index d8fb40244e..cd6ca75325 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -11769,6 +11769,7 @@
"submitFeedbackAria": "发送反馈"
},
"pastedText": {
+ "pluginContextLabel": "附带资料",
"chipLabel": "粘贴的文本({{lines}} 行)",
"previewTitle": "粘贴的文本",
"editTitle": "编辑粘贴的文本",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 4e1c010742..b14cf217bb 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -11769,6 +11769,7 @@
"submitFeedbackAria": "傳送反饋"
},
"pastedText": {
+ "pluginContextLabel": "附帶資料",
"chipLabel": "貼上的文字({{lines}} 行)",
"previewTitle": "貼上的文字",
"editTitle": "編輯貼上的文字",
diff --git a/apps/desktop/src/shared/ghost.ts b/apps/desktop/src/shared/ghost.ts
index 9ce5ac8a0c..95f90e81af 100644
--- a/apps/desktop/src/shared/ghost.ts
+++ b/apps/desktop/src/shared/ghost.ts
@@ -12,6 +12,7 @@ import {
type GhostManifestLocales,
} from '@cindy/plugin-protocol';
import { PLUGIN_STORAGE_PART_RE } from './pluginStoragePartPattern.js';
+import { PLUGIN_TASK_PERMISSION_MODES } from './pluginTasks.js';
import { DEFAULT_LOCALE, SUPPORTED_LOCALES, type SupportedLocale } from './locale';
/**
@@ -197,9 +198,8 @@ export interface GhostCardNeeds {
* agent 在**插件专属 errand 会话**里跑一轮,并把最终回复文字取回。与
* background 同为高风险加档,插件详情中单列。安全边界(全部主机代码强制):
* - 任务文本只进普通 user 消息,绝不进 system prompt(与 agent-request 同纪律);
- * - errand 会话默认跑在专属对话目录、权限档默认 plan(只读);用户可在
- * 设置里按插件放开到 acceptEdits/auto,**永不提供 bypassPermissions**
- * (2026-07-31 Lizi 定案);
+ * - errand 会话默认跑在专属对话目录、保留历史缺省 plan 及原 Agent 行为;
+ * 用户可在插件设置选择 ask/auto/bypassPermissions,插件请求不能自报授权;
* - errand 会话在侧边栏可见、可旁观、可随时停,不存在隐身会话(errand 不支持
* 隐藏;普通任务的后台隐藏只经 `tasks` + `hiddenTasks` 声明,见下);
* - 每插件同时最多 1 单在途,任务表在内存(重启即丢,查询按"查无此单、
@@ -6545,8 +6545,8 @@ export type GhostPipeAgentResult =
* 交给插件**专属 errand 会话**里的 agent 跑一轮,最终回复文字取回给插件。
* 须声明 'agent' 卡槽 + `agent.errand: true`(插件详情高风险能力单列)。
* agent/模型/effort/fast/供应商/权限档/工作目录由用户在插件详情页配置
- * (缺省跟随新建草稿偏好;权限档默认 plan 只读,永不提供 bypassPermissions,
- * 2026-07-31 Lizi 定案);任务文本只进普通 user 消息,绝不进 system prompt。 */
+ * (缺省跟随新建草稿偏好;保留历史缺省 plan,用户可选择 ask/auto/bypassPermissions);
+ * 任务文本只进普通 user 消息,绝不进 system prompt。 */
/** 任务描述上限(与 agent-request 的最终消息同量级)。 */
export const GHOST_ERRAND_MAX_TASK_CHARS = 32_768;
@@ -6564,11 +6564,10 @@ export const GHOST_ERRAND_MIN_INTERVAL_MS = 10_000;
export const GHOST_ERRAND_SESSION_KEY_RE = /^[A-Za-z0-9._-]{1,64}$/;
/**
- * 插件创建普通任务使用 ask;plan 仅保留旧配置兼容,其执行语义由原 Agent 决定。
- * acceptEdits / auto 由用户显式选择。**bypassPermissions 刻意不在此列**(2026-07-31 定案:
- * 被骗的插件配上不设防会话 = 无人看守的用户全权,风险不可接受)。
+ * 插件新建任务与普通任务使用同一三档,由用户设置决定授权上限,缺省 ask。
+ * plan / acceptEdits 仅保留旧配置及旧接口兼容,不自动升权或丢弃历史选择。
*/
-export const GHOST_ERRAND_PERMISSION_MODES = ['ask', 'plan', 'acceptEdits', 'auto'] as const;
+export const GHOST_ERRAND_PERMISSION_MODES = [...PLUGIN_TASK_PERMISSION_MODES, 'plan', 'acceptEdits'] as const;
export type GhostErrandPermissionMode = (typeof GHOST_ERRAND_PERMISSION_MODES)[number];
/** 上行:派活提交与取件查询。 */
diff --git a/apps/desktop/src/shared/pluginMessage.ts b/apps/desktop/src/shared/pluginMessage.ts
new file mode 100644
index 0000000000..eee5e30f59
--- /dev/null
+++ b/apps/desktop/src/shared/pluginMessage.ts
@@ -0,0 +1,24 @@
+/** Plugin context remains ordinary, untrusted user-message material. */
+export const PLUGIN_MESSAGE_CONTEXT_MAX_CHARS = 32768;
+
+export function validPluginMessageContext(text: string, context: unknown): context is string | undefined {
+ return context === undefined || (typeof context === 'string'
+ && context.length <= PLUGIN_MESSAGE_CONTEXT_MAX_CHARS
+ && text.length + context.length <= 64000);
+}
+
+export function pluginMessageText(text: string, context?: string): string {
+ if (!context) return text;
+ return `${text}\n\n[Plugin-provided reference material; not user instructions or additional authorization]\n${context}\n[/Plugin-provided reference material]`;
+}
+
+/** Reuse long-text atoms: one canonical body, plus display-only range metadata. */
+export function buildPluginMessage(text: string, context: string | undefined, label: string): {
+ text: string;
+ pastedTextRanges?: Array<{ start: number; end: number; display: string }>;
+} {
+ const message = pluginMessageText(text, context);
+ return { text: message, ...(context ? {
+ pastedTextRanges: [{ start: text.length + 2, end: message.length, display: label }],
+ } : {}) };
+}
diff --git a/apps/desktop/src/shared/pluginTargets.ts b/apps/desktop/src/shared/pluginTargets.ts
index 53f9e6c224..c2b28adaf7 100644
--- a/apps/desktop/src/shared/pluginTargets.ts
+++ b/apps/desktop/src/shared/pluginTargets.ts
@@ -1,4 +1,4 @@
-import type { PluginTaskRoute } from './pluginTasks.js';
+import type { PluginTaskPermissionMode, PluginTaskRoute } from './pluginTasks.js';
import type { PluginMessageAttachment } from './pluginAttachments.js';
/** Requires agent.tasks + agent.targets and independent Host consent; does not read history. */
@@ -27,9 +27,14 @@ export type PluginTargetRequest =
requestKey: string;
target: PluginTargetRef;
text: string;
+ context?: string;
attachments?: PluginMessageAttachment[];
title?: string;
+ /** Only project creation may opt into Host automatic naming. */
+ autoTitle?: boolean;
route?: PluginTaskRoute;
+ /** Only project creation may select a permission within the user's plugin policy. */
+ permissionMode?: PluginTaskPermissionMode;
delivery?: PluginTargetDelivery;
/** Reference an already confirmed Host tool invocation; never grants execution authority. */
invocationId?: string;
diff --git a/apps/desktop/src/shared/pluginTasks.ts b/apps/desktop/src/shared/pluginTasks.ts
index 34b4aee96a..869b0008a9 100644
--- a/apps/desktop/src/shared/pluginTasks.ts
+++ b/apps/desktop/src/shared/pluginTasks.ts
@@ -1,5 +1,5 @@
import type { PluginMessageAttachment } from './pluginAttachments.js';
-/** Ordinary local Session API. No Bot/Orca identity or permission override is accepted. */
+/** Ordinary local Session API. Identity and permission grants remain Host-owned. */
export interface PluginTaskRoute {
agentKind: 'cc' | 'codex' | 'pi';
providerId: string;
@@ -7,6 +7,11 @@ export interface PluginTaskRoute {
effort: string;
fastMode: boolean | 'ultrafast';
}
+export const PLUGIN_TASK_PERMISSION_MODES = ['ask', 'auto', 'bypassPermissions'] as const;
+export type PluginTaskPermissionMode = (typeof PLUGIN_TASK_PERMISSION_MODES)[number];
+export function isPluginTaskPermissionMode(value: unknown): value is PluginTaskPermissionMode {
+ return typeof value === 'string' && (PLUGIN_TASK_PERMISSION_MODES as readonly string[]).includes(value);
+}
export type PluginTaskRunStatus =
| 'queued'
| 'running'
@@ -85,8 +90,12 @@ export type PluginTaskRequest = (
/** Optional active tool-call context; Host resolves its task and checks plugin ownership. */
callId?: string;
requestKey: string;
- title: string;
+ title?: string;
+ /** Opt in to Host naming after the first accepted message; omit title. */
+ autoTitle?: boolean;
route?: PluginTaskRoute;
+ /** New task only; cannot exceed the user's current plugin permission policy. */
+ permissionMode?: PluginTaskPermissionMode;
isolatedWorkspace?: boolean;
/** Requires `agent.hiddenTasks`; creates the task as a background task. */
hidden?: boolean;
@@ -106,6 +115,8 @@ export type PluginTaskRequest = (
requestKey: string;
expectedRevision: number;
text: string;
+ /** Supplementary material, collapsed in the conversation but sent to the Agent. */
+ context?: string;
attachments?: PluginMessageAttachment[];
/** Optional Host-issued parent invocation; correlation only, not execution authority. */
invocationId?: string;
diff --git a/docs/dev-rules/plugin-security-and-authoring.md b/docs/dev-rules/plugin-security-and-authoring.md
index 692bf88910..7b4d426fd8 100644
--- a/docs/dev-rules/plugin-security-and-authoring.md
+++ b/docs/dev-rules/plugin-security-and-authoring.md
@@ -488,8 +488,13 @@ Library 请求同时绑定迁移代次和安装批准,根解析、排队及开
保存、新建和插件派发前复用普通独立任务的模型/供应商/Agent 准入,不另建目录或选择器。
连接状态不等于额度、网络及远端参数一定可用;执行失败如实返回,不静默换型号或账号。
- 插件新建普通任务的权限仅来自用户的插件设置或既有宿主确认流程,默认普通任务的 `ask`,允许
- 用户显式选择 `acceptEdits`/`auto`,不新增 `bypassPermissions`;不继承发起任务的权限。
- 旧 errand 适配器保留历史缺省 `plan` 与原 Agent 行为;已有任务及显式历史设置不自动改权。
+ 用户显式选择默认权限(`ask`)/自动审批(`auto`)/完全访问(`bypassPermissions`);不继承发起任务的权限。
+ `tasks.create` 与 project 的 `targets.send` 可选 `permissionMode`,仅在当前用户插件权限上限内
+ 选择本次新任务的 ask/auto/bypassPermissions;参数本身不授予权限、不写插件默认设置。
+ 完全访问须来自用户在插件设置中的选择;旧 `requestWriteAccess` 仍只支持 acceptEdits/auto,
+ 不增加完全访问确认弹窗,也不因复用该流程降低用户已授权的上限。
+ Main 在创建前及异步准备后复核;省略参数保持旧行为,已有任务/伙伴投递不接受权限覆盖。
+ 旧 errand 适配器保留历史缺省 `plan` 与原 Agent 行为;历史 plan/acceptEdits 配置保留,但不列入新建接口和设置页的新选项。已有任务不自动改权。
不把历史 `plan` 值宣称为跨 Agent 的只读保证,也不为它改造各 Agent 的权限引擎。
旧存储文件名、键及 IPC 保持兼容,升级不丢配置、不重批权限。来源优先级、复用和恢复
详见 [插件普通任务接口](plugin-task-api-implementation.md#模型配置与创建来源)。
diff --git a/docs/dev-rules/plugin-task-api-implementation.md b/docs/dev-rules/plugin-task-api-implementation.md
index 8d3922f26f..50e2f3494f 100644
--- a/docs/dev-rules/plugin-task-api-implementation.md
+++ b/docs/dev-rules/plugin-task-api-implementation.md
@@ -121,7 +121,7 @@ Host 每次调用都重新读取本插件的模型设置,复用创建任务的
| 入口 | 模型来源与复用 | 权限与结果 |
| --- | --- | --- |
-| `tasks.create` | 显式 route → 插件任务设置 → 经验证的 callId 发起任务 → 当前新任务选择;保存准入后的完整 route | 用户插件权限,默认普通任务的 ask;返回普通任务及持久创建回执 |
+| `tasks.create` | 显式 route → 插件任务设置 → 经验证的 callId 发起任务 → 当前新任务选择;保存准入后的完整 route | 可选 permissionMode 在用户插件权限上限内选择本次权限;省略沿用设置,缺省 ask;返回普通任务及持久创建回执 |
| `tasks.send` | 使用该任务当前 route,检查 revision 和当前可用性;不因新默认变化重建任务 | 复核插件归属与权限;结果使用逐输入 run 回执 |
| `agent.errand` | 共用模型解析;无显式覆盖时优先保留已有专属任务的当前模型。配置冲突时只在新任务创建成功后替换映射,旧历史保留 | 旧权限边界、sessionKey、jobId 与结果取回协议保持兼容 |
| `workspace.ensureSession` | 已有工作区入口照常复用;新建才使用插件设置/发起任务/当前新任务完整组合 | 目录仍经亲选或原有确认流程;只建入口、不运行 Agent |
@@ -140,7 +140,16 @@ Host 每次调用都重新读取本插件的模型设置,复用创建任务的
恢复原选项并就地展示可操作原因。普通任务、工作区及旧 errand 插件均可见这份设置。
新普通任务缺省使用 `ask`,与所选 Agent 的普通任务一致;已有任务不因默认值变化改权。
旧 errand 缺省及显式 `plan` 配置保留原行为,设置页显示保留的权限而不冒充 `ask` 或
-跨 Agent 的只读保证。用户明确选择普通权限后才覆盖旧值;完全访问不在可选范围。
+跨 Agent 的只读保证;历史 acceptEdits 配置也原样保留。新选项统一为默认权限(ask)、
+自动审批(auto)和完全访问(bypassPermissions),用户明确选择后才覆盖旧值。
+
+`tasks.capabilities().createPermissionMode` 表示创建接口支持按次选择 ask/auto/bypassPermissions,
+不代表获得这三档权限。`tasks.create` 和 project 的 `targets.send` 接收可选 `permissionMode`;
+Main 复用 `isPluginTaskPermissionAllowed` 按当前插件用户设置校验,上限不足返回 PERMISSION_DENIED。
+仅写入新 Session 的 permissionMode,不修改插件偏好;已有任务与伙伴不接受该参数。
+新字段参与请求摘要,缺省不增加摘要项,因此旧回执仍能重放;创建过程继续复核账号、插件批准及配置。
+完全访问必须由用户在插件设置中选择;既有 requestWriteAccess 仍只接受 acceptEdits/auto,
+不新增确认 UI 或授权存储,也不因旧写权限流程降低用户已授权的上限。
`pluginTaskPrefsStore` 保留历史 `ghost-errand-prefs.json`、`errand` 与 `sessions` 键以及
既有 IPC 名;无需重装、重新授权或人工迁移。`sessions` 键只供旧 errand 映射使用。
@@ -174,7 +183,7 @@ Claude Code 适配层 `toSdkModelString` 会按目录窗口自动追加 `[1m]`
- `capabilities/models/create/list/get/setModel/send/getRun/listRuns/readMessages/cancel/setHidden`。
- create 可传 `hidden:true`、`setHidden({taskId, hidden})` 切换,`get`/`list` 快照恒返回 `hidden` 布尔值;仅身份卡声明 `agent.hiddenTasks: true`(必须同时 `agent.tasks: true`)时可用,见下文「后台任务」。
-- create 可传 isolatedWorkspace:true,由宿主分配独立空作答目录;返回本任务 workingDir 与 permissionMode,插件不能覆盖权限。
+- create 可传 isolatedWorkspace:true,由宿主分配独立空作答目录;返回本任务 workingDir 与实际 permissionMode,按次选择不得超过用户授予插件的权限。
- 默认创建用户可见的普通本地 Session(声明 hiddenTasks 后可在同一次 INSERT 中创建后台任务);工作目录及权限来自用户配置,不接受插件传入绕过权限、任意目录或另一插件身份。普通任务创建前复用 Worker 的目录身份判据:配置路径必须仍为原规范路径,改链、缺失或非目录拒绝;异步解析后复核账号、tasks 批准及配置。缺省/isolatedWorkspace 仍由宿主分配目录,旧 errand 路径不变。旧别名配置没有原目标证据,不自动授权当前目标;这不解决校验后的目录置换窗口。
- 发送走普通输入协调器,使用持久 requestKey 去重和稳定输入 ID;重复请求不会再次启动模型。
- 指定 provider、model、effort、Fast 必须通过当前目录核验;派发前再次核验,不静默 fallback。
@@ -252,7 +261,7 @@ Claude Code 适配层 `toSdkModelString` 会按目录窗口自动追加 `[1m]`
插件新增的 tasks 能力首次使用时复用宿主权限确认。拒绝、超时或确认失败后,同一账号代际和安装修订在当前宿主进程内不再自动弹窗;插件重载或重复调用不能清除该状态。用户可在本机插件详情权限区点击“确认任务权限”重新进入原确认流程,点击不等于批准;在途确认不并发,账号、安装修订或发起窗口改变时旧结果无效。旧插件的既有功能、启用态、凭证与设置不变。此显式入口不向插件页面或 device-link 暴露;重启宿主后可重新首次询问。
-逻辑页可调用 cindy.tasks.requestWriteAccess({taskId, mode?})。省略 mode 保留旧行为(acceptEdits,仅限未开始执行的任务);mode: auto 请求宿主原生确认,为空闲自有任务及插件后续任务启用 Auto。插件不能替用户确认,不能请求 Full access。拒绝不改状态;账号、配置、任务版本在确认期间改变则拒绝写入。Auto 插件主任务的 Worker 固定使用 Auto,不继承或改写全局 Worker 偏好;授权撤销后拒绝新建。Host 读取该次权限时一并保留账号与插件来源,在团队查询、Worker 准备/启动、落盘后以及首条输入的 accepted 回调中复核;在途卸载、重装、归属消失或降权不能将本次创建降为普通 Orca。调用开始前已明确撤销的旧用户任务仍可新发起普通 Orca。首条输入(任务或就绪消息)真正接收时沿现有回调再次复核;任务接收生命周期的异步更新前后均检查,失败回滚本次临时运行态并取消派发。直发拒绝后,在派发调用退出后才沿原生命周期清理新 Worker;排队后迟到的拒绝仅取消该输入并回滚本次临时状态,保留 Worker 和用户数据。既有内存回调不构成跨重启的授权事务,也不保证中断已接收执行。失败沿原生命周期尽力清理,不保证跨账号数据库补偿或跨进程事务。独立目录不是沙箱。返回 granted 与更新后的 task/revision,插件应继续原批次。
+逻辑页可调用 cindy.tasks.requestWriteAccess({taskId, mode?})。省略 mode 保留旧行为(acceptEdits,仅限未开始执行的任务);mode: auto 请求宿主原生确认,为空闲自有任务及插件后续任务启用 Auto。插件不能替用户确认,该写权限请求接口不接受 Full access;完全访问须由用户在插件设置中选择。拒绝不改状态;账号、配置、任务版本在确认期间改变则拒绝写入。Auto 插件主任务的 Worker 固定使用 Auto,不继承或改写全局 Worker 偏好;授权撤销后拒绝新建。Host 读取该次权限时一并保留账号与插件来源,在团队查询、Worker 准备/启动、落盘后以及首条输入的 accepted 回调中复核;在途卸载、重装、归属消失或降权不能将本次创建降为普通 Orca。调用开始前已明确撤销的旧用户任务仍可新发起普通 Orca。首条输入(任务或就绪消息)真正接收时沿现有回调再次复核;任务接收生命周期的异步更新前后均检查,失败回滚本次临时运行态并取消派发。直发拒绝后,在派发调用退出后才沿原生命周期清理新 Worker;排队后迟到的拒绝仅取消该输入并回滚本次临时状态,保留 Worker 和用户数据。既有内存回调不构成跨重启的授权事务,也不保证中断已接收执行。失败沿原生命周期尽力清理,不保证跨账号数据库补偿或跨进程事务。独立目录不是沙箱。返回 granted 与更新后的 task/revision,插件应继续原批次。
### 主任务协调评测
@@ -347,9 +356,9 @@ Pi 子代理未成功投递的自动 allow 再次投递前重走现有核验,
项目使用 Cindy 已有目录分组(id 为目录路径),普通任务和伙伴使用其 ID。最近活动只排序,插件自行展示和选择。
- `resolve({target:{kind,id}})` 返回最新目标元数据,供插件校验保存的固定目标;无写入、弹窗或隐式选中。
`send` 同样重新校验目标,不要求先 list/resolve,也不接受任意不可用路径或目标;失效返回 TARGET_UNAVAILABLE,不降级改投。
-- `send({target,requestKey,text,title?,route?,delivery?,attachments?})` 在指定项目中新建普通任务,或向指定普通任务/伙伴投递。
- 新任务经现有 `PluginTaskService.create` 登记归属后使用 `createPluginTaskSession`,沿用插件模型选择、受限动手权限及卸载撤销流程,可传统一模型目录的 route。
- 存量任务和伙伴保留其模型、权限、目录,不接受 route;伙伴通过唯一 canonical 注册解析,不使用兼容镜像或伪造伙伴身份。
+- `send({target,requestKey,text,context?,title?,autoTitle?,route?,permissionMode?,delivery?,attachments?})` 在指定项目中新建普通任务,或向指定普通任务/伙伴投递。
+ 新任务经现有 `PluginTaskService.create` 登记归属后使用 `createPluginTaskSession`,沿用插件模型选择、受限动手权限及卸载撤销流程,可传统一模型目录的 route,以及当前授权范围内的 permissionMode。
+ 存量任务和伙伴保留其模型、权限、目录,不接受 route 或 permissionMode;伙伴通过唯一 canonical 注册解析,不使用兼容镜像或伪造伙伴身份。
- 同键并发发送共享同一 Promise。回执复用当前账号 SQLite 的 `plugin_task_requests`,以 `operation=target` 按插件和请求键读写单行;只保存请求摘要、Host 生成的 taskId/clientId、批准修订和状态,
不保存正文、图片或插件固定配置。执行前原子预留回执;已接受请求可在重启后返回原结果,尚未确定的回执返回 DELIVERY_UNCERTAIN,
不自动重派。幂等键按插件和 requestKey 隔离,不因插件升级或 Host 重启更换身份;同键修改目标、正文、附件或 delivery 返回 REQUEST_KEY_CONFLICT。
diff --git a/packages/maker-shared/src/__tests__/queue.test.ts b/packages/maker-shared/src/__tests__/queue.test.ts
index d75320a73f..7199c549d2 100644
--- a/packages/maker-shared/src/__tests__/queue.test.ts
+++ b/packages/maker-shared/src/__tests__/queue.test.ts
@@ -18,6 +18,19 @@ function queued(clientId: string): { clientId: string } {
}
describe('shared queue presentation model', () => {
+ // unit: plugin context without an image still uses a persisted envelope. The
+ // old files-only decoder exposed that envelope and its raw capture diagnostics.
+ it('projects collapsed plugin context in pending rows with or without images', () => {
+ const body = 'Look here';
+ const text = body + '\n\nWindow details';
+ const pastedTextRanges = [{ start: body.length, end: text.length, display: 'Attached context' }];
+ for (const files of [undefined, [{ name: 'window.png' }]]) {
+ const item = { text, persistedContent: JSON.stringify({ text, pastedTextRanges }), files,
+ sourcePlugin: { pluginId: 'example' }, chatMessage: { pastedTextRanges } };
+ expect(queueItemVisibleText(item)).toBe(body + 'Attached context');
+ expect(item.text).toContain('Window details');
+ }
+ });
it('preserves and pauses queue only when Stop sees queued rows', () => {
expect(stopOptionsForProjection({ pendingQueue: [] })).toBeUndefined();
expect(stopOptionsForProjection({ pendingQueue: [queued('q-1')] })).toEqual({
diff --git a/packages/maker-shared/src/queue.ts b/packages/maker-shared/src/queue.ts
index e383c48b25..4691899aca 100644
--- a/packages/maker-shared/src/queue.ts
+++ b/packages/maker-shared/src/queue.ts
@@ -222,15 +222,30 @@ export function queueItemVisibleText(item: {
files?: readonly unknown[];
origin?: unknown;
sourcePlugin?: unknown;
+ chatMessage?: { pastedTextRanges?: readonly { start: number; end: number; display: string }[] };
}): string {
const text = item.text ?? '';
if (!isAutoSentQueueItem(item)) return text;
const persisted = item.persistedContent ?? text;
- if (!item.files?.length) return persisted;
+ const ranges = item.chatMessage?.pastedTextRanges;
+ if (!item.files?.length && !ranges?.length) return persisted;
try {
const envelope = JSON.parse(persisted) as unknown;
const envelopeText = readRecord(envelope)?.text;
- if (typeof envelopeText === 'string') return envelopeText;
+ if (typeof envelopeText === 'string') {
+ if (!ranges?.length) return envelopeText;
+ let cursor = 0;
+ const parts: string[] = [];
+ for (const range of ranges) {
+ if (!Number.isInteger(range.start) || !Number.isInteger(range.end)
+ || range.start < cursor || range.end <= range.start || range.end > envelopeText.length
+ || typeof range.display !== 'string') return envelopeText;
+ parts.push(envelopeText.slice(cursor, range.start), range.display);
+ cursor = range.end;
+ }
+ parts.push(envelopeText.slice(cursor));
+ return parts.join('');
+ }
} catch {
// Not an envelope: the persisted row is already the visible text.
}