Skip to content

Commit edef6bc

Browse files
committed
refactor(daemon): move the durable-capture admission family to capture-kit
The 19-module durable-capture admission family (durable-*, perf-*, audio-*, screen-*) reached src/** only through SessionState, SessionStore, and safeSessionName. Its SessionState slice is exactly the three durable-capture slots it reads/replaces (perfCapture, audioProbe, screenRecording); its SessionStore use is exactly capture-kit's structural DurableCaptureSessionStore (set + resolveSessionDir) — not the session spine. capture-kit's durable-capture machinery is already generic over S, so the residue retypes onto that slice with no behavior change: sessionSlot.replace spreads S and sessionStore.set writes the runtime record back, so the session type stays opaque behind S. - safeSessionName + session path helpers move to @agent-device/host-kit/session-paths (its only dep was host-kit/file). - The family moves behind granular @agent-device/capture-kit subpaths, one per module (session-resource, admission-ledger, resource-store, recovery, and the durable-capture core/recovery). Each moved module is a rename-tracked entry governed by the eager-closure no-growth rule, so no façade and no over-ceiling exemption is needed. session-teardown reaches finishLive* through the thin per-kind session-resource subpaths, keeping the hub flat, and no symbol gets two import paths. - app-log-* stay in the daemon and consume the relocated factory/ledger. Closes #2544 Issue #2544
1 parent 849ad7d commit edef6bc

81 files changed

Lines changed: 304 additions & 224 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/daemon/__tests__/audio-probe-session-resource.test.ts renamed to packages/capture-kit/src/capture-admission/__tests__/audio-probe-session-resource.test.ts

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@ import type {
77
} from '@agent-device/contracts/audio-probe-runtime-host';
88
import type { HostCommandResult } from '@agent-device/contracts/platform-runtime-host';
99
import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
10-
import { createHostAudioProbeCaptureOperations } from '@agent-device/capture-kit';
11-
import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
10+
import { createHostAudioProbeCaptureOperations } from '../../audio-probe-runtime.ts';
1211
import { createAudioProbeAdmissionLedger } from '../audio-probe-admission-ledger.ts';
1312
import { audioProbeResourceStore } from '../audio-probe-resource-store.ts';
1413
import {
1514
adoptStartedAudioProbe,
1615
audioProbeDurableResource,
1716
finishLiveAudioProbe,
1817
} from '../audio-probe-session-resource.ts';
19-
import type { SessionState } from '../session-state.ts';
18+
import type { DurableCaptureSessionState } from '../session-state-slice.ts';
19+
import {
20+
makeCaptureAdmissionSessionStore,
21+
type CaptureAdmissionSessionStore,
22+
} from './session-store.fixtures.ts';
2023

2124
const device = {
2225
platform: 'apple' as const,
@@ -36,13 +39,10 @@ const marker = { pid: 4242, startTime: 'boot+1', command: 'helper' };
3639
*/
3740
test('audio-probe disposes on a failed finish because terminating the helper is what remains and the status file survives it', async () => {
3841
const sessionName = 'session';
39-
const sessionStore = makeSessionStore('audio-probe-failed-finish-');
40-
const session: SessionState = {
41-
name: sessionName,
42-
device,
43-
createdAt: 1,
44-
actions: [],
45-
};
42+
const sessionStore = makeCaptureAdmissionSessionStore<DurableCaptureSessionState>(
43+
'audio-probe-failed-finish-',
44+
);
45+
const session: DurableCaptureSessionState = {};
4646
sessionStore.set(sessionName, session);
4747
const statusPath = path.join(sessionStore.resolveSessionDir(sessionName), 'audio-probe.json');
4848
const terminate = vi.fn(async () => {});
@@ -122,6 +122,9 @@ test('audio-probe disposes on a failed finish because terminating the helper is
122122
).not.toThrow();
123123
});
124124

125-
function resourcePath(sessionStore: ReturnType<typeof makeSessionStore>, sessionName: string) {
125+
function resourcePath(
126+
sessionStore: CaptureAdmissionSessionStore<DurableCaptureSessionState>,
127+
sessionName: string,
128+
) {
126129
return audioProbeResourceStore.resolvePath(sessionStore.resolveSessionDir(sessionName));
127130
}

src/daemon/__tests__/durable-capture-admission-ledger.test.ts renamed to packages/capture-kit/src/capture-admission/__tests__/durable-capture-admission-ledger.test.ts

File renamed without changes.

src/daemon/__tests__/durable-capture-resource.fixtures.ts renamed to packages/capture-kit/src/capture-admission/__tests__/durable-capture-resource.fixtures.ts

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,24 @@ import { vi } from 'vitest';
22
import type { AppLogCompletion, AppLogLiveHandle } from '@agent-device/contracts/app-log-runtime';
33
import type { CleanupOutcome, FinishOutcome } from '@agent-device/contracts/durable-resource';
44
import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
5-
import { createAppLogStartResult, createDurableResourceEnvelope } from '@agent-device/capture-kit';
65
import type { DeviceInfo } from '@agent-device/kernel/device';
7-
import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
8-
import { createTestAppLogLiveHandle } from '../../__tests__/test-utils/app-log-live-handle.ts';
9-
import { createDurableCaptureAdmissionLedger } from '../durable-capture-admission-ledger.ts';
10-
import { createDurableCaptureResource } from '../durable-capture-resource.ts';
6+
import { createAppLogLiveHandle } from '../../app-log-live-handle.ts';
7+
import { createAppLogStartResult } from '../../app-log-runtime.ts';
8+
import { createDurableResourceEnvelope } from '../../durable-resource-envelope.ts';
119
import {
1210
createDurableCaptureResourceStore,
1311
type DurableCaptureResourceStore,
14-
} from '@agent-device/capture-kit/durable-capture';
15-
import type { SessionState } from '../session-state.ts';
12+
type DurableCaptureSessionResource,
13+
} from '../../durable-capture/index.ts';
14+
import { createDurableCaptureAdmissionLedger } from '../durable-capture-admission-ledger.ts';
15+
import { createDurableCaptureResource } from '../durable-capture-resource.ts';
16+
import { makeCaptureAdmissionSessionStore } from './session-store.fixtures.ts';
17+
18+
/** The session record these tests hand the coordinator: the one slot it replaces, plus its twin. */
19+
export type TestCaptureSession = Readonly<{
20+
appLog?: DurableCaptureSessionResource<'app-log', AppLogLiveHandle>;
21+
appLogFailure?: unknown;
22+
}>;
1623

1724
export const testCaptureStore = createDurableCaptureResourceStore({
1825
resourceKind: 'app-log',
@@ -23,7 +30,12 @@ export const testCaptureStore = createDurableCaptureResourceStore({
2330
export function createTestCaptureResource(
2431
store: DurableCaptureResourceStore<'app-log'> = testCaptureStore,
2532
) {
26-
return createDurableCaptureResource<'app-log', AppLogLiveHandle, AppLogCompletion>({
33+
return createDurableCaptureResource<
34+
'app-log',
35+
AppLogLiveHandle,
36+
AppLogCompletion,
37+
TestCaptureSession
38+
>({
2739
resourceKind: 'app-log',
2840
displayName: 'test capture',
2941
store,
@@ -53,14 +65,11 @@ export function makeDurableCaptureContext(
5365
kind: 'emulator',
5466
},
5567
) {
56-
const sessionStore = makeSessionStore('durable-capture-resource-');
68+
const sessionStore = makeCaptureAdmissionSessionStore<TestCaptureSession>(
69+
'durable-capture-resource-',
70+
);
5771
const sessionName = 'session';
58-
const session: SessionState = {
59-
name: sessionName,
60-
device,
61-
createdAt: 1,
62-
actions: [],
63-
};
72+
const session: TestCaptureSession = {};
6473
sessionStore.set(sessionName, session);
6574
return {
6675
admissionLedger: createDurableCaptureAdmissionLedger({ displayName: 'test capture' }),
@@ -97,7 +106,7 @@ export function makeDurableCaptureStartResult(
97106
} as const)
98107
);
99108
});
100-
const handle = createTestAppLogLiveHandle({
109+
const handle = createAppLogLiveHandle({
101110
inspect: () => ({ backend: 'android', state: 'active', startedAt: 1 }),
102111
finish,
103112
forceCleanup,

src/daemon/__tests__/durable-capture-resource.test.ts renamed to packages/capture-kit/src/capture-admission/__tests__/durable-capture-resource.test.ts

File renamed without changes.

src/daemon/__tests__/durable-capture-start-preflight.test.ts renamed to packages/capture-kit/src/capture-admission/__tests__/durable-capture-start-preflight.test.ts

File renamed without changes.

src/daemon/__tests__/screen-recording-boundary-faults.test.ts renamed to packages/capture-kit/src/capture-admission/__tests__/screen-recording-boundary-faults.test.ts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import path from 'node:path';
22
import { expect, test, vi } from 'vitest';
3-
import {
4-
createDurableResourceEnvelope,
5-
createScreenRecordingLiveHandle,
6-
} from '@agent-device/capture-kit';
3+
import { createDurableResourceEnvelope } from '../../durable-resource-envelope.ts';
4+
import { createScreenRecordingLiveHandle } from '../../screen-recording-live-handle.ts';
75
import { PendingTransferGuard } from '@agent-device/contracts/async-lifecycle';
86
import type { CleanupOutcome, ReattachOutcome } from '@agent-device/contracts/durable-resource';
97
import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
@@ -13,16 +11,16 @@ import type {
1311
} from '@agent-device/contracts/screen-recording-runtime';
1412
import type { DeviceInfo } from '@agent-device/kernel/device';
1513
import { AppError } from '@agent-device/kernel/errors';
16-
import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
1714
import {
1815
countDiagnosticEventsByPhase,
1916
withDiagnosticsScope,
2017
} from '@agent-device/host-kit/diagnostics';
2118
import { createDurableCaptureAdmissionLedger } from '../durable-capture-admission-ledger.ts';
2219
import { createDurableCaptureResource } from '../durable-capture-resource.ts';
23-
import type { DurableCaptureResourceStore } from '@agent-device/capture-kit/durable-capture';
20+
import type { DurableCaptureResourceStore } from '../../durable-capture/index.ts';
2421
import { screenRecordingResourceStore } from '../screen-recording-resource-store.ts';
25-
import type { SessionState } from '../session-state.ts';
22+
import type { DurableCaptureSessionState } from '../session-state-slice.ts';
23+
import { makeCaptureAdmissionSessionStore } from './session-store.fixtures.ts';
2624

2725
type ScreenRecordingStore = DurableCaptureResourceStore<'screen-recording'>;
2826

@@ -189,7 +187,8 @@ function createScreenRecordingTestResource(
189187
return createDurableCaptureResource<
190188
'screen-recording',
191189
ScreenRecordingLiveHandle,
192-
ScreenRecordingCompletion
190+
ScreenRecordingCompletion,
191+
DurableCaptureSessionState
193192
>({
194193
resourceKind: 'screen-recording',
195194
displayName: 'screen recording',
@@ -212,14 +211,11 @@ function createScreenRecordingTestResource(
212211
}
213212

214213
function makeContext(resource: ReturnType<typeof createScreenRecordingTestResource>) {
215-
const sessionStore = makeSessionStore('screen-recording-boundary-fault-');
214+
const sessionStore = makeCaptureAdmissionSessionStore<DurableCaptureSessionState>(
215+
'screen-recording-boundary-fault-',
216+
);
216217
const sessionName = 'recording';
217-
const session: SessionState = {
218-
name: sessionName,
219-
device,
220-
createdAt: 1,
221-
actions: [],
222-
};
218+
const session: DurableCaptureSessionState = {};
223219
sessionStore.set(sessionName, session);
224220
return {
225221
admissionLedger: createDurableCaptureAdmissionLedger({ displayName: 'screen recording' }),

src/daemon/__tests__/screen-recording-session-resource.test.ts renamed to packages/capture-kit/src/capture-admission/__tests__/screen-recording-session-resource.test.ts

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,38 @@ import { expect, test, vi } from 'vitest';
22
import { PendingTransferGuard } from '@agent-device/contracts/async-lifecycle';
33
import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
44
import type { ScreenRecordingLiveHandle } from '@agent-device/contracts/screen-recording-runtime';
5-
import {
6-
createDurableResourceEnvelope,
7-
createScreenRecordingLiveHandle,
8-
} from '@agent-device/capture-kit';
9-
import { stopAndExportScreenRecording } from '@agent-device/capture-kit/recording-stop-sequence';
10-
import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
5+
import { createDurableResourceEnvelope } from '../../durable-resource-envelope.ts';
6+
import { createScreenRecordingLiveHandle } from '../../screen-recording-live-handle.ts';
7+
import { stopAndExportScreenRecording } from '../../recording/stop-sequence.ts';
118
import { createScreenRecordingAdmissionLedger } from '../screen-recording-admission-ledger.ts';
129
import {
1310
adoptStartedScreenRecording,
1411
finishLiveScreenRecording,
1512
} from '../screen-recording-session-resource.ts';
1613
import { screenRecordingResourceStore } from '../screen-recording-resource-store.ts';
17-
import type { SessionState } from '../session-state.ts';
14+
import type { DeviceInfo } from '@agent-device/kernel/device';
15+
import type { DurableCaptureSessionState } from '../session-state-slice.ts';
16+
import {
17+
makeCaptureAdmissionSessionStore,
18+
type CaptureAdmissionSessionStore,
19+
} from './session-store.fixtures.ts';
20+
21+
const device: DeviceInfo = {
22+
platform: 'android',
23+
id: 'emulator-5554',
24+
name: 'Pixel',
25+
kind: 'emulator',
26+
};
27+
/** The recording slot the family owns, plus the device this test reads back off the record. */
28+
type TestRecordingSession = DurableCaptureSessionState &
29+
Readonly<{ name: string; device: DeviceInfo }>;
1830

1931
test('screen recording persists durable truth before adopting only handle and envelope', async () => {
20-
const sessionStore = makeSessionStore('screen-recording-session-resource-');
32+
const sessionStore = makeCaptureAdmissionSessionStore<TestRecordingSession>(
33+
'screen-recording-session-resource-',
34+
);
2135
const sessionName = 'recording';
22-
const session: SessionState = {
23-
name: sessionName,
24-
device: { platform: 'android', id: 'emulator-5554', name: 'Pixel', kind: 'emulator' },
25-
createdAt: 1,
26-
actions: [],
27-
};
36+
const session: TestRecordingSession = { name: sessionName, device };
2837
sessionStore.set(sessionName, session);
2938
const owner = localRuntimeOwner('android');
3039
const fence = { token: 'recording-fence', generation: 1 } as const;
@@ -100,14 +109,11 @@ test('screen recording persists durable truth before adopting only handle and en
100109
});
101110

102111
test('a failed recording finish keeps the record open and never disposes the recording', async () => {
103-
const sessionStore = makeSessionStore('screen-recording-failed-finish-');
112+
const sessionStore = makeCaptureAdmissionSessionStore<TestRecordingSession>(
113+
'screen-recording-failed-finish-',
114+
);
104115
const sessionName = 'recording';
105-
const session: SessionState = {
106-
name: sessionName,
107-
device: { platform: 'android', id: 'emulator-5554', name: 'Pixel', kind: 'emulator' },
108-
createdAt: 1,
109-
actions: [],
110-
};
116+
const session: TestRecordingSession = { name: sessionName, device };
111117
sessionStore.set(sessionName, session);
112118
const owner = localRuntimeOwner('android');
113119
const fence = { token: 'recording-fence', generation: 1 } as const;
@@ -170,14 +176,11 @@ test('a failed recording finish keeps the record open and never disposes the rec
170176
});
171177

172178
test('a record stop that fails after collecting resumes through the fence without a second signal', async () => {
173-
const sessionStore = makeSessionStore('screen-recording-resumed-stop-');
179+
const sessionStore = makeCaptureAdmissionSessionStore<TestRecordingSession>(
180+
'screen-recording-resumed-stop-',
181+
);
174182
const sessionName = 'recording';
175-
const session: SessionState = {
176-
name: sessionName,
177-
device: { platform: 'android', id: 'emulator-5554', name: 'Pixel', kind: 'emulator' },
178-
createdAt: 1,
179-
actions: [],
180-
};
183+
const session: TestRecordingSession = { name: sessionName, device };
181184
sessionStore.set(sessionName, session);
182185
const owner = localRuntimeOwner('android');
183186
const fence = { token: 'recording-fence', generation: 1 } as const;
@@ -266,6 +269,9 @@ test('a record stop that fails after collecting resumes through the fence withou
266269
expect(sessionStore.get(sessionName)?.screenRecording).toBeUndefined();
267270
});
268271

269-
function resourcePath(sessionStore: ReturnType<typeof makeSessionStore>, sessionName: string) {
272+
function resourcePath(
273+
sessionStore: CaptureAdmissionSessionStore<TestRecordingSession>,
274+
sessionName: string,
275+
) {
270276
return screenRecordingResourceStore.resolvePath(sessionStore.resolveSessionDir(sessionName));
271277
}

src/daemon/__tests__/screen-recording-stop-recovery.test.ts renamed to packages/capture-kit/src/capture-admission/__tests__/screen-recording-stop-recovery.test.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@ import { expect, test } from 'vitest';
44
import type { JsonObject } from '@agent-device/contracts/client';
55
import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
66
import type { ScreenRecordingCompletion } from '@agent-device/contracts/screen-recording-runtime';
7-
import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
7+
import { createDurableResourceEnvelope } from '../../durable-resource-envelope.ts';
88
import type { DeviceInfo } from '@agent-device/kernel/device';
99
import { deviceIdentity } from '@agent-device/kernel/device';
10-
import { mkdtempForTestSync } from '../../__tests__/test-utils/tmp-dir.ts';
11-
import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
10+
import { mkdtempForTestSync } from '../../tmp-dir.fixtures.ts';
1211
import { screenRecordingResourceStore } from '../screen-recording-resource-store.ts';
1312
import { encodeScreenRecordingCompletionMetadata } from '../screen-recording-session-resource.ts';
1413
import {
1514
resolveScreenRecordingStopRecovery,
1615
screenRecordingManifestIsTerminal,
1716
} from '../screen-recording-stop-recovery.ts';
18-
import type { SessionStore } from '../session-store.ts';
17+
import type { DurableCaptureSessionState } from '../session-state-slice.ts';
18+
import {
19+
makeCaptureAdmissionSessionStore,
20+
type CaptureAdmissionSessionStore,
21+
} from './session-store.fixtures.ts';
1922

2023
const SESSION_NAME = 'recording';
2124
const SESSION_DEVICE: DeviceInfo = {
@@ -153,7 +156,9 @@ function withStoredCompletion(metadata: JsonObject, patch: JsonObject): JsonObje
153156
}
154157

155158
function makeHarness() {
156-
const sessionStore = makeSessionStore('screen-recording-stop-recovery-');
159+
const sessionStore = makeCaptureAdmissionSessionStore<DurableCaptureSessionState>(
160+
'screen-recording-stop-recovery-',
161+
);
157162
const outputDir = mkdtempForTestSync('screen-recording-stop-recovery-output-');
158163
return {
159164
sessionStore,
@@ -164,7 +169,9 @@ function makeHarness() {
164169

165170
type Harness = ReturnType<typeof makeHarness>;
166171

167-
function manifestPath(sessionStore: SessionStore): string {
172+
function manifestPath(
173+
sessionStore: CaptureAdmissionSessionStore<DurableCaptureSessionState>,
174+
): string {
168175
return screenRecordingResourceStore.resolvePath(sessionStore.resolveSessionDir(SESSION_NAME));
169176
}
170177

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import path from 'node:path';
2+
import { safeSessionName } from '@agent-device/host-kit/session-paths';
3+
import type { DurableCaptureSessionStore } from '../../durable-capture/index.ts';
4+
import { mkdtempForTestSync } from '../../tmp-dir.fixtures.ts';
5+
6+
export type CaptureAdmissionSessionStore<S> = DurableCaptureSessionStore<S> &
7+
Readonly<{
8+
get(name: string): S | undefined;
9+
sessionsDir: string;
10+
}>;
11+
12+
/**
13+
* The whole of the daemon `SessionStore` these admission modules ever address — `set`,
14+
* `resolveSessionDir`, and the read-back a test asserts on — over a fresh temp directory, so a
15+
* test of this family needs no session record, store class, or daemon import.
16+
*/
17+
export function makeCaptureAdmissionSessionStore<S>(
18+
prefix: string,
19+
): CaptureAdmissionSessionStore<S> {
20+
const sessionsDir = mkdtempForTestSync(prefix);
21+
const sessions = new Map<string, S>();
22+
return {
23+
set: (name, session) => void sessions.set(name, session),
24+
get: (name) => sessions.get(name),
25+
resolveSessionDir: (name) => path.join(sessionsDir, safeSessionName(name)),
26+
sessionsDir,
27+
};
28+
}

src/daemon/audio-probe-admission-ledger.ts renamed to packages/capture-kit/src/capture-admission/audio-probe-admission-ledger.ts

File renamed without changes.

0 commit comments

Comments
 (0)