Skip to content

Commit 0f2338d

Browse files
committed
refactor(apple): route cleanup through bound runner facade
1 parent 60b078b commit 0f2338d

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

‎packages/apple-runner/src/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ export {
6464
resolveRunnerDerivedOverride,
6565
} from './apple-runner-platform.ts';
6666
export {
67+
assertSafeDerivedCleanup,
6768
requireCertifiedRunnerCacheArtifacts,
69+
shouldDeleteRunnerDerivedRootEntry,
6870
writeRunnerCacheMetadataForArtifacts,
6971
} from './runner-cache.ts';
7072
export { findXctestrun as findRunnerXctestrun } from './runner-artifact.ts';

‎packages/apple-runner/src/runner-cache.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,17 +295,16 @@ function shouldCleanDerived(): boolean {
295295
export function assertSafeDerivedCleanup(
296296
derivedPath: string,
297297
env: NodeJS.ProcessEnv = hostEnvironment().env,
298-
projectRoot: () => string = findProjectRoot,
299298
): void {
300299
if (!resolveRunnerDerivedOverride(env)) {
301300
return;
302301
}
303-
if (isPathInsideProjectTmp(derivedPath, projectRoot())) {
302+
if (isPathInsideProjectTmp(derivedPath, findProjectRoot())) {
304303
return;
305304
}
306305
throw new AppError('COMMAND_FAILED', 'Refusing to clean AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH', {
307306
derivedPath,
308-
hint: `Move AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH to a non-symlinked subdirectory of ${path.join(projectRoot(), '.tmp')}. Unset AGENT_DEVICE_IOS_CLEAN_DERIVED to disable cleanup requested by that variable. Explicit cleanup, forced rebuilds, and cache repair still require a contained override.`,
307+
hint: `Move AGENT_DEVICE_IOS_RUNNER_DERIVED_PATH to a non-symlinked subdirectory of ${path.join(findProjectRoot(), '.tmp')}. Unset AGENT_DEVICE_IOS_CLEAN_DERIVED to disable cleanup requested by that variable. Explicit cleanup, forced rebuilds, and cache repair still require a contained override.`,
309308
});
310309
}
311310

‎packages/platform-apple/src/core/runner-client.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export async function runAppleRunnerCommand(
4646
}
4747

4848
export {
49+
assertSafeDerivedCleanup,
4950
RUNNER_STARTUP_TIMEOUT_MS,
5051
createLaunchedAppleRunnerProvider,
5152
mintRunnerToken,
@@ -77,6 +78,7 @@ export {
7778
resolveRunnerSandboxBuildArgs,
7879
resolveRunnerSigningBuildSettings,
7980
runApplePressSeries,
81+
shouldDeleteRunnerDerivedRootEntry,
8082
stopAllIosRunnerSessions,
8183
stopIosRunnerSession,
8284
verifyLeaseRunnerPidIdentity,

‎packages/platform-apple/src/runner-operations-facade.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export {
2+
assertSafeDerivedCleanup,
23
RUNNER_STARTUP_TIMEOUT_MS,
34
createLaunchedAppleRunnerProvider,
45
mintRunnerToken,
@@ -28,6 +29,7 @@ export {
2829
requireCertifiedRunnerCacheArtifacts,
2930
requireRunnerBuildSettingsMatchBuildLog,
3031
runAppleRunnerCommand,
32+
shouldDeleteRunnerDerivedRootEntry,
3133
stopAllIosRunnerSessions,
3234
stopIosRunnerSession,
3335
verifyLeaseRunnerPidIdentity,

‎scripts/clean-xcuitest-derived.mjs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ import fs from 'node:fs';
33
import os from 'node:os';
44
import path from 'node:path';
55
import { AppError } from '@agent-device/kernel/errors';
6-
import { findProjectRoot } from '@agent-device/host-kit/version';
76
import {
87
assertSafeDerivedCleanup,
98
shouldDeleteRunnerDerivedRootEntry,
10-
} from '../packages/apple-runner/src/runner-cache.ts';
11-
import {
129
resolveRunnerDerivedOverride,
1310
resolveRunnerScriptDefaultDerivedPath,
1411
} from '@agent-device/platform-apple/runner/operations';
@@ -41,7 +38,7 @@ for (const platform of requested) {
4138
}
4239
const targetPath = resolveDerivedPath(platform);
4340
try {
44-
assertSafeDerivedCleanup(targetPath, process.env, findProjectRoot);
41+
assertSafeDerivedCleanup(targetPath, process.env);
4542
const result = cleanDerivedPath(platform, targetPath);
4643
console.log(formatCleanupResult(platform, targetPath, result));
4744
} catch (error) {

0 commit comments

Comments
 (0)