Skip to content

Commit ebb1ea0

Browse files
thymikeeapex-callstack
thymikee
and
apex-callstack
committed
refactor(daemon): read the shared state-dir leaf directly (#2559)
Re-exporting the shared leaf through src/daemon/config.ts cost every importer that only needs a state dir one extra evaluated module, and src/cli.ts crossed the ADR 0019 eager-closure ratchet (296 against the merge-base's 295). Point the CLI, client, daemon, scripts, and test importers of resolveDaemonPaths/DaemonPaths/ resolveDaemonServerMode straight at src/daemon-resolution.ts and drop the re-export, so src/daemon/config.ts keeps only the request-scoping rules the daemon applies. Co-Authored-By: Apex <[email protected]>
1 parent 5a350b4 commit ebb1ea0

31 files changed

Lines changed: 35 additions & 39 deletions

‎scripts/clean-daemon.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import fs from 'node:fs';
22
import os from 'node:os';
33
import path from 'node:path';
4-
import { resolveDaemonPaths } from '../src/daemon/config.ts';
4+
import { resolveDaemonPaths } from '../src/daemon-resolution.ts';
55
import { isAgentDeviceDaemonProcess, stopProcessForTakeover } from '../src/daemon-process.ts';
66

77
const DAEMON_TERM_TIMEOUT_MS = 15_000;

‎scripts/ios-snapshot-benchmark/cell-admission.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import fs from 'node:fs';
2-
import { resolveDaemonPaths } from '../../src/daemon/config.ts';
2+
import { resolveDaemonPaths } from '../../src/daemon-resolution.ts';
33
import { readDaemonInfo } from '../../src/daemon-client/daemon-client-metadata.ts';
44
import { isAgentDeviceDaemonProcess } from '../../src/daemon-process.ts';
55
import {

‎scripts/print-daemon-state-dir.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { resolveDaemonPaths } from '../src/daemon/config.ts';
1+
import { resolveDaemonPaths } from '../src/daemon-resolution.ts';
22

33
const paths = resolveDaemonPaths(process.env.AGENT_DEVICE_STATE_DIR);
44

‎src/__tests__/cli-diagnostics.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
33
import fs from 'node:fs';
44
import path from 'node:path';
55
import type { DaemonResponse } from '../daemon-client/daemon-client.ts';
6-
import { resolveDaemonPaths } from '../daemon/config.ts';
6+
import { resolveDaemonPaths } from '../daemon-resolution.ts';
77
import {
88
runCliCapture as captureCli,
99
type CapturedCliRun,

‎src/__tests__/cli-exit-paths.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ vi.mock('../cli/commands/web.ts', async (importOriginal) => {
1212
import { runCli } from '../cli.ts';
1313
import { runWebCommand } from '../cli/commands/web.ts';
1414
import { installIsolatedCliTestEnv } from './cli-test-env.ts';
15-
import { resolveDaemonPaths } from '../daemon/config.ts';
15+
import { resolveDaemonPaths } from '../daemon-resolution.ts';
1616
import type { DaemonResponse } from '../daemon-client/daemon-client.ts';
1717

1818
afterEach(() => {

‎src/__tests__/client-metro.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { prepareMetroRuntime, reloadMetro } from '../metro/client-metro.ts';
1212
import { resolveMetroReloadEndpoints } from '../metro/metro-reload-endpoints.ts';
1313
import { createAgentDeviceClient } from '../agent-device-client.ts';
1414
import { readMetroSessionHints } from '../metro/metro-session-hints.ts';
15-
import { resolveDaemonPaths } from '../daemon/config.ts';
15+
import { resolveDaemonPaths } from '../daemon-resolution.ts';
1616
import { AppError } from '@agent-device/kernel/errors';
1717
import { isProcessAlive, waitForProcessExit } from '@agent-device/host-kit/process';
1818

‎src/__tests__/daemon-entrypoint.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import fs from 'node:fs';
55
import http from 'node:http';
66
import path from 'node:path';
77
import { test } from 'vitest';
8-
import { resolveDaemonPaths } from '../daemon/config.ts';
8+
import { resolveDaemonPaths } from '../daemon-resolution.ts';
99
import { startDaemonRuntime } from '../daemon/server/daemon-runtime.ts';
1010
import {
1111
cleanupDownloadableArtifact,

‎src/agent-device-client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import {
6363
} from './commands/command-projection.ts';
6464
import type { CommandResult } from '@agent-device/command-registry/command-result';
6565
import { sendToDaemon } from './daemon-client/daemon-client.ts';
66-
import { resolveDaemonPaths } from './daemon/config.ts';
66+
import { resolveDaemonPaths } from './daemon-resolution.ts';
6767
import { prepareMetroRuntime, reloadMetro } from './metro/client-metro.ts';
6868
import {
6969
clearMetroSessionHints,

‎src/cli.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
registerDiagnosticSensitiveValue,
3939
withDiagnosticsScope,
4040
} from '@agent-device/host-kit/diagnostics';
41-
import { resolveDaemonPaths } from './daemon/config.ts';
41+
import { resolveDaemonPaths } from './daemon-resolution.ts';
4242
import { applyDefaultPlatformBinding, resolveBindingSettings } from './cli/session-binding.ts';
4343
import { resolveCliOptions } from './cli/resolve-cli-options.ts';
4444
import { maybeRunUpgradeNotifier } from './cli/update-check.ts';

‎src/cli/commands/auth.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { resolveDaemonPaths } from '../../daemon/config.ts';
1+
import { resolveDaemonPaths } from '../../daemon-resolution.ts';
22
import { AppError } from '@agent-device/kernel/errors';
33
import { loginWithDeviceAuth, removeCliSession, summarizeCliSession } from '../auth-session.ts';
44
import { writeCommandOutput } from './shared.ts';

0 commit comments

Comments
 (0)