@@ -8,6 +8,7 @@ import { AppError, normalizeError, type NormalizedError } from '@agent-device/ke
88import { readReplayDivergenceResume } from '@agent-device/ad-replay/divergence' ;
99import { type ExecDetachedExit } from '@agent-device/host-kit/command' ;
1010import { shellQuoteIfNeeded } from '@agent-device/kernel/device-shell' ;
11+ import type { EnvMap , HostEnvironment } from '@agent-device/kernel/source-value' ;
1112import { emitDiagnostic } from '@agent-device/host-kit/diagnostics' ;
1213import { isProcessAlive } from '@agent-device/host-kit/process' ;
1314import { sleep } from '@agent-device/host-kit/retry' ;
@@ -53,6 +54,8 @@ import {
5354} from './daemon-client-transport.ts' ;
5455
5556export 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
8689export 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
110120function 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
125136function 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 ]
0 commit comments