Skip to content

Commit badec4d

Browse files
committed
chore(gates): cover the relocated durable-capture admission owners
- session-resource-ownership (R68): extend scan roots to packages/capture-kit/src/capture-admission and repoint the audio/perf owner paths to the relocated owners, so the field guard follows the code; add a case proving a field planted there is still caught. - package-boundaries (R11): add the relocated capture-kit and host-kit export subpaths to the exact export-surface enumeration. - capture-kit/host-kit export maps: publish the family behind granular per-module subpaths rather than a barrel, so no subpath is a new aggregate entry that would need an eager-closure over-ceiling row. Issue #2544
1 parent edef6bc commit badec4d

5 files changed

Lines changed: 116 additions & 5 deletions

File tree

‎packages/capture-kit/package.json‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,74 @@
1818
"types": "./src/snapshot/android-replacement-surface-occlusion.ts",
1919
"default": "./src/snapshot/android-replacement-surface-occlusion.ts"
2020
},
21+
"./audio-probe-admission-ledger": {
22+
"types": "./src/capture-admission/audio-probe-admission-ledger.ts",
23+
"default": "./src/capture-admission/audio-probe-admission-ledger.ts"
24+
},
25+
"./audio-probe-recovery": {
26+
"types": "./src/capture-admission/audio-probe-resource-recovery.ts",
27+
"default": "./src/capture-admission/audio-probe-resource-recovery.ts"
28+
},
29+
"./audio-probe-resource-store": {
30+
"types": "./src/capture-admission/audio-probe-resource-store.ts",
31+
"default": "./src/capture-admission/audio-probe-resource-store.ts"
32+
},
33+
"./audio-probe-session-resource": {
34+
"types": "./src/capture-admission/audio-probe-session-resource.ts",
35+
"default": "./src/capture-admission/audio-probe-session-resource.ts"
36+
},
37+
"./durable-capture-admission-ledger": {
38+
"types": "./src/capture-admission/durable-capture-admission-ledger.ts",
39+
"default": "./src/capture-admission/durable-capture-admission-ledger.ts"
40+
},
41+
"./durable-capture-resource": {
42+
"types": "./src/capture-admission/durable-capture-resource.ts",
43+
"default": "./src/capture-admission/durable-capture-resource.ts"
44+
},
45+
"./durable-capture-runtime-recovery": {
46+
"types": "./src/capture-admission/durable-capture-runtime-recovery.ts",
47+
"default": "./src/capture-admission/durable-capture-runtime-recovery.ts"
48+
},
49+
"./perf-capture-admission-ledger": {
50+
"types": "./src/capture-admission/perf-capture-admission-ledger.ts",
51+
"default": "./src/capture-admission/perf-capture-admission-ledger.ts"
52+
},
53+
"./perf-capture-recovery": {
54+
"types": "./src/capture-admission/perf-capture-resource-recovery.ts",
55+
"default": "./src/capture-admission/perf-capture-resource-recovery.ts"
56+
},
57+
"./perf-capture-resource-store": {
58+
"types": "./src/capture-admission/perf-capture-resource-store.ts",
59+
"default": "./src/capture-admission/perf-capture-resource-store.ts"
60+
},
61+
"./perf-capture-session-resource": {
62+
"types": "./src/capture-admission/perf-capture-session-resource.ts",
63+
"default": "./src/capture-admission/perf-capture-session-resource.ts"
64+
},
65+
"./perf-runtime-plan": {
66+
"types": "./src/capture-admission/perf-runtime-plan.ts",
67+
"default": "./src/capture-admission/perf-runtime-plan.ts"
68+
},
69+
"./screen-recording-admission-ledger": {
70+
"types": "./src/capture-admission/screen-recording-admission-ledger.ts",
71+
"default": "./src/capture-admission/screen-recording-admission-ledger.ts"
72+
},
73+
"./screen-recording-recovery": {
74+
"types": "./src/capture-admission/screen-recording-resource-recovery.ts",
75+
"default": "./src/capture-admission/screen-recording-resource-recovery.ts"
76+
},
77+
"./screen-recording-resource-store": {
78+
"types": "./src/capture-admission/screen-recording-resource-store.ts",
79+
"default": "./src/capture-admission/screen-recording-resource-store.ts"
80+
},
81+
"./screen-recording-session-resource": {
82+
"types": "./src/capture-admission/screen-recording-session-resource.ts",
83+
"default": "./src/capture-admission/screen-recording-session-resource.ts"
84+
},
85+
"./screen-recording-stop-recovery": {
86+
"types": "./src/capture-admission/screen-recording-stop-recovery.ts",
87+
"default": "./src/capture-admission/screen-recording-stop-recovery.ts"
88+
},
2189
"./durable-capture": {
2290
"types": "./src/durable-capture/index.ts",
2391
"default": "./src/durable-capture/index.ts"

‎packages/host-kit/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"types": "./src/runtime-transport-hints.ts",
6868
"default": "./src/runtime-transport-hints.ts"
6969
},
70+
"./session-paths": {
71+
"types": "./src/session-paths.ts",
72+
"default": "./src/session-paths.ts"
73+
},
7074
"./transport": {
7175
"types": "./src/transport.ts",
7276
"default": "./src/transport.ts"

‎scripts/layering/package-boundaries.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,13 +393,25 @@ test('the real tree parses, declares, and passes R11', () => {
393393
assert.deepEqual([...captureKitPackage.exportTargets.keys()].sort(), [
394394
'@agent-device/capture-kit',
395395
'@agent-device/capture-kit/android-replacement-surface-occlusion',
396+
'@agent-device/capture-kit/audio-probe-admission-ledger',
397+
'@agent-device/capture-kit/audio-probe-recovery',
398+
'@agent-device/capture-kit/audio-probe-resource-store',
399+
'@agent-device/capture-kit/audio-probe-session-resource',
396400
'@agent-device/capture-kit/durable-capture',
401+
'@agent-device/capture-kit/durable-capture-admission-ledger',
402+
'@agent-device/capture-kit/durable-capture-resource',
403+
'@agent-device/capture-kit/durable-capture-runtime-recovery',
397404
'@agent-device/capture-kit/durable-json',
398405
'@agent-device/capture-kit/ios-snapshot-acquisition',
399406
'@agent-device/capture-kit/ios-snapshot-engine',
400407
'@agent-device/capture-kit/ios-snapshot-planning',
401408
'@agent-device/capture-kit/ios-snapshot-runtime',
402409
'@agent-device/capture-kit/mobile-snapshot-semantics',
410+
'@agent-device/capture-kit/perf-capture-admission-ledger',
411+
'@agent-device/capture-kit/perf-capture-recovery',
412+
'@agent-device/capture-kit/perf-capture-resource-store',
413+
'@agent-device/capture-kit/perf-capture-session-resource',
414+
'@agent-device/capture-kit/perf-runtime-plan',
403415
'@agent-device/capture-kit/png',
404416
'@agent-device/capture-kit/png-crop',
405417
'@agent-device/capture-kit/png-resize',
@@ -418,6 +430,11 @@ test('the real tree parses, declares, and passes R11', () => {
418430
'@agent-device/capture-kit/recording-telemetry',
419431
'@agent-device/capture-kit/recording-video',
420432
'@agent-device/capture-kit/repeated-nav-subtree',
433+
'@agent-device/capture-kit/screen-recording-admission-ledger',
434+
'@agent-device/capture-kit/screen-recording-recovery',
435+
'@agent-device/capture-kit/screen-recording-resource-store',
436+
'@agent-device/capture-kit/screen-recording-session-resource',
437+
'@agent-device/capture-kit/screen-recording-stop-recovery',
421438
'@agent-device/capture-kit/screenshot-density',
422439
'@agent-device/capture-kit/screenshot-diff-pixels',
423440
'@agent-device/capture-kit/screenshot-overlay',
@@ -497,6 +514,7 @@ test('the real tree parses, declares, and passes R11', () => {
497514
'@agent-device/host-kit/request',
498515
'@agent-device/host-kit/retry',
499516
'@agent-device/host-kit/runtime-transport-hints',
517+
'@agent-device/host-kit/session-paths',
500518
'@agent-device/host-kit/transport',
501519
'@agent-device/host-kit/version',
502520
]);

‎scripts/layering/session-resource-ownership.test.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ test('session resources are constructed only by their durable domain owners', ()
2626
`sessionStore.set(name, { ...session, appLog: log, appLogFailure: undefined });`,
2727
],
2828
[
29-
'src/daemon/audio-probe-session-resource.ts',
29+
'packages/capture-kit/src/capture-admission/audio-probe-session-resource.ts',
3030
`sessionStore.set(name, { ...session, audioProbe: audio });`,
3131
],
3232
[
33-
'src/daemon/perf-capture-session-resource.ts',
33+
'packages/capture-kit/src/capture-admission/perf-capture-session-resource.ts',
3434
`sessionStore.set(name, { ...session, perfCapture: perf });`,
3535
],
3636
]),
@@ -43,6 +43,20 @@ test('session resources are constructed only by their durable domain owners', ()
4343
);
4444
});
4545

46+
test('the capture-admission owners sit inside the scan, so a field planted there is caught too', () => {
47+
assert.deepEqual(
48+
summaries([
49+
[
50+
'packages/capture-kit/src/capture-admission/durable-capture-resource.ts',
51+
`sessionStore.set(name, { ...session, perfCapture: perf });`,
52+
],
53+
]),
54+
[
55+
'packages/capture-kit/src/capture-admission/durable-capture-resource.ts: session perfCapture record constructed outside its owner',
56+
],
57+
);
58+
});
59+
4660
test('teardown app-log discriminants are policy input rather than session construction', () => {
4761
assert.deepEqual(
4862
summaries([

‎scripts/layering/session-resource-ownership.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,22 @@ type AstNode = Record<string, unknown>;
1717

1818
export const SESSION_RESOURCE_OWNERSHIP_RULE = 'R68 session-resource-ownership';
1919

20+
/**
21+
* Where a durable session-resource record may be constructed. The capture-admission owners live in
22+
* `@agent-device/capture-kit`, so the scan covers that directory alongside the daemon: the rule
23+
* guards the field, not the folder it happens to live in.
24+
*/
25+
const SCANNED_ROOTS = ['src/daemon/', 'packages/capture-kit/src/capture-admission/'] as const;
26+
2027
const RESOURCE_OWNERS: Readonly<Record<string, ReadonlySet<string>>> = {
2128
appLog: new Set(['src/daemon/app-log-session-resource.ts', 'src/daemon/session-state.ts']),
2229
appLogFailure: new Set(['src/daemon/app-log-session-resource.ts', 'src/daemon/session-state.ts']),
2330
audioProbe: new Set([
24-
'src/daemon/audio-probe-session-resource.ts',
31+
'packages/capture-kit/src/capture-admission/audio-probe-session-resource.ts',
2532
'src/daemon/session-state.ts',
2633
]),
2734
perfCapture: new Set([
28-
'src/daemon/perf-capture-session-resource.ts',
35+
'packages/capture-kit/src/capture-admission/perf-capture-session-resource.ts',
2936
'src/daemon/session-state.ts',
3037
]),
3138
};
@@ -36,7 +43,7 @@ export function sessionResourceOwnershipViolations(
3643
): LayeringViolation[] {
3744
const violations: LayeringViolation[] = [];
3845
for (const [file, source] of sources) {
39-
if (!file.startsWith('src/daemon/')) continue;
46+
if (!SCANNED_ROOTS.some((root) => file.startsWith(root))) continue;
4047
const program = parseSync(file, source).program as AstNode;
4148
visitAst(program, (node) => {
4249
if (node['type'] !== 'Property' || node['kind'] !== 'init' || node['computed'] === true) {

0 commit comments

Comments
 (0)