This paper is concerned with optimal control of batch and repetitive processes in the presence of uncertainty. An integrated two-layer optimization strategy is proposed, whereby within-run corrections are performed using a neighboring-extremal update strategy and run-to-run corrections are based on a constraint-adaptation scheme. The latter is appealing since a feasible operating strategy is guaranteed upon convergence, and its combination with neighboring-extremal updates improves the reactivity and convergence speed. Moreover, these two layers are consistent in that they share the same objective function. The proposed optimization scheme is declined into two versions, namely an indirect version based on the Pontryagin maximum principle and a direct version that applies a control parameterization and nonlinear programming techniques. Although less rigorous, the latter approach can deal with singular extremals and path constraints as well as handle active-set changes more conveniently. Two case studies are considered. The indirect approach is demonstrated for a level-control problem in an experimental two-tank system, whereas the direct approach is illustrated in numerical simulation on a fed-batch reactor for acetoacetylation of pyrrole. The results confirm that faster adaptation is possible with the proposed integrated two-layer scheme compared to either constraint adaptation or neighboring-extremal update alone. (c) 2013 Elsevier Ltd. All rights reserved.