Some embodiments of the present invention provide a system that charges a lithium-ion battery. During operation, the system monitors: a current through the battery, a voltage of the battery, and a temperature of the battery. Next, the system uses the monitored current, voltage and temperature to control a charging process for the battery. In some embodiments, controlling the charging process involves: inferring electrode lithium surface concentrations for the battery from the monitored current, voltage and temperature; and applying the charging current and/or the charging voltage in a manner that maintains the inferred electrode lithium surface concentrations for the battery within set limits.