@neon/tools 0.2.0 → 0.3.0

package/dist/operations.gen.js

@@ -1,5 +1,6 @@
-import { zAcceptProjectTransferRequestBody, zAcceptProjectTransferRequestPath, zAddBranchNeonAuthOauthProviderBody, zAddBranchNeonAuthOauthProviderPath, zAddBranchNeonAuthTrustedDomainBody, zAddBranchNeonAuthTrustedDomainPath, zAddNeonAuthDomainToRedirectUriWhitelistBody, zAddNeonAuthDomainToRedirectUriWhitelistPath, zAddNeonAuthOauthProviderBody, zAddNeonAuthOauthProviderPath, zAddProjectJwksBody, zAddProjectJwksPath, zAssignOrganizationVpcEndpointBody, zAssignOrganizationVpcEndpointPath, zAssignProjectVpcEndpointBody, zAssignProjectVpcEndpointPath, zCountProjectBranchesPath, zCountProjectBranchesQuery, zCreateApiKeyBody, zCreateBranchNeonAuthNewUserBody, zCreateBranchNeonAuthNewUserPath, zCreateCredentialBody, zCreateCredentialPath, zCreateNeonAuthBody, zCreateNeonAuthIntegrationBody, zCreateNeonAuthNewUserBody, zCreateNeonAuthPath, zCreateNeonAuthProviderSdkKeysBody, zCreateOrgApiKeyBody, zCreateOrgApiKeyPath, zCreateOrganizationInvitationsBody, zCreateOrganizationInvitationsPath, zCreateProjectBody, zCreateProjectBranchAnonymizedBody, zCreateProjectBranchAnonymizedPath, zCreateProjectBranchBody, zCreateProjectBranchBucketBody, zCreateProjectBranchBucketPath, zCreateProjectBranchDataApiBody, zCreateProjectBranchDataApiPath, zCreateProjectBranchDatabaseBody, zCreateProjectBranchDatabasePath, zCreateProjectBranchFunctionDeploymentBody, zCreateProjectBranchFunctionDeploymentPath, zCreateProjectBranchPath, zCreateProjectBranchRoleBody, zCreateProjectBranchRolePath, zCreateProjectEndpointBody, zCreateProjectEndpointPath, zCreateProjectTransferRequestBody, zCreateProjectTransferRequestPath, zCreateSnapshotPath, zCreateSnapshotQuery, zDeleteBranchNeonAuthOauthProviderPath, zDeleteBranchNeonAuthTrustedDomainBody, zDeleteBranchNeonAuthTrustedDomainPath, zDeleteBranchNeonAuthUserPath, zDeleteNeonAuthDomainFromRedirectUriWhitelistBody, zDeleteNeonAuthDomainFromRedirectUriWhitelistPath, zDeleteNeonAuthIntegrationBody, zDeleteNeonAuthIntegrationPath, zDeleteNeonAuthOauthProviderPath, zDeleteNeonAuthUserPath, zDeleteOrganizationSpendingLimitPath, zDeleteOrganizationVpcEndpointPath, zDeleteProjectBranchBucketObjectPath, zDeleteProjectBranchBucketObjectsByPrefixPath, zDeleteProjectBranchBucketObjectsByPrefixQuery, zDeleteProjectBranchBucketPath, zDeleteProjectBranchDataApiPath, zDeleteProjectBranchDatabasePath, zDeleteProjectBranchFunctionPath, zDeleteProjectBranchPath, zDeleteProjectBranchQuery, zDeleteProjectBranchRolePath, zDeleteProjectEndpointPath, zDeleteProjectJwksPath, zDeleteProjectPath, zDeleteProjectVpcEndpointPath, zDeleteSnapshotPath, zDisableNeonAuthBody, zDisableNeonAuthPath, zFinalizeRestoreBranchBody, zFinalizeRestoreBranchPath, zGetActiveRegionsQuery, zGetAnonymizedBranchStatusPath, zGetAvailablePreloadLibrariesPath, zGetConnectionUriPath, zGetConnectionUriQuery, zGetConsumptionHistoryPerBranchV2Query, zGetConsumptionHistoryPerProjectQuery, zGetConsumptionHistoryPerProjectV2Query, zGetMaskingRulesPath, zGetNeonAuthAllowLocalhostPath, zGetNeonAuthEmailAndPasswordConfigPath, zGetNeonAuthEmailProviderPath, zGetNeonAuthEmailServerPath, zGetNeonAuthPath, zGetNeonAuthPhoneNumberPluginPath, zGetNeonAuthPluginConfigsPath, zGetNeonAuthWebhookConfigPath, zGetOrganizationInvitationsPath, zGetOrganizationMemberPath, zGetOrganizationMembersPath, zGetOrganizationMembersQuery, zGetOrganizationPath, zGetOrganizationSpendingLimitPath, zGetOrganizationVpcEndpointDetailsPath, zGetProjectAdvisorSecurityIssuesPath, zGetProjectAdvisorSecurityIssuesQuery, zGetProjectBranchAiGatewayPath, zGetProjectBranchBucketObjectPath, zGetProjectBranchDataApiPath, zGetProjectBranchDatabasePath, zGetProjectBranchFunctionPath, zGetProjectBranchPath, zGetProjectBranchRolePasswordPath, zGetProjectBranchRolePath, zGetProjectBranchSchemaComparisonPath, zGetProjectBranchSchemaComparisonQuery, zGetProjectBranchSchemaPath, zGetProjectBranchSchemaQuery, zGetProjectBranchStoragePath, zGetProjectEndpointPath, zGetProjectJwksPath, zGetProjectOperationPath, zGetProjectPath, zGetSnapshotSchedulePath, zGrantPermissionToProjectBody, zGrantPermissionToProjectPath, zListBranchNeonAuthOauthProvidersPath, zListBranchNeonAuthTrustedDomainsPath, zListCredentialsPath, zListNeonAuthIntegrationsPath, zListNeonAuthOauthProvidersPath, zListNeonAuthRedirectUriWhitelistDomainsPath, zListOrgApiKeysPath, zListOrganizationVpcEndpointsAllRegionsPath, zListOrganizationVpcEndpointsPath, zListProjectBranchBucketObjectsPath, zListProjectBranchBucketObjectsQuery, zListProjectBranchBucketsPath, zListProjectBranchDatabasesPath, zListProjectBranchEndpointsPath, zListProjectBranchFunctionsPath, zListProjectBranchFunctionsQuery, zListProjectBranchLogFieldValuesPath, zListProjectBranchLogFieldValuesQuery, zListProjectBranchLogFieldsPath, zListProjectBranchRolesPath, zListProjectBranchesPath, zListProjectBranchesQuery, zListProjectEndpointsPath, zListProjectMembersPath, zListProjectMembersQuery, zListProjectOperationsPath, zListProjectOperationsQuery, zListProjectPermissionsPath, zListProjectVpcEndpointsPath, zListProjectsQuery, zListSharedProjectsQuery, zListSnapshotsPath, zPresignProjectBranchBucketObjectBody, zPresignProjectBranchBucketObjectPath, zQueryProjectBranchLogsBody, zQueryProjectBranchLogsPath, zRecoverProjectPath, zRemoveOrganizationMemberPath, zRemoveProjectMemberRolePath, zRemoveProjectMemberRoleQuery, zResetProjectBranchRolePasswordPath, zRestartProjectEndpointPath, zRestoreProjectBranchBody, zRestoreProjectBranchPath, zRestoreSnapshotBody, zRestoreSnapshotPath, zRestoreSnapshotQuery, zRevokeApiKeyPath, zRevokeCredentialPath, zRevokeOrgApiKeyPath, zRevokePermissionFromProjectPath, zSendNeonAuthTestEmailBody, zSendNeonAuthTestEmailPath, zSetDefaultProjectBranchPath, zSetOrganizationSpendingLimitBody, zSetOrganizationSpendingLimitPath, zSetProjectMemberRoleBody, zSetProjectMemberRolePath, zSetProjectMemberRoleQuery, zSetSnapshotScheduleBody, zSetSnapshotSchedulePath, zStartAnonymizationPath, zStartProjectEndpointPath, zSuspendProjectEndpointPath, zTransferNeonAuthProviderProjectBody, zTransferProjectsFromOrgToOrgBody, zTransferProjectsFromOrgToOrgPath, zTransferProjectsFromUserToOrgBody, zUpdateBranchNeonAuthOauthProviderBody, zUpdateBranchNeonAuthOauthProviderPath, zUpdateMaskingRulesBody, zUpdateMaskingRulesPath, zUpdateNeonAuthAllowLocalhostBody, zUpdateNeonAuthAllowLocalhostPath, zUpdateNeonAuthConfigBody, zUpdateNeonAuthConfigPath, zUpdateNeonAuthEmailAndPasswordConfigBody, zUpdateNeonAuthEmailAndPasswordConfigPath, zUpdateNeonAuthEmailProviderBody, zUpdateNeonAuthEmailProviderPath, zUpdateNeonAuthEmailServerBody, zUpdateNeonAuthEmailServerPath, zUpdateNeonAuthMagicLinkPluginBody, zUpdateNeonAuthMagicLinkPluginPath, zUpdateNeonAuthOauthProviderBody, zUpdateNeonAuthOauthProviderPath, zUpdateNeonAuthOrganizationPluginBody, zUpdateNeonAuthOrganizationPluginPath, zUpdateNeonAuthPhoneNumberPluginBody, zUpdateNeonAuthPhoneNumberPluginPath, zUpdateNeonAuthUserRoleBody, zUpdateNeonAuthUserRolePath, zUpdateNeonAuthWebhookConfigBody, zUpdateNeonAuthWebhookConfigPath, zUpdateOrganizationMemberBody, zUpdateOrganizationMemberPath, zUpdateProjectBody, zUpdateProjectBranchBody, zUpdateProjectBranchDataApiBody, zUpdateProjectBranchDataApiPath, zUpdateProjectBranchDatabaseBody, zUpdateProjectBranchDatabasePath, zUpdateProjectBranchFunctionBody, zUpdateProjectBranchFunctionPath, zUpdateProjectBranchPath, zUpdateProjectEndpointBody, zUpdateProjectEndpointPath, zUpdateProjectPath, zUpdateSnapshotBody, zUpdateSnapshotPath } from "./generated/zod.gen.js";
+import { zAcceptProjectTransferRequestBody, zAcceptProjectTransferRequestPath, zAddBranchNeonAuthOauthProviderBody, zAddBranchNeonAuthOauthProviderPath, zAddBranchNeonAuthTrustedDomainBody, zAddBranchNeonAuthTrustedDomainPath, zAddNeonAuthDomainToRedirectUriWhitelistBody, zAddNeonAuthDomainToRedirectUriWhitelistPath, zAddNeonAuthOauthProviderBody, zAddNeonAuthOauthProviderPath, zAddProjectJwksBody, zAddProjectJwksPath, zAssignOrganizationVpcEndpointBody, zAssignOrganizationVpcEndpointPath, zAssignProjectVpcEndpointBody, zAssignProjectVpcEndpointPath, zCountProjectBranchesPath, zCountProjectBranchesQuery, zCreateApiKeyBody, zCreateBranchNeonAuthNewUserBody, zCreateBranchNeonAuthNewUserPath, zCreateCredentialBody, zCreateCredentialPath, zCreateNeonAuthBody, zCreateNeonAuthIntegrationBody, zCreateNeonAuthNewUserBody, zCreateNeonAuthPath, zCreateNeonAuthProviderSdkKeysBody, zCreateOrgApiKeyBody, zCreateOrgApiKeyPath, zCreateOrganizationInvitationsBody, zCreateOrganizationInvitationsPath, zCreateProjectBody, zCreateProjectBranchAnonymizedBody, zCreateProjectBranchAnonymizedPath, zCreateProjectBranchBody, zCreateProjectBranchBucketBody, zCreateProjectBranchBucketPath, zCreateProjectBranchDataApiBody, zCreateProjectBranchDataApiPath, zCreateProjectBranchDatabaseBody, zCreateProjectBranchDatabasePath, zCreateProjectBranchFunctionDeploymentBody, zCreateProjectBranchFunctionDeploymentPath, zCreateProjectBranchPath, zCreateProjectBranchRoleBody, zCreateProjectBranchRolePath, zCreateProjectEndpointBody, zCreateProjectEndpointPath, zCreateProjectTransferRequestBody, zCreateProjectTransferRequestPath, zCreateSnapshotPath, zCreateSnapshotQuery, zDeleteBranchNeonAuthOauthProviderPath, zDeleteBranchNeonAuthTrustedDomainBody, zDeleteBranchNeonAuthTrustedDomainPath, zDeleteBranchNeonAuthUserPath, zDeleteNeonAuthDomainFromRedirectUriWhitelistBody, zDeleteNeonAuthDomainFromRedirectUriWhitelistPath, zDeleteNeonAuthIntegrationBody, zDeleteNeonAuthIntegrationPath, zDeleteNeonAuthOauthProviderPath, zDeleteNeonAuthUserPath, zDeleteOrganizationSpendingLimitPath, zDeleteOrganizationVpcEndpointPath, zDeleteProjectBranchBucketObjectPath, zDeleteProjectBranchBucketObjectsByPrefixPath, zDeleteProjectBranchBucketObjectsByPrefixQuery, zDeleteProjectBranchBucketPath, zDeleteProjectBranchDataApiPath, zDeleteProjectBranchDatabasePath, zDeleteProjectBranchFunctionPath, zDeleteProjectBranchPath, zDeleteProjectBranchQuery, zDeleteProjectBranchRolePath, zDeleteProjectEndpointPath, zDeleteProjectJwksPath, zDeleteProjectPath, zDeleteProjectVpcEndpointPath, zDeleteSnapshotPath, zDisableNeonAuthBody, zDisableNeonAuthPath, zFinalizeRestoreBranchBody, zFinalizeRestoreBranchPath, zGetActiveRegionsQuery, zGetAnonymizedBranchStatusPath, zGetAvailablePreloadLibrariesPath, zGetConnectionUriPath, zGetConnectionUriQuery, zGetConsumptionHistoryPerBranchV2Query, zGetConsumptionHistoryPerProjectQuery, zGetConsumptionHistoryPerProjectV2Query, zGetMaskingRulesPath, zGetNeonAuthAllowLocalhostPath, zGetNeonAuthEmailAndPasswordConfigPath, zGetNeonAuthEmailProviderPath, zGetNeonAuthEmailServerPath, zGetNeonAuthPath, zGetNeonAuthPhoneNumberPluginPath, zGetNeonAuthPluginConfigsPath, zGetNeonAuthWebhookConfigPath, zGetOrganizationInvitationsPath, zGetOrganizationMemberPath, zGetOrganizationMembersPath, zGetOrganizationMembersQuery, zGetOrganizationPath, zGetOrganizationSpendingLimitPath, zGetOrganizationVpcEndpointDetailsPath, zGetProjectAdvisorSecurityIssuesPath, zGetProjectAdvisorSecurityIssuesQuery, zGetProjectBranchAiGatewayPath, zGetProjectBranchBucketObjectPath, zGetProjectBranchDataApiPath, zGetProjectBranchDatabasePath, zGetProjectBranchFunctionPath, zGetProjectBranchPath, zGetProjectBranchRolePasswordPath, zGetProjectBranchRolePath, zGetProjectBranchSchemaComparisonPath, zGetProjectBranchSchemaComparisonQuery, zGetProjectBranchSchemaPath, zGetProjectBranchSchemaQuery, zGetProjectBranchStoragePath, zGetProjectEndpointPath, zGetProjectJwksPath, zGetProjectOperationPath, zGetProjectPath, zGetSnapshotSchedulePath, zGrantPermissionToProjectBody, zGrantPermissionToProjectPath, zListBranchNeonAuthOauthProvidersPath, zListBranchNeonAuthTrustedDomainsPath, zListCredentialsPath, zListNeonAuthIntegrationsPath, zListNeonAuthOauthProvidersPath, zListNeonAuthRedirectUriWhitelistDomainsPath, zListOrgApiKeysPath, zListOrganizationVpcEndpointsAllRegionsPath, zListOrganizationVpcEndpointsPath, zListProjectBranchBucketObjectsPath, zListProjectBranchBucketObjectsQuery, zListProjectBranchBucketsPath, zListProjectBranchDatabasesPath, zListProjectBranchEndpointsPath, zListProjectBranchFunctionsPath, zListProjectBranchFunctionsQuery, zListProjectBranchLogFieldValuesPath, zListProjectBranchLogFieldValuesQuery, zListProjectBranchLogFieldsPath, zListProjectBranchRolesPath, zListProjectBranchesPath, zListProjectBranchesQuery, zListProjectEndpointsPath, zListProjectMembersPath, zListProjectMembersQuery, zListProjectOperationsPath, zListProjectOperationsQuery, zListProjectPermissionsPath, zListProjectVpcEndpointsPath, zListProjectsQuery, zListSharedProjectsQuery, zListSnapshotsPath, zPresignProjectBranchBucketObjectBody, zPresignProjectBranchBucketObjectPath, zQueryProjectBranchLogsBody, zQueryProjectBranchLogsPath, zRecoverProjectPath, zRemoveOrganizationMemberPath, zRemoveProjectMemberRolePath, zRemoveProjectMemberRoleQuery, zResetProjectBranchRolePasswordPath, zRestartProjectEndpointPath, zRestoreProjectBranchBody, zRestoreProjectBranchPath, zRestoreSnapshotBody, zRestoreSnapshotPath, zRevokeApiKeyPath, zRevokeCredentialPath, zRevokeOrgApiKeyPath, zRevokePermissionFromProjectPath, zSendNeonAuthTestEmailBody, zSendNeonAuthTestEmailPath, zSetDefaultProjectBranchPath, zSetOrganizationSpendingLimitBody, zSetOrganizationSpendingLimitPath, zSetProjectMemberRoleBody, zSetProjectMemberRolePath, zSetProjectMemberRoleQuery, zSetSnapshotScheduleBody, zSetSnapshotSchedulePath, zStartAnonymizationPath, zStartProjectEndpointPath, zSuspendProjectEndpointPath, zTransferNeonAuthProviderProjectBody, zTransferProjectsFromOrgToOrgBody, zTransferProjectsFromOrgToOrgPath, zTransferProjectsFromUserToOrgBody, zUpdateBranchNeonAuthOauthProviderBody, zUpdateBranchNeonAuthOauthProviderPath, zUpdateMaskingRulesBody, zUpdateMaskingRulesPath, zUpdateNeonAuthAllowLocalhostBody, zUpdateNeonAuthAllowLocalhostPath, zUpdateNeonAuthConfigBody, zUpdateNeonAuthConfigPath, zUpdateNeonAuthEmailAndPasswordConfigBody, zUpdateNeonAuthEmailAndPasswordConfigPath, zUpdateNeonAuthEmailProviderBody, zUpdateNeonAuthEmailProviderPath, zUpdateNeonAuthEmailServerBody, zUpdateNeonAuthEmailServerPath, zUpdateNeonAuthMagicLinkPluginBody, zUpdateNeonAuthMagicLinkPluginPath, zUpdateNeonAuthOauthProviderBody, zUpdateNeonAuthOauthProviderPath, zUpdateNeonAuthOrganizationPluginBody, zUpdateNeonAuthOrganizationPluginPath, zUpdateNeonAuthPhoneNumberPluginBody, zUpdateNeonAuthPhoneNumberPluginPath, zUpdateNeonAuthUserRoleBody, zUpdateNeonAuthUserRolePath, zUpdateNeonAuthWebhookConfigBody, zUpdateNeonAuthWebhookConfigPath, zUpdateOrganizationMemberBody, zUpdateOrganizationMemberPath, zUpdateProjectBody, zUpdateProjectBranchBody, zUpdateProjectBranchDataApiBody, zUpdateProjectBranchDataApiPath, zUpdateProjectBranchDatabaseBody, zUpdateProjectBranchDatabasePath, zUpdateProjectBranchFunctionBody, zUpdateProjectBranchFunctionPath, zUpdateProjectBranchPath, zUpdateProjectEndpointBody, zUpdateProjectEndpointPath, zUpdateProjectPath, zUpdateSnapshotBody, zUpdateSnapshotPath } from "./generated/zod.gen.js";
 import { decodeBase64 } from "./lib/binary.js";
+import { decodeBinaryFields, optionalGroup } from "./lib/envelope.js";
 import { bindOperation, defineOperation } from "./lib/operation.js";
 import * as z from "zod";
 import * as raw from "@neon/sdk/raw";
@@ -181,8 +182,9 @@ const operationFactories = {
 		title: "Accept a project transfer request",
 		description: "Accepts a transfer request for the specified project, transferring it to the specified organization\nor user. If org_id is not passed, the project will be transferred to the current user or organization account.\n",
 		inputSchema: z.strictObject({
-			body: zAcceptProjectTransferRequestBody.optional(),
-			path: zAcceptProjectTransferRequestPath
+			"project_id": zAcceptProjectTransferRequestPath.shape.project_id,
+			"request_id": zAcceptProjectTransferRequestPath.shape.request_id,
+			"org_id": zAcceptProjectTransferRequestBody.shape.org_id.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -198,7 +200,11 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.acceptProjectTransferRequest({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"request_id": input["request_id"]
+			}, true),
+			body: optionalGroup({ "org_id": input["org_id"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -210,8 +216,12 @@ const operationFactories = {
 		title: "Add an OAuth provider",
 		description: "Adds an OAuth provider configuration to the specified branch's Neon Auth integration.\nAfter adding, users can authenticate using the configured provider.\n",
 		inputSchema: z.strictObject({
-			body: zAddBranchNeonAuthOauthProviderBody,
-			path: zAddBranchNeonAuthOauthProviderPath
+			"project_id": zAddBranchNeonAuthOauthProviderPath.shape.project_id,
+			"branch_id": zAddBranchNeonAuthOauthProviderPath.shape.branch_id,
+			"id": zAddBranchNeonAuthOauthProviderBody.shape.id,
+			"client_id": zAddBranchNeonAuthOauthProviderBody.shape.client_id,
+			"client_secret": zAddBranchNeonAuthOauthProviderBody.shape.client_secret,
+			"microsoft_tenant_id": zAddBranchNeonAuthOauthProviderBody.shape.microsoft_tenant_id
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -227,7 +237,16 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.addBranchNeonAuthOauthProvider({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"id": input["id"],
+				"client_id": input["client_id"],
+				"client_secret": input["client_secret"],
+				"microsoft_tenant_id": input["microsoft_tenant_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -239,8 +258,10 @@ const operationFactories = {
 		title: "Add domain to redirect_uri whitelist",
 		description: "Adds a domain to the redirect URI whitelist for the specified branch.\nOnly domains in this list are permitted as redirect targets after authentication.\n",
 		inputSchema: z.strictObject({
-			body: zAddBranchNeonAuthTrustedDomainBody,
-			path: zAddBranchNeonAuthTrustedDomainPath
+			"project_id": zAddBranchNeonAuthTrustedDomainPath.shape.project_id,
+			"branch_id": zAddBranchNeonAuthTrustedDomainPath.shape.branch_id,
+			"domain": zAddBranchNeonAuthTrustedDomainBody.shape.domain,
+			"auth_provider": zAddBranchNeonAuthTrustedDomainBody.shape.auth_provider
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -256,7 +277,14 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.addBranchNeonAuthTrustedDomain({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"domain": input["domain"],
+				"auth_provider": input["auth_provider"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -268,8 +296,9 @@ const operationFactories = {
 		title: "Add trusted redirect URI domain",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/domains` instead. Removal scheduled for March 1, 2026.\n",
 		inputSchema: z.strictObject({
-			body: zAddNeonAuthDomainToRedirectUriWhitelistBody,
-			path: zAddNeonAuthDomainToRedirectUriWhitelistPath
+			"project_id": zAddNeonAuthDomainToRedirectUriWhitelistPath.shape.project_id,
+			"domain": zAddNeonAuthDomainToRedirectUriWhitelistBody.shape.domain,
+			"auth_provider": zAddNeonAuthDomainToRedirectUriWhitelistBody.shape.auth_provider
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -285,7 +314,11 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.addNeonAuthDomainToRedirectUriWhitelist({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({
+				"domain": input["domain"],
+				"auth_provider": input["auth_provider"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -297,8 +330,11 @@ const operationFactories = {
 		title: "Add an OAuth provider",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/oauth_providers` instead. Removal scheduled for March 1, 2026.\n",
 		inputSchema: z.strictObject({
-			body: zAddNeonAuthOauthProviderBody,
-			path: zAddNeonAuthOauthProviderPath
+			"project_id": zAddNeonAuthOauthProviderPath.shape.project_id,
+			"id": zAddNeonAuthOauthProviderBody.shape.id,
+			"client_id": zAddNeonAuthOauthProviderBody.shape.client_id,
+			"client_secret": zAddNeonAuthOauthProviderBody.shape.client_secret,
+			"microsoft_tenant_id": zAddNeonAuthOauthProviderBody.shape.microsoft_tenant_id
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -314,7 +350,13 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.addNeonAuthOauthProvider({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({
+				"id": input["id"],
+				"client_id": input["client_id"],
+				"client_secret": input["client_secret"],
+				"microsoft_tenant_id": input["microsoft_tenant_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -326,8 +368,13 @@ const operationFactories = {
 		title: "Add JWKS URL",
 		description: "Adds a JWKS URL to the specified project for verifying JWTs used as the authentication mechanism.\n\nThe URL must be a valid HTTPS URL that returns a JSON Web Key Set.\n\nThe `provider_name` field allows you to specify which authentication provider you're using (e.g., Clerk, Auth0, AWS Cognito).\n\nThe `branch_id` scopes the JWKS URL to specific branches; if not specified, it applies to all branches.\n\nThe `role_names` scopes the URL to specific roles; if not specified, default roles are used (`authenticator`, `authenticated`, `anonymous`).\n\nThe `jwt_audience` specifies which `aud` values are accepted in JWTs.\n",
 		inputSchema: z.strictObject({
-			body: zAddProjectJwksBody,
-			path: zAddProjectJwksPath
+			"project_id": zAddProjectJwksPath.shape.project_id,
+			"jwks_url": zAddProjectJwksBody.shape.jwks_url,
+			"provider_name": zAddProjectJwksBody.shape.provider_name,
+			"branch_id": zAddProjectJwksBody.shape.branch_id,
+			"jwt_audience": zAddProjectJwksBody.shape.jwt_audience,
+			"role_names": zAddProjectJwksBody.shape.role_names,
+			"skip_role_creation": zAddProjectJwksBody.shape.skip_role_creation
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -343,7 +390,15 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.addProjectJwks({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({
+				"jwks_url": input["jwks_url"],
+				"provider_name": input["provider_name"],
+				"branch_id": input["branch_id"],
+				"jwt_audience": input["jwt_audience"],
+				"role_names": input["role_names"],
+				"skip_role_creation": input["skip_role_creation"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -355,8 +410,10 @@ const operationFactories = {
 		title: "Assign or update VPC endpoint",
 		description: "Assigns a VPC endpoint to a Neon organization or updates its existing assignment.\n",
 		inputSchema: z.strictObject({
-			body: zAssignOrganizationVpcEndpointBody,
-			path: zAssignOrganizationVpcEndpointPath
+			"org_id": zAssignOrganizationVpcEndpointPath.shape.org_id,
+			"region_id": zAssignOrganizationVpcEndpointPath.shape.region_id,
+			"vpc_endpoint_id": zAssignOrganizationVpcEndpointPath.shape.vpc_endpoint_id,
+			"label": zAssignOrganizationVpcEndpointBody.shape.label
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -372,7 +429,12 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.assignOrganizationVpcEndpoint({
-			...input,
+			path: optionalGroup({
+				"org_id": input["org_id"],
+				"region_id": input["region_id"],
+				"vpc_endpoint_id": input["vpc_endpoint_id"]
+			}, true),
+			body: optionalGroup({ "label": input["label"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -384,8 +446,9 @@ const operationFactories = {
 		title: "Set VPC endpoint restriction",
 		description: "Sets or updates a VPC endpoint restriction for a Neon project.\nWhen a VPC endpoint restriction is set, the project only accepts connections\nfrom the specified VPC.\nA VPC endpoint can be set as a restriction only after it is assigned to the\nparent organization of the Neon project.\n",
 		inputSchema: z.strictObject({
-			body: zAssignProjectVpcEndpointBody,
-			path: zAssignProjectVpcEndpointPath
+			"project_id": zAssignProjectVpcEndpointPath.shape.project_id,
+			"vpc_endpoint_id": zAssignProjectVpcEndpointPath.shape.vpc_endpoint_id,
+			"label": zAssignProjectVpcEndpointBody.shape.label
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -401,7 +464,11 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.assignProjectVpcEndpoint({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"vpc_endpoint_id": input["vpc_endpoint_id"]
+			}, true),
+			body: optionalGroup({ "label": input["label"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -413,8 +480,8 @@ const operationFactories = {
 		title: "Retrieve number of branches",
 		description: "Retrieves the total number of branches in the specified project.\nSupports an optional `search` parameter to count branches matching a name filter.\n",
 		inputSchema: z.strictObject({
-			path: zCountProjectBranchesPath,
-			query: zCountProjectBranchesQuery.optional()
+			"project_id": zCountProjectBranchesPath.shape.project_id,
+			"search": zCountProjectBranchesQuery.shape.search.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -429,7 +496,8 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.countProjectBranches({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			query: optionalGroup({ "search": input["search"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -440,7 +508,7 @@ const operationFactories = {
 		id: "create_api_key",
 		title: "Create API key",
 		description: "Creates an API key.\nThe `key_name` is a user-specified name for the key.\nReturns an `id` and `key`; the `key` is a randomly generated, 64-bit token required to access the Neon API.\nStore the key securely — it is only returned once.\nAPI keys can also be managed in the Neon Console.\nSee [Manage API keys](https://neon.com/docs/manage/api-keys/).\n",
-		inputSchema: z.strictObject({ body: zCreateApiKeyBody }),
+		inputSchema: z.strictObject({ "key_name": zCreateApiKeyBody.shape.key_name }),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -455,7 +523,7 @@ const operationFactories = {
 			tags: ["API Key"]
 		},
 		invoke: (client, input, signal) => raw.createApiKey({
-			...input,
+			body: optionalGroup({ "key_name": input["key_name"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -467,8 +535,10 @@ const operationFactories = {
 		title: "Create new auth user",
 		description: "Creates a new user in the Neon Auth user directory for the specified branch.\nThe user is created in the `neon_auth.users_sync` table and can immediately authenticate\nusing the branch's configured auth providers.\n",
 		inputSchema: z.strictObject({
-			body: zCreateBranchNeonAuthNewUserBody,
-			path: zCreateBranchNeonAuthNewUserPath
+			"project_id": zCreateBranchNeonAuthNewUserPath.shape.project_id,
+			"branch_id": zCreateBranchNeonAuthNewUserPath.shape.branch_id,
+			"email": zCreateBranchNeonAuthNewUserBody.shape.email,
+			"name": zCreateBranchNeonAuthNewUserBody.shape.name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -484,7 +554,14 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.createBranchNeonAuthNewUser({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"email": input["email"],
+				"name": input["name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -496,8 +573,11 @@ const operationFactories = {
 		title: "Issue a scoped credential on the branch",
 		description: "Issues a new scoped service credential anchored to the specified\nbranch. The response carries `api_token` and `s3_secret_access_key`\nexactly once — they are not stored server-side.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			body: zCreateCredentialBody,
-			path: zCreateCredentialPath
+			"project_id": zCreateCredentialPath.shape.project_id,
+			"branch_id": zCreateCredentialPath.shape.branch_id,
+			"name": zCreateCredentialBody.shape.name,
+			"scopes": zCreateCredentialBody.shape.scopes,
+			"principal_type": zCreateCredentialBody.shape.principal_type
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -513,7 +593,15 @@ const operationFactories = {
 			tags: ["Credentials"]
 		},
 		invoke: (client, input, signal) => raw.createCredential({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"name": input["name"],
+				"scopes": input["scopes"],
+				"principal_type": input["principal_type"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -525,8 +613,10 @@ const operationFactories = {
 		title: "Enable Neon Auth for the branch",
 		description: "Enables Neon Auth for the specified branch by connecting it to an authentication provider.\nCreating the integration provisions the `neon_auth` schema in the branch database, which stores user identity data synchronized from the provider.\n",
 		inputSchema: z.strictObject({
-			body: zCreateNeonAuthBody,
-			path: zCreateNeonAuthPath
+			"project_id": zCreateNeonAuthPath.shape.project_id,
+			"branch_id": zCreateNeonAuthPath.shape.branch_id,
+			"auth_provider": zCreateNeonAuthBody.shape.auth_provider,
+			"database_name": zCreateNeonAuthBody.shape.database_name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -542,7 +632,14 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.createNeonAuth({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"auth_provider": input["auth_provider"],
+				"database_name": input["database_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -553,7 +650,13 @@ const operationFactories = {
 		id: "create_neon_auth_integration",
 		title: "Create Neon Auth integration",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth` instead. Removal scheduled for March 1, 2026.\nUse this endpoint if the frontend integration flow can't be used.\n",
-		inputSchema: z.strictObject({ body: zCreateNeonAuthIntegrationBody }),
+		inputSchema: z.strictObject({
+			"auth_provider": zCreateNeonAuthIntegrationBody.shape.auth_provider,
+			"project_id": zCreateNeonAuthIntegrationBody.shape.project_id,
+			"branch_id": zCreateNeonAuthIntegrationBody.shape.branch_id,
+			"database_name": zCreateNeonAuthIntegrationBody.shape.database_name,
+			"role_name": zCreateNeonAuthIntegrationBody.shape.role_name
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -568,7 +671,13 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.createNeonAuthIntegration({
-			...input,
+			body: optionalGroup({
+				"auth_provider": input["auth_provider"],
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"],
+				"role_name": input["role_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -579,7 +688,12 @@ const operationFactories = {
 		id: "create_neon_auth_new_user",
 		title: "Create new auth user",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/users` instead. Removal scheduled for March 1, 2026.\nThe user will be created in your neon_auth.users_sync table and automatically propagated to your auth project, whether Neon-managed or provider-owned.\n",
-		inputSchema: z.strictObject({ body: zCreateNeonAuthNewUserBody }),
+		inputSchema: z.strictObject({
+			"project_id": zCreateNeonAuthNewUserBody.shape.project_id,
+			"auth_provider": zCreateNeonAuthNewUserBody.shape.auth_provider,
+			"email": zCreateNeonAuthNewUserBody.shape.email,
+			"name": zCreateNeonAuthNewUserBody.shape.name
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -594,7 +708,12 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.createNeonAuthNewUser({
-			...input,
+			body: optionalGroup({
+				"project_id": input["project_id"],
+				"auth_provider": input["auth_provider"],
+				"email": input["email"],
+				"name": input["name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -605,7 +724,10 @@ const operationFactories = {
 		id: "create_neon_auth_provider_sdk_keys",
 		title: "Create Auth Provider SDK keys",
 		description: "Generates SDK or API Keys for the auth provider. These might be called different things depending\non the auth provider you're using, but are generally used for setting up the frontend and backend SDKs.\n",
-		inputSchema: z.strictObject({ body: zCreateNeonAuthProviderSdkKeysBody }),
+		inputSchema: z.strictObject({
+			"project_id": zCreateNeonAuthProviderSdkKeysBody.shape.project_id,
+			"auth_provider": zCreateNeonAuthProviderSdkKeysBody.shape.auth_provider
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -620,7 +742,10 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.createNeonAuthProviderSdkKeys({
-			...input,
+			body: optionalGroup({
+				"project_id": input["project_id"],
+				"auth_provider": input["auth_provider"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -632,8 +757,8 @@ const operationFactories = {
 		title: "Create organization invitations",
 		description: "Creates invitations for a specific organization.\nIf the invited user has an existing account, they automatically join as a member.\nIf they don't yet have an account, they are invited to create one, after which they become a member.\nEach invited user receives an email notification.\n",
 		inputSchema: z.strictObject({
-			body: zCreateOrganizationInvitationsBody,
-			path: zCreateOrganizationInvitationsPath
+			"org_id": zCreateOrganizationInvitationsPath.shape.org_id,
+			"invitations": zCreateOrganizationInvitationsBody.shape.invitations
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -649,7 +774,8 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.createOrganizationInvitations({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
+			body: optionalGroup({ "invitations": input["invitations"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -661,8 +787,9 @@ const operationFactories = {
 		title: "Create organization API key",
 		description: "Creates an API key for the specified organization.\nThe `key_name` is a user-specified name for the key.\nReturns an `id` and `key`; the `key` is a randomly generated, 64-bit token required to access the Neon API.\nStore the key securely — it is only returned once.\nAPI keys can also be managed in the Neon Console.\nSee [Manage API keys](https://neon.com/docs/manage/api-keys/).\n",
 		inputSchema: z.strictObject({
-			body: zCreateOrgApiKeyBody,
-			path: zCreateOrgApiKeyPath
+			"org_id": zCreateOrgApiKeyPath.shape.org_id,
+			"key_name": zCreateOrgApiKeyBody.shape.key_name,
+			"project_id": zCreateOrgApiKeyBody.shape.project_id
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -678,7 +805,11 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.createOrgApiKey({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
+			body: optionalGroup({
+				"key_name": input["key_name"],
+				"project_id": input["project_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -689,7 +820,20 @@ const operationFactories = {
 		id: "create_project",
 		title: "Create project",
 		description: "Creates a Neon project within an organization.\nIf using a personal API key, include the `org_id` parameter to specify which organization to create the project in.\nIf using an org API key, `org_id` is automatically inferred from the key.\nPlan limits define how many projects you can create.\nFor more information, see [Manage projects](https://neon.com/docs/manage/projects/).\n\nYou can specify a region and Postgres version in the request body.\nNeon supports Postgres 14 through 18, with 19 rolling out to enabled regions.\nFor supported regions and `region_id` values, see [Regions](https://neon.com/docs/introduction/regions/).\n",
-		inputSchema: z.strictObject({ body: zCreateProjectBody }),
+		inputSchema: z.strictObject({
+			"settings": zCreateProjectBody.shape.project.shape.settings,
+			"name": zCreateProjectBody.shape.project.shape.name,
+			"branch": zCreateProjectBody.shape.project.shape.branch,
+			"autoscaling_limit_min_cu": zCreateProjectBody.shape.project.shape.autoscaling_limit_min_cu,
+			"autoscaling_limit_max_cu": zCreateProjectBody.shape.project.shape.autoscaling_limit_max_cu,
+			"provisioner": zCreateProjectBody.shape.project.shape.provisioner,
+			"region_id": zCreateProjectBody.shape.project.shape.region_id,
+			"default_endpoint_settings": zCreateProjectBody.shape.project.shape.default_endpoint_settings,
+			"pg_version": zCreateProjectBody.shape.project.shape.pg_version,
+			"store_passwords": zCreateProjectBody.shape.project.shape.store_passwords,
+			"history_retention_seconds": zCreateProjectBody.shape.project.shape.history_retention_seconds,
+			"org_id": zCreateProjectBody.shape.project.shape.org_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -704,7 +848,20 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.createProject({
-			...input,
+			body: optionalGroup({ "project": optionalGroup({
+				"settings": input["settings"],
+				"name": input["name"],
+				"branch": input["branch"],
+				"autoscaling_limit_min_cu": input["autoscaling_limit_min_cu"],
+				"autoscaling_limit_max_cu": input["autoscaling_limit_max_cu"],
+				"provisioner": input["provisioner"],
+				"region_id": input["region_id"],
+				"default_endpoint_settings": input["default_endpoint_settings"],
+				"pg_version": input["pg_version"],
+				"store_passwords": input["store_passwords"],
+				"history_retention_seconds": input["history_retention_seconds"],
+				"org_id": input["org_id"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -716,8 +873,10 @@ const operationFactories = {
 		title: "Create branch",
 		description: "Creates a branch in the specified project.\nNo request body is required, but you can specify one to create a compute endpoint or select a non-default parent branch.\nBy default, the branch is created from the project's default branch with no compute endpoint, and the branch name is auto-generated.\nTo access the branch, add a `read_write` endpoint.\nEach branch supports one read-write endpoint and multiple read-only endpoints.\nFor related information, see [Manage branches](https://neon.com/docs/manage/branches/).\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectBranchBody.optional(),
-			path: zCreateProjectBranchPath
+			"project_id": zCreateProjectBranchPath.shape.project_id,
+			"endpoints": zCreateProjectBranchBody.shape.endpoints.optional(),
+			"branch": zCreateProjectBranchBody.shape.branch.optional(),
+			"annotation_value": zCreateProjectBranchBody.shape.annotation_value.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -733,7 +892,12 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.createProjectBranch({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({
+				"endpoints": input["endpoints"],
+				"branch": input["branch"],
+				"annotation_value": input["annotation_value"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -745,8 +909,11 @@ const operationFactories = {
 		title: "Create anonymized branch",
 		description: "Creates a new branch with anonymized data using PostgreSQL Anonymizer for static masking.\nThis allows developers to work with masked production data.\nOptionally, provide `masking_rules` to set initial masking rules for the branch\nand `start_anonymization` to automatically start anonymization after creation. This\ncombines functionality of updating masking rules and starting anonymization into the\nbranch creation request.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectBranchAnonymizedBody,
-			path: zCreateProjectBranchAnonymizedPath
+			"project_id": zCreateProjectBranchAnonymizedPath.shape.project_id,
+			"annotation_value": zCreateProjectBranchAnonymizedBody.shape.annotation_value,
+			"branch_create": zCreateProjectBranchAnonymizedBody.shape.branch_create,
+			"masking_rules": zCreateProjectBranchAnonymizedBody.shape.masking_rules,
+			"start_anonymization": zCreateProjectBranchAnonymizedBody.shape.start_anonymization
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -762,7 +929,13 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.createProjectBranchAnonymized({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({
+				"annotation_value": input["annotation_value"],
+				"branch_create": input["branch_create"],
+				"masking_rules": input["masking_rules"],
+				"start_anonymization": input["start_anonymization"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -774,8 +947,10 @@ const operationFactories = {
 		title: "Create a bucket on the branch",
 		description: "Creates a new branchable object storage bucket on the specified branch.\nBuckets are managed by the Neon Platform branchable object storage service.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectBranchBucketBody,
-			path: zCreateProjectBranchBucketPath
+			"project_id": zCreateProjectBranchBucketPath.shape.project_id,
+			"branch_id": zCreateProjectBranchBucketPath.shape.branch_id,
+			"name": zCreateProjectBranchBucketBody.shape.name,
+			"access_level": zCreateProjectBranchBucketBody.shape.access_level
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -791,7 +966,14 @@ const operationFactories = {
 			tags: ["Buckets"]
 		},
 		invoke: (client, input, signal) => raw.createProjectBranchBucket({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"name": input["name"],
+				"access_level": input["access_level"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -803,8 +985,16 @@ const operationFactories = {
 		title: "Create Neon Data API",
 		description: "Creates a new instance of Neon Data API in the specified branch.\nThe Data API exposes a REST interface over the branch database. The `database_name` path parameter determines which database the API serves.\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectBranchDataApiBody.optional(),
-			path: zCreateProjectBranchDataApiPath
+			"project_id": zCreateProjectBranchDataApiPath.shape.project_id,
+			"branch_id": zCreateProjectBranchDataApiPath.shape.branch_id,
+			"database_name": zCreateProjectBranchDataApiPath.shape.database_name,
+			"auth_provider": zCreateProjectBranchDataApiBody.shape.auth_provider.optional(),
+			"jwks_url": zCreateProjectBranchDataApiBody.shape.jwks_url.optional(),
+			"provider_name": zCreateProjectBranchDataApiBody.shape.provider_name.optional(),
+			"jwt_audience": zCreateProjectBranchDataApiBody.shape.jwt_audience.optional(),
+			"add_default_grants": zCreateProjectBranchDataApiBody.shape.add_default_grants.optional(),
+			"skip_auth_schema": zCreateProjectBranchDataApiBody.shape.skip_auth_schema.optional(),
+			"settings": zCreateProjectBranchDataApiBody.shape.settings.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -820,7 +1010,20 @@ const operationFactories = {
 			tags: ["DataAPI"]
 		},
 		invoke: (client, input, signal) => raw.createProjectBranchDataApi({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"]
+			}, true),
+			body: optionalGroup({
+				"auth_provider": input["auth_provider"],
+				"jwks_url": input["jwks_url"],
+				"provider_name": input["provider_name"],
+				"jwt_audience": input["jwt_audience"],
+				"add_default_grants": input["add_default_grants"],
+				"skip_auth_schema": input["skip_auth_schema"],
+				"settings": input["settings"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -832,8 +1035,10 @@ const operationFactories = {
 		title: "Create database",
 		description: "Creates a database in the specified branch.\nA branch can have multiple databases.\nFor related information, see [Manage databases](https://neon.com/docs/manage/databases/).\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectBranchDatabaseBody,
-			path: zCreateProjectBranchDatabasePath
+			"project_id": zCreateProjectBranchDatabasePath.shape.project_id,
+			"branch_id": zCreateProjectBranchDatabasePath.shape.branch_id,
+			"name": zCreateProjectBranchDatabaseBody.shape.database.shape.name,
+			"owner_name": zCreateProjectBranchDatabaseBody.shape.database.shape.owner_name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -849,7 +1054,14 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.createProjectBranchDatabase({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "database": optionalGroup({
+				"name": input["name"],
+				"owner_name": input["owner_name"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -861,8 +1073,12 @@ const operationFactories = {
 		title: "Deploy code to a function",
 		description: "Creates a deployment for the function. Supply any subset of zip,\nenvironment, and runtime; omitted fields inherit the\nfunction's latest version. At least one field must be supplied. The\nfirst deployment of a function must include zip. The newest deployment\nbecomes active.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectBranchFunctionDeploymentBody.safeExtend({ "zip": z.base64().describe("Base64-encoded binary file contents.").optional() }),
-			path: zCreateProjectBranchFunctionDeploymentPath
+			"project_id": zCreateProjectBranchFunctionDeploymentPath.shape.project_id,
+			"branch_id": zCreateProjectBranchFunctionDeploymentPath.shape.branch_id,
+			"slug": zCreateProjectBranchFunctionDeploymentPath.shape.slug,
+			"zip": z.base64().describe("Base64-encoded binary file contents.").optional(),
+			"runtime": zCreateProjectBranchFunctionDeploymentBody.shape.runtime,
+			"environment": zCreateProjectBranchFunctionDeploymentBody.shape.environment
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -877,19 +1093,21 @@ const operationFactories = {
 			deprecated: false,
 			tags: ["Functions"]
 		},
-		invoke: (client, input, signal) => {
-			const { ["zip"]: binary0, ...body } = input.body;
-			return raw.createProjectBranchFunctionDeployment({
-				...input,
-				body: {
-					...body,
-					...binary0 === void 0 ? {} : { "zip": decodeBase64(binary0) }
-				},
-				client,
-				signal,
-				throwOnError: true
-			});
-		}
+		invoke: (client, input, signal) => raw.createProjectBranchFunctionDeployment({
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"slug": input["slug"]
+			}, true),
+			body: decodeBinaryFields(optionalGroup({
+				"zip": input["zip"],
+				"runtime": input["runtime"],
+				"environment": input["environment"]
+			}, true), ["zip"], decodeBase64),
+			client,
+			signal,
+			throwOnError: true
+		})
 	}), client),
 	"createProjectBranchRole": (client) => bindOperation(defineOperation({
 		operationId: "createProjectBranchRole",
@@ -897,8 +1115,10 @@ const operationFactories = {
 		title: "Create role",
 		description: "Creates a Postgres role in the specified branch.\nFor related information, see [Manage roles](https://neon.com/docs/manage/roles/).\n\nConnections established to the active compute endpoint will be dropped.\nIf the compute endpoint is idle, the endpoint becomes active for a short period of time and is suspended afterward.\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectBranchRoleBody,
-			path: zCreateProjectBranchRolePath
+			"project_id": zCreateProjectBranchRolePath.shape.project_id,
+			"branch_id": zCreateProjectBranchRolePath.shape.branch_id,
+			"name": zCreateProjectBranchRoleBody.shape.role.shape.name,
+			"no_login": zCreateProjectBranchRoleBody.shape.role.shape.no_login
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -914,7 +1134,14 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.createProjectBranchRole({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "role": optionalGroup({
+				"name": input["name"],
+				"no_login": input["no_login"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -926,8 +1153,20 @@ const operationFactories = {
 		title: "Create compute endpoint",
 		description: "Creates a compute endpoint for the specified branch.\nA compute endpoint is a Neon compute instance.\nThere is a maximum of one read-write compute endpoint per branch.\nIf the specified branch already has a read-write compute endpoint, the operation fails.\nA branch can have multiple read-only compute endpoints.\n\nFor more information about compute endpoints, see [Manage computes](https://neon.com/docs/manage/endpoints/).\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectEndpointBody,
-			path: zCreateProjectEndpointPath
+			"project_id": zCreateProjectEndpointPath.shape.project_id,
+			"branch_id": zCreateProjectEndpointBody.shape.endpoint.shape.branch_id,
+			"region_id": zCreateProjectEndpointBody.shape.endpoint.shape.region_id,
+			"type": zCreateProjectEndpointBody.shape.endpoint.shape.type,
+			"settings": zCreateProjectEndpointBody.shape.endpoint.shape.settings,
+			"autoscaling_limit_min_cu": zCreateProjectEndpointBody.shape.endpoint.shape.autoscaling_limit_min_cu,
+			"autoscaling_limit_max_cu": zCreateProjectEndpointBody.shape.endpoint.shape.autoscaling_limit_max_cu,
+			"provisioner": zCreateProjectEndpointBody.shape.endpoint.shape.provisioner,
+			"pooler_enabled": zCreateProjectEndpointBody.shape.endpoint.shape.pooler_enabled,
+			"pooler_mode": zCreateProjectEndpointBody.shape.endpoint.shape.pooler_mode,
+			"disabled": zCreateProjectEndpointBody.shape.endpoint.shape.disabled,
+			"passwordless_access": zCreateProjectEndpointBody.shape.endpoint.shape.passwordless_access,
+			"suspend_timeout_seconds": zCreateProjectEndpointBody.shape.endpoint.shape.suspend_timeout_seconds,
+			"name": zCreateProjectEndpointBody.shape.endpoint.shape.name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -943,7 +1182,22 @@ const operationFactories = {
 			tags: ["Endpoint"]
 		},
 		invoke: (client, input, signal) => raw.createProjectEndpoint({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({ "endpoint": optionalGroup({
+				"branch_id": input["branch_id"],
+				"region_id": input["region_id"],
+				"type": input["type"],
+				"settings": input["settings"],
+				"autoscaling_limit_min_cu": input["autoscaling_limit_min_cu"],
+				"autoscaling_limit_max_cu": input["autoscaling_limit_max_cu"],
+				"provisioner": input["provisioner"],
+				"pooler_enabled": input["pooler_enabled"],
+				"pooler_mode": input["pooler_mode"],
+				"disabled": input["disabled"],
+				"passwordless_access": input["passwordless_access"],
+				"suspend_timeout_seconds": input["suspend_timeout_seconds"],
+				"name": input["name"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -955,8 +1209,8 @@ const operationFactories = {
 		title: "Create a project transfer request",
 		description: "Creates a transfer request for the specified project. The request expires after a set period.\nTo accept the request, the recipient calls `PUT /projects/{project_id}/transfer_requests/{request_id}`\nor uses the Neon Console claim link.\nThe optional `ru` parameter redirects the recipient after acceptance.\n",
 		inputSchema: z.strictObject({
-			body: zCreateProjectTransferRequestBody.optional(),
-			path: zCreateProjectTransferRequestPath
+			"project_id": zCreateProjectTransferRequestPath.shape.project_id,
+			"ttl_seconds": zCreateProjectTransferRequestBody.shape.ttl_seconds.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -972,7 +1226,8 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.createProjectTransferRequest({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({ "ttl_seconds": input["ttl_seconds"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -984,8 +1239,12 @@ const operationFactories = {
 		title: "Create snapshot",
 		description: "Creates a snapshot from the specified branch.\nThis operation may initiate an asynchronous process.\n",
 		inputSchema: z.strictObject({
-			path: zCreateSnapshotPath,
-			query: zCreateSnapshotQuery.optional()
+			"project_id": zCreateSnapshotPath.shape.project_id,
+			"branch_id": zCreateSnapshotPath.shape.branch_id,
+			"lsn": zCreateSnapshotQuery.shape.lsn.optional(),
+			"timestamp": zCreateSnapshotQuery.shape.timestamp.optional(),
+			"name": zCreateSnapshotQuery.shape.name.optional(),
+			"expires_at": zCreateSnapshotQuery.shape.expires_at.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -1001,7 +1260,16 @@ const operationFactories = {
 			tags: ["Snapshot"]
 		},
 		invoke: (client, input, signal) => raw.createSnapshot({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			query: optionalGroup({
+				"lsn": input["lsn"],
+				"timestamp": input["timestamp"],
+				"name": input["name"],
+				"expires_at": input["expires_at"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -1012,7 +1280,11 @@ const operationFactories = {
 		id: "delete_branch_neon_auth_oauth_provider",
 		title: "Delete OAuth provider",
 		description: "Deletes an OAuth provider from the specified project.\n",
-		inputSchema: z.strictObject({ path: zDeleteBranchNeonAuthOauthProviderPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteBranchNeonAuthOauthProviderPath.shape.project_id,
+			"branch_id": zDeleteBranchNeonAuthOauthProviderPath.shape.branch_id,
+			"oauth_provider_id": zDeleteBranchNeonAuthOauthProviderPath.shape.oauth_provider_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1027,7 +1299,11 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.deleteBranchNeonAuthOauthProvider({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"oauth_provider_id": input["oauth_provider_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1039,8 +1315,10 @@ const operationFactories = {
 		title: "Delete domain from redirect_uri whitelist",
 		description: "Removes a domain from the redirect URI whitelist for the specified branch.\nAfter removal, the domain can no longer be used as a redirect target after authentication.\n",
 		inputSchema: z.strictObject({
-			body: zDeleteBranchNeonAuthTrustedDomainBody,
-			path: zDeleteBranchNeonAuthTrustedDomainPath
+			"project_id": zDeleteBranchNeonAuthTrustedDomainPath.shape.project_id,
+			"branch_id": zDeleteBranchNeonAuthTrustedDomainPath.shape.branch_id,
+			"auth_provider": zDeleteBranchNeonAuthTrustedDomainBody.shape.auth_provider,
+			"domains": zDeleteBranchNeonAuthTrustedDomainBody.shape.domains
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -1056,7 +1334,14 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.deleteBranchNeonAuthTrustedDomain({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"auth_provider": input["auth_provider"],
+				"domains": input["domains"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1067,7 +1352,11 @@ const operationFactories = {
 		id: "delete_branch_neon_auth_user",
 		title: "Delete auth user",
 		description: "Deletes the specified user from the Neon Auth user directory for the specified branch.\nRemoves the user record from `neon_auth.users_sync`. This action cannot be undone.\n",
-		inputSchema: z.strictObject({ path: zDeleteBranchNeonAuthUserPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteBranchNeonAuthUserPath.shape.project_id,
+			"branch_id": zDeleteBranchNeonAuthUserPath.shape.branch_id,
+			"auth_user_id": zDeleteBranchNeonAuthUserPath.shape.auth_user_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1082,7 +1371,11 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.deleteBranchNeonAuthUser({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"auth_user_id": input["auth_user_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1094,8 +1387,9 @@ const operationFactories = {
 		title: "Delete trusted redirect URI domain",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/domains` instead. Removal scheduled for March 1, 2026.\n",
 		inputSchema: z.strictObject({
-			body: zDeleteNeonAuthDomainFromRedirectUriWhitelistBody,
-			path: zDeleteNeonAuthDomainFromRedirectUriWhitelistPath
+			"project_id": zDeleteNeonAuthDomainFromRedirectUriWhitelistPath.shape.project_id,
+			"auth_provider": zDeleteNeonAuthDomainFromRedirectUriWhitelistBody.shape.auth_provider,
+			"domains": zDeleteNeonAuthDomainFromRedirectUriWhitelistBody.shape.domains
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -1111,7 +1405,11 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.deleteNeonAuthDomainFromRedirectUriWhitelist({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({
+				"auth_provider": input["auth_provider"],
+				"domains": input["domains"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1123,8 +1421,9 @@ const operationFactories = {
 		title: "Delete integration with auth provider",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth` instead. Removal scheduled for March 1, 2026.",
 		inputSchema: z.strictObject({
-			body: zDeleteNeonAuthIntegrationBody.optional(),
-			path: zDeleteNeonAuthIntegrationPath
+			"project_id": zDeleteNeonAuthIntegrationPath.shape.project_id,
+			"auth_provider": zDeleteNeonAuthIntegrationPath.shape.auth_provider,
+			"delete_data": zDeleteNeonAuthIntegrationBody.shape.delete_data.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -1140,7 +1439,11 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.deleteNeonAuthIntegration({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"auth_provider": input["auth_provider"]
+			}, true),
+			body: optionalGroup({ "delete_data": input["delete_data"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -1151,7 +1454,10 @@ const operationFactories = {
 		id: "delete_neon_auth_oauth_provider",
 		title: "Delete OAuth provider",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/oauth_providers/{oauth_provider_id}` instead. Removal scheduled for March 1, 2026.\n",
-		inputSchema: z.strictObject({ path: zDeleteNeonAuthOauthProviderPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteNeonAuthOauthProviderPath.shape.project_id,
+			"oauth_provider_id": zDeleteNeonAuthOauthProviderPath.shape.oauth_provider_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1166,7 +1472,10 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.deleteNeonAuthOauthProvider({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"oauth_provider_id": input["oauth_provider_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1177,7 +1486,10 @@ const operationFactories = {
 		id: "delete_neon_auth_user",
 		title: "Delete auth user",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/users/{auth_user_id}` instead. Removal scheduled for March 1, 2026.\n",
-		inputSchema: z.strictObject({ path: zDeleteNeonAuthUserPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteNeonAuthUserPath.shape.project_id,
+			"auth_user_id": zDeleteNeonAuthUserPath.shape.auth_user_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1192,7 +1504,10 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.deleteNeonAuthUser({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"auth_user_id": input["auth_user_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1203,7 +1518,7 @@ const operationFactories = {
 		id: "delete_organization_spending_limit",
 		title: "Remove organization spending limit",
 		description: "Removes the configured monthly spending limit for the specified organization.\nIdempotent — removing an already-unset limit still succeeds.\nAvailable to organization admins on Launch and Scale plans only.\n",
-		inputSchema: z.strictObject({ path: zDeleteOrganizationSpendingLimitPath }),
+		inputSchema: z.strictObject({ "org_id": zDeleteOrganizationSpendingLimitPath.shape.org_id }),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1218,7 +1533,7 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.deleteOrganizationSpendingLimit({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1229,7 +1544,11 @@ const operationFactories = {
 		id: "delete_organization_vpc_endpoint",
 		title: "Delete VPC endpoint",
 		description: "Deletes the VPC endpoint from the specified Neon organization.\nIf you delete a VPC endpoint from a Neon organization, that VPC endpoint cannot\nbe added back to the Neon organization.\n",
-		inputSchema: z.strictObject({ path: zDeleteOrganizationVpcEndpointPath }),
+		inputSchema: z.strictObject({
+			"org_id": zDeleteOrganizationVpcEndpointPath.shape.org_id,
+			"region_id": zDeleteOrganizationVpcEndpointPath.shape.region_id,
+			"vpc_endpoint_id": zDeleteOrganizationVpcEndpointPath.shape.vpc_endpoint_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1244,7 +1563,11 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.deleteOrganizationVpcEndpoint({
-			...input,
+			path: optionalGroup({
+				"org_id": input["org_id"],
+				"region_id": input["region_id"],
+				"vpc_endpoint_id": input["vpc_endpoint_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1255,7 +1578,7 @@ const operationFactories = {
 		id: "delete_project",
 		title: "Delete project",
 		description: "Deletes the specified project and all its endpoints, branches, databases, and users.\nDeleted projects can be recovered within 7 days using `POST /projects/{project_id}/recover`.\nTo list recoverable projects, use `GET /projects?recoverable=true`.\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectPath }),
+		inputSchema: z.strictObject({ "project_id": zDeleteProjectPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1270,7 +1593,7 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.deleteProject({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1282,8 +1605,9 @@ const operationFactories = {
 		title: "Delete branch",
 		description: "Deletes the specified branch from a project and places all compute endpoints into an idle state, breaking existing client connections.\n\nThe deletion completes after all operations finish.\nYou cannot delete a project's root or default branch, or a branch that has a child branch.\nA project must have at least one branch.\n\nBy default, deleted branches can be recovered within a 7-day grace period.\nUse the `hard_delete` parameter to permanently delete the branch immediately.\nFor related information, see [Manage branches](https://neon.com/docs/manage/branches/).\n",
 		inputSchema: z.strictObject({
-			path: zDeleteProjectBranchPath,
-			query: zDeleteProjectBranchQuery.optional()
+			"project_id": zDeleteProjectBranchPath.shape.project_id,
+			"branch_id": zDeleteProjectBranchPath.shape.branch_id,
+			"hard_delete": zDeleteProjectBranchQuery.shape.hard_delete.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -1299,7 +1623,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectBranch({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			query: optionalGroup({ "hard_delete": input["hard_delete"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -1310,7 +1638,11 @@ const operationFactories = {
 		id: "delete_project_branch_bucket",
 		title: "Delete a bucket on the branch",
 		description: "Deletes the named bucket from the specified branch.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectBranchBucketPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectBranchBucketPath.shape.project_id,
+			"branch_id": zDeleteProjectBranchBucketPath.shape.branch_id,
+			"bucket_name": zDeleteProjectBranchBucketPath.shape.bucket_name
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1325,7 +1657,11 @@ const operationFactories = {
 			tags: ["Buckets"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectBranchBucket({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"bucket_name": input["bucket_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1336,7 +1672,12 @@ const operationFactories = {
 		id: "delete_project_branch_bucket_object",
 		title: "Delete an object in a bucket",
 		description: "Deletes the named object from the bucket on the specified branch.\nServed by the user's session (no customer S3 credentials required).\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectBranchBucketObjectPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectBranchBucketObjectPath.shape.project_id,
+			"branch_id": zDeleteProjectBranchBucketObjectPath.shape.branch_id,
+			"bucket_name": zDeleteProjectBranchBucketObjectPath.shape.bucket_name,
+			"object_key": zDeleteProjectBranchBucketObjectPath.shape.object_key
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1351,7 +1692,12 @@ const operationFactories = {
 			tags: ["Buckets"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectBranchBucketObject({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"bucket_name": input["bucket_name"],
+				"object_key": input["object_key"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1363,8 +1709,10 @@ const operationFactories = {
 		title: "Delete every object under a key prefix (folder) in a bucket",
 		description: "Soft-deletes every object on the specified branch whose key starts with\n`prefix`, in a single call. Intended to back a \"delete folder\" action in\nan object browser: a `prefix` of `app/avatars/` removes every object\nbeneath that folder. Served by the user's session (no customer S3\ncredentials required).\n\n`prefix` must be non-empty, end with `/`, be at most 1024 bytes, and\ncontain no control characters - a partial-segment prefix cannot\naccidentally delete sibling keys. Returns the number of objects\nsoft-deleted (`deleted`), which may be 0 when no live object matched the\nprefix on this branch.\n\nOnly objects physically present on this branch are tombstoned; objects\ninherited from an ancestor branch via copy-on-write (not materialized on\nthis branch) are out of scope.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			path: zDeleteProjectBranchBucketObjectsByPrefixPath,
-			query: zDeleteProjectBranchBucketObjectsByPrefixQuery
+			"project_id": zDeleteProjectBranchBucketObjectsByPrefixPath.shape.project_id,
+			"branch_id": zDeleteProjectBranchBucketObjectsByPrefixPath.shape.branch_id,
+			"bucket_name": zDeleteProjectBranchBucketObjectsByPrefixPath.shape.bucket_name,
+			"prefix": zDeleteProjectBranchBucketObjectsByPrefixQuery.shape.prefix
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -1380,7 +1728,12 @@ const operationFactories = {
 			tags: ["Buckets"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectBranchBucketObjectsByPrefix({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"bucket_name": input["bucket_name"]
+			}, true),
+			query: optionalGroup({ "prefix": input["prefix"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1391,7 +1744,11 @@ const operationFactories = {
 		id: "delete_project_branch_data_api",
 		title: "Delete Neon Data API",
 		description: "Deletes the Neon Data API for the specified branch.\nExisting connections using the Data API endpoint will fail after deletion.\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectBranchDataApiPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectBranchDataApiPath.shape.project_id,
+			"branch_id": zDeleteProjectBranchDataApiPath.shape.branch_id,
+			"database_name": zDeleteProjectBranchDataApiPath.shape.database_name
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1406,7 +1763,11 @@ const operationFactories = {
 			tags: ["DataAPI"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectBranchDataApi({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1417,7 +1778,11 @@ const operationFactories = {
 		id: "delete_project_branch_database",
 		title: "Delete database",
 		description: "Deletes the specified database from the branch.\nFor related information, see [Manage databases](https://neon.com/docs/manage/databases/).\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectBranchDatabasePath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectBranchDatabasePath.shape.project_id,
+			"branch_id": zDeleteProjectBranchDatabasePath.shape.branch_id,
+			"database_name": zDeleteProjectBranchDatabasePath.shape.database_name
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1432,7 +1797,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectBranchDatabase({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1443,7 +1812,11 @@ const operationFactories = {
 		id: "delete_project_branch_function",
 		title: "Delete a function on the branch",
 		description: "Deletes the function identified by its slug.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectBranchFunctionPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectBranchFunctionPath.shape.project_id,
+			"branch_id": zDeleteProjectBranchFunctionPath.shape.branch_id,
+			"slug": zDeleteProjectBranchFunctionPath.shape.slug
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1458,7 +1831,11 @@ const operationFactories = {
 			tags: ["Functions"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectBranchFunction({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"slug": input["slug"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1469,7 +1846,11 @@ const operationFactories = {
 		id: "delete_project_branch_role",
 		title: "Delete role",
 		description: "Deletes the specified Postgres role from the branch.\nFor related information, see [Manage roles](https://neon.com/docs/manage/roles/).\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectBranchRolePath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectBranchRolePath.shape.project_id,
+			"branch_id": zDeleteProjectBranchRolePath.shape.branch_id,
+			"role_name": zDeleteProjectBranchRolePath.shape.role_name
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1484,7 +1865,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectBranchRole({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"role_name": input["role_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1495,7 +1880,10 @@ const operationFactories = {
 		id: "delete_project_endpoint",
 		title: "Delete compute endpoint",
 		description: "Deletes the specified compute endpoint.\nA compute endpoint is a Neon compute instance.\nDeleting a compute endpoint drops existing network connections to the compute endpoint.\nThe deletion is completed when the last operation in the chain finishes successfully.\n\nAn `endpoint_id` has an `ep-` prefix.\nFor information about compute endpoints, see [Manage computes](https://neon.com/docs/manage/endpoints/).\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectEndpointPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectEndpointPath.shape.project_id,
+			"endpoint_id": zDeleteProjectEndpointPath.shape.endpoint_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1510,7 +1898,10 @@ const operationFactories = {
 			tags: ["Endpoint"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectEndpoint({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"endpoint_id": input["endpoint_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1521,7 +1912,10 @@ const operationFactories = {
 		id: "delete_project_jwks",
 		title: "Delete JWKS URL",
 		description: "Removes the specified JWKS URL from the project.\nJWTs signed by keys from the removed URL can no longer authenticate to the project's endpoints.\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectJwksPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectJwksPath.shape.project_id,
+			"jwks_id": zDeleteProjectJwksPath.shape.jwks_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1536,7 +1930,10 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectJwks({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"jwks_id": input["jwks_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1547,7 +1944,10 @@ const operationFactories = {
 		id: "delete_project_vpc_endpoint",
 		title: "Delete VPC endpoint restriction",
 		description: "Removes the specified VPC endpoint restriction from a Neon project.\n",
-		inputSchema: z.strictObject({ path: zDeleteProjectVpcEndpointPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteProjectVpcEndpointPath.shape.project_id,
+			"vpc_endpoint_id": zDeleteProjectVpcEndpointPath.shape.vpc_endpoint_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1562,7 +1962,10 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.deleteProjectVpcEndpoint({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"vpc_endpoint_id": input["vpc_endpoint_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1573,7 +1976,10 @@ const operationFactories = {
 		id: "delete_snapshot",
 		title: "Delete snapshot",
 		description: "Deletes the specified snapshot.\n",
-		inputSchema: z.strictObject({ path: zDeleteSnapshotPath }),
+		inputSchema: z.strictObject({
+			"project_id": zDeleteSnapshotPath.shape.project_id,
+			"snapshot_id": zDeleteSnapshotPath.shape.snapshot_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -1588,7 +1994,10 @@ const operationFactories = {
 			tags: ["Snapshot"]
 		},
 		invoke: (client, input, signal) => raw.deleteSnapshot({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"snapshot_id": input["snapshot_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1600,8 +2009,9 @@ const operationFactories = {
 		title: "Disable Neon Auth for the branch",
 		description: "Disables the Neon Auth integration for the specified branch, removing the connection\nto the authentication provider.\nIf `delete_data` is `true`, also deletes the `neon_auth` schema and all associated tables\nfrom the branch database.\nThe integration can be re-enabled by calling `POST /projects/{project_id}/branches/{branch_id}/auth`.\n",
 		inputSchema: z.strictObject({
-			body: zDisableNeonAuthBody.optional(),
-			path: zDisableNeonAuthPath
+			"project_id": zDisableNeonAuthPath.shape.project_id,
+			"branch_id": zDisableNeonAuthPath.shape.branch_id,
+			"delete_data": zDisableNeonAuthBody.shape.delete_data.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -1617,7 +2027,11 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.disableNeonAuth({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "delete_data": input["delete_data"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -1629,8 +2043,9 @@ const operationFactories = {
 		title: "Finalize branch restore from snapshot",
 		description: "Finalize the restore operation for a branch created from a snapshot.\nThis operation updates the branch so it functions as the original branch it replaced.\nThis includes:\n  - Reassigning any computes from the original branch to the restored branch (this will restart the computes)\n  - Renaming the restored branch to the original branch's name\n  - Renaming the original branch so it no longer uses the original name\n\nThis operation only applies to branches created using the `restoreSnapshot` endpoint with `finalize_restore: false`.\n",
 		inputSchema: z.strictObject({
-			body: zFinalizeRestoreBranchBody.optional(),
-			path: zFinalizeRestoreBranchPath
+			"project_id": zFinalizeRestoreBranchPath.shape.project_id,
+			"branch_id": zFinalizeRestoreBranchPath.shape.branch_id,
+			"name": zFinalizeRestoreBranchBody.shape.name.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -1646,7 +2061,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.finalizeRestoreBranch({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "name": input["name"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -1657,7 +2076,7 @@ const operationFactories = {
 		id: "get_active_regions",
 		title: "List supported regions",
 		description: "Lists supported Neon regions.\n\n**Note:** Not all regions are available to all organizations. Pass the `org_id`\nparameter to get an accurate list of regions available to your organization.\n",
-		inputSchema: z.strictObject({ query: zGetActiveRegionsQuery.optional() }),
+		inputSchema: z.strictObject({ "org_id": zGetActiveRegionsQuery.shape.org_id.optional() }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1671,7 +2090,7 @@ const operationFactories = {
 			tags: ["Region"]
 		},
 		invoke: (client, input, signal) => raw.getActiveRegions({
-			...input,
+			query: optionalGroup({ "org_id": input["org_id"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -1682,7 +2101,10 @@ const operationFactories = {
 		id: "get_anonymized_branch_status",
 		title: "Retrieve anonymized branch status",
 		description: "Retrieves the current status of an anonymized branch, including its state and progress information.\nThis endpoint allows you to monitor the anonymization process from initialization through completion.\nOnly anonymized branches will have status information available.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zGetAnonymizedBranchStatusPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetAnonymizedBranchStatusPath.shape.project_id,
+			"branch_id": zGetAnonymizedBranchStatusPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1696,7 +2118,10 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.getAnonymizedBranchStatus({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1721,7 +2146,6 @@ const operationFactories = {
 			tags: ["Users"]
 		},
 		invoke: (client, input, signal) => raw.getAuthDetails({
-			...input,
 			client,
 			signal,
 			throwOnError: true
@@ -1732,7 +2156,7 @@ const operationFactories = {
 		id: "get_available_preload_libraries",
 		title: "List available shared preload libraries",
 		description: "Returns the shared preload libraries available for the specified project's Postgres version.\nShared preload libraries are Postgres extensions that require the `shared_preload_libraries`\nsetting and a compute restart to activate.\nUse this list to determine which libraries can be enabled in the project's\n`settings.preload_libraries` configuration.\n",
-		inputSchema: z.strictObject({ path: zGetAvailablePreloadLibrariesPath }),
+		inputSchema: z.strictObject({ "project_id": zGetAvailablePreloadLibrariesPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1746,7 +2170,7 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.getAvailablePreloadLibraries({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1758,8 +2182,12 @@ const operationFactories = {
 		title: "Retrieve connection URI",
 		description: "Retrieves a connection URI for the specified database.\nThe URI uses the standard PostgreSQL connection string format. Set `pooled=true` to include the `-pooler` suffix for a connection pooler URI.\n",
 		inputSchema: z.strictObject({
-			path: zGetConnectionUriPath,
-			query: zGetConnectionUriQuery
+			"project_id": zGetConnectionUriPath.shape.project_id,
+			"branch_id": zGetConnectionUriQuery.shape.branch_id,
+			"endpoint_id": zGetConnectionUriQuery.shape.endpoint_id,
+			"database_name": zGetConnectionUriQuery.shape.database_name,
+			"role_name": zGetConnectionUriQuery.shape.role_name,
+			"pooled": zGetConnectionUriQuery.shape.pooled
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -1774,7 +2202,14 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.getConnectionUri({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			query: optionalGroup({
+				"branch_id": input["branch_id"],
+				"endpoint_id": input["endpoint_id"],
+				"database_name": input["database_name"],
+				"role_name": input["role_name"],
+				"pooled": input["pooled"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1785,7 +2220,17 @@ const operationFactories = {
 		id: "get_consumption_history_per_branch_v2",
 		title: "Retrieve branch consumption metrics",
 		description: "Returns consumption metrics for each branch across one or more projects listed in\n`project_ids` (1 to 100 projects). Available for accounts on paid usage-based Launch, Scale,\nAgent, and Enterprise plans.\n\nHistory starts when the account first ingests branch-level consumption data.\n\nThe `metrics` query parameter is required. Only these six values are supported on this\nendpoint:\n`compute_unit_seconds`, `root_branch_bytes_month`, `child_branch_bytes_month`,\n`instant_restore_bytes_month`, `public_network_transfer_bytes`, `private_network_transfer_bytes`.\n\nThis endpoint does not support `extra_branches_month` or `snapshot_storage_bytes_month`.\nUse `GET /consumption_history/v2/projects` for those.\n\nConsumption metrics within each branch are returned in ascending time order (oldest first).\nThis request does not wake project computes.\n",
-		inputSchema: z.strictObject({ query: zGetConsumptionHistoryPerBranchV2Query }),
+		inputSchema: z.strictObject({
+			"cursor": zGetConsumptionHistoryPerBranchV2Query.shape.cursor,
+			"limit": zGetConsumptionHistoryPerBranchV2Query.shape.limit,
+			"project_ids": zGetConsumptionHistoryPerBranchV2Query.shape.project_ids,
+			"branch_ids": zGetConsumptionHistoryPerBranchV2Query.shape.branch_ids,
+			"from": zGetConsumptionHistoryPerBranchV2Query.shape.from,
+			"to": zGetConsumptionHistoryPerBranchV2Query.shape.to,
+			"granularity": zGetConsumptionHistoryPerBranchV2Query.shape.granularity,
+			"org_id": zGetConsumptionHistoryPerBranchV2Query.shape.org_id,
+			"metrics": zGetConsumptionHistoryPerBranchV2Query.shape.metrics
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1799,7 +2244,17 @@ const operationFactories = {
 			tags: ["Consumption"]
 		},
 		invoke: (client, input, signal) => raw.getConsumptionHistoryPerBranchV2({
-			...input,
+			query: optionalGroup({
+				"cursor": input["cursor"],
+				"limit": input["limit"],
+				"project_ids": input["project_ids"],
+				"branch_ids": input["branch_ids"],
+				"from": input["from"],
+				"to": input["to"],
+				"granularity": input["granularity"],
+				"org_id": input["org_id"],
+				"metrics": input["metrics"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1810,7 +2265,17 @@ const operationFactories = {
 		id: "get_consumption_history_per_project",
 		title: "Retrieve project consumption metrics (legacy plans)",
 		description: "Retrieves consumption metrics for Scale, Business, and Enterprise plan projects. History begins at the time of upgrade.\nResults are ordered by time in ascending order (oldest to newest).\nIssuing a call to this API does not wake a project's compute endpoint.\n",
-		inputSchema: z.strictObject({ query: zGetConsumptionHistoryPerProjectQuery }),
+		inputSchema: z.strictObject({
+			"cursor": zGetConsumptionHistoryPerProjectQuery.shape.cursor,
+			"limit": zGetConsumptionHistoryPerProjectQuery.shape.limit,
+			"project_ids": zGetConsumptionHistoryPerProjectQuery.shape.project_ids,
+			"from": zGetConsumptionHistoryPerProjectQuery.shape.from,
+			"to": zGetConsumptionHistoryPerProjectQuery.shape.to,
+			"granularity": zGetConsumptionHistoryPerProjectQuery.shape.granularity,
+			"org_id": zGetConsumptionHistoryPerProjectQuery.shape.org_id,
+			"include_v1_metrics": zGetConsumptionHistoryPerProjectQuery.shape.include_v1_metrics,
+			"metrics": zGetConsumptionHistoryPerProjectQuery.shape.metrics
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1824,7 +2289,17 @@ const operationFactories = {
 			tags: ["Consumption"]
 		},
 		invoke: (client, input, signal) => raw.getConsumptionHistoryPerProject({
-			...input,
+			query: optionalGroup({
+				"cursor": input["cursor"],
+				"limit": input["limit"],
+				"project_ids": input["project_ids"],
+				"from": input["from"],
+				"to": input["to"],
+				"granularity": input["granularity"],
+				"org_id": input["org_id"],
+				"include_v1_metrics": input["include_v1_metrics"],
+				"metrics": input["metrics"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1835,7 +2310,16 @@ const operationFactories = {
 		id: "get_consumption_history_per_project_v2",
 		title: "Retrieve project consumption metrics",
 		description: "Returns consumption metrics for up to `limit` projects per page. If `project_ids` is omitted,\nprojects in the organization are included across pages (use `cursor`). If `project_ids` is\nprovided, the response is limited to those projects (up to 100). Available for accounts on\nLaunch, Scale, Agent, Business, and Enterprise plans.\n\nHistory starts when the account upgrades to an eligible plan.\n\nThe `metrics` query parameter is required. Supported values:\n`compute_unit_seconds`, `root_branch_bytes_month`, `child_branch_bytes_month`,\n`instant_restore_bytes_month`, `public_network_transfer_bytes`, `private_network_transfer_bytes`,\n`extra_branches_month`, `snapshot_storage_bytes_month`.\n\nConsumption metrics within each project are returned in ascending time order (oldest first).\nThis request does not wake project computes.\n",
-		inputSchema: z.strictObject({ query: zGetConsumptionHistoryPerProjectV2Query }),
+		inputSchema: z.strictObject({
+			"cursor": zGetConsumptionHistoryPerProjectV2Query.shape.cursor,
+			"limit": zGetConsumptionHistoryPerProjectV2Query.shape.limit,
+			"project_ids": zGetConsumptionHistoryPerProjectV2Query.shape.project_ids,
+			"from": zGetConsumptionHistoryPerProjectV2Query.shape.from,
+			"to": zGetConsumptionHistoryPerProjectV2Query.shape.to,
+			"granularity": zGetConsumptionHistoryPerProjectV2Query.shape.granularity,
+			"org_id": zGetConsumptionHistoryPerProjectV2Query.shape.org_id,
+			"metrics": zGetConsumptionHistoryPerProjectV2Query.shape.metrics
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1849,7 +2333,16 @@ const operationFactories = {
 			tags: ["Consumption"]
 		},
 		invoke: (client, input, signal) => raw.getConsumptionHistoryPerProjectV2({
-			...input,
+			query: optionalGroup({
+				"cursor": input["cursor"],
+				"limit": input["limit"],
+				"project_ids": input["project_ids"],
+				"from": input["from"],
+				"to": input["to"],
+				"granularity": input["granularity"],
+				"org_id": input["org_id"],
+				"metrics": input["metrics"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1874,7 +2367,6 @@ const operationFactories = {
 			tags: ["Users"]
 		},
 		invoke: (client, input, signal) => raw.getCurrentUserInfo({
-			...input,
 			client,
 			signal,
 			throwOnError: true
@@ -1899,7 +2391,6 @@ const operationFactories = {
 			tags: ["Users", "Organizations"]
 		},
 		invoke: (client, input, signal) => raw.getCurrentUserOrganizations({
-			...input,
 			client,
 			signal,
 			throwOnError: true
@@ -1910,7 +2401,10 @@ const operationFactories = {
 		id: "get_masking_rules",
 		title: "Retrieve masking rules",
 		description: "Retrieves the masking rules for the specified anonymized branch.\nMasking rules define how sensitive data should be anonymized using PostgreSQL Anonymizer.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zGetMaskingRulesPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetMaskingRulesPath.shape.project_id,
+			"branch_id": zGetMaskingRulesPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1924,7 +2418,10 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.getMaskingRules({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1935,7 +2432,10 @@ const operationFactories = {
 		id: "get_neon_auth",
 		title: "Retrieve Neon Auth details for the branch",
 		description: "Retrieves the Neon Auth integration details for the specified branch,\nincluding the auth provider type and integration status.\n",
-		inputSchema: z.strictObject({ path: zGetNeonAuthPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetNeonAuthPath.shape.project_id,
+			"branch_id": zGetNeonAuthPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1949,7 +2449,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.getNeonAuth({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1960,7 +2463,10 @@ const operationFactories = {
 		id: "get_neon_auth_allow_localhost",
 		title: "Retrieve localhost allow setting",
 		description: "Retrieves the localhost allow setting for the specified branch's Neon Auth integration.\nWhen enabled, authentication flows work from `localhost` without adding it to the redirect URI whitelist.\n",
-		inputSchema: z.strictObject({ path: zGetNeonAuthAllowLocalhostPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetNeonAuthAllowLocalhostPath.shape.project_id,
+			"branch_id": zGetNeonAuthAllowLocalhostPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1974,7 +2480,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.getNeonAuthAllowLocalhost({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -1985,7 +2494,10 @@ const operationFactories = {
 		id: "get_neon_auth_email_and_password_config",
 		title: "Retrieve email and password configuration",
 		description: "Retrieves the email and password authentication configuration for the specified branch's Neon Auth integration,\nincluding whether it is enabled and the email verification method.\n",
-		inputSchema: z.strictObject({ path: zGetNeonAuthEmailAndPasswordConfigPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetNeonAuthEmailAndPasswordConfigPath.shape.project_id,
+			"branch_id": zGetNeonAuthEmailAndPasswordConfigPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -1999,7 +2511,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.getNeonAuthEmailAndPasswordConfig({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2010,7 +2525,10 @@ const operationFactories = {
 		id: "get_neon_auth_email_provider",
 		title: "Retrieve email provider configuration",
 		description: "Retrieves the email provider configuration for the specified branch's Neon Auth integration,\nincluding the provider type and server settings.\n",
-		inputSchema: z.strictObject({ path: zGetNeonAuthEmailProviderPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetNeonAuthEmailProviderPath.shape.project_id,
+			"branch_id": zGetNeonAuthEmailProviderPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2024,7 +2542,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.getNeonAuthEmailProvider({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2035,7 +2556,7 @@ const operationFactories = {
 		id: "get_neon_auth_email_server",
 		title: "Retrieve email server configuration",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/email_provider` instead. Removal scheduled for March 1, 2026.\n",
-		inputSchema: z.strictObject({ path: zGetNeonAuthEmailServerPath }),
+		inputSchema: z.strictObject({ "project_id": zGetNeonAuthEmailServerPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2049,7 +2570,7 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.getNeonAuthEmailServer({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2060,7 +2581,10 @@ const operationFactories = {
 		id: "get_neon_auth_phone_number_plugin",
 		title: "Retrieve phone number plugin configuration",
 		description: "Returns the phone number plugin configuration for Neon Auth.\nThe phone number plugin enables phone-based OTP authentication.\n",
-		inputSchema: z.strictObject({ path: zGetNeonAuthPhoneNumberPluginPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetNeonAuthPhoneNumberPluginPath.shape.project_id,
+			"branch_id": zGetNeonAuthPhoneNumberPluginPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2074,7 +2598,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.getNeonAuthPhoneNumberPlugin({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2085,7 +2612,10 @@ const operationFactories = {
 		id: "get_neon_auth_plugin_configs",
 		title: "Retrieve Neon Auth plugin configurations",
 		description: "Returns all plugin configurations for Neon Auth in a single response.\nThis endpoint aggregates organization, email provider, email and password,\nOAuth providers, and localhost settings.\n",
-		inputSchema: z.strictObject({ path: zGetNeonAuthPluginConfigsPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetNeonAuthPluginConfigsPath.shape.project_id,
+			"branch_id": zGetNeonAuthPluginConfigsPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2099,7 +2629,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.getNeonAuthPluginConfigs({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2110,7 +2643,10 @@ const operationFactories = {
 		id: "get_neon_auth_webhook_config",
 		title: "Retrieve Neon Auth webhook configuration",
 		description: "Returns the webhook configuration for the specified branch's Neon Auth integration,\nincluding the endpoint URL and the events that trigger it.\n",
-		inputSchema: z.strictObject({ path: zGetNeonAuthWebhookConfigPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetNeonAuthWebhookConfigPath.shape.project_id,
+			"branch_id": zGetNeonAuthWebhookConfigPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2124,7 +2660,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.getNeonAuthWebhookConfig({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2135,7 +2674,7 @@ const operationFactories = {
 		id: "get_organization",
 		title: "Retrieve organization details",
 		description: "Retrieves details for the specified organization, including its name, plan, and configuration.\n",
-		inputSchema: z.strictObject({ path: zGetOrganizationPath }),
+		inputSchema: z.strictObject({ "org_id": zGetOrganizationPath.shape.org_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2149,7 +2688,7 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.getOrganization({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2160,7 +2699,7 @@ const operationFactories = {
 		id: "get_organization_invitations",
 		title: "List organization invitations",
 		description: "Retrieves pending and accepted invitations for the specified organization.\n",
-		inputSchema: z.strictObject({ path: zGetOrganizationInvitationsPath }),
+		inputSchema: z.strictObject({ "org_id": zGetOrganizationInvitationsPath.shape.org_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2174,7 +2713,7 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.getOrganizationInvitations({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2185,7 +2724,10 @@ const operationFactories = {
 		id: "get_organization_member",
 		title: "Retrieve organization member details",
 		description: "Retrieves information about the specified organization member.\n",
-		inputSchema: z.strictObject({ path: zGetOrganizationMemberPath }),
+		inputSchema: z.strictObject({
+			"org_id": zGetOrganizationMemberPath.shape.org_id,
+			"member_id": zGetOrganizationMemberPath.shape.member_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2199,7 +2741,10 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.getOrganizationMember({
-			...input,
+			path: optionalGroup({
+				"org_id": input["org_id"],
+				"member_id": input["member_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2211,8 +2756,11 @@ const operationFactories = {
 		title: "List organization members",
 		description: "Retrieves a paginated list of members for the specified organization.\n",
 		inputSchema: z.strictObject({
-			path: zGetOrganizationMembersPath,
-			query: zGetOrganizationMembersQuery.optional()
+			"org_id": zGetOrganizationMembersPath.shape.org_id,
+			"sort_by": zGetOrganizationMembersQuery.shape.sort_by.optional(),
+			"cursor": zGetOrganizationMembersQuery.shape.cursor.optional(),
+			"sort_order": zGetOrganizationMembersQuery.shape.sort_order.optional(),
+			"limit": zGetOrganizationMembersQuery.shape.limit.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -2227,7 +2775,13 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.getOrganizationMembers({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
+			query: optionalGroup({
+				"sort_by": input["sort_by"],
+				"cursor": input["cursor"],
+				"sort_order": input["sort_order"],
+				"limit": input["limit"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -2238,7 +2792,7 @@ const operationFactories = {
 		id: "get_organization_spending_limit",
 		title: "Retrieve organization spending limit",
 		description: "Returns the configured monthly spending limit for the specified organization.\n`spending_limit_cents: null` indicates that no limit is currently set.\nAvailable to organization members with read access on Launch and Scale plans only.\n",
-		inputSchema: z.strictObject({ path: zGetOrganizationSpendingLimitPath }),
+		inputSchema: z.strictObject({ "org_id": zGetOrganizationSpendingLimitPath.shape.org_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2252,7 +2806,7 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.getOrganizationSpendingLimit({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2263,7 +2817,11 @@ const operationFactories = {
 		id: "get_organization_vpc_endpoint_details",
 		title: "Retrieve VPC endpoint details",
 		description: "Retrieves the current state and configuration details of a specified VPC endpoint.\n",
-		inputSchema: z.strictObject({ path: zGetOrganizationVpcEndpointDetailsPath }),
+		inputSchema: z.strictObject({
+			"org_id": zGetOrganizationVpcEndpointDetailsPath.shape.org_id,
+			"region_id": zGetOrganizationVpcEndpointDetailsPath.shape.region_id,
+			"vpc_endpoint_id": zGetOrganizationVpcEndpointDetailsPath.shape.vpc_endpoint_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2277,7 +2835,11 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.getOrganizationVpcEndpointDetails({
-			...input,
+			path: optionalGroup({
+				"org_id": input["org_id"],
+				"region_id": input["region_id"],
+				"vpc_endpoint_id": input["vpc_endpoint_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2288,7 +2850,7 @@ const operationFactories = {
 		id: "get_project",
 		title: "Retrieve project details",
 		description: "Retrieves information about the specified project.\nReturned details include the project settings, compute configuration, history retention, owner information, and current usage metrics.\n",
-		inputSchema: z.strictObject({ path: zGetProjectPath }),
+		inputSchema: z.strictObject({ "project_id": zGetProjectPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2302,7 +2864,7 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.getProject({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2314,8 +2876,11 @@ const operationFactories = {
 		title: "Get advisor issues",
 		description: "Analyzes the database for security and performance issues.\nReturns a list of issues categorized by severity (ERROR, WARN, INFO).\n\nRequires read access to the project and Data API enabled.\n",
 		inputSchema: z.strictObject({
-			path: zGetProjectAdvisorSecurityIssuesPath,
-			query: zGetProjectAdvisorSecurityIssuesQuery.optional()
+			"project_id": zGetProjectAdvisorSecurityIssuesPath.shape.project_id,
+			"branch_id": zGetProjectAdvisorSecurityIssuesQuery.shape.branch_id.optional(),
+			"database_name": zGetProjectAdvisorSecurityIssuesQuery.shape.database_name.optional(),
+			"category": zGetProjectAdvisorSecurityIssuesQuery.shape.category.optional(),
+			"min_severity": zGetProjectAdvisorSecurityIssuesQuery.shape.min_severity.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -2330,7 +2895,13 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.getProjectAdvisorSecurityIssues({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			query: optionalGroup({
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"],
+				"category": input["category"],
+				"min_severity": input["min_severity"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -2341,7 +2912,10 @@ const operationFactories = {
 		id: "get_project_branch",
 		title: "Retrieve branch details",
 		description: "Retrieves information about the specified branch.\nA `branch_id` value has a `br-` prefix.\n\nEach Neon project is initially created with a root and default branch named `main`.\nA project can contain one or more branches.\nA parent branch is identified by a `parent_id` value, which is the `id` of the parent branch.\nFor related information, see [Manage branches](https://neon.com/docs/manage/branches/).\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchPath.shape.project_id,
+			"branch_id": zGetProjectBranchPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2355,7 +2929,10 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranch({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2366,7 +2943,10 @@ const operationFactories = {
 		id: "get_project_branch_ai_gateway",
 		title: "Get branch AI Gateway endpoint",
 		description: "Returns the AI Gateway endpoint host for the specified branch, used to\nrender code-snippet base URLs. A 200 response means the branch is\nregistered and this region serves the AI gateway. A 404 response\nincludes a `reason` field indicating why the gateway is unavailable.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchAiGatewayPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchAiGatewayPath.shape.project_id,
+			"branch_id": zGetProjectBranchAiGatewayPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2380,7 +2960,10 @@ const operationFactories = {
 			tags: ["AI Gateway"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchAiGateway({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2391,7 +2974,12 @@ const operationFactories = {
 		id: "get_project_branch_bucket_object",
 		title: "Download an object's bytes",
 		description: "Streams the raw bytes of the named object from the bucket on the\nspecified branch, including objects inherited from ancestor branches.\nServed by the user's session (no customer S3 credentials required).\n\nThe body is returned as `application/octet-stream` so a browser treats\nit as a download; the `Content-Length` and `ETag` response headers echo\nthe stored object metadata.\n\nBINARY-STREAM EXCEPTION TO THE BUILD-GENERATED-TYPES RULE (#7029): the\nsuccessful 200 body is the raw object stream, proxied verbatim from the\nplatform object storage admin endpoint. It is modeled as an\n`application/octet-stream` binary body (not a JSON response schema) and\nis streamed without buffering the whole object in memory. Error\nresponses still use the generated `GeneralError` shape.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchBucketObjectPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchBucketObjectPath.shape.project_id,
+			"branch_id": zGetProjectBranchBucketObjectPath.shape.branch_id,
+			"bucket_name": zGetProjectBranchBucketObjectPath.shape.bucket_name,
+			"object_key": zGetProjectBranchBucketObjectPath.shape.object_key
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2405,7 +2993,12 @@ const operationFactories = {
 			tags: ["Buckets"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchBucketObject({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"bucket_name": input["bucket_name"],
+				"object_key": input["object_key"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2416,7 +3009,11 @@ const operationFactories = {
 		id: "get_project_branch_data_api",
 		title: "Retrieve Neon Data API configuration",
 		description: "Retrieves the Neon Data API configuration for the specified branch,\nincluding endpoint URL, enabled state, and database settings.\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchDataApiPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchDataApiPath.shape.project_id,
+			"branch_id": zGetProjectBranchDataApiPath.shape.branch_id,
+			"database_name": zGetProjectBranchDataApiPath.shape.database_name
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2430,7 +3027,11 @@ const operationFactories = {
 			tags: ["DataAPI"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchDataApi({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2441,7 +3042,11 @@ const operationFactories = {
 		id: "get_project_branch_database",
 		title: "Retrieve database details",
 		description: "Retrieves information about the specified database.\nFor related information, see [Manage databases](https://neon.com/docs/manage/databases/).\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchDatabasePath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchDatabasePath.shape.project_id,
+			"branch_id": zGetProjectBranchDatabasePath.shape.branch_id,
+			"database_name": zGetProjectBranchDatabasePath.shape.database_name
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2455,7 +3060,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchDatabase({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2466,7 +3075,11 @@ const operationFactories = {
 		id: "get_project_branch_function",
 		title: "Get function details",
 		description: "Returns the function identified by its slug.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchFunctionPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchFunctionPath.shape.project_id,
+			"branch_id": zGetProjectBranchFunctionPath.shape.branch_id,
+			"slug": zGetProjectBranchFunctionPath.shape.slug
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2480,7 +3093,11 @@ const operationFactories = {
 			tags: ["Functions"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchFunction({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"slug": input["slug"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2491,7 +3108,11 @@ const operationFactories = {
 		id: "get_project_branch_role",
 		title: "Retrieve role details",
 		description: "Retrieves details about the specified role.\nIn Neon, the terms \"role\" and \"user\" are synonymous.\nFor related information, see [Manage roles](https://neon.com/docs/manage/roles/).\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchRolePath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchRolePath.shape.project_id,
+			"branch_id": zGetProjectBranchRolePath.shape.branch_id,
+			"role_name": zGetProjectBranchRolePath.shape.role_name
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2505,7 +3126,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchRole({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"role_name": input["role_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2516,7 +3141,11 @@ const operationFactories = {
 		id: "get_project_branch_role_password",
 		title: "Retrieve role password",
 		description: "Retrieves the password for the specified Postgres role, if possible.\nFor related information, see [Manage roles](https://neon.com/docs/manage/roles/).\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchRolePasswordPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchRolePasswordPath.shape.project_id,
+			"branch_id": zGetProjectBranchRolePasswordPath.shape.branch_id,
+			"role_name": zGetProjectBranchRolePasswordPath.shape.role_name
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2530,7 +3159,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchRolePassword({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"role_name": input["role_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2542,8 +3175,12 @@ const operationFactories = {
 		title: "Retrieve database schema",
 		description: "Retrieves the database schema. Specify `lsn` or `timestamp` (not both) to read at a point in time; omit both to read from the database's head.",
 		inputSchema: z.strictObject({
-			path: zGetProjectBranchSchemaPath,
-			query: zGetProjectBranchSchemaQuery
+			"project_id": zGetProjectBranchSchemaPath.shape.project_id,
+			"branch_id": zGetProjectBranchSchemaPath.shape.branch_id,
+			"db_name": zGetProjectBranchSchemaQuery.shape.db_name,
+			"lsn": zGetProjectBranchSchemaQuery.shape.lsn,
+			"timestamp": zGetProjectBranchSchemaQuery.shape.timestamp,
+			"format": zGetProjectBranchSchemaQuery.shape.format
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -2558,7 +3195,16 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchSchema({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			query: optionalGroup({
+				"db_name": input["db_name"],
+				"lsn": input["lsn"],
+				"timestamp": input["timestamp"],
+				"format": input["format"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2570,8 +3216,14 @@ const operationFactories = {
 		title: "Compare database schema",
 		description: "Compares the schema from the specified database with another branch's schema.",
 		inputSchema: z.strictObject({
-			path: zGetProjectBranchSchemaComparisonPath,
-			query: zGetProjectBranchSchemaComparisonQuery
+			"project_id": zGetProjectBranchSchemaComparisonPath.shape.project_id,
+			"branch_id": zGetProjectBranchSchemaComparisonPath.shape.branch_id,
+			"base_branch_id": zGetProjectBranchSchemaComparisonQuery.shape.base_branch_id,
+			"db_name": zGetProjectBranchSchemaComparisonQuery.shape.db_name,
+			"lsn": zGetProjectBranchSchemaComparisonQuery.shape.lsn,
+			"timestamp": zGetProjectBranchSchemaComparisonQuery.shape.timestamp,
+			"base_lsn": zGetProjectBranchSchemaComparisonQuery.shape.base_lsn,
+			"base_timestamp": zGetProjectBranchSchemaComparisonQuery.shape.base_timestamp
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -2586,7 +3238,18 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchSchemaComparison({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			query: optionalGroup({
+				"base_branch_id": input["base_branch_id"],
+				"db_name": input["db_name"],
+				"lsn": input["lsn"],
+				"timestamp": input["timestamp"],
+				"base_lsn": input["base_lsn"],
+				"base_timestamp": input["base_timestamp"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2597,7 +3260,10 @@ const operationFactories = {
 		id: "get_project_branch_storage",
 		title: "Get branch object storage state",
 		description: "Returns whether branchable object storage is usable for the specified\nbranch. A 200 response means the branch is registered in the object storage\nservice and the S3 data plane will accept requests for it. A 404\nresponse includes a `reason` field indicating why object storage is unavailable.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zGetProjectBranchStoragePath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectBranchStoragePath.shape.project_id,
+			"branch_id": zGetProjectBranchStoragePath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2611,7 +3277,10 @@ const operationFactories = {
 			tags: ["Storage"]
 		},
 		invoke: (client, input, signal) => raw.getProjectBranchStorage({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2622,7 +3291,10 @@ const operationFactories = {
 		id: "get_project_endpoint",
 		title: "Retrieve compute endpoint details",
 		description: "Retrieves information about the specified compute endpoint.\nA compute endpoint is a Neon compute instance.\nAn `endpoint_id` has an `ep-` prefix.\nFor information about compute endpoints, see [Manage computes](https://neon.com/docs/manage/endpoints/).\n",
-		inputSchema: z.strictObject({ path: zGetProjectEndpointPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectEndpointPath.shape.project_id,
+			"endpoint_id": zGetProjectEndpointPath.shape.endpoint_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2636,7 +3308,10 @@ const operationFactories = {
 			tags: ["Endpoint"]
 		},
 		invoke: (client, input, signal) => raw.getProjectEndpoint({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"endpoint_id": input["endpoint_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2647,7 +3322,7 @@ const operationFactories = {
 		id: "get_project_jwks",
 		title: "List JWKS URLs",
 		description: "Returns the JWKS URLs available for verifying JWTs used as the authentication mechanism for the specified project.\n",
-		inputSchema: z.strictObject({ path: zGetProjectJwksPath }),
+		inputSchema: z.strictObject({ "project_id": zGetProjectJwksPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2661,7 +3336,7 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.getProjectJwks({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2672,7 +3347,10 @@ const operationFactories = {
 		id: "get_project_operation",
 		title: "Retrieve operation details",
 		description: "Retrieves details for the specified operation.\nAn operation is an action performed on a Neon project resource.\n",
-		inputSchema: z.strictObject({ path: zGetProjectOperationPath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetProjectOperationPath.shape.project_id,
+			"operation_id": zGetProjectOperationPath.shape.operation_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2686,7 +3364,10 @@ const operationFactories = {
 			tags: ["Operation"]
 		},
 		invoke: (client, input, signal) => raw.getProjectOperation({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"operation_id": input["operation_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2697,7 +3378,10 @@ const operationFactories = {
 		id: "get_snapshot_schedule",
 		title: "Retrieve backup schedule",
 		description: "Returns the backup schedule for the specified branch, including the configured snapshot frequencies.\n",
-		inputSchema: z.strictObject({ path: zGetSnapshotSchedulePath }),
+		inputSchema: z.strictObject({
+			"project_id": zGetSnapshotSchedulePath.shape.project_id,
+			"branch_id": zGetSnapshotSchedulePath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2711,7 +3395,10 @@ const operationFactories = {
 			tags: ["Snapshot"]
 		},
 		invoke: (client, input, signal) => raw.getSnapshotSchedule({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2723,8 +3410,8 @@ const operationFactories = {
 		title: "Grant project access",
 		description: "Grants project access to the account associated with the specified email address.\n",
 		inputSchema: z.strictObject({
-			body: zGrantPermissionToProjectBody,
-			path: zGrantPermissionToProjectPath
+			"project_id": zGrantPermissionToProjectPath.shape.project_id,
+			"email": zGrantPermissionToProjectBody.shape.email
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -2740,7 +3427,8 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.grantPermissionToProject({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({ "email": input["email"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2765,7 +3453,6 @@ const operationFactories = {
 			tags: ["API Key"]
 		},
 		invoke: (client, input, signal) => raw.listApiKeys({
-			...input,
 			client,
 			signal,
 			throwOnError: true
@@ -2776,7 +3463,10 @@ const operationFactories = {
 		id: "list_branch_neon_auth_oauth_providers",
 		title: "List OAuth providers for the branch",
 		description: "Lists the OAuth providers configured for the specified branch's Neon Auth integration.\n",
-		inputSchema: z.strictObject({ path: zListBranchNeonAuthOauthProvidersPath }),
+		inputSchema: z.strictObject({
+			"project_id": zListBranchNeonAuthOauthProvidersPath.shape.project_id,
+			"branch_id": zListBranchNeonAuthOauthProvidersPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2790,7 +3480,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.listBranchNeonAuthOauthProviders({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2801,7 +3494,10 @@ const operationFactories = {
 		id: "list_branch_neon_auth_trusted_domains",
 		title: "List domains in redirect_uri whitelist",
 		description: "Lists the trusted domains in the redirect URI whitelist for the specified branch.\nOnly domains in this list are permitted as redirect targets after authentication.\n",
-		inputSchema: z.strictObject({ path: zListBranchNeonAuthTrustedDomainsPath }),
+		inputSchema: z.strictObject({
+			"project_id": zListBranchNeonAuthTrustedDomainsPath.shape.project_id,
+			"branch_id": zListBranchNeonAuthTrustedDomainsPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2815,7 +3511,10 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.listBranchNeonAuthTrustedDomains({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2826,7 +3525,10 @@ const operationFactories = {
 		id: "list_credentials",
 		title: "List credentials on the branch",
 		description: "Returns metadata for customer-issued credentials on the branch.\nSecrets are never included.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zListCredentialsPath }),
+		inputSchema: z.strictObject({
+			"project_id": zListCredentialsPath.shape.project_id,
+			"branch_id": zListCredentialsPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2840,7 +3542,10 @@ const operationFactories = {
 			tags: ["Credentials"]
 		},
 		invoke: (client, input, signal) => raw.listCredentials({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2851,7 +3556,7 @@ const operationFactories = {
 		id: "list_neon_auth_integrations",
 		title: "List active integrations with auth providers",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth` instead. Removal scheduled for March 1, 2026.",
-		inputSchema: z.strictObject({ path: zListNeonAuthIntegrationsPath }),
+		inputSchema: z.strictObject({ "project_id": zListNeonAuthIntegrationsPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2865,7 +3570,7 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.listNeonAuthIntegrations({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2876,7 +3581,7 @@ const operationFactories = {
 		id: "list_neon_auth_oauth_providers",
 		title: "List OAuth providers",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/oauth_providers` instead. Removal scheduled for March 1, 2026.\n",
-		inputSchema: z.strictObject({ path: zListNeonAuthOauthProvidersPath }),
+		inputSchema: z.strictObject({ "project_id": zListNeonAuthOauthProvidersPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2890,7 +3595,7 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.listNeonAuthOauthProviders({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2901,7 +3606,7 @@ const operationFactories = {
 		id: "list_neon_auth_redirect_uri_whitelist_domains",
 		title: "List trusted redirect URI domains",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/domains` instead. Removal scheduled for March 1, 2026.\n",
-		inputSchema: z.strictObject({ path: zListNeonAuthRedirectUriWhitelistDomainsPath }),
+		inputSchema: z.strictObject({ "project_id": zListNeonAuthRedirectUriWhitelistDomainsPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2915,7 +3620,7 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.listNeonAuthRedirectUriWhitelistDomains({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2926,7 +3631,10 @@ const operationFactories = {
 		id: "list_organization_vpc_endpoints",
 		title: "List VPC endpoints",
 		description: "Retrieves the list of VPC endpoints for the specified Neon organization.\n",
-		inputSchema: z.strictObject({ path: zListOrganizationVpcEndpointsPath }),
+		inputSchema: z.strictObject({
+			"org_id": zListOrganizationVpcEndpointsPath.shape.org_id,
+			"region_id": zListOrganizationVpcEndpointsPath.shape.region_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2940,7 +3648,10 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.listOrganizationVpcEndpoints({
-			...input,
+			path: optionalGroup({
+				"org_id": input["org_id"],
+				"region_id": input["region_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2951,7 +3662,7 @@ const operationFactories = {
 		id: "list_organization_vpc_endpoints_all_regions",
 		title: "List VPC endpoints across all regions",
 		description: "Retrieves the list of VPC endpoints for the specified Neon organization across all regions.\n",
-		inputSchema: z.strictObject({ path: zListOrganizationVpcEndpointsAllRegionsPath }),
+		inputSchema: z.strictObject({ "org_id": zListOrganizationVpcEndpointsAllRegionsPath.shape.org_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2965,7 +3676,7 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.listOrganizationVpcEndpointsAllRegions({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -2976,7 +3687,7 @@ const operationFactories = {
 		id: "list_org_api_keys",
 		title: "List organization API keys",
 		description: "Retrieves the API keys for the specified organization.\nThe response does not include API key tokens. A token is only provided when creating an API key.\nAPI keys can also be managed in the Neon Console.\nFor more information, see [Manage API keys](https://neon.com/docs/manage/api-keys/).\n",
-		inputSchema: z.strictObject({ path: zListOrgApiKeysPath }),
+		inputSchema: z.strictObject({ "org_id": zListOrgApiKeysPath.shape.org_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -2990,7 +3701,7 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.listOrgApiKeys({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3002,8 +3713,13 @@ const operationFactories = {
 		title: "List objects in a bucket",
 		description: "Lists objects visible in the named bucket on the specified branch,\nincluding those inherited from ancestor branches. Listing is served by\nthe user's session (no customer S3 credentials required).\n\nWhen `delimiter` is supplied (typically `/`), keys are collapsed into\ncommon prefixes (`folders`) so callers can render a folder-style\nbrowser; keys that do not contain the delimiter after `prefix` are\nreturned as `objects`.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			path: zListProjectBranchBucketObjectsPath,
-			query: zListProjectBranchBucketObjectsQuery.optional()
+			"project_id": zListProjectBranchBucketObjectsPath.shape.project_id,
+			"branch_id": zListProjectBranchBucketObjectsPath.shape.branch_id,
+			"bucket_name": zListProjectBranchBucketObjectsPath.shape.bucket_name,
+			"prefix": zListProjectBranchBucketObjectsQuery.shape.prefix.optional(),
+			"delimiter": zListProjectBranchBucketObjectsQuery.shape.delimiter.optional(),
+			"cursor": zListProjectBranchBucketObjectsQuery.shape.cursor.optional(),
+			"limit": zListProjectBranchBucketObjectsQuery.shape.limit.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -3018,7 +3734,17 @@ const operationFactories = {
 			tags: ["Buckets"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranchBucketObjects({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"bucket_name": input["bucket_name"]
+			}, true),
+			query: optionalGroup({
+				"prefix": input["prefix"],
+				"delimiter": input["delimiter"],
+				"cursor": input["cursor"],
+				"limit": input["limit"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3029,7 +3755,10 @@ const operationFactories = {
 		id: "list_project_branch_buckets",
 		title: "List buckets on the branch",
 		description: "Lists branchable object storage buckets visible on the specified branch,\nincluding those inherited from ancestor branches.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zListProjectBranchBucketsPath }),
+		inputSchema: z.strictObject({
+			"project_id": zListProjectBranchBucketsPath.shape.project_id,
+			"branch_id": zListProjectBranchBucketsPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3043,7 +3772,10 @@ const operationFactories = {
 			tags: ["Buckets"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranchBuckets({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3054,7 +3786,10 @@ const operationFactories = {
 		id: "list_project_branch_databases",
 		title: "List databases",
 		description: "Retrieves a list of databases for the specified branch.\nA branch can have multiple databases.\nFor related information, see [Manage databases](https://neon.com/docs/manage/databases/).\n",
-		inputSchema: z.strictObject({ path: zListProjectBranchDatabasesPath }),
+		inputSchema: z.strictObject({
+			"project_id": zListProjectBranchDatabasesPath.shape.project_id,
+			"branch_id": zListProjectBranchDatabasesPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3068,7 +3803,10 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranchDatabases({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3079,7 +3817,10 @@ const operationFactories = {
 		id: "list_project_branch_endpoints",
 		title: "List branch endpoints",
 		description: "Retrieves a list of compute endpoints for the specified branch.\nNeon permits only one read-write compute endpoint per branch.\nA branch can have multiple read-only compute endpoints.\n",
-		inputSchema: z.strictObject({ path: zListProjectBranchEndpointsPath }),
+		inputSchema: z.strictObject({
+			"project_id": zListProjectBranchEndpointsPath.shape.project_id,
+			"branch_id": zListProjectBranchEndpointsPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3093,7 +3834,10 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranchEndpoints({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3105,8 +3849,13 @@ const operationFactories = {
 		title: "List branches",
 		description: "Retrieves a list of branches for the specified project.\n\nEach Neon project has a root branch named `main`.\nA `branch_id` value has a `br-` prefix.\nA project may contain child branches that were branched from `main` or from another branch.\nA parent branch is identified by the `parent_id` value, which is the `id` of the parent branch.\nFor related information, see [Manage branches](https://neon.com/docs/manage/branches/).\n",
 		inputSchema: z.strictObject({
-			path: zListProjectBranchesPath,
-			query: zListProjectBranchesQuery.optional()
+			"project_id": zListProjectBranchesPath.shape.project_id,
+			"search": zListProjectBranchesQuery.shape.search.optional(),
+			"sort_by": zListProjectBranchesQuery.shape.sort_by.optional(),
+			"cursor": zListProjectBranchesQuery.shape.cursor.optional(),
+			"sort_order": zListProjectBranchesQuery.shape.sort_order.optional(),
+			"limit": zListProjectBranchesQuery.shape.limit.optional(),
+			"include_deleted": zListProjectBranchesQuery.shape.include_deleted.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -3121,7 +3870,15 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranches({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			query: optionalGroup({
+				"search": input["search"],
+				"sort_by": input["sort_by"],
+				"cursor": input["cursor"],
+				"sort_order": input["sort_order"],
+				"limit": input["limit"],
+				"include_deleted": input["include_deleted"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3133,8 +3890,10 @@ const operationFactories = {
 		title: "List functions on the branch",
 		description: "Lists functions on the specified branch.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			path: zListProjectBranchFunctionsPath,
-			query: zListProjectBranchFunctionsQuery.optional()
+			"project_id": zListProjectBranchFunctionsPath.shape.project_id,
+			"branch_id": zListProjectBranchFunctionsPath.shape.branch_id,
+			"cursor": zListProjectBranchFunctionsQuery.shape.cursor.optional(),
+			"limit": zListProjectBranchFunctionsQuery.shape.limit.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -3149,7 +3908,14 @@ const operationFactories = {
 			tags: ["Functions"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranchFunctions({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			query: optionalGroup({
+				"cursor": input["cursor"],
+				"limit": input["limit"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3160,7 +3926,10 @@ const operationFactories = {
 		id: "list_project_branch_log_fields",
 		title: "List branch log fields",
 		description: "Lists the low-cardinality log fields observed on this branch whose\ndistinct values can be discovered with the log field-values endpoint.\n\nThe set is computed per branch and grows as new fields are observed, so\ntreat it as data rather than a fixed list: discover a field here, then\npass it as `field_name` to the field-values endpoint.\n\n**Note**: This endpoint is currently in Private Beta.\n",
-		inputSchema: z.strictObject({ path: zListProjectBranchLogFieldsPath }),
+		inputSchema: z.strictObject({
+			"project_id": zListProjectBranchLogFieldsPath.shape.project_id,
+			"branch_id": zListProjectBranchLogFieldsPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3174,7 +3943,10 @@ const operationFactories = {
 			tags: ["Logs"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranchLogFields({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3186,8 +3958,14 @@ const operationFactories = {
 		title: "List branch log field values",
 		description: "Lists the distinct values observed for a low-cardinality log field in\nthe requested time range. Call the log fields endpoint first to learn\nwhich `field_name` values this branch supports; a field that branch has\nnever emitted is rejected with `unknown_field`.\n\nGive the window either as `since` or as an explicit `start_time`;\nsupplying both is rejected. If neither is given, the previous six hours\nare used. The maximum supported time range is seven days.\n\n**Note**: This endpoint is currently in Private Beta.\n",
 		inputSchema: z.strictObject({
-			path: zListProjectBranchLogFieldValuesPath,
-			query: zListProjectBranchLogFieldValuesQuery.optional()
+			"project_id": zListProjectBranchLogFieldValuesPath.shape.project_id,
+			"branch_id": zListProjectBranchLogFieldValuesPath.shape.branch_id,
+			"field_name": zListProjectBranchLogFieldValuesPath.shape.field_name,
+			"since": zListProjectBranchLogFieldValuesQuery.shape.since.optional(),
+			"start_time": zListProjectBranchLogFieldValuesQuery.shape.start_time.optional(),
+			"end_time": zListProjectBranchLogFieldValuesQuery.shape.end_time.optional(),
+			"source": zListProjectBranchLogFieldValuesQuery.shape.source.optional(),
+			"limit": zListProjectBranchLogFieldValuesQuery.shape.limit.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -3202,7 +3980,18 @@ const operationFactories = {
 			tags: ["Logs"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranchLogFieldValues({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"field_name": input["field_name"]
+			}, true),
+			query: optionalGroup({
+				"since": input["since"],
+				"start_time": input["start_time"],
+				"end_time": input["end_time"],
+				"source": input["source"],
+				"limit": input["limit"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3213,7 +4002,10 @@ const operationFactories = {
 		id: "list_project_branch_roles",
 		title: "List roles",
 		description: "Retrieves a list of Postgres roles from the specified branch.\nFor related information, see [Manage roles](https://neon.com/docs/manage/roles/).\n",
-		inputSchema: z.strictObject({ path: zListProjectBranchRolesPath }),
+		inputSchema: z.strictObject({
+			"project_id": zListProjectBranchRolesPath.shape.project_id,
+			"branch_id": zListProjectBranchRolesPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3227,7 +4019,10 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.listProjectBranchRoles({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3238,7 +4033,7 @@ const operationFactories = {
 		id: "list_project_endpoints",
 		title: "List compute endpoints",
 		description: "Retrieves a list of compute endpoints for the specified project.\nA compute endpoint is a Neon compute instance.\nFor information about compute endpoints, see [Manage computes](https://neon.com/docs/manage/endpoints/).\n",
-		inputSchema: z.strictObject({ path: zListProjectEndpointsPath }),
+		inputSchema: z.strictObject({ "project_id": zListProjectEndpointsPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3252,7 +4047,7 @@ const operationFactories = {
 			tags: ["Endpoint"]
 		},
 		invoke: (client, input, signal) => raw.listProjectEndpoints({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3264,8 +4059,9 @@ const operationFactories = {
 		title: "List org members and their project roles",
 		description: "Lists organization members and their per-project roles for an org-owned project.\nReturns 404 when the project is not org-owned, per-project role management is disabled,\nor the caller has no access. Callers with VIEWER or EDITOR see members with\neffective project access. Callers with ADMIN also see unassigned org members.\n",
 		inputSchema: z.strictObject({
-			path: zListProjectMembersPath,
-			query: zListProjectMembersQuery.optional()
+			"project_id": zListProjectMembersPath.shape.project_id,
+			"cursor": zListProjectMembersQuery.shape.cursor.optional(),
+			"limit": zListProjectMembersQuery.shape.limit.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -3280,7 +4076,11 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.listProjectMembers({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			query: optionalGroup({
+				"cursor": input["cursor"],
+				"limit": input["limit"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3292,8 +4092,9 @@ const operationFactories = {
 		title: "List operations",
 		description: "Retrieves a list of operations for the specified Neon project.\nThe number of operations returned can be large.\nTo paginate the response, issue an initial request with a `limit` value.\nThen, add the `cursor` value that was returned in the response to the next request.\nOperations older than 6 months may be deleted from our systems.\nIf you need more history than that, you should store your own history.\n",
 		inputSchema: z.strictObject({
-			path: zListProjectOperationsPath,
-			query: zListProjectOperationsQuery.optional()
+			"project_id": zListProjectOperationsPath.shape.project_id,
+			"cursor": zListProjectOperationsQuery.shape.cursor.optional(),
+			"limit": zListProjectOperationsQuery.shape.limit.optional()
 		}),
 		annotations: {
 			readOnlyHint: true,
@@ -3308,7 +4109,11 @@ const operationFactories = {
 			tags: ["Operation"]
 		},
 		invoke: (client, input, signal) => raw.listProjectOperations({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			query: optionalGroup({
+				"cursor": input["cursor"],
+				"limit": input["limit"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3319,7 +4124,7 @@ const operationFactories = {
 		id: "list_project_permissions",
 		title: "List project access",
 		description: "Retrieves details about users who have access to the project, including the permission `id`, the granted-to email address, and the date project access was granted.",
-		inputSchema: z.strictObject({ path: zListProjectPermissionsPath }),
+		inputSchema: z.strictObject({ "project_id": zListProjectPermissionsPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3333,7 +4138,7 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.listProjectPermissions({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3344,7 +4149,14 @@ const operationFactories = {
 		id: "list_projects",
 		title: "List projects",
 		description: "Retrieves a list of projects for the specified organization.\nIf using a personal API key, include the `org_id` parameter to specify which organization to work with.\nIf using an org API key, `org_id` is automatically inferred from the key.\nFor more information, see [Manage organizations using the Neon API](https://neon.com/docs/manage/orgs-api)\nand [Manage projects](https://neon.com/docs/manage/projects/).\n",
-		inputSchema: z.strictObject({ query: zListProjectsQuery.optional() }),
+		inputSchema: z.strictObject({
+			"cursor": zListProjectsQuery.shape.cursor.optional(),
+			"limit": zListProjectsQuery.shape.limit.optional(),
+			"search": zListProjectsQuery.shape.search.optional(),
+			"org_id": zListProjectsQuery.shape.org_id.optional(),
+			"timeout": zListProjectsQuery.shape.timeout.optional(),
+			"recoverable": zListProjectsQuery.shape.recoverable.optional()
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3358,7 +4170,14 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.listProjects({
-			...input,
+			query: optionalGroup({
+				"cursor": input["cursor"],
+				"limit": input["limit"],
+				"search": input["search"],
+				"org_id": input["org_id"],
+				"timeout": input["timeout"],
+				"recoverable": input["recoverable"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3369,7 +4188,7 @@ const operationFactories = {
 		id: "list_project_vpc_endpoints",
 		title: "List VPC endpoint restrictions",
 		description: "Lists VPC endpoint restrictions for the specified Neon project.\n",
-		inputSchema: z.strictObject({ path: zListProjectVpcEndpointsPath }),
+		inputSchema: z.strictObject({ "project_id": zListProjectVpcEndpointsPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3383,7 +4202,7 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.listProjectVpcEndpoints({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3394,7 +4213,12 @@ const operationFactories = {
 		id: "list_shared_projects",
 		title: "List shared projects",
 		description: "Retrieves a list of projects shared with your Neon account.\nFor more information, see [Manage projects](https://neon.com/docs/manage/projects/).\n",
-		inputSchema: z.strictObject({ query: zListSharedProjectsQuery.optional() }),
+		inputSchema: z.strictObject({
+			"cursor": zListSharedProjectsQuery.shape.cursor.optional(),
+			"limit": zListSharedProjectsQuery.shape.limit.optional(),
+			"search": zListSharedProjectsQuery.shape.search.optional(),
+			"timeout": zListSharedProjectsQuery.shape.timeout.optional()
+		}),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3408,7 +4232,12 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.listSharedProjects({
-			...input,
+			query: optionalGroup({
+				"cursor": input["cursor"],
+				"limit": input["limit"],
+				"search": input["search"],
+				"timeout": input["timeout"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3419,7 +4248,7 @@ const operationFactories = {
 		id: "list_snapshots",
 		title: "List project snapshots",
 		description: "Lists the snapshots for the specified project.\nEach snapshot represents a point-in-time backup of the project data.\n",
-		inputSchema: z.strictObject({ path: zListSnapshotsPath }),
+		inputSchema: z.strictObject({ "project_id": zListSnapshotsPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: true,
 			openWorldHint: true
@@ -3433,7 +4262,7 @@ const operationFactories = {
 			tags: ["Snapshot"]
 		},
 		invoke: (client, input, signal) => raw.listSnapshots({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3445,8 +4274,13 @@ const operationFactories = {
 		title: "Presign an upload or download for an object in a bucket",
 		description: "Returns a presigned URL that transfers bytes directly to or from the\nobject's bucket on the specified branch, without the caller ever\nhandling S3 credentials. The `operation` field selects the direction:\n\n- `upload` returns a presigned `PUT` URL (the caller `PUT`s the file\n  bytes straight to `url` with the returned `headers`). Authorized with\n  project write access.\n- `download` returns a presigned `GET` URL (the caller `GET`s the\n  bytes straight from `url`). Authorized with project read access.\n\nThe platform mints a short-lived credential and builds the SigV4-signed\nURL against the branch's S3 data-plane host, returning it together with\nthe HTTP method, any headers the caller must echo, and the URL's expiry.\n\nServed by the user's session (no customer S3 credentials required).\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			body: zPresignProjectBranchBucketObjectBody,
-			path: zPresignProjectBranchBucketObjectPath
+			"project_id": zPresignProjectBranchBucketObjectPath.shape.project_id,
+			"branch_id": zPresignProjectBranchBucketObjectPath.shape.branch_id,
+			"bucket_name": zPresignProjectBranchBucketObjectPath.shape.bucket_name,
+			"object_key": zPresignProjectBranchBucketObjectPath.shape.object_key,
+			"operation": zPresignProjectBranchBucketObjectBody.shape.operation,
+			"content_type": zPresignProjectBranchBucketObjectBody.shape.content_type,
+			"expires_in_seconds": zPresignProjectBranchBucketObjectBody.shape.expires_in_seconds
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3462,7 +4296,17 @@ const operationFactories = {
 			tags: ["Buckets"]
 		},
 		invoke: (client, input, signal) => raw.presignProjectBranchBucketObject({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"bucket_name": input["bucket_name"],
+				"object_key": input["object_key"]
+			}, true),
+			body: optionalGroup({
+				"operation": input["operation"],
+				"content_type": input["content_type"],
+				"expires_in_seconds": input["expires_in_seconds"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3474,8 +4318,22 @@ const operationFactories = {
 		title: "Query branch logs",
 		description: "Returns logs emitted by services running on the specified branch,\nordered by timestamp according to `sort_order`.\n\nAll supplied filters are combined with `AND`: a record is returned only\nwhen it matches every filter. `minimum_severity` and `severity_text` are\nindependent filters, so setting both requires a record to clear the\nseverity floor *and* match the exact severity text.\n\nSupply `logql` instead of the structured filters to run a raw LogQL\nexpression. Combining it with any structured filter is rejected rather\nthan silently ignored; `limit`, `sort_order`, and the time window still\napply, because those bound the query rather than form part of the\nexpression.\n\nGive the window either as `since` — a duration ending at `end_time`, or\nat the current time when `end_time` is omitted — or as an explicit\n`start_time`. Supplying both is rejected.\n\nA single response holds at most 1,000 records. When `is_truncated` is\n`true`, pass the returned `next_cursor` back as `cursor` to fetch the\nnext page, repeating the time range and every filter unchanged.\n\nIf no time range is supplied, the query covers the previous hour. The\nmaximum supported time range is seven days. `end_time` is exclusive.\n\n**Note**: This endpoint is currently in Private Beta.\n",
 		inputSchema: z.strictObject({
-			body: zQueryProjectBranchLogsBody,
-			path: zQueryProjectBranchLogsPath
+			"project_id": zQueryProjectBranchLogsPath.shape.project_id,
+			"branch_id": zQueryProjectBranchLogsPath.shape.branch_id,
+			"since": zQueryProjectBranchLogsBody.shape.since,
+			"start_time": zQueryProjectBranchLogsBody.shape.start_time,
+			"end_time": zQueryProjectBranchLogsBody.shape.end_time,
+			"limit": zQueryProjectBranchLogsBody.shape.limit,
+			"cursor": zQueryProjectBranchLogsBody.shape.cursor,
+			"sort_order": zQueryProjectBranchLogsBody.shape.sort_order,
+			"source": zQueryProjectBranchLogsBody.shape.source,
+			"service_name": zQueryProjectBranchLogsBody.shape.service_name,
+			"scope_name": zQueryProjectBranchLogsBody.shape.scope_name,
+			"minimum_severity": zQueryProjectBranchLogsBody.shape.minimum_severity,
+			"severity_text": zQueryProjectBranchLogsBody.shape.severity_text,
+			"body_contains": zQueryProjectBranchLogsBody.shape.body_contains,
+			"trace_id": zQueryProjectBranchLogsBody.shape.trace_id,
+			"logql": zQueryProjectBranchLogsBody.shape.logql
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3491,7 +4349,26 @@ const operationFactories = {
 			tags: ["Logs"]
 		},
 		invoke: (client, input, signal) => raw.queryProjectBranchLogs({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"since": input["since"],
+				"start_time": input["start_time"],
+				"end_time": input["end_time"],
+				"limit": input["limit"],
+				"cursor": input["cursor"],
+				"sort_order": input["sort_order"],
+				"source": input["source"],
+				"service_name": input["service_name"],
+				"scope_name": input["scope_name"],
+				"minimum_severity": input["minimum_severity"],
+				"severity_text": input["severity_text"],
+				"body_contains": input["body_contains"],
+				"trace_id": input["trace_id"],
+				"logql": input["logql"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3502,7 +4379,7 @@ const operationFactories = {
 		id: "recover_project",
 		title: "Recover a deleted project",
 		description: "Recovers a deleted project within the 7-day deletion recovery period.\nRestores branches, endpoints, settings, and connection strings.\nSome integrations require manual reconfiguration after recovery.\nTo list recoverable projects, use `GET /projects?recoverable=true`.\n",
-		inputSchema: z.strictObject({ path: zRecoverProjectPath }),
+		inputSchema: z.strictObject({ "project_id": zRecoverProjectPath.shape.project_id }),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3517,7 +4394,7 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.recoverProject({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3528,7 +4405,10 @@ const operationFactories = {
 		id: "remove_organization_member",
 		title: "Remove organization member",
 		description: "Removes the specified member from the organization.\nOnly organization admins can perform this action.\nThe last admin in an organization cannot be removed.\n",
-		inputSchema: z.strictObject({ path: zRemoveOrganizationMemberPath }),
+		inputSchema: z.strictObject({
+			"org_id": zRemoveOrganizationMemberPath.shape.org_id,
+			"member_id": zRemoveOrganizationMemberPath.shape.member_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3543,7 +4423,10 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.removeOrganizationMember({
-			...input,
+			path: optionalGroup({
+				"org_id": input["org_id"],
+				"member_id": input["member_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3555,8 +4438,9 @@ const operationFactories = {
 		title: "Remove an org member's role on a project",
 		description: "Idempotently removes the explicit project grant. The member's organization-role\ndefault project permission still applies. Self-DELETE requires\n`confirm_self_lockout=true` when effective manage access would be lost.\n",
 		inputSchema: z.strictObject({
-			path: zRemoveProjectMemberRolePath,
-			query: zRemoveProjectMemberRoleQuery.optional()
+			"project_id": zRemoveProjectMemberRolePath.shape.project_id,
+			"member_id": zRemoveProjectMemberRolePath.shape.member_id,
+			"confirm_self_lockout": zRemoveProjectMemberRoleQuery.shape.confirm_self_lockout.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3572,7 +4456,11 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.removeProjectMemberRole({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"member_id": input["member_id"]
+			}, true),
+			query: optionalGroup({ "confirm_self_lockout": input["confirm_self_lockout"] }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3583,7 +4471,11 @@ const operationFactories = {
 		id: "reset_project_branch_role_password",
 		title: "Reset role password",
 		description: "Resets the password for the specified Postgres role.\nReturns a new password and operations. The new password is ready to use when the last operation finishes.\nThe old password remains valid until last operation finishes.\nConnections to the compute endpoint are dropped. If idle,\nthe compute endpoint becomes active for a short period of time.\n\nFor related information, see [Manage roles](https://neon.com/docs/manage/roles/).\n",
-		inputSchema: z.strictObject({ path: zResetProjectBranchRolePasswordPath }),
+		inputSchema: z.strictObject({
+			"project_id": zResetProjectBranchRolePasswordPath.shape.project_id,
+			"branch_id": zResetProjectBranchRolePasswordPath.shape.branch_id,
+			"role_name": zResetProjectBranchRolePasswordPath.shape.role_name
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3598,7 +4490,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.resetProjectBranchRolePassword({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"role_name": input["role_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3609,7 +4505,10 @@ const operationFactories = {
 		id: "restart_project_endpoint",
 		title: "Restart compute endpoint",
 		description: "Restarts the specified compute endpoint by immediately suspending it and then starting it again.\nAn `endpoint_id` has an `ep-` prefix.\nFor information about compute endpoints, see [Manage computes](https://neon.com/docs/manage/endpoints/).\n",
-		inputSchema: z.strictObject({ path: zRestartProjectEndpointPath }),
+		inputSchema: z.strictObject({
+			"project_id": zRestartProjectEndpointPath.shape.project_id,
+			"endpoint_id": zRestartProjectEndpointPath.shape.endpoint_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3624,7 +4523,10 @@ const operationFactories = {
 			tags: ["Endpoint"]
 		},
 		invoke: (client, input, signal) => raw.restartProjectEndpoint({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"endpoint_id": input["endpoint_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3636,8 +4538,12 @@ const operationFactories = {
 		title: "Restore branch to a historical state",
 		description: "Restores a branch to an earlier state in its own or another branch's history\nby specifying an LSN or timestamp.\nCreates a new branch from the historical state.\n",
 		inputSchema: z.strictObject({
-			body: zRestoreProjectBranchBody,
-			path: zRestoreProjectBranchPath
+			"project_id": zRestoreProjectBranchPath.shape.project_id,
+			"branch_id": zRestoreProjectBranchPath.shape.branch_id,
+			"source_branch_id": zRestoreProjectBranchBody.shape.source_branch_id,
+			"source_lsn": zRestoreProjectBranchBody.shape.source_lsn,
+			"source_timestamp": zRestoreProjectBranchBody.shape.source_timestamp,
+			"preserve_under_name": zRestoreProjectBranchBody.shape.preserve_under_name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3653,7 +4559,16 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.restoreProjectBranch({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"source_branch_id": input["source_branch_id"],
+				"source_lsn": input["source_lsn"],
+				"source_timestamp": input["source_timestamp"],
+				"preserve_under_name": input["preserve_under_name"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3665,9 +4580,11 @@ const operationFactories = {
 		title: "Restore snapshot",
 		description: "Restores the specified snapshot to a new branch,\nand optionally finalizes the restore operation to replace the original branch.\n",
 		inputSchema: z.strictObject({
-			body: zRestoreSnapshotBody.optional(),
-			path: zRestoreSnapshotPath,
-			query: zRestoreSnapshotQuery.optional()
+			"project_id": zRestoreSnapshotPath.shape.project_id,
+			"snapshot_id": zRestoreSnapshotPath.shape.snapshot_id,
+			"name": zRestoreSnapshotBody.shape.name.optional(),
+			"target_branch_id": zRestoreSnapshotBody.shape.target_branch_id.optional(),
+			"finalize_restore": zRestoreSnapshotBody.shape.finalize_restore.optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3683,7 +4600,15 @@ const operationFactories = {
 			tags: ["Snapshot"]
 		},
 		invoke: (client, input, signal) => raw.restoreSnapshot({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"snapshot_id": input["snapshot_id"]
+			}, true),
+			body: optionalGroup({
+				"name": input["name"],
+				"target_branch_id": input["target_branch_id"],
+				"finalize_restore": input["finalize_restore"]
+			}, false),
 			client,
 			signal,
 			throwOnError: true
@@ -3694,7 +4619,7 @@ const operationFactories = {
 		id: "revoke_api_key",
 		title: "Revoke API key",
 		description: "Revokes the specified API key.\nAn API key that is no longer needed can be revoked.\nThis action cannot be reversed.\nAPI keys can also be managed in the Neon Console.\nSee [Manage API keys](https://neon.com/docs/manage/api-keys/).\n",
-		inputSchema: z.strictObject({ path: zRevokeApiKeyPath }),
+		inputSchema: z.strictObject({ "key_id": zRevokeApiKeyPath.shape.key_id }),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3709,7 +4634,7 @@ const operationFactories = {
 			tags: ["API Key"]
 		},
 		invoke: (client, input, signal) => raw.revokeApiKey({
-			...input,
+			path: optionalGroup({ "key_id": input["key_id"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3720,7 +4645,11 @@ const operationFactories = {
 		id: "revoke_credential",
 		title: "Revoke a credential",
 		description: "Soft-deletes the credential.  Idempotent.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zRevokeCredentialPath }),
+		inputSchema: z.strictObject({
+			"project_id": zRevokeCredentialPath.shape.project_id,
+			"branch_id": zRevokeCredentialPath.shape.branch_id,
+			"token_id": zRevokeCredentialPath.shape.token_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3735,7 +4664,11 @@ const operationFactories = {
 			tags: ["Credentials"]
 		},
 		invoke: (client, input, signal) => raw.revokeCredential({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"token_id": input["token_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3746,7 +4679,10 @@ const operationFactories = {
 		id: "revoke_org_api_key",
 		title: "Revoke organization API key",
 		description: "Revokes the specified organization API key.\nAn API key that is no longer needed can be revoked.\nThis action cannot be reversed.\nAPI keys can also be managed in the Neon Console.\nSee [Manage API keys](https://neon.com/docs/manage/api-keys/).\n",
-		inputSchema: z.strictObject({ path: zRevokeOrgApiKeyPath }),
+		inputSchema: z.strictObject({
+			"org_id": zRevokeOrgApiKeyPath.shape.org_id,
+			"key_id": zRevokeOrgApiKeyPath.shape.key_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3761,7 +4697,10 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.revokeOrgApiKey({
-			...input,
+			path: optionalGroup({
+				"org_id": input["org_id"],
+				"key_id": input["key_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3772,7 +4711,10 @@ const operationFactories = {
 		id: "revoke_permission_from_project",
 		title: "Revoke project access",
 		description: "Revokes project access from the user associated with the specified permission `id`. You can retrieve a user's permission `id` by listing project access.",
-		inputSchema: z.strictObject({ path: zRevokePermissionFromProjectPath }),
+		inputSchema: z.strictObject({
+			"project_id": zRevokePermissionFromProjectPath.shape.project_id,
+			"permission_id": zRevokePermissionFromProjectPath.shape.permission_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3787,7 +4729,10 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.revokePermissionFromProject({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"permission_id": input["permission_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3799,8 +4744,15 @@ const operationFactories = {
 		title: "Send test email",
 		description: "Sends a test email using the configured email server settings to verify SMTP connectivity and credentials.\nThe request body must include the SMTP server settings\n(`host`, `port`, `username`, `password`, `sender_email`, `sender_name`) and the `recipient_email` address.\n",
 		inputSchema: z.strictObject({
-			body: zSendNeonAuthTestEmailBody,
-			path: zSendNeonAuthTestEmailPath
+			"project_id": zSendNeonAuthTestEmailPath.shape.project_id,
+			"branch_id": zSendNeonAuthTestEmailPath.shape.branch_id,
+			"host": zSendNeonAuthTestEmailBody.shape.host,
+			"port": zSendNeonAuthTestEmailBody.shape.port,
+			"username": zSendNeonAuthTestEmailBody.shape.username,
+			"password": zSendNeonAuthTestEmailBody.shape.password,
+			"sender_email": zSendNeonAuthTestEmailBody.shape.sender_email,
+			"sender_name": zSendNeonAuthTestEmailBody.shape.sender_name,
+			"recipient_email": zSendNeonAuthTestEmailBody.shape.recipient_email
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3816,7 +4768,19 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.sendNeonAuthTestEmail({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"host": input["host"],
+				"port": input["port"],
+				"username": input["username"],
+				"password": input["password"],
+				"sender_email": input["sender_email"],
+				"sender_name": input["sender_name"],
+				"recipient_email": input["recipient_email"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3827,7 +4791,10 @@ const operationFactories = {
 		id: "set_default_project_branch",
 		title: "Set branch as default",
 		description: "Sets the specified branch as the project's default branch.\nThe default designation is automatically removed from the previous default branch.\nFor more information, see [Manage branches](https://neon.com/docs/manage/branches/).\n",
-		inputSchema: z.strictObject({ path: zSetDefaultProjectBranchPath }),
+		inputSchema: z.strictObject({
+			"project_id": zSetDefaultProjectBranchPath.shape.project_id,
+			"branch_id": zSetDefaultProjectBranchPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3842,7 +4809,10 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.setDefaultProjectBranch({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3854,8 +4824,8 @@ const operationFactories = {
 		title: "Set organization spending limit",
 		description: "Sets the monthly spending limit for the specified organization.\nTo remove a previously configured limit, send a DELETE request to this endpoint.\nWhen a limit is configured, email notifications are sent at 80% and 100% of the limit.\nComputes are not suspended when the limit is reached.\nAvailable to organization admins on Launch and Scale plans only.\n",
 		inputSchema: z.strictObject({
-			body: zSetOrganizationSpendingLimitBody,
-			path: zSetOrganizationSpendingLimitPath
+			"org_id": zSetOrganizationSpendingLimitPath.shape.org_id,
+			"spending_limit_cents": zSetOrganizationSpendingLimitBody.shape.spending_limit_cents
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3871,7 +4841,8 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.setOrganizationSpendingLimit({
-			...input,
+			path: optionalGroup({ "org_id": input["org_id"] }, true),
+			body: optionalGroup({ "spending_limit_cents": input["spending_limit_cents"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3883,9 +4854,10 @@ const operationFactories = {
 		title: "Set an org member's role on a project",
 		description: "Idempotently sets or updates the explicit project grant of the specified org member.\nSelf-demotion requires `confirm_self_demotion=true`.\n",
 		inputSchema: z.strictObject({
-			body: zSetProjectMemberRoleBody,
-			path: zSetProjectMemberRolePath,
-			query: zSetProjectMemberRoleQuery.optional()
+			"project_id": zSetProjectMemberRolePath.shape.project_id,
+			"member_id": zSetProjectMemberRolePath.shape.member_id,
+			"confirm_self_demotion": zSetProjectMemberRoleQuery.shape.confirm_self_demotion.optional(),
+			"role": zSetProjectMemberRoleBody.shape.role
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3901,7 +4873,12 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.setProjectMemberRole({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"member_id": input["member_id"]
+			}, true),
+			query: optionalGroup({ "confirm_self_demotion": input["confirm_self_demotion"] }, false),
+			body: optionalGroup({ "role": input["role"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3913,8 +4890,9 @@ const operationFactories = {
 		title: "Update backup schedule",
 		description: "Updates the backup schedule for the specified branch.\nThe schedule defines how often automatic snapshots are created (for example, `daily` or `weekly`). Requires a paid plan.\n",
 		inputSchema: z.strictObject({
-			body: zSetSnapshotScheduleBody,
-			path: zSetSnapshotSchedulePath
+			"project_id": zSetSnapshotSchedulePath.shape.project_id,
+			"branch_id": zSetSnapshotSchedulePath.shape.branch_id,
+			"schedule": zSetSnapshotScheduleBody.shape.schedule
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -3930,7 +4908,11 @@ const operationFactories = {
 			tags: ["Snapshot"]
 		},
 		invoke: (client, input, signal) => raw.setSnapshotSchedule({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "schedule": input["schedule"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3941,7 +4923,10 @@ const operationFactories = {
 		id: "start_anonymization",
 		title: "Start anonymization",
 		description: "Starts the anonymization process for an anonymized branch that is in the initialized, error, or anonymized state.\nThis will apply all defined masking rules to anonymize sensitive data in the branch databases.\nThe branch must be an anonymized branch to start anonymization.\n\n**Note**: This endpoint is currently in Beta.\n",
-		inputSchema: z.strictObject({ path: zStartAnonymizationPath }),
+		inputSchema: z.strictObject({
+			"project_id": zStartAnonymizationPath.shape.project_id,
+			"branch_id": zStartAnonymizationPath.shape.branch_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3956,7 +4941,10 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.startAnonymization({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3967,7 +4955,10 @@ const operationFactories = {
 		id: "start_project_endpoint",
 		title: "Start compute endpoint",
 		description: "Starts a compute endpoint.\nThe compute endpoint is ready to use after the last operation in the chain finishes successfully.\n\nAn `endpoint_id` has an `ep-` prefix.\nFor information about compute endpoints, see [Manage computes](https://neon.com/docs/manage/endpoints/).\n",
-		inputSchema: z.strictObject({ path: zStartProjectEndpointPath }),
+		inputSchema: z.strictObject({
+			"project_id": zStartProjectEndpointPath.shape.project_id,
+			"endpoint_id": zStartProjectEndpointPath.shape.endpoint_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -3982,7 +4973,10 @@ const operationFactories = {
 			tags: ["Endpoint"]
 		},
 		invoke: (client, input, signal) => raw.startProjectEndpoint({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"endpoint_id": input["endpoint_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -3993,7 +4987,10 @@ const operationFactories = {
 		id: "suspend_project_endpoint",
 		title: "Suspend compute endpoint",
 		description: "Suspends the specified compute endpoint.\nAn `endpoint_id` has an `ep-` prefix.\nFor information about compute endpoints, see [Manage computes](https://neon.com/docs/manage/endpoints/).\n",
-		inputSchema: z.strictObject({ path: zSuspendProjectEndpointPath }),
+		inputSchema: z.strictObject({
+			"project_id": zSuspendProjectEndpointPath.shape.project_id,
+			"endpoint_id": zSuspendProjectEndpointPath.shape.endpoint_id
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -4008,7 +5005,10 @@ const operationFactories = {
 			tags: ["Endpoint"]
 		},
 		invoke: (client, input, signal) => raw.suspendProjectEndpoint({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"endpoint_id": input["endpoint_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4019,7 +5019,10 @@ const operationFactories = {
 		id: "transfer_neon_auth_provider_project",
 		title: "Transfer Neon-managed auth project to your own account",
 		description: "Transfers ownership of your Neon-managed auth project to your own auth provider account.\n",
-		inputSchema: z.strictObject({ body: zTransferNeonAuthProviderProjectBody }),
+		inputSchema: z.strictObject({
+			"project_id": zTransferNeonAuthProviderProjectBody.shape.project_id,
+			"auth_provider": zTransferNeonAuthProviderProjectBody.shape.auth_provider
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -4034,7 +5037,10 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.transferNeonAuthProviderProject({
-			...input,
+			body: optionalGroup({
+				"project_id": input["project_id"],
+				"auth_provider": input["auth_provider"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4046,8 +5052,9 @@ const operationFactories = {
 		title: "Transfer projects between organizations",
 		description: "Transfers selected projects, identified by their IDs, from your organization to another specified organization.\n",
 		inputSchema: z.strictObject({
-			body: zTransferProjectsFromOrgToOrgBody,
-			path: zTransferProjectsFromOrgToOrgPath
+			"source_org_id": zTransferProjectsFromOrgToOrgPath.shape.source_org_id,
+			"destination_org_id": zTransferProjectsFromOrgToOrgBody.shape.destination_org_id,
+			"project_ids": zTransferProjectsFromOrgToOrgBody.shape.project_ids
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4063,7 +5070,11 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.transferProjectsFromOrgToOrg({
-			...input,
+			path: optionalGroup({ "source_org_id": input["source_org_id"] }, true),
+			body: optionalGroup({
+				"destination_org_id": input["destination_org_id"],
+				"project_ids": input["project_ids"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4074,7 +5085,10 @@ const operationFactories = {
 		id: "transfer_projects_from_user_to_org",
 		title: "Transfer projects from personal account to organization",
 		description: "Deprecated. Personal accounts have been migrated to organizations, so this operation no longer applies. Removal scheduled for July 1, 2026.\n",
-		inputSchema: z.strictObject({ body: zTransferProjectsFromUserToOrgBody }),
+		inputSchema: z.strictObject({
+			"destination_org_id": zTransferProjectsFromUserToOrgBody.shape.destination_org_id,
+			"project_ids": zTransferProjectsFromUserToOrgBody.shape.project_ids
+		}),
 		annotations: {
 			readOnlyHint: false,
 			destructiveHint: true,
@@ -4089,7 +5103,10 @@ const operationFactories = {
 			tags: ["Users"]
 		},
 		invoke: (client, input, signal) => raw.transferProjectsFromUserToOrg({
-			...input,
+			body: optionalGroup({
+				"destination_org_id": input["destination_org_id"],
+				"project_ids": input["project_ids"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4101,8 +5118,12 @@ const operationFactories = {
 		title: "Update OAuth provider",
 		description: "Updates an OAuth provider for the specified project.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateBranchNeonAuthOauthProviderBody,
-			path: zUpdateBranchNeonAuthOauthProviderPath
+			"project_id": zUpdateBranchNeonAuthOauthProviderPath.shape.project_id,
+			"branch_id": zUpdateBranchNeonAuthOauthProviderPath.shape.branch_id,
+			"oauth_provider_id": zUpdateBranchNeonAuthOauthProviderPath.shape.oauth_provider_id,
+			"client_id": zUpdateBranchNeonAuthOauthProviderBody.shape.client_id,
+			"client_secret": zUpdateBranchNeonAuthOauthProviderBody.shape.client_secret,
+			"microsoft_tenant_id": zUpdateBranchNeonAuthOauthProviderBody.shape.microsoft_tenant_id
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4118,7 +5139,16 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateBranchNeonAuthOauthProvider({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"oauth_provider_id": input["oauth_provider_id"]
+			}, true),
+			body: optionalGroup({
+				"client_id": input["client_id"],
+				"client_secret": input["client_secret"],
+				"microsoft_tenant_id": input["microsoft_tenant_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4130,8 +5160,9 @@ const operationFactories = {
 		title: "Update masking rules",
 		description: "Updates the masking rules for the specified anonymized branch.\nMasking rules define how sensitive data should be anonymized using PostgreSQL Anonymizer.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateMaskingRulesBody,
-			path: zUpdateMaskingRulesPath
+			"project_id": zUpdateMaskingRulesPath.shape.project_id,
+			"branch_id": zUpdateMaskingRulesPath.shape.branch_id,
+			"masking_rules": zUpdateMaskingRulesBody.shape.masking_rules
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4147,7 +5178,11 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.updateMaskingRules({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "masking_rules": input["masking_rules"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4159,8 +5194,9 @@ const operationFactories = {
 		title: "Update localhost allow setting",
 		description: "Updates the localhost allow setting for the specified branch's Neon Auth integration.\nWhen enabled, authentication flows work from `localhost` without adding it to the redirect URI whitelist.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthAllowLocalhostBody,
-			path: zUpdateNeonAuthAllowLocalhostPath
+			"project_id": zUpdateNeonAuthAllowLocalhostPath.shape.project_id,
+			"branch_id": zUpdateNeonAuthAllowLocalhostPath.shape.branch_id,
+			"allow_localhost": zUpdateNeonAuthAllowLocalhostBody.shape.allow_localhost
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4176,7 +5212,11 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthAllowLocalhost({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "allow_localhost": input["allow_localhost"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4188,8 +5228,9 @@ const operationFactories = {
 		title: "Update auth configuration",
 		description: "Updates the auth configuration for the branch.\nCurrently supports updating the application name used in auth emails.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthConfigBody,
-			path: zUpdateNeonAuthConfigPath
+			"project_id": zUpdateNeonAuthConfigPath.shape.project_id,
+			"branch_id": zUpdateNeonAuthConfigPath.shape.branch_id,
+			"name": zUpdateNeonAuthConfigBody.shape.name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4205,7 +5246,11 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthConfig({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "name": input["name"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4217,8 +5262,15 @@ const operationFactories = {
 		title: "Update email and password configuration",
 		description: "Updates the email and password authentication configuration for the specified branch's Neon Auth integration.\nOnly the fields provided in the request body are updated.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthEmailAndPasswordConfigBody,
-			path: zUpdateNeonAuthEmailAndPasswordConfigPath
+			"project_id": zUpdateNeonAuthEmailAndPasswordConfigPath.shape.project_id,
+			"branch_id": zUpdateNeonAuthEmailAndPasswordConfigPath.shape.branch_id,
+			"enabled": zUpdateNeonAuthEmailAndPasswordConfigBody.shape.enabled,
+			"email_verification_method": zUpdateNeonAuthEmailAndPasswordConfigBody.shape.email_verification_method,
+			"require_email_verification": zUpdateNeonAuthEmailAndPasswordConfigBody.shape.require_email_verification,
+			"auto_sign_in_after_verification": zUpdateNeonAuthEmailAndPasswordConfigBody.shape.auto_sign_in_after_verification,
+			"send_verification_email_on_sign_up": zUpdateNeonAuthEmailAndPasswordConfigBody.shape.send_verification_email_on_sign_up,
+			"send_verification_email_on_sign_in": zUpdateNeonAuthEmailAndPasswordConfigBody.shape.send_verification_email_on_sign_in,
+			"disable_sign_up": zUpdateNeonAuthEmailAndPasswordConfigBody.shape.disable_sign_up
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4234,7 +5286,19 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthEmailAndPasswordConfig({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"enabled": input["enabled"],
+				"email_verification_method": input["email_verification_method"],
+				"require_email_verification": input["require_email_verification"],
+				"auto_sign_in_after_verification": input["auto_sign_in_after_verification"],
+				"send_verification_email_on_sign_up": input["send_verification_email_on_sign_up"],
+				"send_verification_email_on_sign_in": input["send_verification_email_on_sign_in"],
+				"disable_sign_up": input["disable_sign_up"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4246,8 +5310,9 @@ const operationFactories = {
 		title: "Update email provider configuration",
 		description: "Updates the email provider configuration for the specified branch's Neon Auth integration.\nThe email provider handles transactional messages such as verification emails and password reset links.\n\nPartial `standard` updates — omitting fields to keep their stored values — are supported only for\nBetter Auth integrations, which merge omitted fields server-side. Legacy Stack Auth integrations do\nnot merge and require all six `standard` fields (`host`, `port`, `username`, `password`,\n`sender_email`, `sender_name`) on every update; a partial `standard` body is rejected with 400.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthEmailProviderBody,
-			path: zUpdateNeonAuthEmailProviderPath
+			"project_id": zUpdateNeonAuthEmailProviderPath.shape.project_id,
+			"branch_id": zUpdateNeonAuthEmailProviderPath.shape.branch_id,
+			"body": zUpdateNeonAuthEmailProviderBody
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4263,7 +5328,11 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthEmailProvider({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: input.body,
 			client,
 			signal,
 			throwOnError: true
@@ -4275,8 +5344,8 @@ const operationFactories = {
 		title: "Update email server configuration",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/email_provider` instead. Removal scheduled for March 1, 2026.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthEmailServerBody,
-			path: zUpdateNeonAuthEmailServerPath
+			"project_id": zUpdateNeonAuthEmailServerPath.shape.project_id,
+			"body": zUpdateNeonAuthEmailServerBody
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4292,7 +5361,8 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthEmailServer({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: input.body,
 			client,
 			signal,
 			throwOnError: true
@@ -4304,8 +5374,11 @@ const operationFactories = {
 		title: "Update magic link plugin configuration",
 		description: "Updates the magic link plugin configuration for Neon Auth.\nThe magic link plugin enables passwordless authentication via email magic links.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthMagicLinkPluginBody,
-			path: zUpdateNeonAuthMagicLinkPluginPath
+			"project_id": zUpdateNeonAuthMagicLinkPluginPath.shape.project_id,
+			"branch_id": zUpdateNeonAuthMagicLinkPluginPath.shape.branch_id,
+			"enabled": zUpdateNeonAuthMagicLinkPluginBody.shape.enabled,
+			"expires_in": zUpdateNeonAuthMagicLinkPluginBody.shape.expires_in,
+			"disable_sign_up": zUpdateNeonAuthMagicLinkPluginBody.shape.disable_sign_up
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4321,7 +5394,15 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthMagicLinkPlugin({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"enabled": input["enabled"],
+				"expires_in": input["expires_in"],
+				"disable_sign_up": input["disable_sign_up"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4333,8 +5414,11 @@ const operationFactories = {
 		title: "Update OAuth provider",
 		description: "Deprecated. Use `/projects/{project_id}/branches/{branch_id}/auth/oauth_providers/{oauth_provider_id}` instead. Removal scheduled for March 1, 2026.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthOauthProviderBody,
-			path: zUpdateNeonAuthOauthProviderPath
+			"project_id": zUpdateNeonAuthOauthProviderPath.shape.project_id,
+			"oauth_provider_id": zUpdateNeonAuthOauthProviderPath.shape.oauth_provider_id,
+			"client_id": zUpdateNeonAuthOauthProviderBody.shape.client_id,
+			"client_secret": zUpdateNeonAuthOauthProviderBody.shape.client_secret,
+			"microsoft_tenant_id": zUpdateNeonAuthOauthProviderBody.shape.microsoft_tenant_id
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4350,7 +5434,15 @@ const operationFactories = {
 			tags: ["Auth (legacy)"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthOauthProvider({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"oauth_provider_id": input["oauth_provider_id"]
+			}, true),
+			body: optionalGroup({
+				"client_id": input["client_id"],
+				"client_secret": input["client_secret"],
+				"microsoft_tenant_id": input["microsoft_tenant_id"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4362,8 +5454,13 @@ const operationFactories = {
 		title: "Update organization plugin configuration",
 		description: "Updates the organization plugin configuration for Neon Auth.\nThe organization plugin enables multi-tenant organization support.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthOrganizationPluginBody,
-			path: zUpdateNeonAuthOrganizationPluginPath
+			"project_id": zUpdateNeonAuthOrganizationPluginPath.shape.project_id,
+			"branch_id": zUpdateNeonAuthOrganizationPluginPath.shape.branch_id,
+			"enabled": zUpdateNeonAuthOrganizationPluginBody.shape.enabled,
+			"organization_limit": zUpdateNeonAuthOrganizationPluginBody.shape.organization_limit,
+			"membership_limit": zUpdateNeonAuthOrganizationPluginBody.shape.membership_limit,
+			"creator_role": zUpdateNeonAuthOrganizationPluginBody.shape.creator_role,
+			"send_invitation_email": zUpdateNeonAuthOrganizationPluginBody.shape.send_invitation_email
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4379,7 +5476,17 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthOrganizationPlugin({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"enabled": input["enabled"],
+				"organization_limit": input["organization_limit"],
+				"membership_limit": input["membership_limit"],
+				"creator_role": input["creator_role"],
+				"send_invitation_email": input["send_invitation_email"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4391,8 +5498,10 @@ const operationFactories = {
 		title: "Update phone number plugin configuration",
 		description: "Updates the phone number plugin configuration for Neon Auth.\nOnly the fields provided in the request body are updated; omitted fields retain their current values.\nThe phone number plugin enables phone-based OTP authentication.\nOTP codes are delivered via the `send.otp` webhook event with `delivery_preference: \"sms\"`.\nA webhook must be configured with the `send.otp` event enabled for SMS delivery to work.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthPhoneNumberPluginBody,
-			path: zUpdateNeonAuthPhoneNumberPluginPath
+			"project_id": zUpdateNeonAuthPhoneNumberPluginPath.shape.project_id,
+			"branch_id": zUpdateNeonAuthPhoneNumberPluginPath.shape.branch_id,
+			"enabled": zUpdateNeonAuthPhoneNumberPluginBody.shape.enabled,
+			"otp_expires_in": zUpdateNeonAuthPhoneNumberPluginBody.shape.otp_expires_in
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4408,7 +5517,14 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthPhoneNumberPlugin({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"enabled": input["enabled"],
+				"otp_expires_in": input["otp_expires_in"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4420,8 +5536,10 @@ const operationFactories = {
 		title: "Update auth user role",
 		description: "Updates the role of a user in the Neon Auth user directory for the specified branch.\nThe role controls the user's level of access within the Neon Auth integration.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthUserRoleBody,
-			path: zUpdateNeonAuthUserRolePath
+			"project_id": zUpdateNeonAuthUserRolePath.shape.project_id,
+			"branch_id": zUpdateNeonAuthUserRolePath.shape.branch_id,
+			"auth_user_id": zUpdateNeonAuthUserRolePath.shape.auth_user_id,
+			"roles": zUpdateNeonAuthUserRoleBody.shape.roles
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4437,7 +5555,12 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthUserRole({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"auth_user_id": input["auth_user_id"]
+			}, true),
+			body: optionalGroup({ "roles": input["roles"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4449,8 +5572,12 @@ const operationFactories = {
 		title: "Update Neon Auth webhook configuration",
 		description: "Updates the webhook configuration for the specified branch's Neon Auth integration.\nWebhooks notify an external endpoint when auth events occur, such as user creation or sign-in.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateNeonAuthWebhookConfigBody,
-			path: zUpdateNeonAuthWebhookConfigPath
+			"project_id": zUpdateNeonAuthWebhookConfigPath.shape.project_id,
+			"branch_id": zUpdateNeonAuthWebhookConfigPath.shape.branch_id,
+			"enabled": zUpdateNeonAuthWebhookConfigBody.shape.enabled,
+			"webhook_url": zUpdateNeonAuthWebhookConfigBody.shape.webhook_url,
+			"enabled_events": zUpdateNeonAuthWebhookConfigBody.shape.enabled_events,
+			"timeout_seconds": zUpdateNeonAuthWebhookConfigBody.shape.timeout_seconds
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4466,7 +5593,16 @@ const operationFactories = {
 			tags: ["Auth"]
 		},
 		invoke: (client, input, signal) => raw.updateNeonAuthWebhookConfig({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({
+				"enabled": input["enabled"],
+				"webhook_url": input["webhook_url"],
+				"enabled_events": input["enabled_events"],
+				"timeout_seconds": input["timeout_seconds"]
+			}, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4478,8 +5614,9 @@ const operationFactories = {
 		title: "Update role for organization member",
 		description: "Updates the role of an existing member in the specified organization.\nThe requested role must be valid for the organization.\nOnly organization admins can call this endpoint.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateOrganizationMemberBody,
-			path: zUpdateOrganizationMemberPath
+			"org_id": zUpdateOrganizationMemberPath.shape.org_id,
+			"member_id": zUpdateOrganizationMemberPath.shape.member_id,
+			"role": zUpdateOrganizationMemberBody.shape.role
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4495,7 +5632,11 @@ const operationFactories = {
 			tags: ["Organizations"]
 		},
 		invoke: (client, input, signal) => raw.updateOrganizationMember({
-			...input,
+			path: optionalGroup({
+				"org_id": input["org_id"],
+				"member_id": input["member_id"]
+			}, true),
+			body: optionalGroup({ "role": input["role"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4507,8 +5648,11 @@ const operationFactories = {
 		title: "Update project",
 		description: "Updates the specified project.\nConfigurable properties include the project name, default compute settings, history retention period, and IP allowlist.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateProjectBody,
-			path: zUpdateProjectPath
+			"project_id": zUpdateProjectPath.shape.project_id,
+			"settings": zUpdateProjectBody.shape.project.shape.settings,
+			"name": zUpdateProjectBody.shape.project.shape.name,
+			"default_endpoint_settings": zUpdateProjectBody.shape.project.shape.default_endpoint_settings,
+			"history_retention_seconds": zUpdateProjectBody.shape.project.shape.history_retention_seconds
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4524,7 +5668,13 @@ const operationFactories = {
 			tags: ["Project"]
 		},
 		invoke: (client, input, signal) => raw.updateProject({
-			...input,
+			path: optionalGroup({ "project_id": input["project_id"] }, true),
+			body: optionalGroup({ "project": optionalGroup({
+				"settings": input["settings"],
+				"name": input["name"],
+				"default_endpoint_settings": input["default_endpoint_settings"],
+				"history_retention_seconds": input["history_retention_seconds"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4536,8 +5686,11 @@ const operationFactories = {
 		title: "Update branch",
 		description: "Updates the specified branch.\nFor more information, see [Manage branches](https://neon.com/docs/manage/branches/).\n",
 		inputSchema: z.strictObject({
-			body: zUpdateProjectBranchBody,
-			path: zUpdateProjectBranchPath
+			"project_id": zUpdateProjectBranchPath.shape.project_id,
+			"branch_id": zUpdateProjectBranchPath.shape.branch_id,
+			"name": zUpdateProjectBranchBody.shape.branch.shape.name,
+			"protected": zUpdateProjectBranchBody.shape.branch.shape.protected,
+			"expires_at": zUpdateProjectBranchBody.shape.branch.shape.expires_at
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4553,7 +5706,15 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.updateProjectBranch({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"]
+			}, true),
+			body: optionalGroup({ "branch": optionalGroup({
+				"name": input["name"],
+				"protected": input["protected"],
+				"expires_at": input["expires_at"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4565,8 +5726,19 @@ const operationFactories = {
 		title: "Update Neon Data API",
 		description: "Updates the Neon Data API configuration for the specified branch.\nYou can optionally provide settings to update the Data API configuration.\nThe schema cache is always refreshed as part of this operation.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateProjectBranchDataApiBody.optional(),
-			path: zUpdateProjectBranchDataApiPath
+			"project_id": zUpdateProjectBranchDataApiPath.shape.project_id,
+			"branch_id": zUpdateProjectBranchDataApiPath.shape.branch_id,
+			"database_name": zUpdateProjectBranchDataApiPath.shape.database_name,
+			"db_aggregates_enabled": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["db_aggregates_enabled"].optional(),
+			"db_anon_role": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["db_anon_role"].optional(),
+			"db_extra_search_path": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["db_extra_search_path"].optional(),
+			"db_max_rows": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["db_max_rows"].optional(),
+			"db_schemas": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["db_schemas"].optional(),
+			"jwt_role_claim_key": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["jwt_role_claim_key"].optional(),
+			"jwt_cache_max_lifetime": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["jwt_cache_max_lifetime"].optional(),
+			"openapi_mode": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["openapi_mode"].optional(),
+			"server_cors_allowed_origins": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["server_cors_allowed_origins"].optional(),
+			"server_timing_enabled": zUpdateProjectBranchDataApiBody.shape.settings.unwrap().shape["server_timing_enabled"].optional()
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4582,7 +5754,23 @@ const operationFactories = {
 			tags: ["DataAPI"]
 		},
 		invoke: (client, input, signal) => raw.updateProjectBranchDataApi({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"]
+			}, true),
+			body: optionalGroup({ "settings": optionalGroup({
+				"db_aggregates_enabled": input["db_aggregates_enabled"],
+				"db_anon_role": input["db_anon_role"],
+				"db_extra_search_path": input["db_extra_search_path"],
+				"db_max_rows": input["db_max_rows"],
+				"db_schemas": input["db_schemas"],
+				"jwt_role_claim_key": input["jwt_role_claim_key"],
+				"jwt_cache_max_lifetime": input["jwt_cache_max_lifetime"],
+				"openapi_mode": input["openapi_mode"],
+				"server_cors_allowed_origins": input["server_cors_allowed_origins"],
+				"server_timing_enabled": input["server_timing_enabled"]
+			}, false) }, false),
 			client,
 			signal,
 			throwOnError: true
@@ -4594,8 +5782,11 @@ const operationFactories = {
 		title: "Update database",
 		description: "Updates the specified database in the branch.\nFor related information, see [Manage databases](https://neon.com/docs/manage/databases/).\n",
 		inputSchema: z.strictObject({
-			body: zUpdateProjectBranchDatabaseBody,
-			path: zUpdateProjectBranchDatabasePath
+			"project_id": zUpdateProjectBranchDatabasePath.shape.project_id,
+			"branch_id": zUpdateProjectBranchDatabasePath.shape.branch_id,
+			"database_name": zUpdateProjectBranchDatabasePath.shape.database_name,
+			"name": zUpdateProjectBranchDatabaseBody.shape.database.shape.name,
+			"owner_name": zUpdateProjectBranchDatabaseBody.shape.database.shape.owner_name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4611,7 +5802,15 @@ const operationFactories = {
 			tags: ["Branch"]
 		},
 		invoke: (client, input, signal) => raw.updateProjectBranchDatabase({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"database_name": input["database_name"]
+			}, true),
+			body: optionalGroup({ "database": optionalGroup({
+				"name": input["name"],
+				"owner_name": input["owner_name"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4623,8 +5822,10 @@ const operationFactories = {
 		title: "Update a function",
 		description: "Updates the function's mutable metadata — currently only the display\n`name`. A string sets the display name; `null` clears it, after which\nthe function's `name` falls back to its slug. Leading and trailing\nwhitespace is trimmed; a whitespace-only name is rejected. Acts only\non a function owned by the branch: a slug that is only inherited from\nan ancestor branch returns 404 — rename it on the branch that owns\nit. Like every other change on a branch, a rename is isolated per\nbranch: a branch forked before the rename keeps the name it had at\nfork time.\n\n**Note**: This endpoint is currently in Beta.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateProjectBranchFunctionBody,
-			path: zUpdateProjectBranchFunctionPath
+			"project_id": zUpdateProjectBranchFunctionPath.shape.project_id,
+			"branch_id": zUpdateProjectBranchFunctionPath.shape.branch_id,
+			"slug": zUpdateProjectBranchFunctionPath.shape.slug,
+			"name": zUpdateProjectBranchFunctionBody.shape.name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4640,7 +5841,12 @@ const operationFactories = {
 			tags: ["Functions"]
 		},
 		invoke: (client, input, signal) => raw.updateProjectBranchFunction({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"branch_id": input["branch_id"],
+				"slug": input["slug"]
+			}, true),
+			body: optionalGroup({ "name": input["name"] }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4652,8 +5858,19 @@ const operationFactories = {
 		title: "Update compute endpoint",
 		description: "Updates the specified compute endpoint.\n\nAn `endpoint_id` has an `ep-` prefix. A `branch_id` has a `br-` prefix.\nFor more information about compute endpoints, see [Manage computes](https://neon.com/docs/manage/endpoints/).\n\nIf the returned list of operations is not empty, the compute endpoint is not ready to use.\nThe client must wait for the last operation to finish before using the compute endpoint.\nIf the compute endpoint was idle before the update, it becomes active for a short period of time,\nand the control plane suspends it again after the update.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateProjectEndpointBody,
-			path: zUpdateProjectEndpointPath
+			"project_id": zUpdateProjectEndpointPath.shape.project_id,
+			"endpoint_id": zUpdateProjectEndpointPath.shape.endpoint_id,
+			"branch_id": zUpdateProjectEndpointBody.shape.endpoint.shape.branch_id,
+			"autoscaling_limit_min_cu": zUpdateProjectEndpointBody.shape.endpoint.shape.autoscaling_limit_min_cu,
+			"autoscaling_limit_max_cu": zUpdateProjectEndpointBody.shape.endpoint.shape.autoscaling_limit_max_cu,
+			"provisioner": zUpdateProjectEndpointBody.shape.endpoint.shape.provisioner,
+			"settings": zUpdateProjectEndpointBody.shape.endpoint.shape.settings,
+			"pooler_enabled": zUpdateProjectEndpointBody.shape.endpoint.shape.pooler_enabled,
+			"pooler_mode": zUpdateProjectEndpointBody.shape.endpoint.shape.pooler_mode,
+			"disabled": zUpdateProjectEndpointBody.shape.endpoint.shape.disabled,
+			"passwordless_access": zUpdateProjectEndpointBody.shape.endpoint.shape.passwordless_access,
+			"suspend_timeout_seconds": zUpdateProjectEndpointBody.shape.endpoint.shape.suspend_timeout_seconds,
+			"name": zUpdateProjectEndpointBody.shape.endpoint.shape.name
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4669,7 +5886,23 @@ const operationFactories = {
 			tags: ["Endpoint"]
 		},
 		invoke: (client, input, signal) => raw.updateProjectEndpoint({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"endpoint_id": input["endpoint_id"]
+			}, true),
+			body: optionalGroup({ "endpoint": optionalGroup({
+				"branch_id": input["branch_id"],
+				"autoscaling_limit_min_cu": input["autoscaling_limit_min_cu"],
+				"autoscaling_limit_max_cu": input["autoscaling_limit_max_cu"],
+				"provisioner": input["provisioner"],
+				"settings": input["settings"],
+				"pooler_enabled": input["pooler_enabled"],
+				"pooler_mode": input["pooler_mode"],
+				"disabled": input["disabled"],
+				"passwordless_access": input["passwordless_access"],
+				"suspend_timeout_seconds": input["suspend_timeout_seconds"],
+				"name": input["name"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true
@@ -4681,8 +5914,10 @@ const operationFactories = {
 		title: "Update snapshot",
 		description: "Updates the specified snapshot.\n",
 		inputSchema: z.strictObject({
-			body: zUpdateSnapshotBody,
-			path: zUpdateSnapshotPath
+			"project_id": zUpdateSnapshotPath.shape.project_id,
+			"snapshot_id": zUpdateSnapshotPath.shape.snapshot_id,
+			"name": zUpdateSnapshotBody.shape.snapshot.shape.name,
+			"expires_at": zUpdateSnapshotBody.shape.snapshot.shape.expires_at
 		}),
 		annotations: {
 			readOnlyHint: false,
@@ -4698,7 +5933,14 @@ const operationFactories = {
 			tags: ["Snapshot"]
 		},
 		invoke: (client, input, signal) => raw.updateSnapshot({
-			...input,
+			path: optionalGroup({
+				"project_id": input["project_id"],
+				"snapshot_id": input["snapshot_id"]
+			}, true),
+			body: optionalGroup({ "snapshot": optionalGroup({
+				"name": input["name"],
+				"expires_at": input["expires_at"]
+			}, true) }, true),
 			client,
 			signal,
 			throwOnError: true