Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): 处置 review:改名并发串行化、插件计划锁、空白角色校验
Zhang Yunjin68e128642c89
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.tsindex beec5c470f..ee0aa927d2 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts@@ -272,6 +272,62 @@ describe('OrcaTeamService updateWorker', () => {})).resolves.toMatchObject({ ok: false, errorCode: 'DUPLICATE_LABEL' });expect(deps.broadcastOrcaWorkerChanged).not.toHaveBeenCalled();});++ it('serializes concurrent partial renames so the later one merges the earlier result', async () => {+ const { deps, service, getWorker } = createDeps();+ const original = deps.updateWorkerIdentity;+ let releaseFirst!: () => void;+ const firstGate = new Promise<void>((resolve) => { releaseFirst = resolve; });+ let writes = 0;+ deps.updateWorkerIdentity = vi.fn(async (input) => {+ writes += 1;+ if (writes === 1) await firstGate;+ return original(input);+ });++ const roleOnly = service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ role: 'Reviewer',+ });+ const labelOnly = service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ label: 'backend-2',+ });++ releaseFirst();+ await expect(Promise.all([roleOnly, labelOnly])).resolves.toEqual([+ { ok: true, workerId: 'worker-1', role: 'Reviewer', label: 'research' },+ { ok: true, workerId: 'worker-1', role: 'Reviewer', label: 'backend-2' },+ ]);+ expect(getWorker()).toMatchObject({ role: 'Reviewer', label: 'backend-2' });+ });++ it('rejects a label rename locked by the active plugin team plan but still allows role changes', async () => {+ const isWorkerLabelLockedByPlan = vi.fn(async () => true);+ const { deps, service, getWorker } = createDeps({ isWorkerLabelLockedByPlan });++ await expect(service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ label: 'backend-2',+ })).resolves.toMatchObject({ ok: false, errorCode: 'WORKER_STATE_CHANGED' });+ expect(isWorkerLabelLockedByPlan).toHaveBeenCalledWith({+ leadSessionId: 'lead-1',+ labels: ['research', 'backend-2'],+ });+ expect(deps.updateWorkerIdentity).not.toHaveBeenCalled();++ // 计划只按 label 寻址,role 改名不受影响,也不触发计划查询。+ await expect(service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ role: 'Reviewer',+ })).resolves.toMatchObject({ ok: true, role: 'Reviewer', label: 'research' });+ expect(isWorkerLabelLockedByPlan).toHaveBeenCalledTimes(1);+ expect(getWorker()).toMatchObject({ role: 'Reviewer', label: 'research' });+ });});function createDeps(overrides: Partial<OrcaTeamServiceDeps> = {}) {diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.tsindex 5b581aada8..6fc6a799b6 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts@@ -5,6 +5,7 @@ import ts from 'typescript';import {createPluginTaskService,isPluginTaskPermissionAllowed,+ isTeamPlanLabelLocked,PluginTaskError,assertPluginTaskResult,readPluginTaskPlanReceipt,@@ -12,10 +13,27 @@ import {type PluginTaskStore,type PluginTaskServiceDeps,} from '../pluginTaskService.js';-import type { PluginTaskView } from '../../../shared/pluginTasks.js';+import type { PluginTeamPlan, PluginTaskView } from '../../../shared/pluginTasks.js';import { controlOwnedSessionExecution, isSameSessionExecution, withdrawOwnedSessionInputs } from '../sessionExecutionOwnership.js';import { PLUGIN_TEAM_PLAN_MAX_JSON_CHARS, PLUGIN_TASK_RECEIPT_MAX_JSON_CHARS } from '../../../shared/pluginTasks.js';+it('locks only unsettled team-plan labels for worker rename', () => {+ const route = {} as never;+ const plan = {+ concurrency: 2,+ items: [+ { label: 'w0', workingDir: '/answer', route },+ { label: 'w1', workingDir: '/answer', route },+ ],+ } as unknown as PluginTeamPlan;+ expect(isTeamPlanLabelLocked(plan, [], ['w0'])).toBe(true);+ expect(isTeamPlanLabelLocked(plan, [], ['w1', null])).toBe(true);+ expect(isTeamPlanLabelLocked(plan, ['w0'], ['w0'])).toBe(false);+ expect(isTeamPlanLabelLocked(plan, ['w0'], ['w1'])).toBe(true);+ expect(isTeamPlanLabelLocked(plan, [], ['other'])).toBe(false);+ expect(isTeamPlanLabelLocked(undefined, [], ['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/orcaTeamService.ts b/apps/desktop/src/main/maker-ipc/orcaTeamService.tsindex 6e1dbf5c34..f4615b4d61 100644--- a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts+++ b/apps/desktop/src/main/maker-ipc/orcaTeamService.ts@@ -155,7 +155,12 @@ export type UpdateWorkerResult =| { ok: true; workerId: string; role: string; label: string | null }| {ok: false;- errorCode: 'WORKER_NOT_FOUND' | 'INVALID_PARAMS' | 'DUPLICATE_LABEL' | 'INTERNAL';+ errorCode:+ | 'WORKER_NOT_FOUND'+ | 'INVALID_PARAMS'+ | 'DUPLICATE_LABEL'+ | 'WORKER_STATE_CHANGED'+ | 'INTERNAL';message: string;};@@ -278,6 +283,14 @@ export interface OrcaTeamServiceDeps {previousRole: string;previousLabel: string | null;}) => Promise<{ ok: true } | { ok: false; errorCode: 'NOT_FOUND' | 'DUPLICATE_LABEL' }>;+ /**+ * true = 这些 label 中被当前 lead 的插件 team plan 未结算条目引用,改名会破坏计划归属与委派自动授权。+ * 非插件任务 / 无计划 / 已结算时不锁定。可选:未注入时不做计划锁。+ */+ isWorkerLabelLockedByPlan?: (params: {+ leadSessionId: string;+ labels: ReadonlyArray<string | null>;+ }) => Promise<boolean>;updateWorkerStatus(workerId: string, status: OrcaWorkerStatus): Promise<void>;markWorkerIdle(workerId: string): Promise<void>;markWorkerIdleIfStatus(workerId: string, expectedStatus: 'done'): Promise<boolean>;@@ -501,6 +514,11 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic});/** Per-worker transition tails serialize dispatch reservations against implicit done acknowledgement. */const workerTransitionTails = new Map<string, Promise<void>>();+ /**+ * Per-worker identity tails serialize rename read-modify-write;否则 UI 改 role 与 Lead 改 label+ * 并发的两个请求会各自基于同一份旧快照回写完整 role+label,后者静默覆盖前者。+ */+ const workerIdentityTails = new Map<string, Promise<void>>();/** Active dispatch count stays positive from pre-resume reservation through host dispatch settlement. */const activeWorkerDispatches = new Map<string, number>();type ProvisionalDispatchSettlement =@@ -1407,55 +1425,104 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServicrole?: string;label?: string;}): Promise<UpdateWorkerResult> {- const found = await resolveWorkerRef(params.callerLeadSessionId, params.workerId);- if (!found.ok) {- if (found.errorCode === 'NOT_FOUND') {+ const initial = await resolveWorkerRef(params.callerLeadSessionId, params.workerId);+ if (!initial.ok) {+ if (initial.errorCode === 'NOT_FOUND') {return { ok: false, errorCode: 'WORKER_NOT_FOUND', message: `worker ${params.workerId} not found` };}- return { ok: false, errorCode: 'INTERNAL', message: found.message };- }- const { link, worker } = found;- if (params.role === undefined && params.label === undefined) {- return { ok: false, errorCode: 'INVALID_PARAMS', message: 'role or label required' };+ return { ok: false, errorCode: 'INTERNAL', message: initial.message };}+ // 用解析出的 worker.id 串行化:worker_id / session_id 两种 ref 都落到同一把锁。+ // 读-改-写整体在锁内,后到者重新读到前一次的结果,部分字段更新不会互相覆盖。+ return withWorkerIdentityUpdate(initial.worker.id, async () => {+ const found = await resolveWorkerRef(params.callerLeadSessionId, params.workerId);+ if (!found.ok) {+ if (found.errorCode === 'NOT_FOUND') {+ return { ok: false as const, errorCode: 'WORKER_NOT_FOUND' as const, message: `worker ${params.workerId} not found` };+ }+ return { ok: false as const, errorCode: 'INTERNAL' as const, message: found.message };+ }+ const { link, worker } = found;+ if (params.role === undefined && params.label === undefined) {+ return { ok: false as const, errorCode: 'INVALID_PARAMS' as const, message: 'role or label required' };+ }- let role = worker.role;- if (params.role !== undefined) {- const normalized = normalizeOrcaWorkerRole(params.role);- if (!normalized.ok) return { ok: false, errorCode: 'INVALID_PARAMS', message: normalized.message };- role = normalized.value;- }- let label = worker.label;- if (params.label !== undefined) {- const normalized = normalizeOrcaWorkerLabel(params.label);- if (!normalized.ok) return { ok: false, errorCode: 'INVALID_PARAMS', message: normalized.message };- label = normalized.value;- }+ let role = worker.role;+ if (params.role !== undefined) {+ const normalized = normalizeOrcaWorkerRole(params.role);+ if (!normalized.ok) return { ok: false as const, errorCode: 'INVALID_PARAMS' as const, message: normalized.message };+ role = normalized.value;+ }+ let label = worker.label;+ if (params.label !== undefined) {+ const normalized = normalizeOrcaWorkerLabel(params.label);+ if (!normalized.ok) return { ok: false as const, errorCode: 'INVALID_PARAMS' as const, message: normalized.message };+ label = normalized.value;+ }- // 幂等:值没变时不写库、不广播(MCP 重试与 UI 重复提交都落到这里)。- if (role === worker.role && label === worker.label) {- return { ok: true, workerId: worker.id, role, label };- }+ // 幂等:值没变时不写库、不广播(MCP 重试与 UI 重复提交都落到这里)。+ if (role === worker.role && label === worker.label) {+ return { ok: true as const, workerId: worker.id, role, label };+ }++ // 插件 team plan 以 label 冻结 Worker 归属与委派自动授权且登记后不可变;+ // 活动(未结算)计划引用到旧/新 label 时必须拒绝改 label,只放过 role 改名。+ if (label !== worker.label && deps.isWorkerLabelLockedByPlan) {+ const locked = await deps.isWorkerLabelLockedByPlan({+ leadSessionId: link.leadSessionId,+ labels: [worker.label, label],+ });+ if (locked) {+ return {+ ok: false as const,+ errorCode: 'WORKER_STATE_CHANGED' as const,+ message:+ 'worker label is referenced by the active plugin team plan and cannot be changed; change the role or release the worker first',+ };+ }+ }- const updated = await deps.updateWorkerIdentity({- workerId: worker.id,- role,- label,- previousRole: worker.role,- previousLabel: worker.label,+ const updated = await deps.updateWorkerIdentity({+ workerId: worker.id,+ role,+ label,+ previousRole: worker.role,+ previousLabel: worker.label,+ });+ if (!updated.ok) {+ if (updated.errorCode === 'DUPLICATE_LABEL') {+ return {+ ok: false as const,+ errorCode: 'DUPLICATE_LABEL' as const,+ message: `label "${label}" already used in this team`,+ };+ }+ return { ok: false as const, errorCode: 'WORKER_NOT_FOUND' as const, message: `worker ${params.workerId} not found` };+ }+ deps.broadcastOrcaWorkerChanged(link.leadSessionId);+ return { ok: true as const, workerId: worker.id, role, label };});- if (!updated.ok) {- if (updated.errorCode === 'DUPLICATE_LABEL') {- return {- ok: false,- errorCode: 'DUPLICATE_LABEL',- message: `label "${label}" already used in this team`,- };+ }++ async function withWorkerIdentityUpdate<T>(+ workerId: string,+ operation: () => Promise<T>,+ ): Promise<T> {+ const previous = workerIdentityTails.get(workerId) ?? Promise.resolve();+ let release!: () => void;+ const current = new Promise<void>((resolve) => {+ release = resolve;+ });+ workerIdentityTails.set(workerId, current);+ await previous;+ try {+ return await operation();+ } finally {+ release();+ if (workerIdentityTails.get(workerId) === current) {+ workerIdentityTails.delete(workerId);}- return { ok: false, errorCode: 'WORKER_NOT_FOUND', message: `worker ${params.workerId} not found` };}- deps.broadcastOrcaWorkerChanged(link.leadSessionId);- return { ok: true, workerId: worker.id, role, label };}/** 排队消息 source 判定:worker 队列里 orca 条目只可能来自其 lead(通信拓扑为 Lead↔Worker)。 */diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.tsindex 3b58373dda..de36ad67be 100644--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts@@ -68,6 +68,24 @@ export function readPluginTaskPlanReceipt(payload: string): { teamPlan?: PluginTthrow new PluginTaskError('INVALID_REQUEST', 'Team plan exceeds the supported size');return data;}++/**+ * true = 给定 label 中被已登记计划的**未结算**条目引用。+ * 计划整体不可变,且 label 是 Worker 归属与委派自动授权的寻址键;+ * 活动计划引用到的 label 不允许改名,否则 releaseWorker 与自动授权都会找不到条目。+ */+export function isTeamPlanLabelLocked(+ plan: PluginTeamPlan | undefined,+ settledLabels: readonly string[] | undefined,+ labels: ReadonlyArray<string | null>,+): boolean {+ if (!plan) return false;+ const settled = new Set(settledLabels ?? []);+ const locked = new Set(+ plan.items.filter((item) => !settled.has(item.label)).map((item) => item.label),+ );+ return labels.some((label) => label !== null && locked.has(label));+}/** 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 882fafb966..dc960a79fd 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, readPluginTaskPlanReceipt, PluginTaskError, type PluginTaskService } from './pluginTaskService.js';+import { isPluginTaskPermissionAllowed, assertPluginTaskResult, createPluginTaskService, isTeamPlanLabelLocked, readPluginTaskPlanReceipt, PluginTaskError, type PluginTaskService } from './pluginTaskService.js';import { assertPluginWorkerDirectoryScope, resolvePluginWorkerDirectory } from './pluginWorkerDirectory.js';import { PluginWriteAccessGate } from './pluginWriteAccessGate.js';import { pluginWorkerCompletedAt } from './pluginWorkerCompletion.js';@@ -12871,6 +12871,16 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)},updateWorkerStatus,updateWorkerIdentity,+ isWorkerLabelLockedByPlan: async ({ leadSessionId, labels }) => {+ const epoch = getCurrentDbClientSnapshot();+ 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);+ },markWorkerIdle: async (workerId) => {const now = Date.now();const db = getDbClient().drizzle;diff --git a/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsx b/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsxindex d904637649..41406fcca5 100644--- a/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsx@@ -78,14 +78,16 @@ export function EditWorkerPopover({customRole.length > 0 && (PREDEFINED_ROLES as readonly string[]).includes(customRole)? t('orca.createWorker.customRolePredefinedError'): null;+ // 提交与校验都用 trim 后的角色名:只输空格不能启用保存(服务端会拒绝空角色)。+ const trimmedActiveRole = activeRole.trim();const trimmedLabel = label.trim();const labelValidation = trimmedLabel ? normalizeOrcaWorkerLabel(trimmedLabel) : null;const labelError = labelValidation?.ok === false ? t('orca.editWorker.labelInvalid') : null;const canSave =!isSubmitting &&!!worker &&- activeRole.length >= 1 &&- activeRole.length <= 32 &&+ trimmedActiveRole.length >= 1 &&+ trimmedActiveRole.length <= 32 &&!customRoleError &&!labelError;@@ -98,7 +100,7 @@ export function EditWorkerPopover({submittingRef.current = true;setIsSubmitting(true);try {- const ok = await onSave({ role: activeRole, label: trimmedLabel });+ const ok = await onSave({ role: trimmedActiveRole, label: trimmedLabel });if (!ok) {submittingRef.current = false;setIsSubmitting(false);@@ -108,7 +110,7 @@ export function EditWorkerPopover({submittingRef.current = false;setIsSubmitting(false);}- }, [activeRole, canSave, onSave, trimmedLabel]);+ }, [canSave, onSave, trimmedActiveRole, trimmedLabel]);return (<Dialog.Root open={open} onOpenChange={(next) => { if (!next) handleClose(); }}>diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/EditWorkerPopover.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/EditWorkerPopover.test.tsxindex 5fa4595c1b..ff46a1dfc4 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/EditWorkerPopover.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/EditWorkerPopover.test.tsx@@ -70,6 +70,19 @@ describe('EditWorkerPopover', () => {});});+ it('blocks saving when the custom role is only whitespace', () => {+ render(+ <EditWorkerPopover open worker={worker()} onClose={vi.fn()} onSave={vi.fn(async () => true)} />,+ );++ fireEvent.change(screen.getByPlaceholderText('orca.createWorker.customRolePlaceholder'), {+ target: { value: ' ' },+ });+ expect(+ (screen.getByRole('button', { name: 'orca.editWorker.submit' }) as HTMLButtonElement).disabled,+ ).toBe(true);+ });+it('blocks saving on an invalid label and reports it inline', () => {render(<EditWorkerPopover open worker={worker()} onClose={vi.fn()} onSave={vi.fn(async () => true)} />,diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.tsindex 107805e56a..613ace19a9 100644--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts@@ -431,6 +431,8 @@ export function useOrcaWorkerSelection({const ipcError = extractIpcError(err);if (ipcError?.code === 'DUPLICATE_LABEL') {toast.error(t('orca.editWorker.duplicateLabel', { label: payload.label ?? '' }));+ } else if (ipcError?.code === 'WORKER_STATE_CHANGED') {+ toast.error(t('orca.editWorker.labelLocked'));} else if (deviceId && ipcError?.code === 'DEVICE_LINK_CHANNEL_NOT_ALLOWED') {toast.error(t('newChat.collaboration.unsupportedRemoteHint'));} else {diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 8592b09a5b..274f704b35 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -13595,7 +13595,8 @@"labelPlaceholder": "Worker label (leave empty to keep)","labelInvalid": "Label may only contain letters, numbers, hyphens and underscores","duplicateLabel": "Label {{label}} is already used by another worker in this team",- "saveFailed": "Failed to save. Please try again."+ "saveFailed": "Failed to save. Please try again.",+ "labelLocked": "This worker's label is referenced by an active plugin team plan and can't be changed until the plan finishes. Change the role name, or release the worker first."},"rolePill": {"unread": "Unread update",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 826f82d2a4..4cd86908ea 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -13562,7 +13562,8 @@"labelPlaceholder": "Worker 識別子(空欄なら変更しません)","labelInvalid": "識別子は英数字・ハイフン・アンダースコアのみ使用できます","duplicateLabel": "識別子 {{label}} はこのチームの別の Worker が使用しています",- "saveFailed": "保存に失敗しました。もう一度お試しください。"+ "saveFailed": "保存に失敗しました。もう一度お試しください。",+ "labelLocked": "この Worker の識別子は進行中のプラグインのチーム計画から参照されているため、計画の完了まで変更できません。役割名の変更か、先に Worker を解放してください。"},"rolePill": {"unread": "未読の更新",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 23f199a070..333fa8cd34 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -13562,7 +13562,8 @@"labelPlaceholder": "Worker 식별자(비우면 변경하지 않음)","labelInvalid": "식별자는 영문, 숫자, 하이픈, 밑줄만 사용할 수 있습니다","duplicateLabel": "식별자 {{label}}은(는) 이 팀의 다른 Worker가 사용 중입니다",- "saveFailed": "저장하지 못했습니다. 다시 시도해 주세요."+ "saveFailed": "저장하지 못했습니다. 다시 시도해 주세요.",+ "labelLocked": "이 Worker의 식별자는 진행 중인 플러그인 팀 계획에서 참조하고 있어 계획이 끝날 때까지 변경할 수 없습니다. 역할 이름을 바꾸거나 먼저 Worker를 릴리스하세요."},"rolePill": {"unread": "읽지 않은 업데이트",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex e480639bfc..2f4920b436 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -13562,7 +13562,8 @@"labelPlaceholder": "Worker 标识(留空表示不变)","labelInvalid": "标识只能包含字母、数字、连字符和下划线","duplicateLabel": "标识 {{label}} 已被本团队其他 Worker 使用",- "saveFailed": "保存失败,请重试"+ "saveFailed": "保存失败,请重试",+ "labelLocked": "该 Worker 的标识已被活跃的插件团队计划引用,计划结束前不能修改;可改角色名,或先释放该 Worker。"},"rolePill": {"unread": "未读更新",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 6e2cf3e93c..7eb52bfabc 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -13562,7 +13562,8 @@"labelPlaceholder": "Worker 標識(留空表示不變更)","labelInvalid": "標識只能包含字母、數字、連字號與底線","duplicateLabel": "標識 {{label}} 已被本團隊其他 Worker 使用",- "saveFailed": "儲存失敗,請重試"+ "saveFailed": "儲存失敗,請重試",+ "labelLocked": "該 Worker 的標識已被活躍的插件團隊計畫引用,計畫結束前不能修改;可改角色名,或先釋放該 Worker。"},"rolePill": {"unread": "未讀更新",diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.mdindex b9bde692d5..59b87c81da 100644--- a/docs/dev-rules/orca-team-architecture.md+++ b/docs/dev-rules/orca-team-architecture.md@@ -388,7 +388,8 @@ 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 session 标题仍是 `orcaWorkerSessionTitle` 生成形态(`Worker · role · label`,role 与 label 相同时去重为 `Worker · role`)时同步改写为新形态;用户自定义/重命名过的标题不得被覆盖。成功的改名必须广播 `ORCA_WORKER_CHANGED`,并同步 worker session 的 `local-db:sessions:patched`(若标题被改写)。实现指针:`orcaTeamService.ts` 的 `updateWorker`、`orcaTeamStore.ts` 的 `updateWorkerIdentity`、`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 改名不受影响。当 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`。+### 测试与回归清单远端回报身份在 enqueue 前保存于 `orca_workers.pending_remote_report`,恢复时重建 TeamServicediff --git a/packages/lizi-mcps/src/orca/server.ts b/packages/lizi-mcps/src/orca/server.tsindex 660730b024..78571a0ab4 100644--- a/packages/lizi-mcps/src/orca/server.ts+++ b/packages/lizi-mcps/src/orca/server.ts@@ -267,7 +267,7 @@ export interface OrcaMcpDeps {}) => Promise<ControlResult<{ workerId: string; role: string; label: string | null },- 'WORKER_NOT_FOUND' | 'INVALID_PARAMS' | 'DUPLICATE_LABEL'+ 'WORKER_NOT_FOUND' | 'INVALID_PARAMS' | 'DUPLICATE_LABEL' | 'WORKER_STATE_CHANGED'>>;/** 列出 agent 可用 model 清单。 */diff --git a/packages/lizi-mcps/src/xdt-helper/update_worker.ts b/packages/lizi-mcps/src/xdt-helper/update_worker.tsindex 8886c38f81..10b5c28fc3 100644--- a/packages/lizi-mcps/src/xdt-helper/update_worker.ts+++ b/packages/lizi-mcps/src/xdt-helper/update_worker.ts@@ -22,7 +22,7 @@ export interface UpdateWorkerDeps {}) => Promise<ControlResult<{ workerId: string; role: string; label: string | null },- 'WORKER_NOT_FOUND' | 'INVALID_PARAMS' | 'DUPLICATE_LABEL'+ 'WORKER_NOT_FOUND' | 'INVALID_PARAMS' | 'DUPLICATE_LABEL' | 'WORKER_STATE_CHANGED'>>;}@@ -31,7 +31,7 @@ const DESCRIPTION ='修改已创建 worker 的角色名(role)/标识(label),不改 Agent/模型/权限,也不重启会话。' +'worker_id 接受 worker_id 或 session_id 任一(不接受用 label 定位,先 list_workers 取 id)。' +'label 是 team 内唯一 slug(字母/数字/连字符/下划线, 1-32 字符); 改名后 send_to_worker / switch_focus 用新 id 定位。' +- '失败码: LEAD_NOT_SUPPORTED / WORKER_NOT_FOUND / INVALID_PARAMS / DUPLICATE_LABEL。';+ '失败码: LEAD_NOT_SUPPORTED / WORKER_NOT_FOUND / INVALID_PARAMS / DUPLICATE_LABEL / WORKER_STATE_CHANGED(被活动插件团队计划引用的 label 不允许改)。';export function registerUpdateWorkerTool(registry: XdtHelperToolRegistry,