merge conflict/test fixes

Author: jarugupj

cmd/deploy.go

@@ -309,7 +309,7 @@ func runDeploy(cmd *cobra.Command, args []string) (err error) {
 		File:              file,
 		Version:           kernel.Opt(version),
 		Force:             kernel.Opt(force),
-		EntrypointRelPath: kernel.Opt(filepath.Base(resolvedEntrypoint)),
+		EntrypointRelPath: filepath.Base(resolvedEntrypoint),
 		EnvVars:           envVars,
 	}, option.WithMaxRetries(0))
 	if err != nil {

go.mod

@@ -59,4 +59,3 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/onkernel/kernel-go-sdk => github.com/stainless-sdks/kernel-go v0.0.0-20250925165623-ec51df239db4

go.sum

@@ -118,8 +118,6 @@ github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stainless-sdks/kernel-go v0.0.0-20250925165623-ec51df239db4 h1:XxFDKXTl2Av2tJBRuaoIUUf8scWMYompJiYSbZnW5ho=
-github.com/stainless-sdks/kernel-go v0.0.0-20250925165623-ec51df239db4/go.mod h1:MjUR92i8UPqjrmneyVykae6GuB3GGSmnQtnjf1v74Dc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=