@@ -1283,6 +1283,163 @@ it.layer(NodeServices.layer)("server settings", (it) => {
12831283 } ) . pipe ( Effect . provide ( makeServerSettingsLayer ( ) ) ) ,
12841284 ) ;
12851285
1286+ it . effect ( "rolls back provider secret changes when the settings file commit fails" , ( ) =>
1287+ Effect . gen ( function * ( ) {
1288+ const fileSystem = yield * FileSystem . FileSystem ;
1289+ let failRename = false ;
1290+ let settingsPathToFail : string | undefined ;
1291+ const writeFailure = PlatformError . systemError ( {
1292+ _tag : "PermissionDenied" ,
1293+ module : "FileSystem" ,
1294+ method : "rename" ,
1295+ description : "Forced settings write failure." ,
1296+ } ) ;
1297+ const failingFileSystem = FileSystem . FileSystem . of ( {
1298+ ...fileSystem ,
1299+ rename : ( fromPath , toPath ) =>
1300+ failRename && toPath === settingsPathToFail
1301+ ? Effect . fail ( writeFailure )
1302+ : fileSystem . rename ( fromPath , toPath ) ,
1303+ } ) ;
1304+ const instanceId = ProviderInstanceId . make ( "codex_write_failure" ) ;
1305+ const settingsLayer = makeServerSettingsLayer ( ) . pipe (
1306+ Layer . provideMerge ( Layer . succeed ( FileSystem . FileSystem , failingFileSystem ) ) ,
1307+ ) ;
1308+
1309+ yield * Effect . gen ( function * ( ) {
1310+ const serverSettings = yield * ServerSettingsModule . ServerSettingsService ;
1311+ settingsPathToFail = ( yield * ServerConfig . ServerConfig ) . settingsPath ;
1312+ yield * serverSettings . updateSettings ( {
1313+ providerInstances : {
1314+ [ instanceId ] : {
1315+ driver : ProviderDriverKind . make ( "codex" ) ,
1316+ environment : [ { name : "OPENROUTER_API_KEY" , value : "sk-kept" , sensitive : true } ] ,
1317+ config : { } ,
1318+ } ,
1319+ } ,
1320+ } ) ;
1321+
1322+ failRename = true ;
1323+ const failedUpdate = yield * serverSettings
1324+ . updateSettings ( {
1325+ providerInstances : {
1326+ [ instanceId ] : {
1327+ driver : ProviderDriverKind . make ( "codex" ) ,
1328+ environment : [ { name : "OPENROUTER_API_KEY" , value : "sk-new" , sensitive : true } ] ,
1329+ config : { } ,
1330+ } ,
1331+ } ,
1332+ } )
1333+ . pipe ( Effect . result ) ;
1334+ assert . equal ( failedUpdate . _tag , "Failure" ) ;
1335+ assert . equal (
1336+ ( yield * serverSettings . getSettings ) . providerInstances [ instanceId ] ?. environment ?. [ 0 ]
1337+ ?. value ,
1338+ "sk-kept" ,
1339+ ) ;
1340+
1341+ const failed = yield * serverSettings
1342+ . updateSettings ( { providerInstances : { } } )
1343+ . pipe ( Effect . result ) ;
1344+ assert . equal ( failed . _tag , "Failure" ) ;
1345+ assert . equal (
1346+ ( yield * serverSettings . getSettings ) . providerInstances [ instanceId ] ?. environment ?. [ 0 ]
1347+ ?. value ,
1348+ "sk-kept" ,
1349+ ) ;
1350+ } ) . pipe ( Effect . provide ( settingsLayer ) ) ;
1351+ } ) ,
1352+ ) ;
1353+
1354+ it . effect ( "rolls back provider secret changes when response materialization fails" , ( ) => {
1355+ const textDecoder = new TextDecoder ( ) ;
1356+ const secrets = new Map < string , Uint8Array > ( ) ;
1357+ let rejectNewSecret = false ;
1358+ const secretStoreLayer = Layer . succeed (
1359+ ServerSecretStore . ServerSecretStore ,
1360+ ServerSecretStore . ServerSecretStore . of ( {
1361+ get : ( name ) =>
1362+ Effect . suspend ( ( ) => {
1363+ const value = secrets . get ( name ) ;
1364+ if ( rejectNewSecret && value !== undefined && textDecoder . decode ( value ) === "sk-new" ) {
1365+ return Effect . fail (
1366+ new ServerSecretStore . SecretStoreReadError ( {
1367+ resource : `secret ${ name } ` ,
1368+ cause : "Forced response materialization failure." ,
1369+ } ) ,
1370+ ) ;
1371+ }
1372+ return Effect . succeed (
1373+ value === undefined ? Option . none ( ) : Option . some ( Uint8Array . from ( value ) ) ,
1374+ ) ;
1375+ } ) ,
1376+ set : ( name , value ) =>
1377+ Effect . sync ( ( ) => {
1378+ secrets . set ( name , Uint8Array . from ( value ) ) ;
1379+ } ) ,
1380+ create : ( name , value ) =>
1381+ Effect . sync ( ( ) => {
1382+ secrets . set ( name , Uint8Array . from ( value ) ) ;
1383+ } ) ,
1384+ getOrCreateRandom : ( name , bytes ) =>
1385+ Effect . sync ( ( ) => {
1386+ const value = secrets . get ( name ) ?? new Uint8Array ( bytes ) ;
1387+ secrets . set ( name , value ) ;
1388+ return Uint8Array . from ( value ) ;
1389+ } ) ,
1390+ remove : ( name ) =>
1391+ Effect . sync ( ( ) => {
1392+ secrets . delete ( name ) ;
1393+ } ) ,
1394+ } ) ,
1395+ ) ;
1396+ const settingsLayer = ServerSettingsModule . layer . pipe (
1397+ Layer . provideMerge ( Layer . fresh ( SqlitePersistenceMemory ) ) ,
1398+ Layer . provide ( secretStoreLayer ) ,
1399+ Layer . provideMerge (
1400+ Layer . fresh (
1401+ ServerConfig . layerTest ( process . cwd ( ) , {
1402+ prefix : "t3code-server-settings-materialization-failure-test-" ,
1403+ } ) ,
1404+ ) ,
1405+ ) ,
1406+ ) ;
1407+ const instanceId = ProviderInstanceId . make ( "codex_materialization_failure" ) ;
1408+
1409+ return Effect . gen ( function * ( ) {
1410+ const serverSettings = yield * ServerSettingsModule . ServerSettingsService ;
1411+ yield * serverSettings . updateSettings ( {
1412+ providerInstances : {
1413+ [ instanceId ] : {
1414+ driver : ProviderDriverKind . make ( "codex" ) ,
1415+ environment : [ { name : "OPENROUTER_API_KEY" , value : "sk-kept" , sensitive : true } ] ,
1416+ config : { } ,
1417+ } ,
1418+ } ,
1419+ } ) ;
1420+
1421+ rejectNewSecret = true ;
1422+ const failedUpdate = yield * serverSettings
1423+ . updateSettings ( {
1424+ providerInstances : {
1425+ [ instanceId ] : {
1426+ driver : ProviderDriverKind . make ( "codex" ) ,
1427+ environment : [ { name : "OPENROUTER_API_KEY" , value : "sk-new" , sensitive : true } ] ,
1428+ config : { } ,
1429+ } ,
1430+ } ,
1431+ } )
1432+ . pipe ( Effect . result ) ;
1433+
1434+ assert . equal ( failedUpdate . _tag , "Failure" ) ;
1435+ rejectNewSecret = false ;
1436+ assert . equal (
1437+ ( yield * serverSettings . getSettings ) . providerInstances [ instanceId ] ?. environment ?. [ 0 ] ?. value ,
1438+ "sk-kept" ,
1439+ ) ;
1440+ } ) . pipe ( Effect . provide ( settingsLayer ) ) ;
1441+ } ) ;
1442+
12861443 it . effect ( "folds legacy project overrides into projectSettingsOverrides once" , ( ) =>
12871444 Effect . gen ( function * ( ) {
12881445 const serverConfig = yield * ServerConfig . ServerConfig ;
0 commit comments