diff --git a/src/main/droid/hook-service.test.ts b/src/main/droid/hook-service.test.ts new file mode 100644 index 00000000000..18446fa8790 --- /dev/null +++ b/src/main/droid/hook-service.test.ts @@ -0,0 +1,49 @@ +import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import type * as NodeOs from 'node:os' +import { dirname, join } from 'node:path' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' + +const sandbox = vi.hoisted(() => ({ home: '' })) +vi.mock('node:os', async (importOriginal) => ({ + ...(await importOriginal()), + homedir: () => sandbox.home +})) + +import { DroidHookService } from './hook-service' + +describe('DroidHookService', () => { + beforeEach(() => { + sandbox.home = mkdtempSync(join(tmpdir(), 'orca-droid-home-')) + }) + + afterEach(() => { + rmSync(sandbox.home, { recursive: true, force: true }) + }) + + it('drops a previously managed PermissionRequest hook but keeps the user hook on it', () => { + const configPath = join(sandbox.home, '.factory', 'settings.json') + const userDefinition = { + matcher: 'Edit', + hooks: [{ type: 'command', command: '/usr/local/bin/my-approval.sh' }] + } + const managedCommand = join(sandbox.home, '.orca', 'agent-hooks', 'droid-hook.sh') + mkdirSync(dirname(configPath), { recursive: true }) + writeFileSync( + configPath, + JSON.stringify({ + hooks: { + PermissionRequest: [ + { matcher: '*', hooks: [{ type: 'command', command: managedCommand }] }, + userDefinition + ] + } + }) + ) + + expect(new DroidHookService().install().state).toBe('installed') + + const installed = JSON.parse(readFileSync(configPath, 'utf8')) + expect(installed.hooks.PermissionRequest).toEqual([userDefinition]) + }) +}) diff --git a/src/main/droid/hook-service.ts b/src/main/droid/hook-service.ts index 19698a6f15e..535329e42e8 100644 --- a/src/main/droid/hook-service.ts +++ b/src/main/droid/hook-service.ts @@ -49,11 +49,7 @@ const DROID_EVENTS = [ eventName: 'PostToolUse', definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] } }, - // PermissionRequest covers Edit approvals that have no PreToolUse riskLevel. - { - eventName: 'PermissionRequest', - definition: { matcher: '*', hooks: [{ type: 'command', command: '' }] } - }, + // Droid has no PermissionRequest hook event; approval waits come from PreToolUse and Notification. { eventName: 'Notification', definition: { hooks: [{ type: 'command', command: '' }] } } ] as const diff --git a/src/shared/agent-hook-listener/providers/droid-events.ts b/src/shared/agent-hook-listener/providers/droid-events.ts index 84bad1f4439..8a7de57105a 100644 --- a/src/shared/agent-hook-listener/providers/droid-events.ts +++ b/src/shared/agent-hook-listener/providers/droid-events.ts @@ -43,8 +43,6 @@ export function normalizeDroidEvent( stateName = 'working' } else if (eventName === 'Stop') { stateName = 'done' - } else if (eventName === 'PermissionRequest') { - stateName = 'waiting' } else if (eventName === 'Notification' && isDroidPermissionNotification(notificationMessage)) { stateName = 'waiting' } else if (eventName === 'Notification' && isDroidIdleNotification(notificationMessage)) { diff --git a/src/shared/agent-hook-listener/providers/droid-tool-fields.ts b/src/shared/agent-hook-listener/providers/droid-tool-fields.ts index eaf6df482dd..1f88f2da439 100644 --- a/src/shared/agent-hook-listener/providers/droid-tool-fields.ts +++ b/src/shared/agent-hook-listener/providers/droid-tool-fields.ts @@ -60,11 +60,7 @@ export function extractDroidToolFields( eventName: unknown, hookPayload: Record ): ToolSnapshot { - if ( - eventName === 'PreToolUse' || - eventName === 'PostToolUse' || - eventName === 'PermissionRequest' - ) { + if (eventName === 'PreToolUse' || eventName === 'PostToolUse') { const toolName = readString(hookPayload, 'tool_name') ?? readString(hookPayload, 'name') const toolInput = deriveToolInputPreview(toolName, hookPayload.tool_input) ??