@@ -3,7 +3,7 @@ import { Database } from "bun:sqlite"
33import { Effect , Layer , Schema } from "effect"
44import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
55import path from "path"
6- import { TestInstance , testInstanceStoreLayer , tmpdir } from "../../fixture/fixture"
6+ import { requireInstance , testInstanceStoreLayer , tmpdir } from "../../fixture/fixture"
77import { testEffect } from "../../lib/effect"
88import { initTool } from "../tool-fixture"
99import { Agent } from "../../../src/agent/agent"
@@ -1157,48 +1157,47 @@ testEffect(Layer.mergeAll(CrossSpawnSpawner.defaultLayer, testInstanceStoreLayer
11571157 "multi-pattern SQL permissions reject a later deny before prompting and still prompt once when allowed" ,
11581158 ( ) =>
11591159 Effect . gen ( function * ( ) {
1160- const { directory } = yield * TestInstance
1160+ const instance = yield * requireInstance
11611161 yield * Effect . promise ( ( ) =>
1162- Instance . provide ( {
1163- directory,
1164- fn : async ( ) => {
1165- const asked : PermissionNext . Request [ ] = [ ]
1166- const publish = spyOn ( Bus , "publish" ) . mockImplementation ( async ( event , properties ) => {
1167- if ( event . type !== PermissionNext . Event . Asked . type ) return
1168- const request = properties as PermissionNext . Request
1169- asked . push ( request )
1170- await PermissionNext . reply ( { requestID : request . id , reply : "once" } )
1171- } )
1172- const request = {
1173- permission : "sql_execute" ,
1174- patterns : [ "SELECT * FROM orders" , "SELECT * FROM sensitive_table" ] ,
1175- always : [ ] ,
1176- metadata : { } ,
1177- sessionID : SessionID . make ( "session_sql_permissions" ) ,
1178- }
1179- try {
1180- await expect (
1181- PermissionNext . ask ( {
1182- ...request ,
1183- ruleset : [
1184- { permission : "sql_execute" , pattern : "*" , action : "ask" } ,
1185- { permission : "sql_execute" , pattern : "*sensitive_table*" , action : "deny" } ,
1186- ] ,
1187- } ) ,
1188- ) . rejects . toBeInstanceOf ( PermissionNext . DeniedError )
1189- expect ( asked ) . toEqual ( [ ] )
1190- expect ( await PermissionNext . list ( ) ) . toEqual ( [ ] )
1191- await PermissionNext . ask ( {
1162+ Instance . restore ( instance , async ( ) => {
1163+ const asked : PermissionNext . Request [ ] = [ ]
1164+ const publish = spyOn ( Bus , "publish" ) . mockImplementation ( async ( event , properties ) => {
1165+ if ( event . type !== PermissionNext . Event . Asked . type ) return
1166+ const request = properties as PermissionNext . Request
1167+ asked . push ( request )
1168+ await PermissionNext . reply ( { requestID : request . id , reply : "once" } )
1169+ } )
1170+ const request = {
1171+ permission : "sql_execute" ,
1172+ patterns : [ "SELECT * FROM orders" , "SELECT * FROM sensitive_table" ] ,
1173+ always : [ ] ,
1174+ metadata : { } ,
1175+ sessionID : SessionID . make ( "session_sql_permissions" ) ,
1176+ }
1177+ try {
1178+ await expect (
1179+ PermissionNext . ask ( {
11921180 ...request ,
1193- ruleset : [ { permission : "sql_execute" , pattern : "*" , action : "ask" } ] ,
1194- } )
1195- expect ( asked ) . toHaveLength ( 1 )
1196- expect ( asked [ 0 ] . patterns ) . toEqual ( request . patterns )
1197- expect ( await PermissionNext . list ( ) ) . toEqual ( [ ] )
1198- } finally {
1199- publish . mockRestore ( )
1200- }
1201- } ,
1181+ ruleset : [
1182+ { permission : "sql_execute" , pattern : "*" , action : "ask" } ,
1183+ { permission : "sql_execute" , pattern : "*sensitive_table*" , action : "deny" } ,
1184+ ] ,
1185+ } ) ,
1186+ ) . rejects . toBeInstanceOf ( PermissionNext . DeniedError )
1187+ expect ( asked ) . toEqual ( [ ] )
1188+ expect ( await PermissionNext . list ( ) ) . toEqual ( [ ] )
1189+ await PermissionNext . ask ( {
1190+ ...request ,
1191+ ruleset : [ { permission : "sql_execute" , pattern : "*" , action : "ask" } ] ,
1192+ } )
1193+ expect ( asked ) . toHaveLength ( 1 )
1194+ expect ( asked [ 0 ] . patterns ) . toEqual ( request . patterns )
1195+ expect ( await PermissionNext . list ( ) ) . toEqual ( [ ] )
1196+ } finally {
1197+ publish . mockRestore ( )
1198+ // PermissionNext's legacy state is not disposed by the Effect fixture.
1199+ await Instance . dispose ( )
1200+ }
12021201 } ) ,
12031202 )
12041203 } ) ,
0 commit comments