Skip to content

Commit 817930f

Browse files
committed
chore: merge the host environment foundation into the runtime state branch
* refactor/host-environment: fix(host): resolve every client read from the client's host
2 parents 5c98812 + 756cf4e commit 817930f

11 files changed

Lines changed: 169 additions & 54 deletions

File tree

‎packages/test-kit/src/host-environment.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { aroundEach } from 'vitest';
22
import { withCommandHost } from '@agent-device/host-kit/command';
3+
import { captureHostEnvironment } from '@agent-device/host-kit/process';
34
import type { EnvMap, HostEnvironment } from '@agent-device/kernel/source-value';
45

56
/**
@@ -10,7 +11,10 @@ import type { EnvMap, HostEnvironment } from '@agent-device/kernel/source-value'
1011
export function createTestHostEnvironment(
1112
options: { env?: EnvMap; cwd?: string } = {},
1213
): HostEnvironment {
13-
return { env: { ...(options.env ?? process.env) }, cwd: options.cwd ?? process.cwd() };
14+
return captureHostEnvironment({
15+
env: options.env ?? process.env,
16+
cwd: () => options.cwd ?? process.cwd(),
17+
});
1418
}
1519

1620
/**

‎src/__tests__/daemon-registration-owner.test.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -827,12 +827,16 @@ test('cutover refuses an already-running legacy daemon before signaling or chang
827827
assert.equal(disposition.exitCode, DAEMON_STARTUP_EXIT_CODES.unproven);
828828
await assert.rejects(
829829
ensureDaemon(
830-
resolveClientSettings({
831-
session: 'default',
832-
command: 'devices',
833-
positionals: [],
834-
flags: { stateDir: paths.baseDir },
835-
}),
830+
resolveClientSettings(
831+
{
832+
session: 'default',
833+
command: 'devices',
834+
positionals: [],
835+
flags: { stateDir: paths.baseDir },
836+
},
837+
undefined,
838+
{ env: process.env, cwd: process.cwd() },
839+
),
836840
),
837841
(error: unknown) => {
838842
assert.ok(error instanceof AppError);

‎src/agent-device-client.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import {
5858
type DaemonCommandName,
5959
} from './commands/command-projection.ts';
6060
import type { CommandResult } from '@agent-device/command-registry/command-result';
61-
import { sendToDaemon } from './daemon-client/daemon-client.ts';
61+
import { createDaemonTransport } from './daemon-client/daemon-client.ts';
6262
import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
6363
import {
6464
prepareMetroRuntime,
@@ -85,8 +85,8 @@ export function createAgentDeviceClient(
8585
config: AgentDeviceClientConfig = {},
8686
deps: { transport?: AgentDeviceDaemonTransport; host?: HostEnvironment } = {},
8787
): AgentDeviceClient {
88-
const transport = deps.transport ?? sendToDaemon;
8988
const host = deps.host ?? captureHostEnvironment(process);
89+
const transport = deps.transport ?? createDaemonTransport(host);
9090

9191
// A non-default responseLevel (digest/full) makes the daemon return a leveled
9292
// shape; the per-command client normalizers assume the default shape, so the

‎src/cli.ts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ import type { HostEnvironment } from '@agent-device/kernel/source-value';
1414
import { exitAfterFlush } from './cli/process-exit.ts';
1515
import { readVersion } from '@agent-device/host-kit/version';
1616
import { pathToFileURL } from 'node:url';
17-
import { sendToDaemon } from './daemon-client/daemon-client.ts';
17+
import {
18+
createDaemonTransport,
19+
resolveRunTransport,
20+
sendToDaemon,
21+
} from './daemon-client/daemon-client.ts';
1822
import fs from 'node:fs';
1923
import type { BatchStep } from '@agent-device/contracts/client';
2024
import type { ReplayTestReporterRuntime } from './cli/replay-test/reporting.ts';
@@ -54,13 +58,20 @@ import { isKnownCliCommandName } from '@agent-device/command-registry/catalog';
5458

5559
type CliDeps = {
5660
sendToDaemon: typeof sendToDaemon;
61+
/** Builds the transport that talks as a given host; injected deps leave it out. */
62+
transportForHost?: (host: HostEnvironment) => typeof sendToDaemon;
5763
};
5864

5965
type CliDaemonTransport = typeof sendToDaemon;
6066
type CliDaemonRequest = Parameters<CliDaemonTransport>[0];
6167
type CliDaemonTransportOptions = Parameters<CliDaemonTransport>[1];
6268
type ClientDaemonRequest = Parameters<AgentDeviceDaemonTransport>[0];
6369

70+
const DEFAULT_CLI_DEPS: CliDeps = {
71+
sendToDaemon,
72+
transportForHost: createDaemonTransport,
73+
};
74+
6475
const printHumanError = (
6576
err: AppError | NormalizedError,
6677
options: { showDetails?: boolean } = {},
@@ -72,10 +83,6 @@ const printJson = (
7283
): Promise<void> =>
7384
import('./commands/output/json.ts').then(({ printJson: write }) => write(result));
7485

75-
const DEFAULT_CLI_DEPS: CliDeps = {
76-
sendToDaemon,
77-
};
78-
7986
const METRO_RUNTIME_OVERRIDE_FLAG_KEYS = new Set<FlagKey>([
8087
'launchUrl',
8188
'kind',
@@ -196,7 +203,7 @@ async function runCliOnHost(argv: string[], deps: CliDeps, host: HostEnvironment
196203
flags: ctx.effectiveFlags,
197204
replayTestReporterRuntime,
198205
commandProgress,
199-
transport: deps.sendToDaemon,
206+
transport: resolveRunTransport(deps, host),
200207
}),
201208
});
202209
await dispatchCliCommand(ctx, client, replayTestReporterRuntime, commandProgress);
@@ -411,7 +418,7 @@ async function resolveRemoteContext(ctx: CliRunContext, deps: CliDeps): Promise<
411418
if (ctx.effectiveFlags.remoteConfig && shouldMaterializeRemoteConnection(ctx.command)) {
412419
const materializationClient = createAgentDeviceClient(buildClientConfig(ctx), {
413420
host: ctx.host,
414-
transport: createClientDaemonTransport(deps.sendToDaemon),
421+
transport: createClientDaemonTransport(resolveRunTransport(deps, ctx.host)),
415422
});
416423
const { materializeRemoteConnectionForCommand } =
417424
await import('./cli/commands/connection-runtime.ts');

‎src/cli/commands/__tests__/proxy.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
listenOnLoopback,
1111
mkdtempForTestSync,
1212
skipWhenLoopbackUnavailable,
13+
bindTestCommandHost,
1314
} from '@agent-device/test-kit';
1415
import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
1516

@@ -46,6 +47,8 @@ vi.mock('../shared.ts', () => ({ writeCommandOutput: mocks.writeCommandOutput })
4647
import { proxyCommand, renderProxyStartup } from '../proxy.ts';
4748
import type { AgentDeviceClient } from '../../../agent-device-client.ts';
4849

50+
bindTestCommandHost();
51+
4952
// The proxy command never reads the client; a typed stub that throws on any access proves it
5053
// without the `{} as never` blind cast.
5154
const unreferencedClient = new Proxy({} as AgentDeviceClient, {

‎src/cli/commands/proxy.ts‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { commandHostEnvironment } from '@agent-device/host-kit/command';
12
import { randomBytes } from 'node:crypto';
23
import { createDaemonProxyServer } from '@agent-device/proxy';
34
import { buildDaemonHttpBaseUrl } from '@agent-device/contracts/daemon-http';
@@ -30,17 +31,21 @@ export const proxyCommand: ClientCommandHandler = async ({ positionals, flags })
3031
};
3132

3233
async function startProxy(flags: CliFlags): Promise<ProxyStartup> {
33-
const settings = resolveClientSettings({
34-
session: 'default',
35-
command: 'proxy',
36-
positionals: [],
37-
flags: {
38-
stateDir: flags.stateDir,
39-
daemonBaseUrl: '',
40-
daemonTransport: 'http',
41-
daemonServerMode: 'http',
34+
const settings = resolveClientSettings(
35+
{
36+
session: 'default',
37+
command: 'proxy',
38+
positionals: [],
39+
flags: {
40+
stateDir: flags.stateDir,
41+
daemonBaseUrl: '',
42+
daemonTransport: 'http',
43+
daemonServerMode: 'http',
44+
},
4245
},
43-
});
46+
undefined,
47+
commandHostEnvironment(),
48+
);
4449
const daemon = await ensureDaemon(settings);
4550
const upstreamBaseUrl = resolveLocalDaemonBaseUrl(daemon.info.httpPort);
4651
const token = resolveProxyClientToken(flags);

‎src/daemon-client/__tests__/daemon-client-lease-beat.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@ describe('buildUploadLeaseHeartbeat', () => {
578578
};
579579

580580
const settings = {
581+
host: { env: process.env, cwd: process.cwd() },
581582
paths: resolveDaemonPaths('/tmp/agent-device-upload-lease'),
582583
transportPreference: 'socket' as const,
583584
serverMode: 'socket' as const,
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import path from 'node:path';
2+
import { expect, test, vi } from 'vitest';
3+
4+
const ensured = vi.hoisted(() => ({ settings: undefined as unknown }));
5+
6+
vi.mock('./daemon-client-lifecycle.ts', async (importOriginal) => ({
7+
...(await importOriginal<typeof import('./daemon-client-lifecycle.ts')>()),
8+
ensureDaemon: async (settings: unknown) => {
9+
ensured.settings = settings;
10+
throw new Error('stop before talking to a daemon');
11+
},
12+
}));
13+
14+
import { createAgentDeviceClient } from '../agent-device-client.ts';
15+
import { createDaemonTransport } from './daemon-client.ts';
16+
import type { DaemonClientSettings } from './daemon-client-lifecycle.ts';
17+
18+
const request = { session: 'default', command: 'devices', positionals: [] };
19+
20+
test('a transport resolves its daemon from the host it was built for, not the process', async () => {
21+
vi.stubEnv('AGENT_DEVICE_STATE_DIR', '/process/state');
22+
const host = {
23+
env: { AGENT_DEVICE_STATE_DIR: 'client-state', AGENT_DEVICE_DAEMON_SERVER_MODE: 'http' },
24+
cwd: '/client/workspace',
25+
};
26+
27+
await expect(createDaemonTransport(host)(request)).rejects.toThrow('stop before talking');
28+
29+
const settings = ensured.settings as DaemonClientSettings;
30+
expect(settings.host).toBe(host);
31+
expect(settings.paths.baseDir).toBe(path.resolve('/client/workspace', 'client-state'));
32+
expect(settings.serverMode).toBe('http');
33+
});
34+
35+
test('a client reports and uses the same state dir when its host and the process disagree', async () => {
36+
vi.stubEnv('AGENT_DEVICE_STATE_DIR', '/process/state');
37+
const host = { env: { AGENT_DEVICE_STATE_DIR: '/client/state' }, cwd: '/client/workspace' };
38+
const client = createAgentDeviceClient({}, { host });
39+
40+
await expect(client.sessions.stateDir()).resolves.toBe('/client/state');
41+
await expect(client.devices.list()).rejects.toThrow();
42+
43+
expect((ensured.settings as DaemonClientSettings).paths.baseDir).toBe('/client/state');
44+
});

‎src/daemon-client/daemon-client-lifecycle.ts‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { AppError, normalizeError, type NormalizedError } from '@agent-device/ke
88
import { readReplayDivergenceResume } from '@agent-device/ad-replay/divergence';
99
import { type ExecDetachedExit } from '@agent-device/host-kit/command';
1010
import { shellQuoteIfNeeded } from '@agent-device/kernel/device-shell';
11+
import type { EnvMap, HostEnvironment } from '@agent-device/kernel/source-value';
1112
import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
1213
import { isProcessAlive } from '@agent-device/host-kit/process';
1314
import { sleep } from '@agent-device/host-kit/retry';
@@ -53,6 +54,8 @@ import {
5354
} from './daemon-client-transport.ts';
5455

5556
export type DaemonClientSettings = {
57+
/** The environment and working directory this client reads, for every setting below and the launch. */
58+
host: HostEnvironment;
5659
paths: DaemonPaths;
5760
transportPreference: DaemonTransportPreference;
5861
serverMode: DaemonServerMode;
@@ -85,16 +88,20 @@ LOOPBACK_BLOCK_LIST.addSubnet('::ffff:127.0.0.0', 104, 'ipv6');
8588

8689
export function resolveClientSettings(
8790
req: Omit<DaemonWireRequest, 'token'>,
88-
suppliedAuthToken?: string,
91+
suppliedAuthToken: string | undefined,
92+
host: HostEnvironment,
8993
): DaemonClientSettings {
90-
const explicitStateDir = resolveExplicitStateDir(req);
91-
const remote = resolveRemoteClientSettings(req, suppliedAuthToken);
92-
const transport = resolveTransportClientSettings(req, remote.remoteBaseUrl);
94+
const explicitStateDir = resolveExplicitStateDir(req, host.env);
95+
const remote = resolveRemoteClientSettings(req, suppliedAuthToken, host.env);
96+
const transport = resolveTransportClientSettings(req, remote.remoteBaseUrl, host.env);
9397
const ownedStateDir = shouldUseOwnedReplayStateDir(req, explicitStateDir, remote.rawBaseUrl)
9498
? createOwnedReplayStateDir()
9599
: undefined;
96100
return {
97-
paths: ownedStateDir?.paths ?? resolveDaemonPaths(explicitStateDir, { cwd: process.cwd() }),
101+
host,
102+
paths:
103+
ownedStateDir?.paths ??
104+
resolveDaemonPaths(explicitStateDir, { env: host.env, cwd: host.cwd }),
98105
transportPreference: transport.preference,
99106
serverMode: transport.serverMode,
100107
ownedStateDir,
@@ -103,30 +110,35 @@ export function resolveClientSettings(
103110
};
104111
}
105112

106-
function resolveExplicitStateDir(req: Omit<DaemonWireRequest, 'token'>): string | undefined {
107-
return req.flags?.stateDir ?? process.env.AGENT_DEVICE_STATE_DIR;
113+
function resolveExplicitStateDir(
114+
req: Omit<DaemonWireRequest, 'token'>,
115+
env: Readonly<EnvMap>,
116+
): string | undefined {
117+
return req.flags?.stateDir ?? env.AGENT_DEVICE_STATE_DIR;
108118
}
109119

110120
function resolveRemoteClientSettings(
111121
req: Omit<DaemonWireRequest, 'token'>,
112122
suppliedAuthToken: string | undefined,
123+
env: Readonly<EnvMap>,
113124
): {
114125
rawBaseUrl: string | undefined;
115126
remoteBaseUrl?: string;
116127
authToken?: string;
117128
} {
118-
const rawBaseUrl = req.flags?.daemonBaseUrl ?? process.env.AGENT_DEVICE_DAEMON_BASE_URL;
129+
const rawBaseUrl = req.flags?.daemonBaseUrl ?? env.AGENT_DEVICE_DAEMON_BASE_URL;
119130
const remoteBaseUrl = resolveRemoteDaemonBaseUrl(rawBaseUrl);
120-
const authToken = suppliedAuthToken ?? process.env.AGENT_DEVICE_DAEMON_AUTH_TOKEN;
131+
const authToken = suppliedAuthToken ?? env.AGENT_DEVICE_DAEMON_AUTH_TOKEN;
121132
validateRemoteDaemonTrust(remoteBaseUrl, authToken);
122133
return { rawBaseUrl, remoteBaseUrl, authToken };
123134
}
124135

125136
function resolveTransportClientSettings(
126137
req: Omit<DaemonWireRequest, 'token'>,
127138
remoteBaseUrl: string | undefined,
139+
env: Readonly<EnvMap>,
128140
): { preference: DaemonTransportPreference; serverMode: DaemonServerMode } {
129-
const rawTransport = req.flags?.daemonTransport ?? process.env.AGENT_DEVICE_DAEMON_TRANSPORT;
141+
const rawTransport = req.flags?.daemonTransport ?? env.AGENT_DEVICE_DAEMON_TRANSPORT;
130142
const preference = resolveDaemonTransportPreference(rawTransport);
131143
if (remoteBaseUrl && preference === 'socket') {
132144
throw new AppError(
@@ -137,7 +149,7 @@ function resolveTransportClientSettings(
137149
}
138150
const rawServerMode =
139151
req.flags?.daemonServerMode ??
140-
process.env.AGENT_DEVICE_DAEMON_SERVER_MODE ??
152+
env.AGENT_DEVICE_DAEMON_SERVER_MODE ??
141153
(rawTransport === 'dual' ? 'dual' : undefined);
142154
return {
143155
preference,
@@ -160,7 +172,7 @@ export async function ensureDaemon(settings: DaemonClientSettings): Promise<Ensu
160172

161173
const ensured = await ensureLocalDaemon(settings);
162174
// Checked on both branches: a startup can resolve to a daemon another caller raced in.
163-
await assertDaemonPolicyMatches(ensured.info, settings.paths.baseDir);
175+
await assertDaemonPolicyMatches(ensured.info, settings.paths.baseDir, settings.host.env);
164176
return ensured;
165177
}
166178

@@ -304,10 +316,14 @@ async function canReachReusableDaemon(
304316
* ADR 0029: a caller that names a daemon policy must not silently use a daemon that enforces a
305317
* different one (or none). A caller that names no policy uses whatever the daemon enforces.
306318
*/
307-
async function assertDaemonPolicyMatches(existing: DaemonInfo, stateDir: string): Promise<void> {
308-
if (!process.env.AGENT_DEVICE_DAEMON_POLICY?.trim()) return;
319+
async function assertDaemonPolicyMatches(
320+
existing: DaemonInfo,
321+
stateDir: string,
322+
env: Readonly<EnvMap>,
323+
): Promise<void> {
324+
if (!env.AGENT_DEVICE_DAEMON_POLICY?.trim()) return;
309325
const { loadDaemonPolicy } = await import('@agent-device/daemon-contracts/daemon-policy-file');
310-
const expected = loadDaemonPolicy(process.env)?.digest;
326+
const expected = loadDaemonPolicy(env)?.digest;
311327
if (expected === existing.policyDigest) return;
312328
throw new AppError(
313329
'COMMAND_FAILED',
@@ -815,7 +831,7 @@ function startDaemon(settings: DaemonClientSettings): DaemonStartupLaunch {
815831
return launchDaemonProcess({
816832
paths: settings.paths,
817833
serverMode: settings.serverMode,
818-
env: process.env,
834+
env: settings.host.env,
819835
ownedStateDir: settings.ownedStateDir,
820836
args: launchSpec.useSrc
821837
? ['--experimental-strip-types', launchSpec.srcPath]

‎src/daemon-client/daemon-client-metadata.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { isProcessPid } from '@agent-device/host-kit/process';
44
import type { DaemonCodeOrigin } from '@agent-device/host-kit/code-signature';
55

66
import {
7-
resolveDaemonPaths,
87
type DaemonPaths,
98
type DaemonServerMode,
109
} from '@agent-device/daemon-contracts/daemon-resolution';
@@ -94,10 +93,7 @@ export function isRemoteDaemon(info: DaemonInfo): boolean {
9493

9594
export function resolveDaemonStartupHint(
9695
state: { hasInfo: boolean; hasLock: boolean },
97-
paths: Pick<DaemonPaths, 'infoPath' | 'lockPath'> = resolveDaemonPaths(
98-
process.env.AGENT_DEVICE_STATE_DIR,
99-
{ cwd: process.cwd() },
100-
),
96+
paths: Pick<DaemonPaths, 'infoPath' | 'lockPath'>,
10197
): string {
10298
const artifacts = [state.hasInfo ? paths.infoPath : null, state.hasLock ? paths.lockPath : null]
10399
.filter(Boolean)

0 commit comments

Comments
 (0)