Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(orca): 支持创建后修改 Worker 角色名与标识
Zhang Yunjin6823cd9be03b
diff --git a/apps/desktop/src/main/localDb/__tests__/orcaTeamStore.test.ts b/apps/desktop/src/main/localDb/__tests__/orcaTeamStore.test.tsindex c04fa4a953..5c088f0a9a 100644--- a/apps/desktop/src/main/localDb/__tests__/orcaTeamStore.test.ts+++ b/apps/desktop/src/main/localDb/__tests__/orcaTeamStore.test.ts@@ -70,6 +70,90 @@ describe('orcaTeamStore', () => {expect(h.runtimeCleanup).not.toHaveBeenCalled();});+ it('updates worker identity and rewrites only the generated session title', async () => {+ const { updateWorkerIdentity } = await import('../orcaTeamStore.js');+ const client = createTestDbClient();+ setCurrentDbClient(client, 'test-user');+ await seedOrcaWorkers(client);+ await client.exec('UPDATE orca_workers SET role = ?, label = ? WHERE id = ?', [+ 'developer',+ 'developer-2',+ 'worker-1',+ ]);+ await client.exec('UPDATE sessions SET title = ? WHERE id = ?', [+ 'Worker · developer · developer-2',+ 'worker-session-1',+ ]);++ await expect(+ updateWorkerIdentity({+ workerId: 'worker-1',+ role: 'reviewer',+ label: 'reviewer-2',+ previousRole: 'developer',+ previousLabel: 'developer-2',+ }),+ ).resolves.toEqual({ ok: true });++ await expect(+ client.queryOne('SELECT role, label FROM orca_workers WHERE id = ?', ['worker-1']),+ ).resolves.toEqual({ role: 'reviewer', label: 'reviewer-2' });+ await expect(+ client.queryOne('SELECT title FROM sessions WHERE id = ?', ['worker-session-1']),+ ).resolves.toEqual({ title: 'Worker · reviewer · reviewer-2' });+ expect(h.tapWindowBroadcast).toHaveBeenCalledWith('local-db:sessions:patched', {+ sessionId: 'worker-session-1',+ patch: { title: 'Worker · reviewer · reviewer-2' },+ });+ });++ it('keeps a customized session title and rejects a duplicate label with zero side effects', async () => {+ const { updateWorkerIdentity } = await import('../orcaTeamStore.js');+ const client = createTestDbClient();+ setCurrentDbClient(client, 'test-user');+ await seedOrcaWorkers(client);+ await client.exec('UPDATE orca_workers SET role = ?, label = ? WHERE id = ?', [+ 'developer',+ 'developer-2',+ 'worker-1',+ ]);+ await client.exec('UPDATE sessions SET title = ? WHERE id = ?', [+ 'My custom title',+ 'worker-session-1',+ ]);++ await expect(+ updateWorkerIdentity({+ workerId: 'worker-1',+ role: 'reviewer',+ label: 'reviewer-2',+ previousRole: 'developer',+ previousLabel: 'developer-2',+ }),+ ).resolves.toEqual({ ok: true });+ await expect(+ client.queryOne('SELECT title FROM sessions WHERE id = ?', ['worker-session-1']),+ ).resolves.toEqual({ title: 'My custom title' });+ expect(h.tapWindowBroadcast).not.toHaveBeenCalledWith('local-db:sessions:patched', {+ sessionId: 'worker-session-1',+ patch: { title: 'Worker · reviewer · reviewer-2' },+ });++ await client.exec('UPDATE orca_workers SET label = ? WHERE id = ?', ['tester-2', 'worker-2']);+ await expect(+ updateWorkerIdentity({+ workerId: 'worker-1',+ role: 'reviewer',+ label: 'tester-2',+ previousRole: 'reviewer',+ previousLabel: 'reviewer-2',+ }),+ ).resolves.toEqual({ ok: false, errorCode: 'DUPLICATE_LABEL' });+ await expect(+ client.queryOne('SELECT role, label FROM orca_workers WHERE id = ?', ['worker-1']),+ ).resolves.toEqual({ role: 'reviewer', label: 'reviewer-2' });+ });+it('requires workerId and workerSessionId to match the same row when both are supplied', async () => {const { getWorkerLink } = await import('../orcaTeamStore.js');const client = createTestDbClient();@@ -539,6 +623,7 @@ describe('orcaTeamStore', () => {created_at INTEGER NOT NULL,updated_at INTEGER NOT NULL);+ CREATE UNIQUE INDEX uniq_orca_workers_team_label ON orca_workers (team_id, lower(label));`);const db = drizzle(dbHandle, { schema });const client: DbClient = {diff --git a/apps/desktop/src/main/localDb/orcaTeamStore.ts b/apps/desktop/src/main/localDb/orcaTeamStore.tsindex c2b73194f4..29cdebbcc0 100644--- a/apps/desktop/src/main/localDb/orcaTeamStore.ts+++ b/apps/desktop/src/main/localDb/orcaTeamStore.ts@@ -1,6 +1,7 @@import { BrowserWindow } from 'electron';import { and, desc, eq, gt, inArray, isNotNull, isNull, ne } from 'drizzle-orm';import { createId } from '@paralleldrive/cuid2';+import { orcaWorkerSessionTitle } from '@cindy/maker-shared/orca-team';import type { OrcaRemotePendingReport } from '../../shared/orcaRemoteWorker.js';import { getDbClient } from './client/current.js';@@ -443,6 +444,62 @@ export async function addOrUpdateWorker(input: {return worker;}+/** Worker label 唯一性由 uniq_orca_workers_team_label 保证;约束错误翻译成稳定业务码。 */+function isWorkerLabelConstraintError(err: unknown): boolean {+ if (!(err instanceof Error)) return false;+ return err.message.includes('uniq_orca_workers_team_label');+}++export type OrcaWorkerIdentityUpdateResult =+ | { ok: true }+ | { ok: false; errorCode: 'NOT_FOUND' | 'DUPLICATE_LABEL' };++/**+ * 更新 worker 的 role/label;当 worker session 的标题仍是「上一个生成标题」时同步改写。+ *+ * 标题同步只认 `Worker · role · label` 这一生成形态:用户自定义/重命名过的标题保持不动。+ * label 唯一性由 `uniq_orca_workers_team_label` 在 UPDATE 时最终把关(含已归档 worker)。+ */+export async function updateWorkerIdentity(input: {+ workerId: string;+ role: string;+ label: string | null;+ previousRole: string;+ previousLabel: string | null;+}): Promise<OrcaWorkerIdentityUpdateResult> {+ const db = getDbClient().drizzle;+ const now = Date.now();+ const [existing] = await db+ .select({ id: orcaWorkers.id, sessionId: orcaWorkers.sessionId })+ .from(orcaWorkers)+ .where(eq(orcaWorkers.id, input.workerId))+ .limit(1);+ if (!existing) return { ok: false, errorCode: 'NOT_FOUND' };++ try {+ await db+ .update(orcaWorkers)+ .set({ role: input.role, label: input.label, updatedAt: now })+ .where(eq(orcaWorkers.id, input.workerId));+ } catch (err) {+ if (isWorkerLabelConstraintError(err)) return { ok: false, errorCode: 'DUPLICATE_LABEL' };+ throw err;+ }++ // previousLabel 为空(旧行/已清空)时无法证明旧标题是生成标题,跳过标题同步。+ if (input.label !== null && input.previousLabel !== null) {+ const previousTitle = orcaWorkerSessionTitle(input.previousRole, input.previousLabel);+ const nextTitle = orcaWorkerSessionTitle(input.role, input.label);+ const updated = await db+ .update(sessions)+ .set({ title: nextTitle, updatedAt: now })+ .where(and(eq(sessions.id, existing.sessionId), eq(sessions.title, previousTitle)))+ .returning({ id: sessions.id });+ if (updated.length > 0) broadcastSessionPatch(existing.sessionId, { title: nextTitle });+ }+ return { ok: true };+}+export async function listWorkersByLead(leadSessionId: string,): Promise<OrcaWorkerRecord[]> {diff --git a/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.tsindex 4c351f82f1..3bf788ee65 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts@@ -650,6 +650,7 @@ describe('AgentInputCoordinator Orca priority queue transactions', () => {restoreManualInterrupt: (_sessionId, snapshot) => {manualInterrupt.current = snapshot;},+ updateWorkerIdentity: async () => ({ ok: true as const }),broadcastOrcaWorkerChanged: () => {},dispatchWorkerMessage: async (params) => {await params.onAccepted?.();diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.tsindex 809e956895..beec5c470f 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts@@ -203,6 +203,77 @@ describe('findFocusTargetWorker', () => {});});+describe('OrcaTeamService updateWorker', () => {+ it('normalizes role/label, writes once, and broadcasts to the lead', async () => {+ const { deps, service, getWorker } = createDeps();+ const result = await service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ role: ' Reviewer ',+ label: ' Backend-2 ',+ });+ expect(result).toEqual({ ok: true, workerId: 'worker-1', role: 'Reviewer', label: 'backend-2' });+ expect(deps.updateWorkerIdentity).toHaveBeenCalledWith({+ workerId: 'worker-1',+ role: 'Reviewer',+ label: 'backend-2',+ previousRole: 'Researcher',+ previousLabel: 'research',+ });+ expect(deps.broadcastOrcaWorkerChanged).toHaveBeenCalledWith('lead-1');+ expect(getWorker()).toMatchObject({ role: 'Reviewer', label: 'backend-2' });+ });++ it('is idempotent when nothing changes', async () => {+ const { deps, service } = createDeps();+ const result = await service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ role: 'Researcher',+ label: 'research',+ });+ expect(result).toEqual({ ok: true, workerId: 'worker-1', role: 'Researcher', label: 'research' });+ expect(deps.updateWorkerIdentity).not.toHaveBeenCalled();+ expect(deps.broadcastOrcaWorkerChanged).not.toHaveBeenCalled();+ });++ it('rejects cross-lead refs, invalid input, and an empty patch', async () => {+ const { deps, service } = createDeps();+ await expect(service.updateWorker({+ callerLeadSessionId: 'lead-2',+ workerId: 'worker-1',+ role: 'Reviewer',+ })).resolves.toMatchObject({ ok: false, errorCode: 'WORKER_NOT_FOUND' });+ await expect(service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ })).resolves.toMatchObject({ ok: false, errorCode: 'INVALID_PARAMS' });+ await expect(service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ role: ' ',+ })).resolves.toMatchObject({ ok: false, errorCode: 'INVALID_PARAMS' });+ await expect(service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ label: '前端',+ })).resolves.toMatchObject({ ok: false, errorCode: 'INVALID_PARAMS' });+ expect(deps.updateWorkerIdentity).not.toHaveBeenCalled();+ });++ it('maps the store duplicate-label result without broadcasting', async () => {+ const { deps, service } = createDeps({+ updateWorkerIdentity: vi.fn(async () => ({ ok: false as const, errorCode: 'DUPLICATE_LABEL' as const })),+ });+ await expect(service.updateWorker({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ label: 'reviewer',+ })).resolves.toMatchObject({ ok: false, errorCode: 'DUPLICATE_LABEL' });+ expect(deps.broadcastOrcaWorkerChanged).not.toHaveBeenCalled();+ });+});+function createDeps(overrides: Partial<OrcaTeamServiceDeps> = {}) {const calls: string[] = [];let workers = [createWorker()];@@ -311,6 +382,15 @@ function createDeps(overrides: Partial<OrcaTeamServiceDeps> = {}) {restoreManualInterrupt: vi.fn((_sessionId, snapshot) => {manualInterrupt = snapshot;}),+ updateWorkerIdentity: vi.fn(async (input) => {+ calls.push(`updateWorkerIdentity:${input.role}:${input.label}`);+ workers = workers.map((worker) =>+ worker.id === input.workerId+ ? { ...worker, role: input.role, label: input.label }+ : worker,+ );+ return { ok: true as const };+ }),broadcastOrcaWorkerChanged: vi.fn(() => {calls.push('broadcastOrcaWorkerChanged');}),diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerControlHandlers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerControlHandlers.test.tsindex a307d11563..c8fc3ebdbe 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerControlHandlers.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerControlHandlers.test.ts@@ -12,6 +12,7 @@ function createDeps() {return {idleWorker: vi.fn(async (): Promise<WorkerControlResult> => ({ ok: true, workerId: 'worker-1' })),archiveWorker: vi.fn(async (): Promise<WorkerControlResult> => ({ ok: true, workerId: 'worker-1' })),+ updateWorker: vi.fn(async (): Promise<WorkerControlResult> => ({ ok: true, workerId: 'worker-1' })),logInfo: vi.fn(),};}@@ -186,4 +187,66 @@ describe('Orca worker control IPC handlers', () => {}),).rejects.toMatchObject({ code: 'INTERNAL' });});++ it('forwards partial identity patches to the update service', async () => {+ const harness = new IpcHarness();+ const deps = createDeps();+ registerOrcaWorkerControlHandlers(harness, deps);++ await harness.invoke(MAKER_INVOKE.WORKER_UPDATE, {+ leadSessionId: 'lead-1',+ workerId: 'worker-1',+ label: 'backend-2',+ });+ expect(deps.updateWorker).toHaveBeenCalledWith({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ label: 'backend-2',+ });++ deps.updateWorker.mockClear();+ await harness.invoke(MAKER_INVOKE.WORKER_UPDATE, {+ leadSessionId: 'lead-1',+ workerId: 'worker-1',+ role: 'Reviewer',+ });+ expect(deps.updateWorker).toHaveBeenCalledWith({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ role: 'Reviewer',+ });+ });++ it('rejects an empty update patch before calling the service', async () => {+ const harness = new IpcHarness();+ const deps = createDeps();+ registerOrcaWorkerControlHandlers(harness, deps);++ await expect(+ harness.invoke(MAKER_INVOKE.WORKER_UPDATE, {+ leadSessionId: 'lead-1',+ workerId: 'worker-1',+ }),+ ).rejects.toMatchObject({ code: 'INVALID_PARAMS' });+ expect(deps.updateWorker).not.toHaveBeenCalled();+ });++ it('maps update duplicate-label failures to the stable IPC error code', async () => {+ const harness = new IpcHarness();+ const deps = createDeps();+ deps.updateWorker.mockResolvedValueOnce({+ ok: false,+ errorCode: 'DUPLICATE_LABEL',+ message: 'label "backend" already used in this team',+ });+ registerOrcaWorkerControlHandlers(harness, deps);++ await expect(+ harness.invoke(MAKER_INVOKE.WORKER_UPDATE, {+ leadSessionId: 'lead-1',+ workerId: 'worker-1',+ label: 'backend',+ }),+ ).rejects.toMatchObject({ code: 'DUPLICATE_LABEL' });+ });});diff --git a/apps/desktop/src/main/maker-ipc/channels.ts b/apps/desktop/src/main/maker-ipc/channels.tsindex 92a38ef184..ff387fed0f 100644--- a/apps/desktop/src/main/maker-ipc/channels.ts+++ b/apps/desktop/src/main/maker-ipc/channels.ts@@ -670,6 +670,8 @@ export const MAKER_INVOKE = {/** New wire contract for automatic done acknowledgements; old peers reject it safely. */WORKER_ACKNOWLEDGE_DONE: 'maker:worker:acknowledge-done',WORKER_ARCHIVE: 'maker:worker:archive',+ /** 修改已创建 Worker 的展示角色名(role)与 team 内唯一标识(label)。 */+ WORKER_UPDATE: 'maker:worker:update',TEAM_END: 'maker:team:end',COLLABORATION_SETTINGS_GET: 'maker:collaboration-settings:get',COLLABORATION_SETTINGS_SET: 'maker:collaboration-settings:set',diff --git a/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts b/apps/desktop/src/main/maker-ipc/orcaLifecycleService.tsindex fb145ed57c..6b9023d5de 100644--- a/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts+++ b/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts@@ -1,9 +1,9 @@import type { AgentKind } from '@cindy/maker-core';+import { normalizeOrcaWorkerLabel } from '@cindy/maker-shared/orca-team';import { createHostSendFailure } from '../maker-host/send-outcome.js';import { buildUiAssignmentInitialTask } from './orcaUiAssignment.js';import type { DispatchWorkerTaskResult, OrcaWorkerEffort } from './orcaTeamService.js';-import { normalizeOrcaWorkerLabel } from './orcaWorkerCreationService.js';import type {OrcaTeamSnapshot,OrcaWorkerCreateInTeamParams,diff --git a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts b/apps/desktop/src/main/maker-ipc/orcaTeamService.tsindex d9df6fa136..6e1dbf5c34 100644--- a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts+++ b/apps/desktop/src/main/maker-ipc/orcaTeamService.ts@@ -1,4 +1,5 @@import type { AgentKind } from '@cindy/maker-core';+import { normalizeOrcaWorkerLabel, normalizeOrcaWorkerRole } from '@cindy/maker-shared/orca-team';import type { AgentInputQueuedMessage } from '../../shared/agentInputQueue.js';import { createHostSendFailure } from '../maker-host/send-outcome.js';@@ -149,6 +150,15 @@ export type DispatchWorkerTaskResult =export type OrcaOkResult ={ ok: true; workerId?: string } | { ok: false; errorCode: string; message: string };+/** update_worker 的 domain result:worker 展示角色名与 team 内唯一 label。 */+export type UpdateWorkerResult =+ | { ok: true; workerId: string; role: string; label: string | null }+ | {+ ok: false;+ errorCode: 'WORKER_NOT_FOUND' | 'INVALID_PARAMS' | 'DUPLICATE_LABEL' | 'INTERNAL';+ message: string;+ };+/** worker 排队消息控制(list/update/cancel)对外暴露的失败码。 */export type WorkerQueuedMessageFailureCode =| 'WORKER_NOT_FOUND'@@ -260,6 +270,14 @@ export interface OrcaTeamServiceDeps {worker: OrcaWorkerRecordSnapshot,link: OrcaWorkerLinkSnapshot,): Promise<void>;+ /** 修订 worker 的 role/label;label 唯一性由 store 的唯一索引把关。 */+ updateWorkerIdentity: (input: {+ workerId: string;+ role: string;+ label: string | null;+ previousRole: string;+ previousLabel: string | null;+ }) => Promise<{ ok: true } | { ok: false; errorCode: 'NOT_FOUND' | 'DUPLICATE_LABEL' }>;updateWorkerStatus(workerId: string, status: OrcaWorkerStatus): Promise<void>;markWorkerIdle(workerId: string): Promise<void>;markWorkerIdleIfStatus(workerId: string, expectedStatus: 'done'): Promise<boolean>;@@ -377,6 +395,13 @@ export interface OrcaTeamService {}, opts?: { deferredRetry?: boolean; assertCurrent?: () => Promise<void> }): Promise<OrcaOkResult>;/** 外部调用边界:按 caller lead 校验 worker 可见性。 */archiveWorker(params: { callerLeadSessionId: string; workerId: string; onlyIfIdle?: boolean; beforeArchive?: () => Promise<void> }): Promise<OrcaOkResult>;+ /** 外部调用边界:修改 worker 的展示角色名(role)与 team 内唯一标识(label),不改执行单元本身。 */+ updateWorker(params: {+ callerLeadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }): Promise<UpdateWorkerResult>;/** 外部调用边界:列出目标 worker 输入队列中的排队消息(lead 自己的条目含正文)。 *//** workerRef 省略时读取 Lead 自己的输入队列(Worker 回报在 Lead 忙时排在这里)。 */listWorkerQueuedMessages(params: {@@ -1376,6 +1401,63 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServicreturn params.onlyIfIdle ? withWorkerTransition(params.workerId,perform) : perform();}+ async function updateWorker(params: {+ callerLeadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }): Promise<UpdateWorkerResult> {+ const found = await resolveWorkerRef(params.callerLeadSessionId, params.workerId);+ if (!found.ok) {+ if (found.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' };+ }++ 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;+ }++ // 幂等:值没变时不写库、不广播(MCP 重试与 UI 重复提交都落到这里)。+ if (role === worker.role && label === worker.label) {+ return { ok: true, workerId: worker.id, role, 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,+ errorCode: 'DUPLICATE_LABEL',+ message: `label "${label}" already used in this team`,+ };+ }+ 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)。 */function queuedMessageSource(item: AgentInputQueuedMessage,@@ -1730,6 +1812,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServicinterruptWorker,idleWorker,archiveWorker,+ updateWorker,listWorkerQueuedMessages,updateWorkerQueuedMessage,cancelWorkerQueuedMessage,diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerControlHandlers.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerControlHandlers.tsindex f7c82c0dcf..62cde36791 100644--- a/apps/desktop/src/main/maker-ipc/orcaWorkerControlHandlers.ts+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerControlHandlers.ts@@ -11,6 +11,12 @@ type IdleWorkerExpectedStatus = 'done';export interface OrcaWorkerControlHandlerDeps {idleWorker(params: { callerLeadSessionId: string; workerId: string; expectedStatus?: IdleWorkerExpectedStatus }): Promise<OrcaWorkerControlResult>;archiveWorker(params: { callerLeadSessionId: string; workerId: string }): Promise<OrcaWorkerControlResult>;+ updateWorker(params: {+ callerLeadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }): Promise<OrcaWorkerControlResult>;logInfo(message: string, fields?: Record<string, unknown>): void;}@@ -59,6 +65,24 @@ export function registerOrcaWorkerControlHandlers(deps.logInfo('archiveWorker done', { workerId: b.workerId });return result;});++ registry.handle(MAKER_INVOKE.WORKER_UPDATE, async (_e, body: unknown) => {+ const b = readWorkerUpdatePayload(body);+ let result: Awaited<ReturnType<OrcaWorkerControlHandlerDeps['updateWorker']>>;+ try {+ result = await deps.updateWorker({+ callerLeadSessionId: b.leadSessionId,+ workerId: b.workerId,+ ...(b.role !== undefined ? { role: b.role } : {}),+ ...(b.label !== undefined ? { label: b.label } : {}),+ });+ } catch (err) {+ throwIpcError('INTERNAL', err instanceof Error ? err.message : String(err));+ }+ if (!result.ok) throwOrcaServiceFailure(result);+ deps.logInfo('updateWorker done', { workerId: b.workerId });+ return result;+ });}function readWorkerControlPayload(body: unknown): {@@ -78,3 +102,29 @@ function readWorkerControlPayload(body: unknown): {...(b.expectedStatus === 'done' ? { expectedStatus: 'done' } : {}),};}++function readWorkerUpdatePayload(body: unknown): {+ leadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+} {+ const b = body as Record<string, unknown> | null | undefined;+ if (!b || typeof b.workerId !== 'string') throwIpcError('INVALID_PARAMS', 'workerId required');+ if (typeof b.leadSessionId !== 'string') throwIpcError('INVALID_PARAMS', 'leadSessionId required');+ if (b.role !== undefined && typeof b.role !== 'string') {+ throwIpcError('INVALID_PARAMS', 'role must be a string');+ }+ if (b.label !== undefined && typeof b.label !== 'string') {+ throwIpcError('INVALID_PARAMS', 'label must be a string');+ }+ if (b.role === undefined && b.label === undefined) {+ throwIpcError('INVALID_PARAMS', 'role or label required');+ }+ return {+ leadSessionId: b.leadSessionId,+ workerId: b.workerId,+ ...(typeof b.role === 'string' ? { role: b.role } : {}),+ ...(typeof b.label === 'string' ? { label: b.label } : {}),+ };+}diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.tsindex 8fc46a8db6..44c36e068a 100644--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts@@ -1,5 +1,6 @@import type { AgentKind } from '@cindy/maker-core';import { isCodexGatewayWireModel, type AuthStrategy } from '@cindy/model-providers';+import { normalizeOrcaWorkerLabel, normalizeOrcaWorkerRole, orcaWorkerSessionTitle } from '@cindy/maker-shared/orca-team';import path from 'node:path';import { isCredentialModeSwitchBusyError } from '../maker-host/codex-credential-switch.js';@@ -394,35 +395,11 @@ function toInternalFailure(err: unknown): Extract<OrcaWorkerCreationResult, { ok};}-function normalizeRequiredText(value: string, field: string): { ok: true; value: string } | { ok: false; message: string } {- const trimmed = value.trim();- if (!trimmed) return { ok: false, message: `${field} required` };- return { ok: true, value: trimmed };-}--const ORCA_WORKER_LABEL_MAX_LENGTH = 32;-const ORCA_WORKER_LABEL_PATTERN = /^[a-z0-9_-]+$/i;--/** worker label 是 switch_focus 的稳定定位键,所有创建入口都走同一组 slug 约束。 */-export function normalizeOrcaWorkerLabel(value: string): { ok: true; value: string } | { ok: false; message: string } {- const label = normalizeRequiredText(value, 'label');- if (!label.ok) return label;- if (label.value.length > ORCA_WORKER_LABEL_MAX_LENGTH) {- return { ok: false, message: 'label must be 1-32 chars' };- }- if (!ORCA_WORKER_LABEL_PATTERN.test(label.value)) {- return { ok: false, message: 'label may only contain letters, numbers, hyphens and underscores' };- }- return { ok: true, value: label.value.toLowerCase() };-}-const ORCA_WORKER_CREATION_RESERVATION_LEASE_MS = 5 * 60 * 1000;-/** Worker 任务标题:label 与角色名相同时只写一次(「Worker · reader」而非「Worker · reader · reader」)。 */+/** Worker 任务标题:label 与角色名相同时只写一次(「Worker · reader」而非「Worker · reader · reader」)。与 maker-shared 的 orcaWorkerSessionTitle 同一形态,创建与改名共用。 */export function orcaWorkerTitle(role: string, label: string): string {- return role.trim().toLowerCase() === label.trim().toLowerCase()- ? `Worker · ${role}`- : `Worker · ${role} · ${label}`;+ return orcaWorkerSessionTitle(role, label);}function isWorkerLabelConstraintError(err: unknown): boolean {@@ -913,11 +890,8 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): Oasync function createWorkerInTeam(params: OrcaWorkerCreateInTeamParams, assertCurrent?: () => Promise<void>,onCreated?: (assertCreatedCurrent: () => Promise<void>) => void): Promise<OrcaWorkerCreationResult> {- const role = normalizeRequiredText(params.role, 'role');+ const role = normalizeOrcaWorkerRole(params.role);if (!role.ok) return { ok: false, errorCode: 'INVALID_PARAMS', message: role.message };- if (role.value.length > 32) {- return { ok: false, errorCode: 'INVALID_PARAMS', message: 'role must be 1-32 chars' };- }const label = normalizeOrcaWorkerLabel(params.label);if (!label.ok) return { ok: false, errorCode: 'INVALID_PARAMS', message: label.message };params = { ...params, label: label.value };diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 92194191d2..882fafb966 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -128,6 +128,7 @@ import {isGatewayProxyTokenInvalidError,redactSensitiveText,} from '@cindy/maker-shared/error-redaction';+import { normalizeOrcaWorkerLabel } from '@cindy/maker-shared/orca-team';import { permissionModeOrAsk } from '@cindy/maker-shared/permission-mode';import {isProductTurnCompletionTailEvent,@@ -440,6 +441,7 @@ import {setRemoteWorkerStatusProvider,setSessionOrcaRole,setWorkerFocus,+ updateWorkerIdentity,updateWorkerStatus,} from '../localDb/orcaTeamStore.js';import {@@ -856,10 +858,7 @@ import {type WorkerQueuedMessageControlResult,type WorkerTerminalTurnCapture,} from './orcaTeamService.js';-import {- createOrcaWorkerCreationService,- normalizeOrcaWorkerLabel,-} from './orcaWorkerCreationService.js';+import { createOrcaWorkerCreationService } from './orcaWorkerCreationService.js';import {resolveSendToSessionExecutionConfig,type SendToSessionExecutionOverrides,@@ -2403,6 +2402,15 @@ interface OrcaCollabService {}) => Promise<{ ok: true; workerId?: string } | { ok: false; errorCode: string; message: string }>;+ updateWorker: (params: {+ callerLeadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }) => Promise<+ | { ok: true; workerId: string; role: string; label: string | null }+ | { ok: false; errorCode: string; message: string }+ >;listAvailableModels: (params: { agent?: AgentKind; callerSessionId?: string }) => Promise<| {ok: true;@@ -6001,6 +6009,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)// 新控制端只有看到此位才允许给被控端 Orca Team 选择 Worker Full access。// 旧 desktop 缺省为 false,避免显式 bypassPermissions 被旧 handler 静默忽略。supportsOrcaWorkerPermissionMode: true,+ // 新控制端只有看到此位才允许对远程 Worker 显示「编辑」入口(maker:worker:update);+ // 旧 desktop 缺省为 false,因为其 allowlist 不认识该 channel。+ supportsOrcaWorkerUpdate: true,// 新控制端只有看到此位,才会让被控端延后 UI initial_task 并在 Lead 首条// 输入 accepted 且历史可查询后走 WORKER_DISPATCH_UI_ASSIGNMENT;旧端继续即时派发。supportsDeferredOrcaUiAssignment: true,@@ -12794,6 +12805,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)registerOrcaWorkerControlHandlers(createElectronIpcHandlerRegistry(), {idleWorker: (params) => orcaTeamService.idleWorker(params),archiveWorker: (params) => orcaTeamService.archiveWorker(params),+ updateWorker: (params) => orcaTeamService.updateWorker(params),logInfo: (message, fields) => log.info(message, fields),});@@ -12858,6 +12870,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)await resumeOrcaWorkerSessionIfMissing(target);},updateWorkerStatus,+ updateWorkerIdentity,markWorkerIdle: async (workerId) => {const now = Date.now();const db = getDbClient().drizzle;@@ -14722,6 +14735,19 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)};}},+ updateWorker: async ({ callerLeadSessionId, workerId, role, label }) => {+ try {+ const { assertCurrent } = await captureOrcaPluginAuthority(callerLeadSessionId);+ await assertCurrent();+ return await orcaTeamService.updateWorker({ callerLeadSessionId, workerId, role, label });+ } catch (err) {+ return {+ ok: false,+ errorCode: 'INTERNAL',+ message: err instanceof Error ? err.message : String(err),+ };+ }+ },listAvailableModels: async ({ agent, callerSessionId }) => {try {const agents: AgentKind[] = agent ? [agent] : ['codex', 'claude-code', 'pi'];diff --git a/apps/desktop/src/main/mcp-integrations/mcp-providers.ts b/apps/desktop/src/main/mcp-integrations/mcp-providers.tsindex 2fa59a8912..102028d30b 100644--- a/apps/desktop/src/main/mcp-integrations/mcp-providers.ts+++ b/apps/desktop/src/main/mcp-integrations/mcp-providers.ts@@ -970,6 +970,7 @@ export function createDesktopMcpProviders(deps: DesktopMcpProvidersDeps): LiziMcidleWorker: wrap((s, params) => s.idleWorker(params)),endTeam: wrap((s, params) => s.endTeam(params)),archiveWorker: wrap((s, params) => s.archiveWorker(params)),+ updateWorker: wrap((s, params) => s.updateWorker(params)),listAvailableModels: wrap((s, params) => s.listAvailableModels(params)),getWorkspaceInfo: wrap((s, params) => s.getWorkspaceInfo(params)),getWorkerStatus: wrap((s, params) => s.getWorkerStatus(params)),diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.tsindex d9108c6b6d..d56056c5f3 100644--- a/apps/desktop/src/preload/preload.ts+++ b/apps/desktop/src/preload/preload.ts@@ -5743,6 +5743,12 @@ contextBridge.exposeInMainWorld('electronAPI', {},archiveWorker: (leadSessionId: string, workerId: string): Promise<unknown> =>ipcRenderer.invoke('maker:worker:archive', { leadSessionId, workerId }),+ updateWorker: (input: {+ leadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }): Promise<unknown> => ipcRenderer.invoke('maker:worker:update', input),endTeam: (leadSessionId: string): Promise<unknown> =>ipcRenderer.invoke('maker:team:end', leadSessionId),getCollaborationSettings: (): Promise<unknown> =>diff --git a/apps/desktop/src/preload/sidebarWindowPreload.ts b/apps/desktop/src/preload/sidebarWindowPreload.tsindex a77638ac14..d0237fdc35 100644--- a/apps/desktop/src/preload/sidebarWindowPreload.ts+++ b/apps/desktop/src/preload/sidebarWindowPreload.ts@@ -512,6 +512,12 @@ contextBridge.exposeInMainWorld('electronAPI', {},archiveWorker: (leadSessionId: string, workerId: string): Promise<unknown> =>ipcRenderer.invoke('maker:worker:archive', { leadSessionId, workerId }),+ updateWorker: (input: {+ leadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }): Promise<unknown> => ipcRenderer.invoke('maker:worker:update', input),endTeam: (leadSessionId: string): Promise<unknown> =>ipcRenderer.invoke('maker:team:end', leadSessionId),getCollaborationSettings: (): Promise<unknown> =>diff --git a/apps/desktop/src/renderer/__tests__/makerTransportOrcaRouting.test.ts b/apps/desktop/src/renderer/__tests__/makerTransportOrcaRouting.test.tsindex 7982f02122..30ab3e444b 100644--- a/apps/desktop/src/renderer/__tests__/makerTransportOrcaRouting.test.ts+++ b/apps/desktop/src/renderer/__tests__/makerTransportOrcaRouting.test.ts@@ -67,6 +67,7 @@ describe('orcaWorkflowsFor 路由', () => {await orca.idleWorker('lead', 'w1');await orca.idleWorker('lead', 'w1', 'done');await orca.archiveWorker('lead', 'w1');+ await orca.updateWorker({ leadSessionId: 'lead', workerId: 'w1', role: 'reviewer', label: 'reviewer-2' });await orca.endTeam('lead');await orca.getCollaborationSettings();await orca.listExecutionDevices();@@ -78,6 +79,7 @@ describe('orcaWorkflowsFor 路由', () => {expect(invoke).toHaveBeenCalledWith('dev-1', 'maker:worker:idle', [{ leadSessionId: 'lead', workerId: 'w1' }]);expect(invoke).toHaveBeenCalledWith('dev-1', 'maker:worker:acknowledge-done', [{ leadSessionId: 'lead', workerId: 'w1' }]);expect(invoke).toHaveBeenCalledWith('dev-1', 'maker:worker:archive', [{ leadSessionId: 'lead', workerId: 'w1' }]);+ expect(invoke).toHaveBeenCalledWith('dev-1', 'maker:worker:update', [{ leadSessionId: 'lead', workerId: 'w1', role: 'reviewer', label: 'reviewer-2' }]);expect(invoke).toHaveBeenCalledWith('dev-1', 'maker:team:end', ['lead']);expect(invoke).toHaveBeenCalledWith('dev-1', 'maker:collaboration-settings:get', []);expect(invoke).toHaveBeenCalledWith('dev-1', 'maker:orca:execution-devices', []);diff --git a/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsx b/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsxnew file mode 100644index 0000000000..d904637649--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/EditWorkerPopover.tsx@@ -0,0 +1,271 @@+import * as Dialog from '@radix-ui/react-dialog';+import { useCallback, useEffect, useRef, useState } from 'react';+import { useTranslation } from 'react-i18next';+import { Info, X } from 'lucide-react';++import { WINDOW_DRAG_STYLE, WINDOW_NO_DRAG_STYLE } from '@/components/layout/windowDrag';+import { Button } from '@/components/ui/button';+import { Tip } from '@/components/ui/tooltip';+import { cn } from '@/lib/utils';+import {+ ORCA_PREDEFINED_WORKER_ROLES as PREDEFINED_ROLES,+ normalizeOrcaWorkerLabel,+} from '@cindy/maker-shared/orca-team';++import type { WorkerInfo } from './hooks/useWorkers';++export interface EditWorkerForm {+ role: string;+ /** 空白表示不改动当前 label(不提供「清空 label」语义)。 */+ label: string;+}++export interface EditWorkerPopoverProps {+ open: boolean;+ worker: WorkerInfo | null;+ onClose: () => void;+ /**+ * 保存。返回 true 表示成功(调用方负责关闭);false 表示失败保持编辑态。+ * 失败文案由调用方统一 toast。+ */+ onSave: (form: EditWorkerForm) => Promise<boolean>;+}++/**+ * EditWorkerPopover —— 创建后修改 Worker 的角色名(role)与 team 内唯一标识(label)。+ *+ * 只改身份元数据:Agent / 模型 / 权限不在这里,避免把「改名」误做成重建执行单元+ * (model 中途切换是 Orca 的禁止项)。视觉与 CreateWorkerPopover 同族。+ */+export function EditWorkerPopover({+ open,+ worker,+ onClose,+ onSave,+}: EditWorkerPopoverProps) {+ const { t } = useTranslation();+ const [role, setRole] = useState('');+ const [customRole, setCustomRole] = useState('');+ const [label, setLabel] = useState('');+ const [isSubmitting, setIsSubmitting] = useState(false);+ const submittingRef = useRef(false);+ const roleInputRef = useRef<HTMLInputElement>(null);+ const openerRef = useRef<HTMLElement | null>(null);+ /** 已用哪个 worker 初始化过表单。投影刷新会换 worker 对象身份,不能用它触发重置,+ * 否则用户编辑到一半会被后台刷新静默回滚。 */+ const initializedWorkerIdRef = useRef<string | null>(null);++ // 打开(或切换到另一个 worker)时按当前值重置表单;同一 worker 的投影刷新不重置。+ useEffect(() => {+ if (!open) {+ initializedWorkerIdRef.current = null;+ submittingRef.current = false;+ setIsSubmitting(false);+ return;+ }+ if (!worker || initializedWorkerIdRef.current === worker.workerId) return;+ initializedWorkerIdRef.current = worker.workerId;+ const predefined = (PREDEFINED_ROLES as readonly string[]).includes(worker.role);+ setRole(predefined ? worker.role : '');+ setCustomRole(predefined ? '' : worker.role);+ setLabel(worker.label ?? '');+ submittingRef.current = false;+ setIsSubmitting(false);+ }, [open, worker]);++ const activeRole = customRole || role;+ const customRoleError =+ customRole.length > 0 && (PREDEFINED_ROLES as readonly string[]).includes(customRole)+ ? t('orca.createWorker.customRolePredefinedError')+ : null;+ 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 &&+ !customRoleError &&+ !labelError;++ const handleClose = useCallback(() => {+ if (!submittingRef.current) onClose();+ }, [onClose]);++ const handleSave = useCallback(async () => {+ if (!canSave || submittingRef.current) return;+ submittingRef.current = true;+ setIsSubmitting(true);+ try {+ const ok = await onSave({ role: activeRole, label: trimmedLabel });+ if (!ok) {+ submittingRef.current = false;+ setIsSubmitting(false);+ }+ } catch {+ // onSave 失败已在调用方统一 toast;回到可编辑态。+ submittingRef.current = false;+ setIsSubmitting(false);+ }+ }, [activeRole, canSave, onSave, trimmedLabel]);++ return (+ <Dialog.Root open={open} onOpenChange={(next) => { if (!next) handleClose(); }}>+ <Dialog.Portal>+ <Dialog.Overlay className="modal-scrim fixed inset-0 z-50 flex items-center justify-center" style={WINDOW_DRAG_STYLE}>+ <Dialog.Content+ className="modal-panel relative z-10 w-[460px] max-w-[calc(100vw-32px)] p-6 outline-none"+ aria-describedby={undefined}+ onPointerDownOutside={(event) => event.preventDefault()}+ onOpenAutoFocus={(event) => {+ event.preventDefault();+ openerRef.current = document.activeElement instanceof HTMLElement ? document.activeElement : null;+ roleInputRef.current?.focus();+ }}+ onCloseAutoFocus={(event) => {+ event.preventDefault();+ if (openerRef.current?.isConnected) openerRef.current.focus({ preventScroll: true });+ }}+ onEscapeKeyDown={(event) => {+ if (submittingRef.current || event.isComposing || event.keyCode === 229) event.preventDefault();+ }}+ style={WINDOW_NO_DRAG_STYLE}+ >+ <div className="mb-5 flex items-center justify-between">+ <Dialog.Title asChild>+ <span className="text-16 font-medium text-[var(--text-primary)]">+ {t('orca.editWorker.title')}+ </span>+ </Dialog.Title>+ <button+ type="button"+ aria-label={t('orca.editWorker.closeAria')}+ className="inline-flex h-6 w-6 items-center justify-center rounded text-[var(--text-tertiary)] hover:text-[var(--text-primary)]"+ disabled={isSubmitting}+ onClick={handleClose}+ >+ <X size={15} />+ </button>+ </div>++ <div className="mb-4">+ <div className="mb-2 flex items-center gap-1">+ <span className="text-12 font-medium uppercase tracking-[0.5px] text-[var(--text-tertiary)]">+ {t('orca.createWorker.roleLabel')}+ </span>+ <Tip+ text={t('orca.createWorker.roleHint')}+ side="top"+ contentClassName="max-w-[280px] whitespace-normal break-words text-left"+ >+ <button+ type="button"+ className={cn(+ 'inline-flex h-5 w-5 shrink-0 items-center justify-center rounded-full border-0 bg-transparent p-0',+ 'text-[var(--text-tertiary)] outline-none transition-colors',+ 'hover:bg-[var(--surface-hover)] hover:text-[var(--text-secondary)]',+ 'focus:bg-[var(--surface-hover)] focus:text-[var(--text-secondary)]',+ )}+ aria-label={t('orca.createWorker.roleHintAria')}+ >+ <Info size={13} aria-hidden />+ </button>+ </Tip>+ </div>+ <div className="flex flex-wrap gap-2">+ {PREDEFINED_ROLES.map((r) => (+ <button+ key={r}+ type="button"+ className={cn(+ 'rounded-full px-3 py-1.5 text-13 leading-none border transition-colors',+ activeRole === r+ ? 'bg-[var(--surface-chip)] border-[var(--text-secondary)] text-[var(--text-primary)] font-medium'+ : 'border-[var(--border-default)] text-[var(--text-secondary)] hover:bg-[var(--surface-chip)]',+ )}+ onClick={() => {+ setRole(r);+ setCustomRole('');+ }}+ >+ {r}+ </button>+ ))}+ </div>+ <input+ ref={roleInputRef}+ type="text"+ className="mt-2 w-full rounded-full border border-[var(--border-default)] bg-transparent px-3 py-1.5 text-13 leading-none text-[var(--text-primary)] placeholder:text-[var(--text-tertiary)] outline-none focus:border-[var(--text-secondary)]"+ placeholder={t('orca.createWorker.customRolePlaceholder')}+ value={customRole}+ maxLength={32}+ onChange={(e) => {+ setCustomRole(e.target.value);+ setRole('');+ }}+ />+ {customRoleError && (+ <div className="mt-1 text-11 text-[var(--error-fg)]">{customRoleError}</div>+ )}+ </div>++ <div className="mb-5">+ <div className="mb-2 flex items-center gap-1">+ <span className="text-12 font-medium uppercase tracking-[0.5px] text-[var(--text-tertiary)]">+ {t('orca.editWorker.labelLabel')}+ </span>+ <Tip+ text={t('orca.editWorker.labelHint')}+ side="top"+ contentClassName="max-w-[280px] whitespace-normal break-words text-left"+ >+ <button+ type="button"+ className={cn(+ 'inline-flex h-5 w-5 shrink-0 items-center justify-center rounded-full border-0 bg-transparent p-0',+ 'text-[var(--text-tertiary)] outline-none transition-colors',+ 'hover:bg-[var(--surface-hover)] hover:text-[var(--text-secondary)]',+ 'focus:bg-[var(--surface-hover)] focus:text-[var(--text-secondary)]',+ )}+ aria-label={t('orca.editWorker.labelHintAria')}+ >+ <Info size={13} aria-hidden />+ </button>+ </Tip>+ </div>+ <input+ type="text"+ className="w-full rounded-full border border-[var(--border-default)] bg-transparent px-3 py-1.5 text-13 leading-none text-[var(--text-primary)] placeholder:text-[var(--text-tertiary)] outline-none focus:border-[var(--text-secondary)]"+ placeholder={t('orca.editWorker.labelPlaceholder')}+ value={label}+ maxLength={32}+ spellCheck={false}+ autoCapitalize="none"+ autoCorrect="off"+ onChange={(e) => setLabel(e.target.value)}+ />+ {labelError && (+ <div className="mt-1 text-11 text-[var(--error-fg)]">{labelError}</div>+ )}+ </div>++ <Button+ variant="cta"+ palette="confirmation"+ size="lg"+ loading={isSubmitting}+ type="button"+ className="w-full"+ disabled={!canSave}+ aria-busy={isSubmitting}+ onClick={() => void handleSave()}+ >+ {t('orca.editWorker.submit')}+ </Button>+ </Dialog.Content>+ </Dialog.Overlay>+ </Dialog.Portal>+ </Dialog.Root>+ );+}diff --git a/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx b/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsxindex bbe5395ee3..779202abfb 100644--- a/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx@@ -11,10 +11,12 @@ import { useTranslation } from 'react-i18next';import { useNavigate } from 'react-router-dom';import { isAgentIslandSupported } from '@/hooks/useAgentIslandSettings';+import { useAgentCapabilities } from '@/hooks/useAgentCapabilities';import { toast } from '@/lib/toast';import { isSidebarWindow } from '@/lib/sidebarWindow';import { CCAgentSessionView } from './CCAgentSessionView';import { CreateWorkerPopover } from './CreateWorkerPopover';+import { EditWorkerPopover } from './EditWorkerPopover';import { RemoteWorkerSessionPane } from './RemoteWorkerSessionPane';import { WorkerListToolbar } from './RolePillDropdown';import { useOrcaWorkerSelection } from './hooks/useOrcaWorkerSelection';@@ -83,6 +85,10 @@ export function OrcaWorkerPanel({workerSessionId,createOpen,setCreateOpen,+ editWorker,+ handleCloseEditWorker,+ handleOpenEditWorker,+ handleUpdateWorker,handleCreateWorker,handleSwitchFocus,handleArchiveWorker,@@ -104,6 +110,18 @@ export function OrcaWorkerPanel({? shownWorker.executionDevice: undefined;+ // 改名入口的远程兼容门:归属已确认本机时始终可编辑;device-link 被控端必须显式+ // 声明支持 maker:worker:update(旧被控端 allowlist 不认该 channel)。+ // 归属未解析(undefined)与「设置」入口同口径 fail closed。+ const editingRemote = typeof deviceId === 'string';+ const editCapabilities = useAgentCapabilities(+ (selectedWorkerRecord ?? focusedWorker)?.agent ?? 'codex',+ editingRemote ? deviceId : undefined,+ );+ const canEditWorker =+ deviceId !== undefined &&+ (!editingRemote || editCapabilities.capabilities?.supportsOrcaWorkerUpdate === true);+const handleOpenCreate = useCallback(async () => {const result = await refreshCreationState();if (result.status !== 'applied') {@@ -191,6 +209,7 @@ export function OrcaWorkerPanel({onOpenCreate={() => void handleOpenCreate()}onOpenSettings={isSidebarWindow() || deviceId !== null ? undefined : handleOpenSettings}onArchiveWorker={handleArchiveWorker}+ onEditWorker={canEditWorker ? handleOpenEditWorker : undefined}clearAttentionWhenVisible={viewVisible}/></div>@@ -232,6 +251,12 @@ export function OrcaWorkerPanel({// 仅任务与 Agent 均已确认在本机的 Lead 可选择 Worker 运行设备,与主进程限制一致。executionDevicesEnabled={deviceId === null && agentDeviceId === null && !sshRemote}/>+ <EditWorkerPopover+ open={!!editWorker}+ worker={editWorker}+ onClose={handleCloseEditWorker}+ onSave={handleUpdateWorker}+ /></div>);}diff --git a/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx b/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsxindex 15ba6e5611..31a6367380 100644--- a/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx@@ -15,7 +15,7 @@ import {type WheelEvent,} from 'react';import { useTranslation } from 'react-i18next';-import { Check, ChevronDown, ChevronLeft, ChevronRight, ChevronUp, Plus, X, EllipsisVertical, Monitor, WifiOff } from 'lucide-react';+import { Check, ChevronDown, ChevronLeft, ChevronRight, ChevronUp, Plus, X, EllipsisVertical, Pencil, Monitor, WifiOff } from 'lucide-react';import { cn } from '@/lib/utils';import { useAppShortcutDisplay } from '@/hooks/useAppShortcut';import { useReducedMotion } from '@/hooks/useReducedMotion';@@ -55,10 +55,13 @@ function WorkerModelLine({model,effort,device,+ reserveClassName = 'mr-7',}: {model: string;effort: string | null;device?: WorkerExecutionDevice;+ /** 右侧 hover 操作图标的保留宽度;默认给单个归档 X 留空。 */+ reserveClassName?: string;}) {const { t } = useTranslation();const effortLabel = workerEffortLabel(t, effort);@@ -92,7 +95,12 @@ function WorkerModelLine({// 菜单有 overflow-x-hidden,整行 nowrap 会把后加的档位裁掉;// 模型名可截,档位词短、必须留在可见区。右侧给 archive / ERR 留空。return (- <div className="mt-0.5 mr-7 ml-[26px] flex min-w-0 items-baseline gap-1.5 text-12 leading-snug text-[var(--text-secondary)]">+ <div+ className={cn(+ 'mt-0.5 ml-[26px] flex min-w-0 items-baseline gap-1.5 text-12 leading-snug text-[var(--text-secondary)]',+ reserveClassName,+ )}+ ><span className="min-w-0 truncate">{simplifyModelName(model)}</span>{effortLabel ? <span className="shrink-0">· {effortLabel}</span> : null}</div>@@ -338,6 +346,8 @@ export interface RolePillDropdownProps {activeWorkerCount: number;onSwitchFocus: (workerId: string) => void;onArchiveWorker: (workerId: string) => void;+ /** 打开「编辑 Worker」表单;undefined 表示当前入口不支持(如远程旧版被控端)。 */+ onEditWorker?: (workerId: string) => void;/** false 时,选中的 worker 不会仅因组件挂载/刷新而自动清 attention。 */clearAttentionWhenVisible?: boolean;className?: string;@@ -470,6 +480,7 @@ function WorkerLayoutMenu({activeWorkerCount,onSwitchFocus,onArchiveWorker,+ onEditWorker,clearAttentionWhenVisible = true,}: {layout: WorkerListLayout;@@ -479,6 +490,7 @@ function WorkerLayoutMenu({activeWorkerCount: number;onSwitchFocus: (workerId: string) => void;onArchiveWorker: (workerId: string) => void;+ onEditWorker?: (workerId: string) => void;clearAttentionWhenVisible?: boolean;}) {const { t } = useTranslation();@@ -651,8 +663,29 @@ function WorkerLayoutMenu({</>)}</div>- <WorkerModelLine model={w.model} effort={w.effort} device={w.executionDevice} />+ <WorkerModelLine+ model={w.model}+ effort={w.effort}+ device={w.executionDevice}+ reserveClassName={onEditWorker ? 'mr-14' : 'mr-7'}+ /></button>+ {onEditWorker && (+ <button+ type="button"+ className="absolute right-8 top-1/2 -translate-y-1/2 inline-flex h-[22px] w-[22px] items-center justify-center rounded opacity-0 transition-opacity group-hover:opacity-100 text-[var(--text-tertiary)] hover:text-[var(--text-primary)]"+ onClick={(e) => {+ e.stopPropagation();+ closeMenu();+ onEditWorker(w.workerId);+ }}+ aria-label={t('orca.rolePill.editWorkerAria', {+ name: getWorkerArchiveDisplayName(w),+ })}+ >+ <Pencil size={12} />+ </button>+ )}{/* hover archive ✕ */}<buttontype="button"@@ -781,12 +814,14 @@ function WorkerTabsList({selectedWorkerId,onSwitchFocus,onArchiveWorker,+ onEditWorker,clearAttentionWhenVisible = true,}: {workers: WorkerInfo[];selectedWorkerId: string | null;onSwitchFocus: (workerId: string) => void;onArchiveWorker: (workerId: string) => void;+ onEditWorker?: (workerId: string) => void;clearAttentionWhenVisible?: boolean;}) {const { t } = useTranslation();@@ -917,7 +952,8 @@ function WorkerTabsList({type="button"ref={selected ? focusedTabRef : undefined}className={cn(- 'inline-flex h-6 shrink-0 items-center gap-1.5 rounded-full border py-0 pl-2 pr-6 text-11 leading-none transition-colors',+ 'inline-flex h-6 shrink-0 items-center gap-1.5 rounded-full border py-0 pl-2 text-11 leading-none transition-colors',+ onEditWorker ? 'pr-10' : 'pr-6',selected? isError? 'border-[var(--error-fg)] bg-[var(--accent-cta-bg)] text-[var(--accent-pure-cta-fg)]'@@ -940,6 +976,26 @@ function WorkerTabsList({(会连带裁剪垂直溢出), 角标朝上溢出会被切掉; 行内则始终在 pill 边界内。 */}{isError && <WorkerErrorBadge className="ml-0.5" />}</button>+ {onEditWorker && (+ <button+ type="button"+ className={cn(+ 'absolute right-[21px] top-1/2 inline-flex h-[18px] w-[18px] -translate-y-1/2 items-center justify-center rounded-full opacity-0 transition-opacity group-hover:opacity-100',+ selected+ ? 'text-[var(--surface-on-card)] hover:text-[var(--surface-on-card)]'+ : 'text-[var(--text-tertiary)] hover:text-[var(--text-primary)]',+ )}+ onClick={(e) => {+ e.stopPropagation();+ onEditWorker(worker.workerId);+ }}+ aria-label={t('orca.rolePill.editWorkerAria', {+ name: getWorkerArchiveDisplayName(worker),+ })}+ >+ <Pencil size={11} />+ </button>+ )}<buttontype="button"className={cn(@@ -1028,6 +1084,7 @@ export function WorkerListToolbar({onOpenCreate,onOpenSettings,onArchiveWorker,+ onEditWorker,trailingActions,clearAttentionWhenVisible = true,className,@@ -1062,6 +1119,7 @@ export function WorkerListToolbar({activeWorkerCount={activeWorkerCount}onSwitchFocus={onSwitchFocus}onArchiveWorker={onArchiveWorker}+ onEditWorker={onEditWorker}clearAttentionWhenVisible={clearAttentionWhenVisible}/>{trailingActions}@@ -1085,6 +1143,7 @@ export function WorkerListToolbar({selectedWorkerId={selectedWorkerId}onSwitchFocus={onSwitchFocus}onArchiveWorker={onArchiveWorker}+ onEditWorker={onEditWorker}clearAttentionWhenVisible={clearAttentionWhenVisible}/></>@@ -1105,6 +1164,7 @@ export function WorkerListToolbar({activeWorkerCount={activeWorkerCount}onSwitchFocus={onSwitchFocus}onArchiveWorker={onArchiveWorker}+ onEditWorker={onEditWorker}clearAttentionWhenVisible={clearAttentionWhenVisible}/></div>@@ -1118,6 +1178,7 @@ export function WorkerListToolbar({activeWorkerCount={activeWorkerCount}onSwitchFocus={onSwitchFocus}onArchiveWorker={onArchiveWorker}+ onEditWorker={onEditWorker}clearAttentionWhenVisible={clearAttentionWhenVisible}/>{trailingActions}@@ -1132,6 +1193,7 @@ export function RolePillDropdown({activeWorkerCount,onSwitchFocus,onArchiveWorker,+ onEditWorker,clearAttentionWhenVisible = true,className,}: RolePillDropdownProps) {@@ -1347,8 +1409,29 @@ export function RolePillDropdown({</div>{/* 副行: 简化 model 名 (去 provider 前缀) + 档位文字.各模型档位集合不同,不用信号条假装同一把尺子. */}- <WorkerModelLine model={w.model} effort={w.effort} device={w.executionDevice} />+ <WorkerModelLine+ model={w.model}+ effort={w.effort}+ device={w.executionDevice}+ reserveClassName={onEditWorker ? 'mr-14' : 'mr-7'}+ /></button>+ {onEditWorker && (+ <button+ type="button"+ className="absolute right-8 top-1/2 inline-flex h-[22px] w-[22px] -translate-y-1/2 items-center justify-center rounded opacity-0 transition-opacity group-hover:opacity-100 text-[var(--text-tertiary)] hover:text-[var(--text-primary)]"+ onClick={(e) => {+ e.stopPropagation();+ closeDropdown();+ onEditWorker(w.workerId);+ }}+ aria-label={t('orca.rolePill.editWorkerAria', {+ name: getWorkerArchiveDisplayName(w),+ })}+ >+ <Pencil size={12} />+ </button>+ )}{/* hover archive ✕ */}<buttontype="button"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.tsxnew file mode 100644index 0000000000..5fa4595c1b--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/EditWorkerPopover.test.tsx@@ -0,0 +1,127 @@+// @vitest-environment jsdom++import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';+import { afterEach, describe, expect, it, vi } from 'vitest';++import { EditWorkerPopover } from '../EditWorkerPopover';+import type { WorkerInfo } from '../hooks/useWorkers';++function worker(overrides: Partial<WorkerInfo> = {}): WorkerInfo {+ return {+ workerId: 'worker-1',+ sessionId: 'worker-session-1',+ role: 'developer',+ agent: 'codex',+ model: 'gpt-5.5',+ effort: 'high',+ label: 'developer-2',+ status: 'idle',+ focused: true,+ idleSince: null,+ ...overrides,+ };+}++describe('EditWorkerPopover', () => {+ afterEach(() => {+ cleanup();+ });++ it('prefills the current role and label and saves them unchanged', async () => {+ const onSave = vi.fn(async () => true);+ render(+ <EditWorkerPopover open worker={worker()} onClose={vi.fn()} onSave={onSave} />,+ );++ const labelInput = screen.getByPlaceholderText('orca.editWorker.labelPlaceholder');+ expect((labelInput as HTMLInputElement).value).toBe('developer-2');++ fireEvent.click(screen.getByRole('button', { name: 'orca.editWorker.submit' }));+ await waitFor(() => {+ expect(onSave).toHaveBeenCalledWith({ role: 'developer', label: 'developer-2' });+ });+ });++ it('accepts a predefined role switch and a custom role', async () => {+ const onSave = vi.fn(async () => true);+ const { rerender } = render(+ <EditWorkerPopover open worker={worker()} onClose={vi.fn()} onSave={onSave} />,+ );++ fireEvent.click(screen.getByRole('button', { name: 'reviewer' }));+ fireEvent.click(screen.getByRole('button', { name: 'orca.editWorker.submit' }));+ await waitFor(() => {+ expect(onSave).toHaveBeenLastCalledWith({ role: 'reviewer', label: 'developer-2' });+ });++ rerender(+ <EditWorkerPopover+ open+ worker={worker({ workerId: 'worker-2', role: '前端负责人' })}+ onClose={vi.fn()}+ onSave={onSave}+ />,+ );+ const customRoleInput = screen.getByPlaceholderText('orca.createWorker.customRolePlaceholder');+ expect((customRoleInput as HTMLInputElement).value).toBe('前端负责人');+ fireEvent.click(screen.getByRole('button', { name: 'orca.editWorker.submit' }));+ await waitFor(() => {+ expect(onSave).toHaveBeenLastCalledWith({ role: '前端负责人', label: 'developer-2' });+ });+ });++ it('blocks saving on an invalid label and reports it inline', () => {+ render(+ <EditWorkerPopover open worker={worker()} onClose={vi.fn()} onSave={vi.fn(async () => true)} />,+ );++ fireEvent.change(screen.getByPlaceholderText('orca.editWorker.labelPlaceholder'), {+ target: { value: '前端' },+ });+ expect(screen.getByText('orca.editWorker.labelInvalid')).toBeTruthy();+ expect(+ (screen.getByRole('button', { name: 'orca.editWorker.submit' }) as HTMLButtonElement).disabled,+ ).toBe(true);+ });++ it('stays open when saving fails', async () => {+ const onSave = vi.fn(async () => false);+ render(+ <EditWorkerPopover open worker={worker()} onClose={vi.fn()} onSave={onSave} />,+ );++ fireEvent.click(screen.getByRole('button', { name: 'orca.editWorker.submit' }));+ await waitFor(() => {+ expect(onSave).toHaveBeenCalledTimes(1);+ });+ expect(+ (screen.getByPlaceholderText('orca.editWorker.labelPlaceholder') as HTMLInputElement).value,+ ).toBe('developer-2');+ });++ it('keeps in-progress edits across worker projection refreshes', () => {+ const onSave = vi.fn(async () => true);+ const { rerender } = render(+ <EditWorkerPopover open worker={worker()} onClose={vi.fn()} onSave={onSave} />,+ );+ fireEvent.change(screen.getByPlaceholderText('orca.editWorker.labelPlaceholder'), {+ target: { value: 'my-label' },+ });++ // 投影刷新会换 worker 对象身份;同一 worker 不得把用户编辑回滚到库里的值。+ rerender(<EditWorkerPopover open worker={worker()} onClose={vi.fn()} onSave={onSave} />);+ expect(+ (screen.getByPlaceholderText('orca.editWorker.labelPlaceholder') as HTMLInputElement).value,+ ).toBe('my-label');+ });++ it('closes through the header affordance', () => {+ const onClose = vi.fn();+ render(+ <EditWorkerPopover open worker={worker()} onClose={onClose} onSave={vi.fn(async () => true)} />,+ );++ fireEvent.click(screen.getByRole('button', { name: 'orca.editWorker.closeAria' }));+ expect(onClose).toHaveBeenCalledTimes(1);+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsxindex d1f4bb02b1..7fdb29d20e 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx@@ -94,6 +94,10 @@ vi.mock('../hooks/useOrcaWorkerSelection', () => ({workerSessionId: null,createOpen: false,setCreateOpen: mocks.setCreateOpen,+ editWorker: null,+ handleOpenEditWorker: vi.fn(),+ handleCloseEditWorker: vi.fn(),+ handleUpdateWorker: vi.fn(),handleCreateWorker: vi.fn(),handleSwitchFocus: vi.fn(),handleArchiveWorker: vi.fn(),@@ -193,11 +197,13 @@ describe('OrcaWorkerPanel settings navigation wiring', () => {it('wires settings navigation for local leads', () => {render(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} viewVisible />);expect(mocks.toolbarProps.onOpenSettings).toBeTypeOf('function');+ expect(mocks.toolbarProps.onEditWorker).toBeTypeOf('function');});it('fails closed for unresolved device ownership', () => {render(<OrcaWorkerPanel leadSessionId="lead-1" viewVisible />);expect(mocks.toolbarProps.onOpenSettings).toBeUndefined();+ expect(mocks.toolbarProps.onEditWorker).toBeUndefined();});});diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/RolePillDropdown.settings.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/RolePillDropdown.settings.test.tsxindex 926e868752..7e871af36b 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/RolePillDropdown.settings.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/RolePillDropdown.settings.test.tsx@@ -127,4 +127,26 @@ describe('RolePillDropdown collaboration settings entry', () => {fireEvent.click(button);expect(onOpenCreate).not.toHaveBeenCalled();});++ it('exposes the worker edit affordance only when the entry is supported', () => {+ const current = worker();+ const onEditWorker = vi.fn();+ const props = {+ worker: current,+ workers: [current],+ selectedWorkerId: current.workerId,+ activeWorkerCount: 1,+ onSwitchFocus: vi.fn(),+ onArchiveWorker: vi.fn(),+ };+ const { rerender } = render(<RolePillDropdown {...props} onEditWorker={onEditWorker} />);++ fireEvent.click(screen.getByRole('button', { name: /developer/ }));+ fireEvent.click(screen.getByRole('button', { name: 'orca.rolePill.editWorkerAria' }));+ expect(onEditWorker).toHaveBeenCalledWith('worker-a');++ rerender(<RolePillDropdown {...props} />);+ fireEvent.click(screen.getByRole('button', { name: /developer/ }));+ expect(screen.queryByRole('button', { name: 'orca.rolePill.editWorkerAria' })).toBeNull();+ });});diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.tsindex 7910fbc11d..107805e56a 100644--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts@@ -11,6 +11,7 @@ import {type ConversationSearchJump,} from '../../../../shared/conversationSearchJump';import type { CreateWorkerForm } from '../CreateWorkerPopover';+import type { EditWorkerForm } from '../EditWorkerPopover';import {executionDeviceErrorMessage,getCollaborationStartErrorMessage,@@ -61,6 +62,7 @@ export function useOrcaWorkerSelection({refreshCreationState,} = useWorkers(leadSessionId);const [createOpen, setCreateOpen] = useState(false);+ const [editWorkerId, setEditWorkerId] = useState<string | null>(null);const [searchJumpPinnedWorkerSessionId, setSearchJumpPinnedWorkerSessionId] = useState<string | null>(null);@@ -98,6 +100,7 @@ export function useOrcaWorkerSelection({setSearchJumpPinnedWorkerSessionId(null);setFocusWorkerPinnedSessionId(null);setPendingFocusWorkerSessionId(null);+ setEditWorkerId(null);}, [leadSessionId]);const searchJumpWorkerSessionId = useMemo(@@ -245,6 +248,10 @@ export function useOrcaWorkerSelection({]);const selectedWorkerId = selectedWorkerRecord?.workerId ?? null;const workerSessionId = selectedWorkerRecord?.sessionId ?? null;+ const editWorker = useMemo(+ () => (editWorkerId ? workers.find((w) => w.workerId === editWorkerId) ?? null : null),+ [editWorkerId, workers],+ );const clearSelectionHints = useCallback(() => {selectionIntentGenerationRef.current += 1;@@ -397,6 +404,44 @@ export function useOrcaWorkerSelection({[leadSessionId, refresh],);+ const handleOpenEditWorker = useCallback((workerId: string) => {+ setEditWorkerId(workerId);+ }, []);++ const handleCloseEditWorker = useCallback(() => {+ setEditWorkerId(null);+ }, []);++ const handleUpdateWorker = useCallback(+ async (form: EditWorkerForm): Promise<boolean> => {+ if (!editWorkerId) return false;+ const payload: { role: string; label?: string } = { role: form.role.trim() };+ const trimmedLabel = form.label.trim();+ if (trimmedLabel) payload.label = trimmedLabel;+ try {+ await orcaWorkflowsFor(leadSessionId).updateWorker({+ leadSessionId,+ workerId: editWorkerId,+ ...payload,+ });+ setEditWorkerId(null);+ await refresh();+ return true;+ } catch (err) {+ const ipcError = extractIpcError(err);+ if (ipcError?.code === 'DUPLICATE_LABEL') {+ toast.error(t('orca.editWorker.duplicateLabel', { label: payload.label ?? '' }));+ } else if (deviceId && ipcError?.code === 'DEVICE_LINK_CHANNEL_NOT_ALLOWED') {+ toast.error(t('newChat.collaboration.unsupportedRemoteHint'));+ } else {+ toast.error(t('orca.editWorker.saveFailed'));+ }+ return false;+ }+ },+ [deviceId, editWorkerId, leadSessionId, refresh, t],+ );+return {workers,focusedWorker,@@ -410,6 +455,10 @@ export function useOrcaWorkerSelection({workerSessionId,createOpen,setCreateOpen,+ editWorker,+ handleOpenEditWorker,+ handleCloseEditWorker,+ handleUpdateWorker,handleCreateWorker,handleSwitchFocus,handleArchiveWorker,diff --git a/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts b/apps/desktop/src/renderer/hooks/useAgentCapabilities.tsindex 71385bdffa..49ffe3138c 100644--- a/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts+++ b/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts@@ -120,6 +120,11 @@ export interface AgentCapabilities {* device-link 老被控端无此字段 → undefined,控制端必须阻止开启协同并提示升级。*/supportsOrcaWorkerPermissionMode?: boolean;+ /**+ * 被控端是否支持创建后修改 Worker 的角色名/标识(maker:worker:update)。+ * device-link 老被控端无此字段 → undefined,控制端对远程 Worker 隐藏编辑入口。+ */+ supportsOrcaWorkerUpdate?: boolean;/** 被控端支持把 UI initial_task 延后到 Lead 首条输入 accepted 后派发。 */supportsDeferredOrcaUiAssignment?: boolean;/**@@ -287,6 +292,7 @@ function parseAgentCapabilities(value: unknown): AgentCapabilities {!isOptionalBoolean(value.supportsSessionAgentSwitch) ||!isOptionalBoolean(value.supportsSessionAgentSwitchCas) ||!isOptionalBoolean(value.supportsOrcaWorkerPermissionMode) ||+ !isOptionalBoolean(value.supportsOrcaWorkerUpdate) ||!isOptionalBoolean(value.supportsDeferredOrcaUiAssignment) ||!isOptionalCapabilityStatus(value.writableDirs) ||!isOptionalCapabilityStatus(value.manualCompact)diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 92238be91a..8592b09a5b 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -13585,6 +13585,18 @@"dirUnavailable": "The folder on {{device}} is temporarily unavailable. Check the connection or network drive, then try again. The Worker wasn't created."}},+ "editWorker": {+ "title": "Edit worker",+ "submit": "Save",+ "closeAria": "Close edit worker dialog",+ "labelLabel": "Label",+ "labelHint": "The label uniquely identifies this worker inside the team. Use letters, numbers, hyphens and underscores only; after saving, the Lead and other references locate the worker by the new label.",+ "labelHintAria": "About worker label",+ "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."+ },"rolePill": {"unread": "Unread update","worker": "Worker",@@ -13593,6 +13605,7 @@"workerCountSummary_other": "{{totalCount}} workers · {{activeCount}} active","statusAria": "status {{status}}","archiveWorkerAria": "Archive worker {{name}}",+ "editWorkerAria": "Edit worker {{name}}","createWorker": "Create new worker","hardLimitHint": "Hard limit reached: {{count}}. Archive an existing worker to create another one.","hardLimitSettingsHint": "Hard limit reached: {{count}}. Click to adjust in collaboration settings.",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex bdf64eb03e..826f82d2a4 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -13552,6 +13552,18 @@"dirUnavailable": "{{device}} のフォルダーは一時的に使用できません。接続やネットワークドライブを確認して再試行してください。Worker は作成されていません。"}},+ "editWorker": {+ "title": "Worker を編集",+ "submit": "保存",+ "closeAria": "Worker 編集ダイアログを閉じる",+ "labelLabel": "識別子",+ "labelHint": "識別子はチーム内でこの Worker を一意に識別するために使います。使用できるのは英数字・ハイフン・アンダースコアのみです。保存後、Lead などの参照は新しい識別子で Worker を特定します。",+ "labelHintAria": "識別子について",+ "labelPlaceholder": "Worker 識別子(空欄なら変更しません)",+ "labelInvalid": "識別子は英数字・ハイフン・アンダースコアのみ使用できます",+ "duplicateLabel": "識別子 {{label}} はこのチームの別の Worker が使用しています",+ "saveFailed": "保存に失敗しました。もう一度お試しください。"+ },"rolePill": {"unread": "未読の更新","worker": "Worker",@@ -13559,6 +13571,7 @@"workerCountSummary_other": "Worker 合計 {{totalCount}} · 稼働中 {{activeCount}}","statusAria": "ステータス {{status}}","archiveWorkerAria": "Worker {{name}} をアーカイブ",+ "editWorkerAria": "Worker {{name}} を編集","createWorker": "新しい Worker を作成","hardLimitHint": "ハード上限 {{count}} に達しました。既存 Worker をアーカイブすると追加できます。","hardLimitSettingsHint": "ハード上限 {{count}} に達しました。クリックして協同設定を調整します。",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 1c1ff213a6..23f199a070 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -13552,6 +13552,18 @@"dirUnavailable": "{{device}}의 폴더를 일시적으로 사용할 수 없습니다. 연결 또는 네트워크 드라이브를 확인한 후 다시 시도하세요. Worker가 생성되지 않았습니다."}},+ "editWorker": {+ "title": "Worker 편집",+ "submit": "저장",+ "closeAria": "Worker 편집 대화상자 닫기",+ "labelLabel": "식별자",+ "labelHint": "식별자는 팀 안에서 이 Worker를 고유하게 식별하는 데 씁니다. 영문, 숫자, 하이픈, 밑줄만 사용할 수 있습니다. 저장하면 Lead를 비롯한 참조가 새 식별자로 Worker를 찾습니다.",+ "labelHintAria": "식별자 안내",+ "labelPlaceholder": "Worker 식별자(비우면 변경하지 않음)",+ "labelInvalid": "식별자는 영문, 숫자, 하이픈, 밑줄만 사용할 수 있습니다",+ "duplicateLabel": "식별자 {{label}}은(는) 이 팀의 다른 Worker가 사용 중입니다",+ "saveFailed": "저장하지 못했습니다. 다시 시도해 주세요."+ },"rolePill": {"unread": "읽지 않은 업데이트","worker": "Worker",@@ -13559,6 +13571,7 @@"workerCountSummary_other": "전체 Worker {{totalCount}} · 활성 {{activeCount}}","statusAria": "상태 {{status}}","archiveWorkerAria": "Worker {{name}} 아카이브",+ "editWorkerAria": "Worker {{name}} 편집","createWorker": "새 Worker 만들기","hardLimitHint": "하드 제한 {{count}} 에 도달했습니다. 기존 Worker 를 아카이브하면 더 만들 수 있습니다.","hardLimitSettingsHint": "하드 제한 {{count}} 에 도달했습니다. 클릭하여 협업 설정을 조정합니다.",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 772af988cb..e480639bfc 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -13552,6 +13552,18 @@"dirUnavailable": "{{device}} 上的目录暂时无法访问。请检查连接或网络盘后重试。Worker 没有创建。"}},+ "editWorker": {+ "title": "编辑 Worker",+ "submit": "保存",+ "closeAria": "关闭编辑 Worker 弹窗",+ "labelLabel": "标识",+ "labelHint": "标识用于在团队内唯一识别这个 Worker,只能包含字母、数字、连字符和下划线;改动后 Lead 与各处引用按新标识定位。",+ "labelHintAria": "标识说明",+ "labelPlaceholder": "Worker 标识(留空表示不变)",+ "labelInvalid": "标识只能包含字母、数字、连字符和下划线",+ "duplicateLabel": "标识 {{label}} 已被本团队其他 Worker 使用",+ "saveFailed": "保存失败,请重试"+ },"rolePill": {"unread": "未读更新","worker": "Worker",@@ -13559,6 +13571,7 @@"workerCountSummary_other": "{{totalCount}} 个 Worker · {{activeCount}} 运行中","statusAria": "状态 {{status}}","archiveWorkerAria": "归档 Worker {{name}}",+ "editWorkerAria": "编辑 Worker {{name}}","createWorker": "创建新 Worker","hardLimitHint": "已达硬上限 {{count}} 个 · 归档现有 Worker 后可继续创建","hardLimitSettingsHint": "已达硬上限 {{count}} 个 · 点击前往协同设置调整",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 039e68b03f..6e2cf3e93c 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -13552,6 +13552,18 @@"dirUnavailable": "{{device}} 上的目錄暫時無法存取。請檢查連線或網路磁碟後重試。Worker 沒有建立。"}},+ "editWorker": {+ "title": "編輯 Worker",+ "submit": "儲存",+ "closeAria": "關閉編輯 Worker 彈窗",+ "labelLabel": "標識",+ "labelHint": "標識用於在團隊內唯一識別這個 Worker,只能包含字母、數字、連字號與底線;改動後 Lead 與各處引用會依新標識定位。",+ "labelHintAria": "標識說明",+ "labelPlaceholder": "Worker 標識(留空表示不變更)",+ "labelInvalid": "標識只能包含字母、數字、連字號與底線",+ "duplicateLabel": "標識 {{label}} 已被本團隊其他 Worker 使用",+ "saveFailed": "儲存失敗,請重試"+ },"rolePill": {"unread": "未讀更新","worker": "Worker",@@ -13559,6 +13571,7 @@"workerCountSummary_other": "{{totalCount}} 個 Worker · {{activeCount}} 執行中","statusAria": "狀態 {{status}}","archiveWorkerAria": "歸檔 Worker {{name}}",+ "editWorkerAria": "編輯 Worker {{name}}","createWorker": "建立新 Worker","hardLimitHint": "已達硬上限 {{count}} 個 · 歸檔現有 Worker 後可繼續建立","hardLimitSettingsHint": "已達硬上限 {{count}} 個 · 點擊前往協同設定調整",diff --git a/apps/desktop/src/renderer/lib/makerTransport.ts b/apps/desktop/src/renderer/lib/makerTransport.tsindex 9338d65b91..5a5d6c04ce 100644--- a/apps/desktop/src/renderer/lib/makerTransport.ts+++ b/apps/desktop/src/renderer/lib/makerTransport.ts@@ -289,10 +289,12 @@ export function agentCapabilitiesForDevice(): Promise<{supportsOrcaWorkerPermissionMode?: boolean;supportsDeferredOrcaUiAssignment?: boolean;+ supportsOrcaWorkerUpdate?: boolean;}> {return invokeRemote(deviceId, 'maker:get-capabilities', [agentKind]) as Promise<{supportsOrcaWorkerPermissionMode?: boolean;supportsDeferredOrcaUiAssignment?: boolean;+ supportsOrcaWorkerUpdate?: boolean;}>;}@@ -906,6 +908,8 @@ export interface RoutableOrcaWorkflows {switchFocus: FullOrca['switchFocus'];idleWorker: FullOrca['idleWorker'];archiveWorker: FullOrca['archiveWorker'];+ /** 修改 worker 的展示角色名与 team 内唯一标识。 */+ updateWorker: FullOrca['updateWorker'];endTeam: FullOrca['endTeam'];getCollaborationSettings: FullOrca['getCollaborationSettings'];listExecutionDevices: FullOrca['listExecutionDevices'];@@ -950,6 +954,12 @@ function remoteOrcaWorkflows(deviceId: string): RoutableOrcaWorkflows {invokeRemote(deviceId, 'maker:worker:archive', [{ leadSessionId, workerId },])) as FullOrca['archiveWorker'],+ updateWorker: ((input: {+ leadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }) => invokeRemote(deviceId, 'maker:worker:update', [input])) as FullOrca['updateWorker'],endTeam: t('maker:team:end') as FullOrca['endTeam'],getCollaborationSettings: t('maker:collaboration-settings:get',diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.tsindex 5017f5ad12..13bcb351fa 100644--- a/apps/desktop/src/renderer/vite-env.d.ts+++ b/apps/desktop/src/renderer/vite-env.d.ts@@ -5084,6 +5084,12 @@ interface ElectronAPI {expectedStatus?: 'done',) => Promise<unknown>;archiveWorker: (leadSessionId: string, workerId: string) => Promise<unknown>;+ updateWorker: (input: {+ leadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }) => Promise<unknown>;endTeam: (leadSessionId: string) => Promise<unknown>;getCollaborationSettings: () => Promise<unknown>;/** 可放 Worker 的同账号其他电脑(`{ devices: OrcaExecutionDeviceView[] }`)。 */diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.mdindex e816aa0a39..b9bde692d5 100644--- a/docs/dev-rules/orca-team-architecture.md+++ b/docs/dev-rules/orca-team-architecture.md@@ -36,7 +36,7 @@ Orca 是 Cindy Desktop 内的多 agent 协同能力:一个 **Lead session**当前已经实现的能力:-- 多 worker:同一个 active team 下可创建多个 worker,支持 role、label、focused worker 切换、soft/hard limit 与归档。+- 多 worker:同一个 active team 下可创建多个 worker,支持 role、label、focused worker 切换、soft/hard limit 与归档。创建后可经协同面板的编辑入口或 `update_worker` 修改 worker 的展示角色名 `role` 与 team 内唯一标识 `label`(只改身份元数据,不换 Agent/模型/权限,见「Worker 运行态」第 10 条)。- Split view:Lead 与 focused Worker 共用 `OrcaSplitView` pane 外壳,宽屏为左右 split,doc rail 为 Lead/Worker toggle。见 `apps/desktop/src/renderer/features/cc-agent/OrcaSplitView.tsx` 的 `OrcaSplitView`、`OrcaPaneShell`。- 本地 Claude Code、Codex 与 Pi 的普通 Lead 无论是项目还是对话都可开启协同,本地 Worker 也支持这三类 agent;SSH 远端会话的 Claude Code、Codex 与 Pi 均可作 Lead 或 Worker(远端 agent 经 SSH remote-forward 连接本机 MCP bridge:Codex 走 daemon config 注入,Claude Code 走 per-query HTTP 注入,Pi 走内部 MCP bridge URL 改写);device-link 被控端的项目与对话同样可作 Lead(Lead / Worker / team 的真身都在被控端,控制端只是镜像)。renderer 的入口判定收敛在 `apps/desktop/src/renderer/features/cc-agent/collabEntryPolicy.ts` 的 `resolveCollabEntryPolicy`,新建草稿(`NewMakerDraftRoute`)与会话视图(`CCAgentSessionView` 的 `allowCollabToggle`)共用同一份:普通 Lead 都显示入口,只排除不能嵌套协同的 Orca Worker 子会话。项目按项目级策略查询;Main 的 `resolveLocalCollabPolicyWorkingDir` 同时服务入口状态查询与最终授权,只有 workspace kind 为 dialogue 且 Main 确认目录位于 app 托管 dialogue root 时才只查用户级/全局级策略(即使 cwd 内出现 `.cindy/plugins.json`),显式绑定真实目录的对话仍按该目录的项目级策略查询,不能靠自报 `workspaceKind` 绕过项目禁用。- Codex Lead 使用全局注册的 `cindy_orca`,调用时通过 context 恢复身份并在 handler 内拒绝越权。远端 Codex 同样走 `params._meta.threadId` 路由——remote thread 与本地 thread 一样注册进 `CodexMcpThreadContextStore`(`packages/maker-core/src/agents/codex/index.ts` 的 `registerCodexMcpContext` 不再跳过 remoteHostId)。远端 cc 没有 threadId,身份走持久 bearer token + URL `?session=<id>` 路由(`codexHttpBridge.registerSessionCtx`),审批归属快照在 `remoteCcQueryFactory` 注入后按 `startParams.mcpServers` 最终清单定稿。@@ -51,7 +51,7 @@ Orca 是 Cindy Desktop 内的多 agent 协同能力:一个 **Lead session**- workflow_run / CC Workflow 编排还未纳入当前实现。- side_chat 尚未登记为 side activity 对象,也未挂进 pane;PR #107 只是 fork 数据动作。- device-link 协同的 Lead / Worker / team 全部在被控端进程内编排,控制端只按 session 来源经隧道路由(`makerTransport` 的 `makerApiFor` / `orcaWorkflowsFor` / `subscribeOrcaWorkerChanged`,channel 见 `packages/device-link/src/allowlist.ts` 的 Orca 段)。collab 开关同样查被控端(`maker:plugins:get-state` 经 `pluginEnableStateFor`):项目读取被控端项目级策略,对话读取被控端用户级/全局级策略。控制端本机状态不能代表被控端真相。老被控端没有该 channel 时回 `CHANNEL_NOT_ALLOWED`,控制端 fail-closed 置灰入口并提示设备版本过旧,而不是放行到 `enableOrca` 才撞错。-- 手机端是同一套 device-link 控制端:Lead / Worker 任务与普通任务一样可操作(发消息、处理确认、编辑队列、Fork / Rewind、任务设置),协同编排经 `apps/mobile/src/device-link/mobileMakerTransport.ts` 的 `orca` 组走与桌面控制端相同的 channel(开启 / 创建 / 确认完成 / 归档 / 结束、Worker 列表、协同设置只读);「焦点」只决定电脑端协同面板展开哪个 Worker,手机上既不展示也不提供切换。入口判定、超时回查与错误文案在 `apps/mobile/src/session/orcaTeam.ts`,会话页与新建任务页的状态在 `useSessionOrcaCollab.ts`。归档 Worker(协同面板长按与 Worker 自身菜单)乐观生效:点击当帧把 Worker 任务移出其物理 shard、从团队视图摘掉(归档自身同时立即回到 Lead),在途登记复用任务归档的 `sessionMetaWriteGuard` / `sessionPendingWrites`,在途期间推送、全量对账与单条 upsert 都不会把它带回;超时回查 Worker 已不在即按成功收口,否则回滚(插回同一 shard、恢复团队视图并 reseed)并提示。被控端 `archiveWorkerSession` 与普通归档一样只等 status 落库就回执,worktree 回收经 `scheduleWorktreeRecycleForStatusChange` 放后台。新建任务开启协同不走二段派单:createSession 后、首条消息入队前即时 `enable-orca`,Worker 任务按 `buildDraftWorkerInitialTask` 附带待发送的 Lead 输入作为上下文;失败时任务照单任务继续并在会话页提示。协同设置(Worker 上限、空闲释放)在手机上只读。「创建 Worker」的记忆规则与桌面 `workerCreationPrefs` 一致(上次的 Agent、每个 Agent 的模型 / 推理强度 / Fast、Worker 权限;初始任务不记;首次默认值共用 `@cindy/maker-shared/orca-team`),与桌面控制端一样存在发起创建的一端(`apps/mobile/src/session/orcaWorkerPrefs.ts`,按账号隔离),不读写被控端偏好;记住的模型不在该电脑可用列表时回落被控端默认。+- 手机端是同一套 device-link 控制端:Lead / Worker 任务与普通任务一样可操作(发消息、处理确认、编辑队列、Fork / Rewind、任务设置),协同编排经 `apps/mobile/src/device-link/mobileMakerTransport.ts` 的 `orca` 组走与桌面控制端相同的 channel(开启 / 创建 / 确认完成 / 归档 / 结束、Worker 列表、协同设置只读);「焦点」只决定电脑端协同面板展开哪个 Worker,手机上既不展示也不提供切换。入口判定、超时回查与错误文案在 `apps/mobile/src/session/orcaTeam.ts`,会话页与新建任务页的状态在 `useSessionOrcaCollab.ts`。归档 Worker(协同面板长按与 Worker 自身菜单)乐观生效:点击当帧把 Worker 任务移出其物理 shard、从团队视图摘掉(归档自身同时立即回到 Lead),在途登记复用任务归档的 `sessionMetaWriteGuard` / `sessionPendingWrites`,在途期间推送、全量对账与单条 upsert 都不会把它带回;超时回查 Worker 已不在即按成功收口,否则回滚(插回同一 shard、恢复团队视图并 reseed)并提示。被控端 `archiveWorkerSession` 与普通归档一样只等 status 落库就回执,worktree 回收经 `scheduleWorktreeRecycleForStatusChange` 放后台。新建任务开启协同不走二段派单:createSession 后、首条消息入队前即时 `enable-orca`,Worker 任务按 `buildDraftWorkerInitialTask` 附带待发送的 Lead 输入作为上下文;失败时任务照单任务继续并在会话页提示。协同设置(Worker 上限、空闲释放)在手机上只读;`maker:worker:update` 已在被控端 allowlist 与能力位(`supportsOrcaWorkerUpdate`)中,但手机端 UI 暂未提供改名入口(后续单独接入)。「创建 Worker」的记忆规则与桌面 `workerCreationPrefs` 一致(上次的 Agent、每个 Agent 的模型 / 推理强度 / Fast、Worker 权限;初始任务不记;首次默认值共用 `@cindy/maker-shared/orca-team`),与桌面控制端一样存在发起创建的一端(`apps/mobile/src/session/orcaWorkerPrefs.ts`,按账号隔离),不读写被控端偏好;记住的模型不在该电脑可用列表时回落被控端默认。- SSH 远端协同支持 Claude Code、Codex 与 Pi Lead / Worker;Worker 继承 Lead 的 `remoteHostId` 与远端工作目录,在同一台远端主机执行,启动前复用远端就绪检查。cc 远端经 `cc-remote-mcp.ts` 把 `cindy_orca` / `orca_worker_bridge` 以 http 形态追加进 `startParams.mcpServers`(persistent token + `?session=` 路由,白名单仅此两个 server)。远端 worker 手动 `send_to_lead` 依赖 daemon 侧 `orca_worker_bridge` 经同一 bridge 可达;auto-bridge 回报不依赖 worker 侧 MCP,天然可用。Claude Code / Codex 共享 userData 多实例连同一远端 host 时,只有先建立 SSH 转发的实例能持有该 host 的 MCP bridge 端口,其余实例按“远端无 MCP”降级(与历史行为一致)。远端会话的项目级 collab 开关不查本机 fs;`assertCollabProjectEnabled` 对 remote 只查用户级/全局级开关,远端项目级配置机制是 follow-up。Pi 的远端 Lead 沿用统一的 Lead 身份与 prompt 装配;内部 MCP(含 `cindy_orca`、@@ -104,7 +104,7 @@ PR #101 之后,Orca 的 main 侧业务由独立 service 承接,`register.ts`### MCP 与 IPC 控制面-`cindy_orca` 是独立 MCP server,直接顶层注册 20 个工具:17 个 team 控制工具 + 3 个只读诊断工具(后者从已下线的 `orca_bridge` 桥入,保裸名)。它与 renderer IPC 共用同一组 main 侧 service,因此 MCP 和 UI 操作必须有一致的权限、状态和回滚语义。+`cindy_orca` 是独立 MCP server,直接顶层注册 21 个工具:18 个 team 控制工具 + 3 个只读诊断工具(后者从已下线的 `orca_bridge` 桥入,保裸名)。它与 renderer IPC 共用同一组 main 侧 service,因此 MCP 和 UI 操作必须有一致的权限、状态和回滚语义。1. `start_team`2. `end_team`@@ -122,10 +122,11 @@ PR #101 之后,Orca 的 main 侧业务由独立 service 承接,`register.ts`14. `move_queued_message`(调整排队顺序)15. `idle_worker`16. `archive_worker`-17. `list_available_models`-18. `get_workspace_info`(只读诊断)-19. `worker_status`(只读诊断)-20. `read_worker`(只读诊断)+17. `update_worker`(改 worker 的展示角色名 `role` 与 team 内唯一标识 `label`;只改身份元数据,不换 Agent/模型/权限)+18. `list_available_models`+19. `get_workspace_info`(只读诊断)+20. `worker_status`(只读诊断)+21. `read_worker`(只读诊断)批量创建必须走一次 `create_workers` 调用,不能让 Lead 并行或连续发多个独立 `create_worker`。批量工具按输入顺序复用同一个 `OrcaLifecycleService.createWorker` 原语;首次收到 `WORKER_LIMIT_HARD_EXCEEDED` 或批次级 `HOST_NOT_READY` 后不再调用 host,剩余项稳定标为 `skipped`。返回值必须包含请求数、实际尝试数、成功数、失败数、跳过数、总未创建数、数量闸快照、代码确定生成的 `user_report`,以及逐项真实 worker/session 或失败终态,供 Lead 如实向用户收口;`success_count + failure_count + skipped_count` 必须等于 `request_count`,其中 `not_created_count = failure_count + skipped_count`。单个 `create_worker` 继续作为兼容入口,并返回相同的结构化 hard-limit 快照。@@ -386,7 +387,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`。### 测试与回归清单远端回报身份在 enqueue 前保存于 `orca_workers.pending_remote_report`,恢复时重建 TeamService@@ -440,7 +442,7 @@ Mobile 的入口读取和残留表单提交都检查该身份,元数据补齐- Auto-resume × auto-bridge:pending/deferred 的 vendor 终态不得 bridge / 置 `error`;失败轮随后的 unclaimed `done` 同样不得收口(含用户接手 force-flush 之后、无 persist-id 的零输出尾巴);无配对 `done` 的旧 tail 不得吞掉后续更大 generation 的产品 `done`;surface/exhaust 恰好一次收口;成功续跑保持 `running` 且 pending 仍在;手动 stop 仍不 bridge。见 `autoResumeBookkeeping.test.ts` 的 `shouldSkipOrcaWorkerTerminal` 与 `interruptedContinuationContract.test.ts`。- 空闲 live 直发:`orcaInterAgentDispatcher` 在 `session.send()` 前必须先 `prepareUnhealthySession`,再重新 `getLiveSession`;prepare 关闭旧 handle 后不得继续向旧对象 send。并发直发必须串行化到同一把 per-session 锁。- Worker 创建权限偏好:覆盖无保存偏好时默认 `bypassPermissions`、已保存的 `auto` / `bypassPermissions` 继续优先、MCP 显式 `auto → bypassPermissions` 必须先经用户确认且取消/超时零副作用、复用 Team 时省略不重置/显式才更新、首个与后续 Worker 都读取共享创建偏好、已有 Worker 权限不反写、renderer localStorage 启动同步与 tool 写回,以及旧 device-link 被控端被阻止开启协同并提示升级。-- MCP 工具:`cindy_orca` 20 工具(17 team + 3 只读诊断)的 role gate、ctx 缺失、worker/main 误调用、soft/hard limit、duplicate label、budget model API mode gate;`create_workers` 另覆盖默认 hard limit、配置 hard=3、部分成功、连续失败与 hard-limit 后不再调用 host;诊断工具的纯只读语义(无 active team 时返回空 workspace、不建 team);排队消息控制 6 工具的归属校验(跨 lead 拒绝)、完整 consuming 投影、非 lead 条目拒绝(`NOT_LEAD_MESSAGE`)、自身队列非协同条目拒绝(`NOT_ORCA_MESSAGE`)、steering 拒绝(`MESSAGE_CONSUMING`)、撤回结清 accepted 暂存、合并的连续性、冲突零修改与移除回调结清,以及转插话的原因回执与排序落点;`send_to_worker` / `send_to_lead` 的 `delivery` 缺省不透传、显式插话与各类 fallback 原因;`interrupt_worker` 另覆盖队首预留、暂停态、graceful-stop 全部 outcome、auto-bridge 抑制和 done 互斥。+- MCP 工具:`cindy_orca` 21 工具(18 team + 3 只读诊断)的 role gate、ctx 缺失、worker/main 误调用、soft/hard limit、duplicate label、budget model API mode gate;`create_workers` 另覆盖默认 hard limit、配置 hard=3、部分成功、连续失败与 hard-limit 后不再调用 host;`update_worker` 覆盖归属校验(跨 lead 拒绝)、role/label 归一、idempotent 空操作、duplicate label 与生成标题同步;诊断工具的纯只读语义(无 active team 时返回空 workspace、不建 team);排队消息控制 6 工具的归属校验(跨 lead 拒绝)、完整 consuming 投影、非 lead 条目拒绝(`NOT_LEAD_MESSAGE`)、自身队列非协同条目拒绝(`NOT_ORCA_MESSAGE`)、steering 拒绝(`MESSAGE_CONSUMING`)、撤回结清 accepted 暂存、合并的连续性、冲突零修改与移除回调结清,以及转插话的原因回执与排序落点;`send_to_worker` / `send_to_lead` 的 `delivery` 缺省不透传、显式插话与各类 fallback 原因;`interrupt_worker` 另覆盖队首预留、暂停态、graceful-stop 全部 outcome、auto-bridge 抑制和 done 互斥。- Codex MCP context:`CodexMcpThreadContextStore` 覆盖按 threadId 查 context、unknown / missing threadId fail-closed、unregister 后清理、`vendorOptions` 引用保持;`codexHttpBridge` 覆盖从 JSON-RPC `params._meta.threadId` 注入真实 session context。- Host 归属校验:`send_to_worker`、`interrupt_worker`、队列控制、`idle_worker`、`archive_worker` 经共享 `resolveWorkerRef`(同时接受 worker_id / session_id 两种 id)必须以 caller 自身 Lead 身份校验,拒绝跨 workflow worker id 与 ctx 缺失;即使模型传错 id 或换用另一种 id,也不能越权操作。- UI route:Orca worker 不出现在 sidebar,Lead 自动进 split route,worker deep link 解析到 Lead split route;已有测试守住“不用 fork parentSessionId 或标题推断 Orca mapping”,见 `apps/desktop/src/renderer/__tests__/orcaWorkflowRoute.test.ts` 的 `does not use fork parentSessionId or title-linked worker lookup for Orca mapping`。diff --git a/packages/device-link/src/__tests__/allowlist.test.ts b/packages/device-link/src/__tests__/allowlist.test.tsindex 1fbe5182f3..a3dd7541a2 100644--- a/packages/device-link/src/__tests__/allowlist.test.ts+++ b/packages/device-link/src/__tests__/allowlist.test.ts@@ -118,6 +118,7 @@ describe('REMOTE_INVOKE_ALLOWLIST', () => {'maker:schedule:get-runtime-state','maker:worker:create','maker:worker:dispatch-ui-assignment',+ 'maker:worker:update','maker:session:enable-orca','maker:rewind:commit','maker:fork',diff --git a/packages/device-link/src/allowlist.ts b/packages/device-link/src/allowlist.tsindex fe90043e90..3a80df8379 100644--- a/packages/device-link/src/allowlist.ts+++ b/packages/device-link/src/allowlist.ts@@ -405,6 +405,7 @@ const EXTENDED_INVOKE_CHANNELS: readonly string[] = ['maker:worker:idle','maker:worker:acknowledge-done','maker:worker:archive',+ 'maker:worker:update','maker:team:end','maker:session:enable-orca','maker:session:disable-orca',diff --git a/packages/lizi-mcps/src/__tests__/sessionContext.test.ts b/packages/lizi-mcps/src/__tests__/sessionContext.test.tsindex b6780e3926..b30162cac2 100644--- a/packages/lizi-mcps/src/__tests__/sessionContext.test.ts+++ b/packages/lizi-mcps/src/__tests__/sessionContext.test.ts@@ -110,6 +110,12 @@ function createOrcaDeps(overrides: Partial<OrcaMcpDeps> = {}): OrcaMcpDeps {idleWorker: vi.fn(async () => ({ ok: true as const, workerId: 'worker-1' })),endTeam: vi.fn(async () => ({ ok: true as const })),archiveWorker: vi.fn(async () => ({ ok: true as const, workerId: 'worker-1' })),+ updateWorker: vi.fn(async () => ({+ ok: true as const,+ workerId: 'worker-1',+ role: 'reviewer',+ label: 'reviewer-2',+ })),listAvailableModels: vi.fn(async () => ({ ok: true as const })),getWorkspaceInfo: vi.fn(async () => ({ok: true as const,@@ -146,7 +152,7 @@ function createOrcaDeps(overrides: Partial<OrcaMcpDeps> = {}): OrcaMcpDeps {}describe('dynamic lizi MCP session context', () => {- it('keeps the 20-tool Orca manifest order stable across server construction', () => {+ it('keeps the 21-tool Orca manifest order stable across server construction', () => {const context = {agentKind: 'codex' as const,workingDir: 'C:\\repo',@@ -156,8 +162,8 @@ describe('dynamic lizi MCP session context', () => {const first = Object.keys(tools(createOrcaMcpServer(createOrcaDeps(), context)));const second = Object.keys(tools(createOrcaMcpServer(createOrcaDeps(), context)));- // 17 个 team 工具 + 3 个只读诊断工具。- expect(first).toHaveLength(20);+ // 18 个 team 工具 + 3 个只读诊断工具。+ expect(first).toHaveLength(21);expect(first).toEqual(second);expect(first).toContain('create_worker');expect(first).toContain('create_workers');@@ -166,6 +172,7 @@ describe('dynamic lizi MCP session context', () => {expect(first).toContain('merge_queued_messages');expect(first).toContain('steer_queued_message');expect(first).toContain('move_queued_message');+ expect(first).toContain('update_worker');expect(first).not.toContain('list_worker_queue');});@@ -183,6 +190,38 @@ describe('dynamic lizi MCP session context', () => {expect(schemaKeys).not.toContain('interrupt');});+ it('routes update_worker through the caller lead context and rejects an empty patch', async () => {+ const deps = createOrcaDeps();+ const server = createOrcaMcpServer(deps, {+ agentKind: 'codex',+ workingDir: '/repo',+ sessionId: 'lead-1',+ vendorOptions: { orcaRole: 'lead' },+ });++ const result = await tools(server).update_worker.handler({+ worker_id: 'worker-1',+ role: 'reviewer',+ label: 'reviewer-2',+ });+ expect(parse(result as never)).toMatchObject({+ ok: true,+ worker_id: 'worker-1',+ role: 'reviewer',+ label: 'reviewer-2',+ });+ expect(deps.updateWorker).toHaveBeenCalledWith({+ callerLeadSessionId: 'lead-1',+ workerId: 'worker-1',+ role: 'reviewer',+ label: 'reviewer-2',+ });++ const empty = await tools(server).update_worker.handler({ worker_id: 'worker-1' });+ expect(parse(empty as never)).toMatchObject({ ok: false, errorCode: 'INVALID_PARAMS' });+ expect(deps.updateWorker).toHaveBeenCalledTimes(1);+ });+it('forwards explicit send_to_worker delivery and reports steered or fallback receipts', async () => {const sendToWorker = vi.fn<OrcaMcpDeps['sendToWorker']>().mockResolvedValueOnce({diff --git a/packages/lizi-mcps/src/orca/server.ts b/packages/lizi-mcps/src/orca/server.tsindex f405863383..660730b024 100644--- a/packages/lizi-mcps/src/orca/server.ts+++ b/packages/lizi-mcps/src/orca/server.ts@@ -3,12 +3,12 @@* ---------------------------------------------------------------------------* In-process MCP server (`cindy_orca`) 暴露多 worker 协同(Orca team)控制工具。*- * 暴露 17 个 team 工具(直接 server.tool() 注册到顶层,不走 list_tools/call_tool 入口):+ * 暴露 18 个 team 工具(直接 server.tool() 注册到顶层,不走 list_tools/call_tool 入口):* start_team / create_worker / create_workers / send_to_worker / interrupt_worker /* get_worker_queue_status / update_queued_message / cancel_queued_message /* merge_queued_messages / steer_queued_message / move_queued_message /* list_workers / switch_focus / idle_worker / end_team / archive_worker /- * list_available_models+ * update_worker / list_available_models** 为什么直接注册而非走入口:协同工具藏在 list_tools/call_tool 后面时, 模型在用户* 说"开协同 / 派 worker"时往往发现不了 start_team, 反而误抓直接可见的@@ -38,7 +38,7 @@ import {type XdtHelperToolCategory,type XdtHelperToolHandler,} from '../lizi_xdtHelperToolRegistry.js';-// 17 个 team 工具的注册函数留在 xdt-helper/ 目录(register 是 registry-agnostic,+// 18 个 team 工具的注册函数留在 xdt-helper/ 目录(register 是 registry-agnostic,// 物理搬迁收益低)。本 server 通过 DirectToolSink 把它们直接注册到 McpServer。import {registerStartTeamTool,@@ -56,6 +56,7 @@ import {registerIdleWorkerTool,registerEndTeamTool,registerArchiveWorkerTool,+ registerUpdateWorkerTool,registerListAvailableModelsTool,type ModelDescriptor,type OrcaMessageDelivery,@@ -72,7 +73,7 @@ import { errorPayload, okPayload } from '../xdt-helper/_payload.js';// ── Host deps ──────────────────────────────────────────────────────────────/**- * 协同(team)控制类工具的 host 回调集合。注入即注册 cindy_orca 的 17 个 team 工具+ * 协同(team)控制类工具的 host 回调集合。注入即注册 cindy_orca 的 18 个 team 工具* (per-session 闭包绑定 ctx)。** 回调返 Result 而非抛 Promise<T>: 让 host 能用 `HOST_NOT_READY` errorCode 表达@@ -257,6 +258,18 @@ export interface OrcaMcpDeps {archiveWorker: (params: { callerLeadSessionId: string; workerId: string }) => Promise<ControlResult<{ workerId: string }, 'WORKER_NOT_FOUND'>>;+ /** 修改已创建 worker 的角色名 / 标识。 */+ updateWorker: (params: {+ callerLeadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }) => Promise<+ ControlResult<+ { workerId: string; role: string; label: string | null },+ 'WORKER_NOT_FOUND' | 'INVALID_PARAMS' | 'DUPLICATE_LABEL'+ >+ >;/** 列出 agent 可用 model 清单。 */listAvailableModels: (params: { agent?: ControlWorkerAgent; callerSessionId?: string }) => Promise<ControlResult<{@@ -487,7 +500,7 @@ export function createOrcaMcpServer(version: '1.0.0',});- // 17 个 team 工具经 DirectToolSink 直接注册到顶层。handler 闭包绑定 ctx+ // 18 个 team 工具经 DirectToolSink 直接注册到顶层。handler 闭包绑定 ctx// (sessionId / vendorOptions), 调用时把请求路由回 host。const sink = new DirectToolSink(server);const getSessionContext = () => resolveLiziMcpSessionContext(ctx);@@ -560,6 +573,10 @@ export function createOrcaMcpServer(getSessionContext,archiveWorker: deps.archiveWorker,});+ registerUpdateWorkerTool(sink, {+ getSessionContext,+ updateWorker: deps.updateWorker,+ });registerListAvailableModelsTool(sink, {getSessionContext,listAvailableModels: deps.listAvailableModels,diff --git a/packages/lizi-mcps/src/xdt-helper/capabilities.ts b/packages/lizi-mcps/src/xdt-helper/capabilities.tsindex a31d3c8488..276d1f1fe0 100644--- a/packages/lizi-mcps/src/xdt-helper/capabilities.ts+++ b/packages/lizi-mcps/src/xdt-helper/capabilities.ts@@ -78,7 +78,7 @@ export const CAPABILITIES: readonly CapabilityEntry[] = ['【怎么开】用户表达"用 worker / 协同模式 / 独立 agent / 派一个 agent 帮我 X"等意图时, Lead 调 start_team 工具创建 team, 再调 create_worker 工具添加 worker。worker 创建后可通过 send_to_worker 派活, 通过 list_workers 查看所有 worker, 通过 switch_focus 切换 focused worker。','【怎么关】用户表达"够了 / 关掉 worker / 不要协同了"时, Lead 调 end_team 结束整个 team(归档所有 worker), 或调 archive_worker 归档单个 worker。Lead 自身保留可继续单 session 对话。','【硬边界】Worker session 不能再开 team(嵌套禁止, 返 WORKER_CANNOT_NEST);Claude Code / Codex / Pi 本地项目或对话 session 都可以作为 Lead 调 start_team,也都可以作为 Worker;SSH 远程 Lead 与 Worker 当前只支持 Claude Code / Codex;Worker 不能结束自己所在 team(返 WORKER_CANNOT_DISABLE);要求 Lead session 有 workingDir。',- '【工具归属】17 个 team 工具(start_team / create_worker / create_workers / send_to_worker / interrupt_worker / get_worker_queue_status / update_queued_message / cancel_queued_message / merge_queued_messages / steer_queued_message / move_queued_message / list_workers / switch_focus / idle_worker / end_team / archive_worker / list_available_models)在独立的 cindy_orca server 直接顶层注册, 对应"协同模式"可关插件(Settings → Connections → Built-in Tools)。通用 session handoff 原语 send_to_session 在 essential 的 cindy_helper 的 handoff 类目下(走 call_tool, 常开, 供 skill 路由用)。',+ '【工具归属】18 个 team 工具(start_team / create_worker / create_workers / send_to_worker / interrupt_worker / get_worker_queue_status / update_queued_message / cancel_queued_message / merge_queued_messages / steer_queued_message / move_queued_message / list_workers / switch_focus / idle_worker / end_team / archive_worker / update_worker / list_available_models)在独立的 cindy_orca server 直接顶层注册, 对应"协同模式"可关插件(Settings → Connections → Built-in Tools)。通用 session handoff 原语 send_to_session 在 essential 的 cindy_helper 的 handoff 类目下(走 call_tool, 常开, 供 skill 路由用)。',`【与 Claude Code Task tool / Codex subagent 的区别】Task / subagent 是 agent 框架内的子任务派发机制(子 agent 跑在同一 SDK 进程内、有限工具集、生命周期短、对话历史归属父 turn);${BRAND_NAME} 协同模式是业务层的 session 级编排(Lead/Worker 都是完整独立的 ${BRAND_NAME} session, 独立进程、UI 栏位、完整工具、独立对话历史, 长生命周期, 通过 main 进程 IPC + MCP bridge 通信)。两者不互斥, Worker 内部仍可用 Task/subagent 派子任务。`,'【手动入口】ChatInput「+」菜单里的「协同模式」项,开启态用橙色 UsersRound 图标与文字标识;用户也能在这里手动开/关,与本工具走同一份业务代码。',].join(' '),diff --git a/packages/lizi-mcps/src/xdt-helper/index.ts b/packages/lizi-mcps/src/xdt-helper/index.tsindex fe2bab1656..dc97bab0aa 100644--- a/packages/lizi-mcps/src/xdt-helper/index.ts+++ b/packages/lizi-mcps/src/xdt-helper/index.ts@@ -105,6 +105,10 @@ export {registerArchiveWorkerTool,type ArchiveWorkerDeps,} from './archive_worker.js';+export {+ registerUpdateWorkerTool,+ type UpdateWorkerDeps,+} from './update_worker.js';export {registerListAvailableModelsTool,type ListAvailableModelsDeps,diff --git a/packages/lizi-mcps/src/xdt-helper/update_worker.ts b/packages/lizi-mcps/src/xdt-helper/update_worker.tsnew file mode 100644index 0000000000..8886c38f81--- /dev/null+++ b/packages/lizi-mcps/src/xdt-helper/update_worker.ts@@ -0,0 +1,90 @@+/**+ * xdt-helper/update_worker.ts —— 修改已创建 worker 的展示角色名(role)与 team 内唯一标识(label)。+ * 只改身份元数据,不改 Agent/模型/权限,也不重启会话。+ */++import { BRAND_NAME } from '@cindy/maker-shared/branding';+import { z } from 'zod';++import type { XdtHelperToolRegistry } from '../lizi_xdtHelperToolRegistry.js';+import type { ControlResult } from '../lizi_xdtHelperMcpServer.js';+import { okPayload, errorPayload } from './_payload.js';++export interface UpdateWorkerDeps {+ getSessionContext?: () => {+ sessionId?: string;+ };+ updateWorker: (params: {+ callerLeadSessionId: string;+ workerId: string;+ role?: string;+ label?: string;+ }) => Promise<+ ControlResult<+ { workerId: string; role: string; label: string | null },+ 'WORKER_NOT_FOUND' | 'INVALID_PARAMS' | 'DUPLICATE_LABEL'+ >+ >;+}++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。';++export function registerUpdateWorkerTool(+ registry: XdtHelperToolRegistry,+ deps: UpdateWorkerDeps,+): void {+ registry.register({+ name: 'update_worker',+ category: 'control',+ description: DESCRIPTION,+ inputShape: {+ worker_id: z+ .string()+ .min(1)+ .describe('目标 worker 的 worker_id 或 session_id 任一'),+ role: z+ .string()+ .min(1)+ .max(32)+ .optional()+ .describe('新的展示角色名(1-32 字符);省略表示不改'),+ label: z+ .string()+ .min(1)+ .max(32)+ .optional()+ .describe('新的 team 内唯一标识(slug: 字母/数字/连字符/下划线, 1-32 字符);省略表示不改'),+ },+ handler: async ({ worker_id, role, label }) => {+ const ctx = deps.getSessionContext?.();+ if (!ctx?.sessionId) {+ return errorPayload('LEAD_NOT_SUPPORTED', '当前 session 类型不支持作为 Lead, 已拒绝 worker 控制操作。');+ }+ if (role === undefined && label === undefined) {+ return errorPayload('INVALID_PARAMS', 'role or label required');+ }+ const result = await deps.updateWorker({+ callerLeadSessionId: ctx.sessionId,+ workerId: worker_id,+ ...(role !== undefined ? { role } : {}),+ ...(label !== undefined ? { label } : {}),+ });+ if (!result.ok) {+ if (result.errorCode === 'HOST_NOT_READY') {+ return errorPayload('HOST_NOT_READY', `${BRAND_NAME} 主进程协同服务尚未就绪。`);+ }+ return errorPayload(result.errorCode, result.message);+ }+ return okPayload({+ worker_id: result.workerId,+ role: result.role,+ label: result.label,+ instruction: 'Worker identity updated.',+ });+ },+ });+}diff --git a/packages/maker-shared/src/__tests__/orcaTeam.test.ts b/packages/maker-shared/src/__tests__/orcaTeam.test.tsindex 02780d9fd0..d611a75b76 100644--- a/packages/maker-shared/src/__tests__/orcaTeam.test.ts+++ b/packages/maker-shared/src/__tests__/orcaTeam.test.ts@@ -3,6 +3,9 @@ import {DEFAULT_ORCA_COLLABORATION_SETTINGS,buildDraftWorkerInitialTask,createWorkerLabel,+ normalizeOrcaWorkerLabel,+ normalizeOrcaWorkerRole,+ orcaWorkerSessionTitle,orcaWorkerSlotState,parseOrcaCollaborationSettings,parseOrcaTeamWorkers,@@ -24,6 +27,29 @@ describe('orca team shared helpers', () => {expect(shouldShowWorkerLabel('developer', 'developer')).toBe(false);});+ it('normalizes worker labels and roles with the shared create/rename contract', () => {+ expect(normalizeOrcaWorkerLabel(' Backend-2 ')).toEqual({ ok: true, value: 'backend-2' });+ expect(normalizeOrcaWorkerLabel('')).toEqual({ ok: false, message: 'label required' });+ expect(normalizeOrcaWorkerLabel('a'.repeat(33))).toEqual({+ ok: false,+ message: 'label must be 1-32 chars',+ });+ expect(normalizeOrcaWorkerLabel('前端')).toEqual({+ ok: false,+ message: 'label may only contain letters, numbers, hyphens and underscores',+ });+ expect(normalizeOrcaWorkerRole(' Reviewer ')).toEqual({ ok: true, value: 'Reviewer' });+ expect(normalizeOrcaWorkerRole(' ')).toEqual({ ok: false, message: 'role required' });+ expect(normalizeOrcaWorkerRole('r'.repeat(33))).toEqual({+ ok: false,+ message: 'role must be 1-32 chars',+ });+ expect(orcaWorkerSessionTitle('reviewer', 'reviewer-2')).toBe('Worker · reviewer · reviewer-2');+ // role 与 label(忽略大小写)相同时只写一次,与创建侧 orcaWorkerTitle 同一形态。+ expect(orcaWorkerSessionTitle('reader', 'reader')).toBe('Worker · reader');+ expect(orcaWorkerSessionTitle('reader', 'READER')).toBe('Worker · reader');+ });+it('keeps pending Lead input as context only when a Worker task exists', () => {expect(buildDraftWorkerInitialTask(undefined, 'lead text')).toBeUndefined();expect(buildDraftWorkerInitialTask(' review ', undefined)).toBe('review');diff --git a/packages/maker-shared/src/agentCapabilities.ts b/packages/maker-shared/src/agentCapabilities.tsindex 3fd7a1510f..bb0ac4c67c 100644--- a/packages/maker-shared/src/agentCapabilities.ts+++ b/packages/maker-shared/src/agentCapabilities.ts@@ -29,6 +29,8 @@ export interface MobileAgentCapabilities {supportsSessionAgentSwitch?: boolean;/** host 是否支持创建 Orca Worker 时显式选择 Worker 权限;旧 host 缺省 false(不得开启协同)。 */supportsOrcaWorkerPermissionMode?: boolean;+ /** host 是否支持创建后修改 Orca Worker 的角色名/标识(update_worker);旧 host 缺省 false。 */+ supportsOrcaWorkerUpdate?: boolean;/** host 是否在 set-model 内执行强制模型窗口保护;旧 host 缺省 false。 */supportsModelWindowSwitchGuard?: boolean;}@@ -162,6 +164,7 @@ export function normalizeMobileAgentCapabilities(value: unknown): MobileAgentCapsupportsSessionAgentSwitch: value.supportsSessionAgentSwitch === true,supportsModelWindowSwitchGuard: value.supportsModelWindowSwitchGuard === true,supportsOrcaWorkerPermissionMode: value.supportsOrcaWorkerPermissionMode === true,+ supportsOrcaWorkerUpdate: value.supportsOrcaWorkerUpdate === true,};}diff --git a/packages/maker-shared/src/orcaTeam.ts b/packages/maker-shared/src/orcaTeam.tsindex 6d6f669cd1..9db25d16ee 100644--- a/packages/maker-shared/src/orcaTeam.ts+++ b/packages/maker-shared/src/orcaTeam.ts@@ -11,6 +11,11 @@ export const ORCA_PREDEFINED_WORKER_ROLES = ['developer', 'designer', 'reviewer'/** 自定义角色名的长度上限(被控端 `maker:worker:create` 同口径校验)。 */export const ORCA_WORKER_ROLE_MAX_LENGTH = 32;+/** Worker label 的长度上限(被控端 `maker:worker:create` / `maker:worker:update` 同口径校验)。 */+export const ORCA_WORKER_LABEL_MAX_LENGTH = 32;++const ORCA_WORKER_LABEL_PATTERN = /^[a-z0-9_-]+$/i;+export type OrcaWorkerAgentKind = 'claude-code' | 'codex' | 'pi';export type OrcaWorkerPermissionMode = 'auto' | 'bypassPermissions';export type OrcaWorkerStatus = 'idle' | 'running' | 'done' | 'error';@@ -28,6 +33,46 @@ export const DEFAULT_ORCA_WORKER_MODELS: Readonly<Record<OrcaWorkerAgentKind, stpi: 'claude-sonnet-4-6',};+/**+ * 归一/校验 Worker label(创建与改名共用同一组 slug 约束)。+ * label 是 switch_focus 的稳定定位键,团队内唯一性由被控端负责,这里只做形态校验。+ */+export function normalizeOrcaWorkerLabel(+ value: string,+): { ok: true; value: string } | { ok: false; message: string } {+ const label = value.trim();+ if (!label) return { ok: false, message: 'label required' };+ if (label.length > ORCA_WORKER_LABEL_MAX_LENGTH) {+ return { ok: false, message: 'label must be 1-32 chars' };+ }+ if (!ORCA_WORKER_LABEL_PATTERN.test(label)) {+ return { ok: false, message: 'label may only contain letters, numbers, hyphens and underscores' };+ }+ return { ok: true, value: label.toLowerCase() };+}++/** 归一/校验 Worker 展示角色名(创建与改名共用):trim 后 1-32 字符。 */+export function normalizeOrcaWorkerRole(+ value: string,+): { ok: true; value: string } | { ok: false; message: string } {+ const role = value.trim();+ if (!role) return { ok: false, message: 'role required' };+ if (role.length > ORCA_WORKER_ROLE_MAX_LENGTH) {+ return { ok: false, message: 'role must be 1-32 chars' };+ }+ return { ok: true, value: role };+}++/**+ * Worker session 的生成标题。创建与改名共用同一形态;改名只在标题仍是这个形态时同步改写,不覆盖用户自定义标题。+ * role 与 label(忽略大小写/首尾空白)相同时只写一次(「Worker · reader」)。+ */+export function orcaWorkerSessionTitle(role: string, label: string): string {+ return role.trim().toLowerCase() === label.trim().toLowerCase()+ ? `Worker · ${role}`+ : `Worker · ${role} · ${label}`;+}+/*** 按角色派生 Worker label(被控端要求 /^[a-z0-9_-]+$/i、≤32、团队内唯一)。* 重名时追加 `-2`、`-3`…;极端情况下用时间戳后缀兜底。diff --git a/packages/orca-workflow/src/__tests__/orca-bridge-prompt.test.ts b/packages/orca-workflow/src/__tests__/orca-bridge-prompt.test.tsindex 5831fbd325..1d1d29db96 100644--- a/packages/orca-workflow/src/__tests__/orca-bridge-prompt.test.ts+++ b/packages/orca-workflow/src/__tests__/orca-bridge-prompt.test.ts@@ -10,7 +10,7 @@ describe('renderOrcaLeadSystemPrompt', () => {const channelDisclosureRule ='label every delegated task with its actual execution channel: Orca Worker or native subagent.';const toolSurfaceRule =- 'Tools: get_workspace_info, create_worker, create_workers, send_to_worker, interrupt_worker, get_worker_queue_status, update_queued_message, cancel_queued_message, merge_queued_messages.';+ 'Tools: get_workspace_info, create_worker, create_workers, send_to_worker, interrupt_worker, get_worker_queue_status, update_queued_message, cancel_queued_message, merge_queued_messages, update_worker.';const explicitCreationBoundary ='Use create_worker only when the user explicitly asks to open one new worker, and use create_workers only when the user explicitly asks to open multiple new workers.';const missingWorkerBoundary =diff --git a/packages/orca-workflow/src/orca-bridge-prompt.ts b/packages/orca-workflow/src/orca-bridge-prompt.tsindex 2231e1774d..5193b7ca56 100644--- a/packages/orca-workflow/src/orca-bridge-prompt.ts+++ b/packages/orca-workflow/src/orca-bridge-prompt.ts@@ -29,7 +29,7 @@ export function renderOrcaLeadSystemPrompt(initialWorker?: OrcaInitialWorkerRef'An Orca Worker is NEVER a substitute for a subagent. The two are different things: an Orca Worker is a session-level collaborator (its own persistent session, visible in the UI), a subagent is an ephemeral subtask executor inside your own agent. Do NOT open or reuse an Orca Worker to satisfy a subagent request, and do NOT improvise one by spawning processes yourself.','Orca Workers are not native subagents. Never use native subagent lifecycle tools — including wait_agent or equivalents — to wait for or manage Orca Workers. Orca reports arrive automatically as new messages. Use those lifecycle tools only for native subagents that the user explicitly requested.','',- 'Tools: get_workspace_info, create_worker, create_workers, send_to_worker, interrupt_worker, get_worker_queue_status, update_queued_message, cancel_queued_message, merge_queued_messages.',+ 'Tools: get_workspace_info, create_worker, create_workers, send_to_worker, interrupt_worker, get_worker_queue_status, update_queued_message, cancel_queued_message, merge_queued_messages, update_worker.','(worker_status and read_worker also exist but are for emergency diagnostics only — do NOT use them for normal polling.)','','Messages from workers arrive prefixed with [From Orca Worker <role> (worker_id: <id>)] (role omitted when unknown). Treat them as worker reports or questions, not user messages.',