Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): 计划锁排除已撤权的插件收据
Zhang Yunjin69da37f31fef
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.tsindex 6fc6a799b6..a3816ee6cb 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts@@ -6,6 +6,7 @@ import {createPluginTaskService,isPluginTaskPermissionAllowed,isTeamPlanLabelLocked,+ isTeamPlanLabelLockedByReceipt,PluginTaskError,assertPluginTaskResult,readPluginTaskPlanReceipt,@@ -34,6 +35,20 @@ it('locks only unsettled team-plan labels for worker rename', () => {expect(isTeamPlanLabelLocked(undefined, [], ['w0'])).toBe(false);});+it('releases the plan label lock once the owning plugin is no longer authorized', () => {+ const route = {} as never;+ const plan = {+ concurrency: 1,+ items: [{ label: 'w0', workingDir: '/answer', route }],+ } as unknown as PluginTeamPlan;+ const receipt = { payload: JSON.stringify({ teamPlan: plan }), operation: 'create' as const };+ expect(isTeamPlanLabelLockedByReceipt(receipt, true, ['w0'])).toBe(true);+ // 插件卸载 / 撤权后,保留的收据不再锁定改名。+ expect(isTeamPlanLabelLockedByReceipt(receipt, false, ['w0'])).toBe(false);+ expect(isTeamPlanLabelLockedByReceipt({ payload: receipt.payload, operation: 'send' }, true, ['w0'])).toBe(false);+ expect(isTeamPlanLabelLockedByReceipt(undefined, true, ['w0'])).toBe(false);+});+it('rejects oversized plans before saving and refuses oversized legacy receipts without truncation', async () => {const f=fixture(), task=await f.create();const before=structuredClone(f.rows.get(task.taskId)!);diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.tsindex de36ad67be..503cd77d87 100644--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts@@ -86,6 +86,21 @@ export function isTeamPlanLabelLocked();return labels.some((label) => label !== null && locked.has(label));}++/**+ * 收据级计划锁:只有当创建收据仍属于活动插件归属(pluginAuthorized)时才锁定 label。+ * 插件卸载 / 撤权后,原插件任务按普通 Orca 任务继续使用,releaseWorker 已不可用,+ * 保留的收据不得继续禁止改名。+ */+export function isTeamPlanLabelLockedByReceipt(+ receipt: Pick<PluginTaskReceipt, 'payload' | 'operation'> | undefined,+ pluginAuthorized: boolean,+ labels: ReadonlyArray<string | null>,+): boolean {+ if (!receipt || receipt.operation !== 'create' || !pluginAuthorized) return false;+ const data = readPluginTaskPlanReceipt(receipt.payload);+ return isTeamPlanLabelLocked(data.teamPlan, data.settledLabels, labels);+}/** Service failures must reject the public task API, without exposing internal diagnostics. */export function assertPluginTaskResult(result: { ok: boolean; errorCode?: string }, message: string): void {if (!result.ok) throw new PluginTaskError(result.errorCode || 'HOST_NOT_READY', message);diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex dc960a79fd..28857ef18b 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -2,7 +2,7 @@ import { assertBotTaskCoordination, classifySessionMessagePurpose, coordinationIimport type { BotTaskCoordination, SessionMessagePurpose } from '../../shared/botTaskCoordination.js';import { openSession, setSessionOpeningModelAdmission } from '../localDb/sessionOpening.js';import { createPluginTaskReviewResolver } from './pluginTaskReviewContext.js';-import { isPluginTaskPermissionAllowed, assertPluginTaskResult, createPluginTaskService, isTeamPlanLabelLocked, readPluginTaskPlanReceipt, PluginTaskError, type PluginTaskService } from './pluginTaskService.js';+import { isPluginTaskPermissionAllowed, assertPluginTaskResult, createPluginTaskService, isTeamPlanLabelLockedByReceipt, readPluginTaskPlanReceipt, PluginTaskError, type PluginTaskService } from './pluginTaskService.js';import { assertPluginWorkerDirectoryScope, resolvePluginWorkerDirectory } from './pluginWorkerDirectory.js';import { PluginWriteAccessGate } from './pluginWriteAccessGate.js';import { pluginWorkerCompletedAt } from './pluginWorkerCompletion.js';@@ -12876,10 +12876,13 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)if (!epoch) throw new Error('plugin task storage unavailable');const receipt = await createPluginTaskStore(epoch.client).get(leadSessionId);if (epoch !== getCurrentDbClientSnapshot()) throw new Error('account changed');- if (!receipt || receipt.operation !== 'create') return false;- const data = readPluginTaskPlanReceipt(receipt.payload);- // 已登记计划整体不可变;未结算条目才是活动引用。已结算的 Worker 已归档且不可达。- return isTeamPlanLabelLocked(data.teamPlan, data.settledLabels, labels);+ // 插件卸载 / 撤权后原任务按普通 Orca 任务继续使用,releaseWorker 已不可用;+ // 保留的创建收据不再构成计划锁。+ return isTeamPlanLabelLockedByReceipt(+ receipt,+ receipt ? isPluginTaskAuthorized(receipt.pluginId) : false,+ labels,+ );},markWorkerIdle: async (workerId) => {const now = Date.now();diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.mdindex 59b87c81da..e20e734dfb 100644--- a/docs/dev-rules/orca-team-architecture.md+++ b/docs/dev-rules/orca-team-architecture.md@@ -388,7 +388,7 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍10. **远端 Worker 只在运行设备上跑(状态:不变量)**Worker 可以放到同账号另一台电脑(运行设备)上运行:真实任务在那台,本机只有一条不跑 Agent、`working_dir` 为空的代理任务行,`orca_workers.execution_device_id` / `remote_session_id` 记录位置。代理行承接计槽、状态机、auto-bridge 与归档,任何路径都不得在本机为它起 Agent(`bootstrapSession` 对远端 Worker 直接拒绝)、不得把它复制到其他电脑;派活、停止与存活查询经 `orcaRemoteWorkers.ts` 的 `wrapTeamDeps` 分流到运行设备,其余依赖原样透传,不另造状态机。回报靠轮询:派出的消息已进入对话(投递回执 accepted)且设备不在跑时,分页读取 user / assistant 历史,按派活 user 的 clientId 定位对应的最后一条 assistant 回复并按消息 id 去重;后续用户插话的回复和异常状态不得归给此前派活,历史读取期间的新派活不得被旧回报清除。每轮最多扫描 2000 行,预算不足时保留游标下一轮续读,不误判缺少回复;宿主 onAccepted / onAcceptedCommit 完成后才冻结回报身份并允许轮询收尾,accepted 回调失败恢复上一代等待状态,保存旧结果期间不得消费新派活身份或写入其捕获文本。同一远端 Worker 的 enqueue、accepted / commit 和身份确认复用现成 session 发送锁串行执行,避免并发回调与投递顺序错位。用户在运行设备上直接发的消息算插话,不触发回报。设备不可达只是运行期投影(`executionDevice.reachable`),不扩展 `OrcaWorkerStatus`;派活时不可达直接失败,不回退到本机。首版远端 Worker 没有 `send_to_lead` 桥,也不支持 steer / 队列编辑。界面:创建弹窗的「运行设备」只在本机 Lead 上出现(`CreateWorkerPopover` 的 `executionDevicesEnabled`),复用标准下拉列表,以有界滚动和键盘按名称定位应对多设备;选了其他电脑后,工作目录提供「对话 / 指定目录」,「对话」不传 `workingDir`、在运行设备创建不绑定项目的任务,「指定目录」只使用那台电脑上的绝对路径。手机版的新任务「开启协同」与 Lead「创建 Worker」共用设备下拉列表和两种目录模式;设备列表从 Lead 所在电脑读取,Agent、模型和供应商目录从所选运行设备读取。协同面板对远端 Worker 展示运行设备上的真实任务(`RemoteWorkerSessionPane`,先登记归属再读写)。实现指针:`orcaRemoteWorkerRuntime.ts`、`orcaRemoteWorkers.ts`、`orcaWorkerCreationService.ts` 的 `createRemoteWorkerInTeam`、运行设备侧 `orcaRemoteWorkerHost.ts`;协议见 `protocol-compatibility.md`「协同远端 Worker」。11. **改名只改身份元数据,不重建执行单元(状态:不变量)**- Worker 的展示角色名 `role`(1-32 字符)与 team 内唯一标识 `label`(slug,`/^[a-z0-9_-]+$/i`,≤32)在创建后可通过 `update_worker` / `maker:worker:update` 修改。改名不是换执行单元:Agent、模型、权限、工作目录与已发起的 turn 都不受影响,也**不允许**借改名实施中途换模型(见坑点 #6)。`label` 唯一性由 `uniq_orca_workers_team_label` 最终把关(约束范围含已归档 worker),冲突必须回 `DUPLICATE_LABEL` 且零副作用;空操作必须 idempotent。同一 Worker 的读-改-写必须按 worker id 串行化,避免 UI 改 role 与 Lead 改 label 的并发请求互相完整回写覆盖。插件 team plan 以 label 冻结 Worker 归属与委派自动授权且登记后整体不可变:未结算计划条目引用到的 label(旧值或新值)不允许改名,必须回 `WORKER_STATE_CHANGED`,role 改名不受影响。当 worker session 标题仍是 `orcaWorkerSessionTitle` 生成形态(`Worker · role · label`,role 与 label 相同时去重为 `Worker · role`)时同步改写为新形态;用户自定义/重命名过的标题不得被覆盖。成功的改名必须广播 `ORCA_WORKER_CHANGED`,并同步 worker session 的 `local-db:sessions:patched`(若标题被改写)。实现指针:`orcaTeamService.ts` 的 `updateWorker`、`orcaTeamStore.ts` 的 `updateWorkerIdentity`、`pluginTaskService.ts` 的 `isTeamPlanLabelLocked`、`orcaWorkerCreationService.ts` 的 `orcaWorkerTitle`、`packages/lizi-mcps/src/xdt-helper/update_worker.ts`。+ Worker 的展示角色名 `role`(1-32 字符)与 team 内唯一标识 `label`(slug,`/^[a-z0-9_-]+$/i`,≤32)在创建后可通过 `update_worker` / `maker:worker:update` 修改。改名不是换执行单元:Agent、模型、权限、工作目录与已发起的 turn 都不受影响,也**不允许**借改名实施中途换模型(见坑点 #6)。`label` 唯一性由 `uniq_orca_workers_team_label` 最终把关(约束范围含已归档 worker),冲突必须回 `DUPLICATE_LABEL` 且零副作用;空操作必须 idempotent。同一 Worker 的读-改-写必须按 worker id 串行化,避免 UI 改 role 与 Lead 改 label 的并发请求互相完整回写覆盖。插件 team plan 以 label 冻结 Worker 归属与委派自动授权且登记后整体不可变:未结算计划条目引用到的 label(旧值或新值)不允许改名,必须回 `WORKER_STATE_CHANGED`,role 改名不受影响;插件已卸载 / 撤权(不再持有 task 授权)后保留的收据不再构成锁,原任务按普通 Orca 任务即可改名。当 worker session 标题仍是 `orcaWorkerSessionTitle` 生成形态(`Worker · role · label`,role 与 label 相同时去重为 `Worker · role`)时同步改写为新形态;用户自定义/重命名过的标题不得被覆盖。成功的改名必须广播 `ORCA_WORKER_CHANGED`,并同步 worker session 的 `local-db:sessions:patched`(若标题被改写)。实现指针:`orcaTeamService.ts` 的 `updateWorker`、`orcaTeamStore.ts` 的 `updateWorkerIdentity`、`pluginTaskService.ts` 的 `isTeamPlanLabelLocked` / `isTeamPlanLabelLockedByReceipt`、`orcaWorkerCreationService.ts` 的 `orcaWorkerTitle`、`packages/lizi-mcps/src/xdt-helper/update_worker.ts`。### 测试与回归清单