@@ -166,6 +166,8 @@ interface ScopedServerWrite {
166166 readonly environmentId : EnvironmentId ;
167167 readonly label : string ;
168168 readonly patch : ServerSettingsPatch ;
169+ /** The environment's settings before the write, to tell a dropped key from a saved one. */
170+ readonly previous : ServerSettings ;
169171}
170172
171173function projectOverrideWrites (
@@ -194,6 +196,7 @@ function projectOverrideWrites(
194196 writes . set ( member . environmentId , {
195197 environmentId : member . environmentId ,
196198 label : environment . label ,
199+ previous : settings ,
197200 patch : {
198201 projectSettingsOverrides : {
199202 ...existing ?. patch . projectSettingsOverrides ,
@@ -266,29 +269,38 @@ export function planScopedSettingsPatch(
266269 return next as ProjectSettingsOverrides ;
267270 } )
268271 : scope . kind === "all" || scope . kind === "environment"
269- ? connectedEnvironments . map ( ( environment ) => ( {
270- environmentId : environment . environmentId ,
271- label : environment . label ,
272- patch :
273- environment . serverConfig ?. settings . worktreeCleanup != null &&
274- serverPatch . storageCleanup &&
275- Object . keys ( serverPatch . storageCleanup ) . some ( ( key ) => key . startsWith ( "worktree" ) )
276- ? {
277- ...serverPatch ,
278- worktreeCleanup : {
279- mode : "custom" ,
280- rules : {
281- ...resolveWorktreeCleanup ( environment . serverConfig . settings , null ) ,
282- ...Object . fromEntries (
283- Object . entries ( serverPatch . storageCleanup ) . filter ( ( [ key ] ) =>
284- key . startsWith ( "worktree" ) ,
285- ) ,
286- ) ,
287- } ,
288- } ,
289- }
290- : serverPatch ,
291- } ) )
272+ ? connectedEnvironments . flatMap ( ( environment ) => {
273+ const previous = environment . serverConfig ?. settings ;
274+ if ( ! previous ) return [ ] ;
275+ return [
276+ {
277+ environmentId : environment . environmentId ,
278+ label : environment . label ,
279+ previous,
280+ patch :
281+ previous . worktreeCleanup != null &&
282+ serverPatch . storageCleanup &&
283+ Object . keys ( serverPatch . storageCleanup ) . some ( ( key ) =>
284+ key . startsWith ( "worktree" ) ,
285+ )
286+ ? {
287+ ...serverPatch ,
288+ worktreeCleanup : {
289+ mode : "custom" ,
290+ rules : {
291+ ...resolveWorktreeCleanup ( previous , null ) ,
292+ ...Object . fromEntries (
293+ Object . entries ( serverPatch . storageCleanup ) . filter ( ( [ key ] ) =>
294+ key . startsWith ( "worktree" ) ,
295+ ) ,
296+ ) ,
297+ } ,
298+ } ,
299+ }
300+ : serverPatch ,
301+ } ,
302+ ] ;
303+ } )
292304 : [ ] ;
293305 const hasClientWrite = Object . keys ( clientPatch ) . length > 0 ;
294306 const hasWrite = hasClientWrite || serverWrites . length > 0 ;
@@ -371,6 +383,7 @@ export function planProjectOverridesClear(
371383 writes . set ( environmentId , {
372384 environmentId,
373385 label : environment . label ,
386+ previous : settings ,
374387 patch : {
375388 projectSettingsOverrides : {
376389 ...existing ?. patch . projectSettingsOverrides ,
@@ -389,13 +402,44 @@ export function planProjectOverridesClear(
389402 } ;
390403}
391404
405+ /** Whether writing `value` leaves `current` as it is. Partial objects compare only the fields they set. */
406+ function patchLeavesUnchanged ( value : unknown , current : unknown ) : boolean {
407+ if ( typeof value === "string" && typeof current === "string" ) return value . trim ( ) === current ;
408+ if ( isPlainObject ( value ) && isPlainObject ( current ) ) {
409+ return Object . entries ( value ) . every ( ( [ field , next ] ) =>
410+ next === null ? current [ field ] == null : patchLeavesUnchanged ( next , current [ field ] ) ,
411+ ) ;
412+ }
413+ return Equal . equals ( value , current ) ;
414+ }
415+
416+ /**
417+ * An older server drops keys it does not know, top-level or nested, and still
418+ * succeeds. A key that should have changed but reads back as it was before
419+ * the write was dropped; left unreported, the row stays mixed forever.
420+ */
421+ function droppedSettingKeys ( write : ScopedServerWrite , saved : ServerSettings | undefined ) {
422+ if ( saved === undefined ) return [ ] ;
423+ return Object . entries ( write . patch ) . flatMap ( ( [ key , value ] ) => {
424+ const before = write . previous [ key as keyof ServerSettings ] ;
425+ return Equal . equals ( saved [ key as keyof ServerSettings ] , before ) &&
426+ ! patchLeavesUnchanged ( value , before )
427+ ? [ key ]
428+ : [ ] ;
429+ } ) ;
430+ }
431+
392432/** Wait for every target so a failed environment does not hide successful or later writes. */
393433export async function persistScopedSettingsPatch (
394434 plan : ReturnType < typeof planScopedSettingsPatch > ,
395435 persistServer : ( input : {
396436 environmentId : EnvironmentId ;
397437 input : { patch : ServerSettingsPatch } ;
398- } ) => Promise < { readonly _tag : "Success" | "Failure" ; readonly cause ?: Cause . Cause < unknown > } > ,
438+ } ) => Promise < {
439+ readonly _tag : "Success" | "Failure" ;
440+ readonly cause ?: Cause . Cause < unknown > ;
441+ readonly value ?: ServerSettings ;
442+ } > ,
399443 persistClient : ( patch : ClientSettingsPatch ) => void ,
400444) {
401445 if ( plan . hasClientWrite ) persistClient ( plan . clientPatch ) ;
@@ -404,9 +448,25 @@ export async function persistScopedSettingsPatch(
404448 persistServer ( { environmentId, input : { patch } } ) ,
405449 ) ,
406450 ) ;
451+ const saved = ( index : number ) => {
452+ const result = results [ index ] ;
453+ return (
454+ result ?. status === "fulfilled" &&
455+ result . value . _tag === "Success" &&
456+ droppedSettingKeys ( plan . serverWrites [ index ] ! , result . value . value ) . length === 0
457+ ) ;
458+ } ;
407459 const failedEnvironments = plan . serverWrites . flatMap ( ( environment , index ) => {
460+ if ( saved ( index ) ) return [ ] ;
408461 const result = results [ index ] ;
409- if ( result ?. status === "fulfilled" && result . value . _tag === "Success" ) return [ ] ;
462+ if ( result ?. status === "fulfilled" && result . value . _tag === "Success" ) {
463+ return [
464+ {
465+ ...environment ,
466+ message : "This environment does not support this setting. Update T3 Code on it." ,
467+ } ,
468+ ] ;
469+ }
410470 const error : unknown =
411471 result ?. status === "rejected"
412472 ? result . reason
@@ -423,10 +483,7 @@ export async function persistScopedSettingsPatch(
423483 } ,
424484 ] ;
425485 } ) ;
426- const savedEnvironments = plan . serverWrites . filter ( ( _ , index ) => {
427- const result = results [ index ] ;
428- return result ?. status === "fulfilled" && result . value . _tag === "Success" ;
429- } ) ;
486+ const savedEnvironments = plan . serverWrites . filter ( ( _ , index ) => saved ( index ) ) ;
430487 return {
431488 failedEnvironments,
432489 savedEnvironments,
0 commit comments