Skip to content

Commit 320af90

Browse files
thymikeeclaude
andcommitted
refactor(test-kit): build the test app-log handle without importing capture-kit
Replaces the capture-kit subpath entry, which grew the declared export surface. Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
1 parent caf959d commit 320af90

11 files changed

Lines changed: 68 additions & 25 deletions

File tree

‎packages/capture-kit/package.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
"types": "./src/capture-admission/app-log-durable-resource.ts",
2323
"default": "./src/capture-admission/app-log-durable-resource.ts"
2424
},
25-
"./app-log-live-handle": {
26-
"types": "./src/app-log-live-handle.ts",
27-
"default": "./src/app-log-live-handle.ts"
28-
},
2925
"./app-log-files": {
3026
"types": "./src/capture-admission/app-log-files.ts",
3127
"default": "./src/capture-admission/app-log-files.ts"

‎packages/daemon-contracts/src/device-claim-reconciliation.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { createDeviceClaimReconciler } from './device-claim-reconciliation.ts';
2-
import { createAppLogLiveHandle } from '@agent-device/capture-kit/app-log-live-handle';
32
import { appLogResourceStore } from '@agent-device/capture-kit/app-log-durable-resource';
43
import fs from 'node:fs';
54
import path from 'node:path';
@@ -12,6 +11,7 @@ import {
1211
} from '@agent-device/contracts/platform-runtime';
1312
import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
1413
import {
14+
createTestAppLogLiveHandle,
1515
mkdtempForTestSync,
1616
unavailableDeploymentSnapshotAndShutdownOperationFacts,
1717
} from '@agent-device/test-kit';
@@ -42,7 +42,7 @@ test('reconciles the dead owner session resources through their exact runtime ow
4242
}),
4343
);
4444
const forceCleanup = vi.fn(async () => ({ status: 'cleaned' as const }));
45-
const handle = createAppLogLiveHandle({
45+
const handle = createTestAppLogLiveHandle({
4646
inspect: () => ({ backend: 'android', state: 'recovering', startedAt: 1 }),
4747
finish: async () => ({
4848
status: 'completed',

‎packages/daemon/src/__tests__/support/handlers/session-test-harness.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import type { DaemonResponse } from '@agent-device/kernel/contracts';
2-
import { createAppLogLiveHandle } from '@agent-device/capture-kit/app-log-live-handle';
32
import { isMacOs } from '@agent-device/kernel/device';
43
import { legacyDispatchCapture } from '../legacy-snapshot-capture-fixture.ts';
54
import { expect, vi, beforeEach } from 'vitest';
6-
import { mkdtempForTestSync } from '@agent-device/test-kit';
5+
import { createTestAppLogLiveHandle, mkdtempForTestSync } from '@agent-device/test-kit';
76
import type { AppLogLiveState } from '@agent-device/contracts/app-log-runtime';
87
import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
98
import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
@@ -202,7 +201,7 @@ export function makeTestAppLogResource(
202201
},
203202
): NonNullable<SessionState['appLog']> {
204203
const outputPath = options.outputPath ?? '/tmp/app.log';
205-
const handle = createAppLogLiveHandle({
204+
const handle = createTestAppLogLiveHandle({
206205
inspect: () => ({
207206
backend: options.backend,
208207
state: options.state ?? 'active',

‎packages/daemon/src/core/__tests__/request-runtime-binding-router.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import fs from 'node:fs';
2-
import { createAppLogLiveHandle } from '@agent-device/capture-kit/app-log-live-handle';
32
import { expect, test, vi } from 'vitest';
43
import { applicationLifecycleOperationFacts } from '@agent-device/contracts/application-lifecycle-runtime';
54
import {
@@ -10,6 +9,7 @@ import {
109
import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
1110
import { createAppLogStartResult, createDurableResourceEnvelope } from '@agent-device/capture-kit';
1211
import {
12+
createTestAppLogLiveHandle,
1313
unavailableDeploymentSnapshotAndShutdownOperationFacts,
1414
createTestHostEnvironment,
1515
} from '@agent-device/test-kit';
@@ -91,7 +91,7 @@ function request(positionals: string[]) {
9191
function makeGateway(disposeError?: Error) {
9292
const owner = localRuntimeOwner('android');
9393
const forceCleanup = vi.fn(async () => ({ status: 'cleaned' as const }));
94-
const handle = createAppLogLiveHandle({
94+
const handle = createTestAppLogLiveHandle({
9595
inspect: () => ({ backend: 'android', state: 'active', startedAt: 1 }),
9696
finish: async () => ({
9797
status: 'completed',

‎packages/daemon/src/resources/__tests__/app-log-resource-recovery.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { appLogResourceStore } from '@agent-device/capture-kit/app-log-durable-resource';
2-
import { createAppLogLiveHandle } from '@agent-device/capture-kit/app-log-live-handle';
32
import { recoverAppLogResourcesAfterDaemonLock } from '@agent-device/capture-kit/app-log-resource-recovery';
43
import fs from 'node:fs';
54
import path from 'node:path';
@@ -14,6 +13,7 @@ import {
1413
import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
1514
import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
1615
import {
16+
createTestAppLogLiveHandle,
1717
mkdtempForTestSync,
1818
unavailableDeploymentSnapshotAndShutdownOperationFacts,
1919
} from '@agent-device/test-kit';
@@ -395,7 +395,7 @@ function createHandle(
395395
status: 'cleaned',
396396
})),
397397
) {
398-
return createAppLogLiveHandle({
398+
return createTestAppLogLiveHandle({
399399
inspect: () => ({ backend: 'android', state: 'recovering', startedAt: 1 }),
400400
finish: async () => ({
401401
status: 'completed',

‎packages/daemon/src/resources/__tests__/app-log-session-resource.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { appLogResourceStore } from '@agent-device/capture-kit/app-log-durable-resource';
2-
import { createAppLogLiveHandle } from '@agent-device/capture-kit/app-log-live-handle';
32
import fs from 'node:fs';
43
import path from 'node:path';
54
import { expect, test, vi } from 'vitest';
@@ -11,7 +10,7 @@ import {
1110
createDurableResourceEnvelope,
1211
} from '@agent-device/capture-kit';
1312
import { PendingTransferGuard } from '@agent-device/contracts/async-lifecycle';
14-
import { mkdtempForTestSync } from '@agent-device/test-kit';
13+
import { createTestAppLogLiveHandle, mkdtempForTestSync } from '@agent-device/test-kit';
1514
import { AppError } from '@agent-device/kernel/errors';
1615
import type { DeviceInfo } from '@agent-device/kernel/device';
1716
import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
@@ -434,7 +433,7 @@ test.each(['rebuild', 'retire', 'replace-resource'] as const)(
434433
result: { backend: 'android' as const, outputPath: '/tmp/app.log', completedAt: 2 },
435434
};
436435
});
437-
const handle = createAppLogLiveHandle({
436+
const handle = createTestAppLogLiveHandle({
438437
inspect: () => ({ backend: 'android', state: 'active', startedAt: 1 }),
439438
finish,
440439
forceCleanup: async () => ({ status: 'cleaned' }),
@@ -511,7 +510,7 @@ function makeStartResult(
511510
envelopeDevice?: Parameters<typeof createDurableResourceEnvelope>[0]['device'],
512511
) {
513512
const forceCleanup = vi.fn(async () => cleanup);
514-
const handle = createAppLogLiveHandle({
513+
const handle = createTestAppLogLiveHandle({
515514
inspect: () => ({ backend: 'android', state: 'active', startedAt: 1 }),
516515
finish: async () => ({
517516
status: 'completed',

‎packages/daemon/src/server/__tests__/daemon-runtime-app-log.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { appLogResourceStore } from '@agent-device/capture-kit/app-log-durable-resource';
2-
import { createAppLogLiveHandle } from '@agent-device/capture-kit/app-log-live-handle';
32
import { recoverAppLogResourcesAfterDaemonLock } from '@agent-device/capture-kit/app-log-resource-recovery';
43
import { platformResourceCleanupFixture } from '../../__tests__/support/platform-resource-cleanup-fixture.ts';
54
import fs from 'node:fs';
@@ -8,7 +7,7 @@ import { expect, test, vi } from 'vitest';
87
import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
98
import type { ResourceDiagnostic } from '@agent-device/host-kit/diagnostics';
109
import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
11-
import { mkdtempForTestSync } from '@agent-device/test-kit';
10+
import { createTestAppLogLiveHandle, mkdtempForTestSync } from '@agent-device/test-kit';
1211
import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
1312
import {
1413
flushDaemonStartupDiagnostics,
@@ -114,7 +113,7 @@ test('daemon shutdown settles fenced app-log cleanup before finalization can rel
114113
await cleanupReleased;
115114
return { status: 'cleaned' as const };
116115
});
117-
const handle = createAppLogLiveHandle({
116+
const handle = createTestAppLogLiveHandle({
118117
inspect: () => ({ backend: 'android', state: 'active', startedAt: 1 }),
119118
finish: async () => ({ status: 'cleanup-pending', reason: 'cleanup-unconfirmed' }),
120119
forceCleanup,

‎packages/daemon/src/sessions/session-observability/internal/__tests__/session-logs.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { appLogResourceStore } from '@agent-device/capture-kit/app-log-durable-resource';
2-
import { createAppLogLiveHandle } from '@agent-device/capture-kit/app-log-live-handle';
32
import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
43
import fs from 'node:fs';
54
import { beforeEach, expect, test, vi } from 'vitest';
@@ -13,6 +12,7 @@ import {
1312
} from '@agent-device/contracts/platform-runtime';
1413
import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
1514
import {
15+
createTestAppLogLiveHandle,
1616
unavailableDeploymentSnapshotAndShutdownOperationFacts,
1717
createTestHostEnvironment,
1818
} from '@agent-device/test-kit';
@@ -345,7 +345,7 @@ function createRuntimeHarness(options: { inspectAvailable?: boolean } = {}) {
345345
status: 'cleaned',
346346
}));
347347
const start = vi.fn<AppLogRuntimeOperations['appLogStart']>(async (input) => {
348-
const handle = createAppLogLiveHandle({
348+
const handle = createTestAppLogLiveHandle({
349349
inspect: () => ({
350350
backend: 'ios-simulator',
351351
state: 'active',
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import { AppError } from '@agent-device/kernel/errors';
2+
import type {
3+
AppLogCompletion,
4+
AppLogLiveHandle,
5+
AppLogLiveSnapshot,
6+
} from '@agent-device/contracts/app-log-runtime';
7+
import {
8+
isConfirmedCleanup,
9+
type CleanupOutcome,
10+
type FinishOutcome,
11+
} from '@agent-device/contracts/durable-resource';
12+
13+
type AppLogLiveHandleImplementation = Readonly<{
14+
inspect(): AppLogLiveSnapshot;
15+
finish(): Promise<FinishOutcome<AppLogCompletion>>;
16+
forceCleanup(): Promise<CleanupOutcome>;
17+
}>;
18+
19+
/**
20+
* Test-only constructor for owners that need independently controlled finish and cleanup outcomes.
21+
* It follows the handle contract (idempotent finish and cleanup, disposal confirms cleanup)
22+
* without importing capture-kit, whose own tests depend on this package.
23+
*/
24+
export function createTestAppLogLiveHandle(
25+
implementation: AppLogLiveHandleImplementation,
26+
): AppLogLiveHandle {
27+
let finish: Promise<FinishOutcome<AppLogCompletion>> | undefined;
28+
let cleanup: Promise<CleanupOutcome> | undefined;
29+
let disposal: Promise<void> | undefined;
30+
const forceCleanup = (): Promise<CleanupOutcome> => (cleanup ??= implementation.forceCleanup());
31+
return Object.freeze({
32+
inspect: () => implementation.inspect(),
33+
finish: () => (finish ??= implementation.finish()),
34+
forceCleanup,
35+
[Symbol.asyncDispose]: async () => {
36+
disposal ??= forceCleanup().then((outcome) => {
37+
if (isConfirmedCleanup(outcome)) return;
38+
throw new AppError(
39+
'COMMAND_FAILED',
40+
outcome.message ?? 'Durable resource cleanup could not be confirmed',
41+
{ reason: outcome.reason },
42+
);
43+
});
44+
await disposal;
45+
},
46+
});
47+
}

‎packages/test-kit/src/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// '@agent-device/test-kit', never from a file path.
44

55
export { assertRejectsAppError, assertThrowsAppError } from './app-error.ts';
6+
export { createTestAppLogLiveHandle } from './app-log-live-handle.ts';
67
export {
78
BOUNDARY_COMMAND_CLASSES,
89
BOUNDARY_FAULT_MATRIX,

0 commit comments

Comments
 (0)