@@ -98,10 +98,11 @@ const noSpawn = ChildProcessSpawner.make(() =>
9898 Effect . die ( "Version advisory resolution must not spawn a process" ) ,
9999) ;
100100
101- // A native launcher at 2.1.308 with the given user and managed settings.json contents .
102- const resolveNativeAdvisory = Effect . fn ( "resolveNativeAdvisory " ) ( function * ( input : {
101+ // A native launcher at 2.1.308 with the given user, managed and managed drop-in settings .
102+ const makeNativeInstall = Effect . fn ( "makeNativeInstall " ) ( function * ( input : {
103103 readonly user : object ;
104104 readonly managed ?: object ;
105+ readonly managedDropIns ?: Record < string , object > ;
105106 readonly unavailableTags ?: ReadonlyArray < string > ;
106107} ) {
107108 const fs = yield * FileSystem . FileSystem ;
@@ -111,23 +112,30 @@ const resolveNativeAdvisory = Effect.fn("resolveNativeAdvisory")(function* (inpu
111112 const versionPath = NodePath . join ( home , ".local" , "share" , "claude" , "versions" , "2.1.308" ) ;
112113 const launcherPath = NodePath . join ( home , ".local" , "bin" , "claude" ) ;
113114 const managedDirectory = NodePath . join ( home , "managed" ) ;
115+ const writeUserSettings = ( settings : object ) =>
116+ fs . writeFileString ( NodePath . join ( home , ".claude" , "settings.json" ) , JSON . stringify ( settings ) ) ;
114117 yield * fs . makeDirectory ( NodePath . dirname ( versionPath ) , { recursive : true } ) ;
115118 yield * fs . writeFileString ( versionPath , "#!/bin/sh\n" ) ;
116119 yield * fs . chmod ( versionPath , 0o755 ) ;
117120 yield * fs . makeDirectory ( NodePath . dirname ( launcherPath ) , { recursive : true } ) ;
118121 yield * fs . symlink ( versionPath , launcherPath ) ;
119122 yield * fs . makeDirectory ( NodePath . join ( home , ".claude" ) ) ;
120- yield * fs . writeFileString (
121- NodePath . join ( home , ".claude" , "settings.json" ) ,
122- JSON . stringify ( input . user ) ,
123- ) ;
124- yield * fs . makeDirectory ( managedDirectory ) ;
123+ yield * writeUserSettings ( input . user ) ;
124+ yield * fs . makeDirectory ( NodePath . join ( managedDirectory , "managed-settings.d" ) , {
125+ recursive : true ,
126+ } ) ;
125127 if ( input . managed ) {
126128 yield * fs . writeFileString (
127129 NodePath . join ( managedDirectory , "managed-settings.json" ) ,
128130 JSON . stringify ( input . managed ) ,
129131 ) ;
130132 }
133+ for ( const [ name , settings ] of Object . entries ( input . managedDropIns ?? { } ) ) {
134+ yield * fs . writeFileString (
135+ NodePath . join ( managedDirectory , "managed-settings.d" , name ) ,
136+ JSON . stringify ( settings ) ,
137+ ) ;
138+ }
131139 const requestedTags : Array < string > = [ ] ;
132140
133141 const instance = yield * ClaudeDriver . create ( {
@@ -139,30 +147,38 @@ const resolveNativeAdvisory = Effect.fn("resolveNativeAdvisory")(function* (inpu
139147 } ) . pipe (
140148 Effect . provideService ( ChildProcessSpawner . ChildProcessSpawner , noSpawn ) ,
141149 Effect . provideService ( HostProcess . HomeDirectory , home ) ,
150+ Effect . provideService ( HostProcess . Environment , { HOME : home } ) ,
142151 Effect . provideService ( ClaudeManagedConfigDirectory , managedDirectory ) ,
143152 Effect . provideService (
144153 HttpClient . HttpClient ,
145154 makeNpmRegistry ( requestedTags , input . unavailableTags ) ,
146155 ) ,
147156 ) ;
148- const capabilities = yield * instance . snapshot . resolveMaintenance ( ) ;
149- const latestVersion = yield * resolveLatestProviderVersion ( capabilities ) . pipe (
150- Effect . provideServiceEffect (
151- ProviderLatestVersions . ProviderLatestVersions ,
152- ProviderLatestVersions . make ( ) ,
153- ) ,
154- ) ;
157+ const latestVersions = yield * ProviderLatestVersions . make ( ) ;
155158
156- expect ( capabilities . update ) . toMatchObject ( { executable : launcherPath , args : [ "update" ] } ) ;
157- return {
158- requestedTags,
159- advisory : createProviderVersionAdvisory ( {
159+ const resolveAdvisory = Effect . fn ( "resolveAdvisory" ) ( function * ( options ?: {
160+ readonly fresh ?: boolean ;
161+ } ) {
162+ const capabilities = yield * instance . snapshot . resolveMaintenance ( options ) ;
163+ const latestVersion = yield * resolveLatestProviderVersion ( capabilities ) . pipe (
164+ Effect . provideService ( ProviderLatestVersions . ProviderLatestVersions , latestVersions ) ,
165+ ) ;
166+ expect ( capabilities . update ) . toMatchObject ( { executable : launcherPath , args : [ "update" ] } ) ;
167+ return createProviderVersionAdvisory ( {
160168 driver : ClaudeDriver . driverKind ,
161169 currentVersion : "2.1.308" ,
162170 latestVersion,
163171 maintenanceCapabilities : capabilities ,
164- } ) ,
165- } ;
172+ } ) ;
173+ } ) ;
174+ return { requestedTags, writeUserSettings, resolveAdvisory } ;
175+ } ) ;
176+
177+ const resolveNativeAdvisory = Effect . fn ( "resolveNativeAdvisory" ) ( function * (
178+ input : Parameters < typeof makeNativeInstall > [ 0 ] ,
179+ ) {
180+ const install = yield * makeNativeInstall ( input ) ;
181+ return { requestedTags : install . requestedTags , advisory : yield * install . resolveAdvisory ( ) } ;
166182} ) ;
167183
168184it . layer ( layerTest ) ( "ClaudeDriver" , ( it ) => {
@@ -212,6 +228,52 @@ it.layer(layerTest)("ClaudeDriver", (it) => {
212228 { skip : windowsHost } ,
213229 ) ;
214230
231+ it . effect (
232+ "follows the last managed drop-in's update channel over the base managed file" ,
233+ ( ) =>
234+ Effect . gen ( function * ( ) {
235+ const { advisory } = yield * resolveNativeAdvisory ( {
236+ user : { } ,
237+ managed : { autoUpdatesChannel : "stable" } ,
238+ managedDropIns : {
239+ "10-telemetry.json" : { env : { } } ,
240+ "20-updates.json" : { autoUpdatesChannel : "latest" } ,
241+ "30-notes.txt" : { autoUpdatesChannel : "stable" } ,
242+ } ,
243+ } ) ;
244+ expect ( advisory ) . toMatchObject ( {
245+ status : "behind_latest" ,
246+ latestVersion : "2.1.312" ,
247+ } ) ;
248+ } ) . pipe ( Effect . scoped ) ,
249+ { skip : windowsHost } ,
250+ ) ;
251+
252+ it . effect (
253+ "follows a switched update channel after a fresh maintenance resolution" ,
254+ ( ) =>
255+ Effect . gen ( function * ( ) {
256+ const install = yield * makeNativeInstall ( { user : { autoUpdatesChannel : "stable" } } ) ;
257+ expect ( yield * install . resolveAdvisory ( ) ) . toMatchObject ( {
258+ status : "current" ,
259+ latestVersion : "2.1.308" ,
260+ } ) ;
261+
262+ yield * install . writeUserSettings ( { autoUpdatesChannel : "latest" } ) ;
263+ expect ( yield * install . resolveAdvisory ( { fresh : true } ) ) . toMatchObject ( {
264+ status : "behind_latest" ,
265+ latestVersion : "2.1.312" ,
266+ } ) ;
267+
268+ yield * install . writeUserSettings ( { autoUpdatesChannel : "stable" } ) ;
269+ expect ( yield * install . resolveAdvisory ( { fresh : true } ) ) . toMatchObject ( {
270+ status : "current" ,
271+ latestVersion : "2.1.308" ,
272+ } ) ;
273+ } ) . pipe ( Effect . scoped ) ,
274+ { skip : windowsHost } ,
275+ ) ;
276+
215277 it . effect (
216278 "reports no latest version when the stable channel's release cannot be fetched" ,
217279 ( ) =>
0 commit comments