Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/daemon/__tests__/request-dispatch-disclosure.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));

import { AppError } from '@agent-device/kernel/errors';
import { resolveCommandRecordingEffect } from '@agent-device/command-registry/registry';
import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
import type { DeviceRuntimeGateway, RuntimeFacts } from '@agent-device/contracts/platform-runtime';
import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
Expand All @@ -29,6 +30,8 @@ import {
import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
import { mkdtempForTestSync } from '../../__tests__/test-utils/tmp-dir.ts';
import type { DaemonRequest } from '../daemon-request.ts';
import { discloseRequestDispatch } from '../request-dispatch-disclosure.ts';
import { createRequestDispatchLedger } from '../request-dispatch-ledger.ts';
import { LeaseRegistry } from '../lease-registry.ts';
import type { SessionState } from '../session-state.ts';
import { clearAndroidObservationFixture } from './android-observation-fixture.ts';
Expand Down Expand Up @@ -355,3 +358,15 @@ for (const row of ROWS) {
});
});
}

test('a command without a declared recording effect rethrows its failure unnormalized', async () => {
const req: DaemonRequest = { token: 't', session: SESSION, command: 'devices', positionals: [] };
assert.equal(resolveCommandRecordingEffect(req), undefined);
const thrown = { reason: 'not an Error' };
await assert.rejects(
discloseRequestDispatch(req, createRequestDispatchLedger(), async () => {
throw thrown;
}),
(error: unknown) => error === thrown,
);
});
13 changes: 4 additions & 9 deletions src/daemon/request-dispatch-disclosure.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import {
asAppError,
detailsAfterDispatchedSteps,
discloseDispatch,
discloseDispatchAfterSteps,
discloseUnclassifiedDispatch,
type ErrorWireDetails,
} from '@agent-device/kernel/errors';
import { resolveCommandRecordingEffect } from '@agent-device/command-registry/registry';
Expand Down Expand Up @@ -35,13 +33,10 @@ export async function discloseRequestDispatch<Response extends DaemonResponse |
return { ...response, error: { ...response.error, details } };
} catch (error) {
const failure = asAppError(error);
if (ledger.dispatchedSteps > 0) {
discloseDispatchAfterSteps(failure, ledger.dispatchedSteps);
throw failure;
}
if (effect === undefined) throw error;
if (effect === 'observes-app') throw discloseDispatch(failure, 'no');
throw discloseUnclassifiedDispatch(failure, 'unknown');
const details = disclosedDetails(effect, failure.details, ledger);
if (details === failure.details) throw error;
failure.details = details;
throw failure;
}
}

Expand Down
Loading