Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): 校验新 worktree 最终目录与显式源引用
fmfsaisai301291e695af
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.tsindex 3f22c4c0d8..34efd19e89 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts@@ -3782,16 +3782,45 @@ describe('local Worker worktree ownership', () => {expect(deps.createWorkerWorktree).not.toHaveBeenCalled();});- it('rejects an unavailable Git target before reservation, worktree creation or bootstrap', async () => {+ it.each(['Repository has no commits', 'Worktree source_branch must reference an existing commit'])('rejects an unavailable Git target before reservation: %s', async message => {const {deps, service} = createDeps({createWorkerWorktree: vi.fn(), discardWorkerWorktree: vi.fn(),- resolveWorkerWorktreeSource: vi.fn(async () => {throw new Error('Repository has no commits');}),+ resolveWorkerWorktreeSource: vi.fn(async () => {throw new Error(message);}),});- await expect(service.createWorker({...request, worktree: {}})).resolves.toMatchObject({ok: false, errorCode: 'INVALID_PARAMS', message: 'Repository has no commits'});+ await expect(service.createWorker({...request, worktree: {}})).resolves.toMatchObject({ok: false, errorCode: 'INVALID_PARAMS', message});expect(deps.reserveWorkerCreation).not.toHaveBeenCalled();expect(deps.createWorkerWorktree).not.toHaveBeenCalled();expect(deps.bootstrapSession).not.toHaveBeenCalled();});+ // #6623 P1 (unit): source policy does not authorize a fallback checkout root.+ // Earlier coverage accepted every resolved directory and missed this bootstrap boundary.+ it.each([false, true])('revalidates a missing-subproject fallback before bootstrap (root allowed=%s)', async allowed => {+ const selected = path.resolve('repo/apps/web');+ const checkoutRoot = path.resolve('repo/.cindy-worktrees/worker');+ const {deps, service} = createDeps({+ createWorkerWorktree: vi.fn(async () => checkoutRoot),+ discardWorkerWorktree: vi.fn(async () => {}),+ resolveWorkerWorkingDir: vi.fn(async directory => {+ if (directory === checkoutRoot && !allowed) throw new Error('Collaboration disabled');+ return directory;+ }),+ });+ const result = await service.createWorker({...request, workingDir: selected});+ expect(deps.resolveWorkerWorkingDir).toHaveBeenNthCalledWith(2, checkoutRoot, expect.objectContaining({id: 'lead-1'}));+ if (allowed) {+ expect(result).toMatchObject({ok: true, workingDir: checkoutRoot});+ expect(deps.bootstrapSession).toHaveBeenCalledWith(expect.objectContaining({workingDir: checkoutRoot}));+ expect(deps.discardWorkerWorktree).not.toHaveBeenCalled();+ } else {+ expect(result).toMatchObject({ok: false, errorCode: 'INVALID_PARAMS',+ message: 'working_dir is unavailable or collaboration is disabled for that directory; no Worker was started'});+ expect(deps.bootstrapSession).not.toHaveBeenCalled();+ expect(deps.addOrUpdateWorker).not.toHaveBeenCalled();+ expect(deps.discardWorkerWorktree).toHaveBeenCalledWith(WORKER_SESSION_ID);+ }+ expect(deps.releaseWorkerCreationReservation).toHaveBeenCalledWith('worker-1');+ });+it('allows a dialogue Lead to explicitly target another local Git project', async () => {const {deps, service} = createDeps({createWorkerWorktree: vi.fn(async () => '/new/checkout'), discardWorkerWorktree: vi.fn()});const lead = await deps.getLeadSessionRow('lead-1');diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerProject.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerProject.test.tsindex bf294d06ce..1b90fbc2f4 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerProject.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerProject.test.ts@@ -540,14 +540,26 @@ describe('Worker worktree source resolution', () => {{headState: 'branch' as const, branch: 'feature', source: undefined, expected: 'feature'},{headState: 'detached' as const, branch: 'a'.repeat(40), source: undefined, expected: 'a'.repeat(40)},{headState: 'branch' as const, branch: 'main', source: 'release', expected: 'release'},+ {headState: 'unborn' as const, branch: null, source: 'main', expected: 'main'},])('resolves $headState with source $source', async ({headState, branch, source, expected}) => {+ if (source !== undefined) vi.mocked(gitExec).mockResolvedValueOnce({stdout: 'a'.repeat(40) + '\n', stderr: ''});await expect(resolveWorkerWorktreeSource('/repo', source, async () => ({...target, headState, branch}))).resolves.toBe(expected);+ if (source !== undefined) expect(gitExec).toHaveBeenLastCalledWith(+ ['rev-parse', '--verify', '--quiet', '--end-of-options', `${source}^{commit}`], '/repo', {timeoutMs: 5000});});it.each([{exists: false}, {baseRepo: null}, {headState: 'unborn' as const, branch: null}, {branch: null},])('rejects an unavailable target %j', async changes => {await expect(resolveWorkerWorktreeSource('/repo', undefined, async () => ({...target, ...changes}))).rejects.toThrow();});+ // #6623 P2 (unit): explicit refs need commit verification, not a born current HEAD.+ // The probe-only cases did not reject an absent ref before creating a worktree.+ it('rejects an explicit reference with no commit, including an empty repository', async () => {+ vi.mocked(gitExec).mockRejectedValueOnce(new Error('revision not found'));+ await expect(resolveWorkerWorktreeSource('/repo', 'missing', async () => ({+ ...target, headState: 'unborn', branch: null,+ }))).rejects.toThrow('source_branch must reference an existing commit');+ });it.each(['', ' ', '-bad', 'bad\nbranch', 'x'.repeat(1025)])('rejects malformed source before probing', async source => {const probe = vi.fn(async () => target);await expect(resolveWorkerWorktreeSource('/repo', source, probe)).rejects.toThrow('source_branch');diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.tsindex 6e22c27346..080b88961c 100644--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts@@ -1567,6 +1567,13 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): Oif (params.worktree) {createdWorktreeSessionId = workerSessionId;workingDir = await deps.createWorkerWorktree!(workerSessionId, workingDir, worktreeSource!);+ // Checkout may fall back from a missing subproject to its root. Authorize+ // the final directory before any runtime starts, for both UI and tool calls.+ try {+ workingDir = await deps.resolveWorkerWorkingDir(workingDir, lead);+ } catch {+ return { ok: false, errorCode: 'INVALID_PARAMS', message: 'working_dir is unavailable or collaboration is disabled for that directory; no Worker was started' };+ }ownedWorktree = deps.getWorkerWorktree!(workerSessionId);if (!ownedWorktree) throw new Error('Worker worktree ownership metadata is unavailable');await assertCurrent?.();diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerProject.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerProject.tsindex fcb21d22d2..544b35d098 100644--- a/apps/desktop/src/main/maker-ipc/orcaWorkerProject.ts+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerProject.ts@@ -258,10 +258,22 @@ export async function resolveWorkerWorktreeSource(const info = await probe(directory);if (!info.exists) throw new Error('Worker worktree directory does not exist');if (!info.baseRepo) throw new Error('Worker worktree requires a Git repository');+ if (sourceBranch !== undefined) {+ try {+ await gitExec(+ ['rev-parse', '--verify', '--quiet', '--end-of-options', `${sourceBranch}^{commit}`],+ directory,+ { timeoutMs: 5000 },+ );+ } catch {+ throw new Error('Worktree source_branch must reference an existing commit');+ }+ return sourceBranch;+ }if (info.headState === 'unborn' || !info.branch) {throw new Error('Worker worktree requires a repository with a commit');}- return sourceBranch ?? info.branch;+ return info.branch;}export function getWorkerOwnedWorktree(sessionId: string): WorkerOwnedWorktree | undefined {