Some embodiments of the present invention provide a system that adaptively charges a battery, wherein the battery is a lithium-ion battery which includes a transport-limiting electrode governed by diffusion, an electrolyte separator and a non-transport-limiting electrode. During operation, the system determines a lithium surface concentration at an interface between the transport-limiting electrode and the electrolyte separator based on a diffusion time for lithium in the transport-limiting electrode. Next, the system calculates a charging current or a charging voltage for the battery based on the determined lithium surface concentration. Finally, the system applies the charging current or the charging voltage to the battery.